Menu
▾
▴
stack-cvs — CVS-commit messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(486) |
Jul
(201) |
Aug
(194) |
Sep
(87) |
Oct
(72) |
Nov
(72) |
Dec
(4) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(6) |
Feb
(41) |
Mar
(22) |
Apr
(4) |
May
(12) |
Jun
|
Jul
|
Aug
(42) |
Sep
(21) |
Oct
(14) |
Nov
(10) |
Dec
|
| 2007 |
Jan
(14) |
Feb
(34) |
Mar
(61) |
Apr
(54) |
May
(140) |
Jun
(184) |
Jul
(164) |
Aug
(130) |
Sep
(241) |
Oct
(175) |
Nov
(148) |
Dec
(96) |
| 2008 |
Jan
(5) |
Feb
(38) |
Mar
(30) |
Apr
(46) |
May
(25) |
Jun
(22) |
Jul
(5) |
Aug
(17) |
Sep
(2) |
Oct
(100) |
Nov
(83) |
Dec
(33) |
| 2009 |
Jan
(127) |
Feb
(43) |
Mar
(86) |
Apr
(34) |
May
(50) |
Jun
(168) |
Jul
(48) |
Aug
(66) |
Sep
(38) |
Oct
(75) |
Nov
(113) |
Dec
(72) |
| 2010 |
Jan
(123) |
Feb
(68) |
Mar
(26) |
Apr
(11) |
May
(39) |
Jun
(131) |
Jul
(56) |
Aug
(79) |
Sep
(69) |
Oct
(17) |
Nov
(166) |
Dec
(32) |
| 2011 |
Jan
(21) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
(1) |
Nov
(8) |
Dec
|
| 2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Chris S. <san...@us...> - 2011-01-24 15:03:44
|
Update of /cvsroot/stack/worksheets In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20772 Modified Files: worksheets.php Log Message: Index: worksheets.php =================================================================== RCS file: /cvsroot/stack/worksheets/worksheets.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** worksheets.php 24 Jan 2011 14:53:43 -0000 1.21 --- worksheets.php 24 Jan 2011 15:03:36 -0000 1.22 *************** *** 108,111 **** --- 108,123 ---- echo "<html>\n<head>\n<title>Worksheet support questions</title>\n"; + /* + echo '<style type="text/css" media="all"> + @import "styles.css"; + </style> + + <script type="text/javascript" src="'.$engine.'/lib/ui/inputTypes/dragmath/dragmath.php"></script> + <script type="text/javascript" src="'.$engine.'/lib/ui/helpPopup.js"></script> + <script type="text/javascript" src="'.$engine.'/tmp/load.js"></script> + + </head>'; + */ + echo '<style type="text/css" media="all"> @import "styles.css"; |
|
From: Chris S. <san...@us...> - 2011-01-24 14:53:52
|
Update of /cvsroot/stack/worksheets In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18402 Modified Files: worksheets.php Log Message: Index: worksheets.php =================================================================== RCS file: /cvsroot/stack/worksheets/worksheets.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** worksheets.php 8 Feb 2010 20:36:33 -0000 1.20 --- worksheets.php 24 Jan 2011 14:53:43 -0000 1.21 *************** *** 112,118 **** </style> ! <script type="text/javascript" src="'.$engine.'/lib/ui/inputTypes/dragmath/dragmath.php"></script> ! <script type="text/javascript" src="'.$engine.'/lib/ui/helpPopup.js"></script> ! <script type="text/javascript" src="'.$engine.'/tmp/load.js"></script> </head>'; --- 112,116 ---- </style> ! <script type="text/javascript" src="load.js"></script> </head>'; *************** *** 173,175 **** } catch(err) {}</script> </body> ! </html> \ No newline at end of file --- 171,173 ---- } catch(err) {}</script> </body> ! </html> \ No newline at end of file |
|
From: Chris S. <san...@us...> - 2011-01-24 09:47:29
|
Update of /cvsroot/stack/stack-dev/lang/en In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24177/lang/en Modified Files: stack.php Log Message: Index: stack.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lang/en/stack.php,v retrieving revision 1.162 retrieving revision 1.163 diff -C2 -d -r1.162 -r1.163 *** stack.php 20 Jan 2011 18:17:39 -0000 1.162 --- stack.php 24 Jan 2011 09:47:20 -0000 1.163 *************** *** 352,356 **** $string['ATNumSigFigs_error_list'] = $string['ATFacForm_error_list']; $string['ATNumSigFigs_NotDecimal'] = 'Your answer should be a decimal number, but is not! '; ! $string['ATNumSigFigs_Inaccurate'] = 'The accuracy of your answer is not correct. Either you have rounded correctly, or you have rounded an intermediate answer which propagates an error.'; $string['ATNumSigFigs_WrongDigits'] = 'Your answer contains the wrong number of significant digits. '; --- 352,356 ---- $string['ATNumSigFigs_error_list'] = $string['ATFacForm_error_list']; $string['ATNumSigFigs_NotDecimal'] = 'Your answer should be a decimal number, but is not! '; ! $string['ATNumSigFigs_Inaccurate'] = 'The accuracy of your answer is not correct. Either you have not rounded correctly, or you have rounded an intermediate answer which propagates an error.'; $string['ATNumSigFigs_WrongDigits'] = 'Your answer contains the wrong number of significant digits. '; |
|
From: Chris S. <san...@us...> - 2011-01-21 08:45:24
|
Update of /cvsroot/stack/stack-dev/lib/answertests In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24489 Modified Files: AnsTestController.php Log Message: Index: AnsTestController.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/answertests/AnsTestController.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** AnsTestController.php 20 Jan 2011 18:20:03 -0000 1.35 --- AnsTestController.php 21 Jan 2011 08:45:15 -0000 1.36 *************** *** 386,388 **** } ! ?> \ No newline at end of file --- 386,388 ---- } ! ?> \ No newline at end of file |
|
From: Chris S. <san...@us...> - 2011-01-20 18:20:30
|
Update of /cvsroot/stack/stack-dev/lib/ui/inputTypes In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv11288 Modified Files: ListIT.php Log Message: Addition of Grobner packages. Chris Index: ListIT.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/ui/inputTypes/ListIT.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ListIT.php 30 Sep 2010 16:56:13 -0000 1.7 --- ListIT.php 20 Jan 2011 18:20:22 -0000 1.8 *************** *** 299,303 **** foreach($randomSet as $id) { ! $xhtml .= '<option value="'.$displayVals[$id]['list_label'].'">'.$displayVals[$id]['list_label'].'</option>'; } } else { --- 299,303 ---- foreach($randomSet as $id) { ! $xhtml .= '<option value="'.$displayVals[$id]['list_label'].'">'.$displayVals[$id]['list_display'].'</option>'; } } else { *************** *** 307,315 **** if($this->default == $displayVals[$id]['list_label']) { ! $xhtml .= '<option value="'.$displayVals[$id]['list_label'].'" selected>'.$displayVals[$id]['list_label'].'</option>'; } else { ! $xhtml .= '<option value="'.$displayVals[$id]['list_label'].'">'.$displayVals[$id]['list_label'].'</option>'; } } --- 307,315 ---- if($this->default == $displayVals[$id]['list_label']) { ! $xhtml .= '<option value="'.$displayVals[$id]['list_label'].'" selected>'.$displayVals[$id]['list_display'].'</option>'; } else { ! $xhtml .= '<option value="'.$displayVals[$id]['list_label'].'">'.$displayVals[$id]['list_display'].'</option>'; } } |
|
From: Chris S. <san...@us...> - 2011-01-20 18:20:11
|
Update of /cvsroot/stack/stack-dev/lib/answertests In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10765 Modified Files: AnsTestController.php Added Files: SysEquiv.php Log Message: Addition of Grobner packages. Chris --- NEW FILE: SysEquiv.php --- <?php /** * * Welcome to STACK. A system for teaching and assessment using a * computer algebra kernel. * * This file is licensed under the GPL License. * * A copy of the license is in your STACK distribution called * license.txt. If you are missing this file you can obtain * it from: * http://www.stack.bham.ac.uk/license.txt * * @author Jonathan Hart (j.p...@bh...) * * @package stackAnswertest */ global $config; require_once $config->get('docroot').'/lib/items/CasString.php'; require_once $config->get('docroot').'/lib/CAS/maximaConnector.php'; require_once 'AnsTest.php'; /** * detailed description * * @author * @version * @copyright */ class SysEquiv extends AnsTest { // Attributes // Associations // Operations /** * constant * The name of the cas function this answer test uses. */ const casFunction = 'ATSysEquiv'; /** * * * @param string $sAnsKey * @param string $tAnsKey * @param CasString $casOption * @access public */ public function __construct($sAnsKey, $tAnsKey, $maximaPreferencs, $casOption = NULL) { parent::__construct($sAnsKey, $tAnsKey, $maximaPreferencs, $casOption); } /** * * * @return bool * @access public */ public function doAnsTest() { $this->maximaPreferences->updateOption('Simplify', 'false'); $mconn = new maximaConnector($this->maximaPreferences); $result = $mconn->sendAnsTest($this->sAnsKey,$this->tAnsKey, self::casFunction); $this->ATMark = $result['rawmark']; $this->ATAnsNote = $result['answernote']; $this->ATFeedback = $result['feedback']; $this->ATError = $result['error']; if($this->ATMark == '1') { //echo '<strong>Returning true</strong>'; return true; } else { //echo '<strong>Returning false</strong>'; return false; } } } ?> Index: AnsTestController.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/answertests/AnsTestController.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** AnsTestController.php 30 Oct 2009 16:43:36 -0000 1.34 --- AnsTestController.php 20 Jan 2011 18:20:03 -0000 1.35 *************** *** 64,68 **** 'SameType'=>get_string('stackOptions_AnsTest_values_SameType','stack',''), 'SubstEquiv'=>get_string('stackOptions_AnsTest_values_SubstEquiv','stack',''), ! 'Expanded'=>get_string('stackOptions_AnsTest_values_Expanded','stack',''), 'FacForm'=>get_string('stackOptions_AnsTest_values_FacForm','stack',''), 'SingleFrac'=>get_string('stackOptions_AnsTest_values_SingleFrac','stack',''), --- 64,68 ---- 'SameType'=>get_string('stackOptions_AnsTest_values_SameType','stack',''), 'SubstEquiv'=>get_string('stackOptions_AnsTest_values_SubstEquiv','stack',''), ! 'SysEquiv'=>get_string('stackOptions_AnsTest_values_SysEquiv','stack',''), 'Expanded'=>get_string('stackOptions_AnsTest_values_Expanded','stack',''), 'FacForm'=>get_string('stackOptions_AnsTest_values_FacForm','stack',''), 'SingleFrac'=>get_string('stackOptions_AnsTest_values_SingleFrac','stack',''), *************** *** 190,193 **** --- 190,198 ---- break; + case 'SysEquiv': + require_once 'SysEquiv.php'; + $this->AT = new SysEquiv($sAns, $tAns, $maximaPreferences, $AnsTestOption); + break; + // The following two are only used in the module ODE and should not be available for questions. // CJS, 30/10/9 *************** *** 381,383 **** } ! ?> \ No newline at end of file --- 386,388 ---- } ! ?> \ No newline at end of file |
|
From: Chris S. <san...@us...> - 2011-01-20 18:19:49
|
Update of /cvsroot/stack/stack-dev/lib/XML/schemas In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10577 Modified Files: stack_question.xsd stack_quiz.xsd Log Message: Addition of Grobner packages. Chris Index: stack_quiz.xsd =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/XML/schemas/stack_quiz.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** stack_quiz.xsd 17 Sep 2007 16:09:08 -0000 1.1 --- stack_quiz.xsd 20 Jan 2011 18:19:40 -0000 1.2 *************** *** 378,381 **** --- 378,382 ---- <xs:enumeration value="StringSloppy" /> <xs:enumeration value="RegExp" /> + <xs:enumeration value="SysEquiv" /> <xs:enumeration value="True" /> </xs:restriction> *************** *** 403,406 **** --- 404,408 ---- <xs:enumeration value="StringSloppy" /> <xs:enumeration value="RegExp" /> + <xs:enumeration value="SysEquiv" /> <xs:enumeration value="True" /> </xs:restriction> *************** *** 892,895 **** --- 894,898 ---- <xs:enumeration value="StringSloppy" /> <xs:enumeration value="RegExp" /> + <xs:enumeration value="SysEquiv" /> <xs:enumeration value="True" /> </xs:restriction> Index: stack_question.xsd =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/XML/schemas/stack_question.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** stack_question.xsd 17 Sep 2007 16:07:51 -0000 1.1 --- stack_question.xsd 20 Jan 2011 18:19:40 -0000 1.2 *************** *** 378,381 **** --- 378,382 ---- <xs:enumeration value="StringSloppy" /> <xs:enumeration value="RegExp" /> + <xs:enumeration value="SysEquiv" /> <xs:enumeration value="True" /> </xs:restriction> *************** *** 403,406 **** --- 404,408 ---- <xs:enumeration value="StringSloppy" /> <xs:enumeration value="RegExp" /> + <xs:enumeration value="SysEquiv" /> <xs:enumeration value="True" /> </xs:restriction> *************** *** 892,895 **** --- 894,898 ---- <xs:enumeration value="StringSloppy" /> <xs:enumeration value="RegExp" /> + <xs:enumeration value="SysEquiv" /> <xs:enumeration value="True" /> </xs:restriction> |
|
From: Chris S. <san...@us...> - 2011-01-20 18:17:47
|
Update of /cvsroot/stack/stack-dev/lang/en In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10045 Modified Files: stack.php Log Message: Addition of Grobner packages. Chris Index: stack.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lang/en/stack.php,v retrieving revision 1.161 retrieving revision 1.162 diff -C2 -d -r1.161 -r1.162 *** stack.php 2 Dec 2010 19:25:55 -0000 1.161 --- stack.php 20 Jan 2011 18:17:39 -0000 1.162 *************** *** 190,193 **** --- 190,194 ---- $string['stackOptions_AnsTest_values_RegExp'] = "RegExp"; $string['stackOptions_AnsTest_values_EquationAT'] = "EquationAT"; + $string['stackOptions_AnsTest_values_SysEquiv'] = "SysEquiv"; $string['stackOptions_AssumePos_values_true'] = "true"; *************** *** 354,357 **** --- 355,369 ---- $string['ATNumSigFigs_WrongDigits'] = 'Your answer contains the wrong number of significant digits. '; + $string['ATSysEquiv_SA_not_list'] = 'Your answer should be a list, but it is not!'; + $string['ATSysEquiv_SB_not_list'] = 'The Teacher\'s answer is not a list. Please contact your teacher.'; + $string['ATSysEquiv_SA_not_eq_list'] = 'Your answer should be a list of equations, but it is not!'; + $string['ATSysEquiv_SB_not_eq_list'] = 'Teacher answer is not a list of equations'; + $string['ATSysEquiv_SA_not_poly_eq_list'] = 'One or more of your equations is not a polynomial!'; + $string['ATSysEquiv_SB_not_poly_eq_list'] = 'The Teacher\'s answer should be a list of polynomial equations, but is not. Please contact your teacher.'; + $string['ATSysEquiv_SA_missing_variables'] = 'Your answer is missing one or more variables!'; + $string['ATSysEquiv_SA_extra_variables'] = 'Your answer includes too many variables!'; + $string['ATSysEquiv_SA_system_underdetermined'] = 'The equations in your system appear to be correct, but you need others besides.'; + $string['ATSysEquiv_SA_system_overdetermined'] = 'The entries in red below are those that are incorrect. {$a[0]} '; + *************** *** 1322,1326 **** $string['matrix_noDim'] = 'Could not get matrix dimensions, Please check Teachers answer is a matrix.'; ! $string['list_label'] = 'Label'; $string['list_display'] = 'Displayed'; $string['list_input_type'] = 'Display Type'; --- 1334,1338 ---- $string['matrix_noDim'] = 'Could not get matrix dimensions, Please check Teachers answer is a matrix.'; ! $string['list_label'] = 'Value'; $string['list_display'] = 'Displayed'; $string['list_input_type'] = 'Display Type'; |
|
From: Chris S. <san...@us...> - 2011-01-20 18:17:25
|
Update of /cvsroot/stack/stack-dev/maxima In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9936/maxima Modified Files: stackmaxima.mac unittests_load.mac Log Message: Addition of Grobner packages. Chris Index: unittests_load.mac =================================================================== RCS file: /cvsroot/stack/stack-dev/maxima/unittests_load.mac,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** unittests_load.mac 6 Dec 2010 16:03:38 -0000 1.6 --- unittests_load.mac 20 Jan 2011 18:17:17 -0000 1.7 *************** *** 27,28 **** --- 27,29 ---- print(SFB); + Index: stackmaxima.mac =================================================================== RCS file: /cvsroot/stack/stack-dev/maxima/stackmaxima.mac,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** stackmaxima.mac 6 Dec 2010 16:03:38 -0000 1.88 --- stackmaxima.mac 20 Jan 2011 18:17:17 -0000 1.89 *************** *** 854,859 **** /* Turn our equations into expressions */ ! S1: ev(maplist(stack_eqnprepare,stack_eval_assignments(exdowncase(SA))),simp), ! S2: ev(maplist(stack_eqnprepare,stack_eval_assignments(exdowncase(SB))),simp), kill(SB), --- 854,859 ---- /* Turn our equations into expressions */ ! S1: ev(maplist(stack_eqnprepare,stack_eval_assignments(SA)),simp), ! S2: ev(maplist(stack_eqnprepare,stack_eval_assignments(SB)),simp), kill(SB), *************** *** 890,895 **** return(ATSysEquivGrob(GA, GB, SA, varlist)) - - )$ --- 890,893 ---- *************** *** 940,944 **** )$ - /*****************************************************************/ --- 938,941 ---- |
|
From: Chris S. <san...@us...> - 2011-01-20 18:17:25
|
Update of /cvsroot/stack/stack-dev In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9936 Added Files: .project Log Message: Addition of Grobner packages. Chris --- NEW FILE: .project --- <?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>stack_grobner</name> <comment></comment> <projects> </projects> <buildSpec> </buildSpec> <natures> </natures> </projectDescription> |
|
From: Chris S. <san...@us...> - 2011-01-20 18:17:25
|
Update of /cvsroot/stack/stack-dev/install In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9936/install Modified Files: answer_test_testsuite.php Log Message: Addition of Grobner packages. Chris Index: answer_test_testsuite.php =================================================================== RCS file: /cvsroot/stack/stack-dev/install/answer_test_testsuite.php,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** answer_test_testsuite.php 6 Dec 2010 19:18:25 -0000 1.60 --- answer_test_testsuite.php 20 Jan 2011 18:17:17 -0000 1.61 *************** *** 226,229 **** --- 226,243 ---- $testsuite[] = stack_testsuite_construct('SameType','x>1','x>=1',1,'',''); + $testsuite[] = stack_testsuite_construct('SysEquiv','[90=v*t,90=(v+5)*(t-1/4)]','[90=v*t,90=(v+5)*(t-1/4)]',1,'',''); + $testsuite[] = stack_testsuite_construct('SysEquiv','[d=90,d=v*t,d=(v+5)*(t-1/4)]','[90=v*t,90=(v+5)*(t-1/4)]',1,'',''); + $testsuite[] = stack_testsuite_construct('SysEquiv','1','[90=v*t,90=(v+5)*(t-1/4)]',0,'',''); + $testsuite[] = stack_testsuite_construct('SysEquiv','[90=v*t,90=(v+5)*(t-1/4)]','1',0,'',''); + $testsuite[] = stack_testsuite_construct('SysEquiv','[1]','[90=v*t,90=(v+5)*(t-1/4)]',0,'',''); + $testsuite[] = stack_testsuite_construct('SysEquiv','[90=v*t,90=(v+5)*(t-1/4)]','[1]',0,'',''); + $testsuite[] = stack_testsuite_construct('SysEquiv','[90=v*t^t,90=(v+5)*(t-1/4)]','[90=v*t,90=(v+5)*(t-1/4)]',0,'',''); + $testsuite[] = stack_testsuite_construct('SysEquiv','[90=v*t,90=(v+5)*(t-1/4)]','[90=v*t^t,90=(v+5)*(t-1/4)]',0,'',''); + $testsuite[] = stack_testsuite_construct('SysEquiv','[90=v*t,90=(v+5)*(t*x-1/4)]','[90=v*t,90=(v+5)*(t-1/4)]',0,'',''); + $testsuite[] = stack_testsuite_construct('SysEquiv','[90=v*t,90=(v+5)*(t-1/4)]','[90=v*t,90=(v+5)*(t*x-1/4)]',0,'',''); + $testsuite[] = stack_testsuite_construct('SysEquiv','[90=v*t]','[90=v*t,90=(v+5)*(t-1/4)]',0,'',''); + $testsuite[] = stack_testsuite_construct('SysEquiv','[90=v*t,90=(v+5)*(t-1/4),90=(v+6)*(t-1/5)]','[90=v*t,90=(v+5)*(t-1/4)]',0,'',''); + $testsuite[] = stack_testsuite_construct('SysEquiv','[90=v*t,90=(v+5)*(t-1/4),90=(v+6)*(t-1/5),90=(v+7)*(t-1/4),90=(v+8)*(t-1/3)]','[90=v*t,90=(v+5)*(t-1/4)]',0,'',''); + $testsuite[] = stack_testsuite_construct('Expanded','1/0','0',0,'',''); *************** *** 516,519 **** --- 530,535 ---- + + /* Create an array with all available tests on it */ foreach ($testsuite as $ts) { |
|
From: Simon H. <sim...@us...> - 2010-12-21 15:50:00
|
Update of /cvsroot/stack/stack-dev/install/update In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9069/install/update Modified Files: Updater.php Log Message: Added missing trigger updating from STACK 2.0 beta to STACK 2.2 Index: Updater.php =================================================================== RCS file: /cvsroot/stack/stack-dev/install/update/Updater.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Updater.php 30 Sep 2010 16:56:14 -0000 1.7 --- Updater.php 21 Dec 2010 15:49:52 -0000 1.8 *************** *** 21,25 **** require_once($root.'/lib/database/StackDBBackup.php'); ! define(STACK_CURRENT, 'STACK 2.2'); //The latest version of STACK. class Updater{ --- 21,25 ---- require_once($root.'/lib/database/StackDBBackup.php'); ! define(STACK_CURRENT, 'STACK 2.2'); //The latest version of STACK: also defined in Updater.php and installFunctions() [bad!] class Updater{ *************** *** 63,69 **** unset($update); - // bit of a jump!? - case 'STACK 2.0 beta': require_once('updates/TwoPointTwo.php'); //load the code to update STACK to 2.2 $update = new TwoPointTwo($this->errorLog); --- 63,68 ---- unset($update); case 'STACK 2.0 beta': + case 'STACK 2.1': // no update defined require_once('updates/TwoPointTwo.php'); //load the code to update STACK to 2.2 $update = new TwoPointTwo($this->errorLog); |
|
From: Chris S. <san...@us...> - 2010-12-20 18:11:51
|
Update of /cvsroot/stack/stack-dev/lib/reporting In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18833/lib/reporting Modified Files: StackReport.php Log Message: Localise the URLs from the config file. Index: StackReport.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/reporting/StackReport.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** StackReport.php 20 Dec 2010 18:05:10 -0000 1.30 --- StackReport.php 20 Dec 2010 18:11:43 -0000 1.31 *************** *** 1367,1371 **** $xhtml .= '<h4>The student was presented with this question note:</h4><p>' . $data['note'] . '</p>'; } ! $xhtml .= '<p><a href="'.$root.'/lib/ui/questionTest.php?id='.$selQ.'&seed='.$data['item']->getQuestionSeed(). '"> Click here to try it in the test question interface.</a></p>'; $xhtml .= '<h4>They made the following attempts:</h4><p>' . $data['item']->displayAttempts() . '</p>'; --- 1367,1372 ---- $xhtml .= '<h4>The student was presented with this question note:</h4><p>' . $data['note'] . '</p>'; } ! $qID = $data['item']->getQuestionId(); ! $xhtml .= '<p><a href="'.$root.'/lib/ui/questionTest.php?id='.$qID.'&seed='.$data['item']->getQuestionSeed(). '"> Click here to try it in the test question interface.</a></p>'; $xhtml .= '<h4>They made the following attempts:</h4><p>' . $data['item']->displayAttempts() . '</p>'; |
|
From: Chris S. <san...@us...> - 2010-12-20 18:05:18
|
Update of /cvsroot/stack/stack-dev/lib/reporting In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv17435/lib/reporting Modified Files: StackReport.php Log Message: Localise the URLs from the config file. Index: StackReport.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/reporting/StackReport.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** StackReport.php 20 Dec 2010 14:19:11 -0000 1.29 --- StackReport.php 20 Dec 2010 18:05:10 -0000 1.30 *************** *** 68,74 **** $xhtml .= $this->simpleInterface(); break; ! // The rest probably aren't worth considering anymore. ! case 'question': $qID = $posted['questionSelector']; --- 68,74 ---- $xhtml .= $this->simpleInterface(); break; ! // The rest probably aren't worth considering anymore. ! case 'question': $qID = $posted['questionSelector']; *************** *** 94,98 **** default: ! break; } --- 94,98 ---- default: ! break; } *************** *** 1344,1351 **** public function simpleInterface() { ! $db = new StackDBReporting(); ! $widgets = new ReportWidgets(); ! $xhtml = '<div class="section"><h3>Quick report</h3>'; $xhtml .= "<form method='POST' action='report.php?type=simple'>"; --- 1344,1353 ---- public function simpleInterface() { ! global $config; ! $root = $config->get('weburl'); ! $db = new StackDBReporting(); ! $widgets = new ReportWidgets(); ! $xhtml = '<div class="section"><h3>Quick report</h3>'; $xhtml .= "<form method='POST' action='report.php?type=simple'>"; *************** *** 1353,1379 **** $xhtml .= $widgets->questionSelector($_POST['questionSelector']); ! $selQ = ! empty($_POST['questionSelector']); $selS = ! empty($_POST['studentSelector']); ! if ($selQ and $selS) { // both question and student selected ! $data = $db->latestAttemptItem($_POST['questionSelector'], $_POST['studentSelector']); //$xhtml .= print_r ($data, true); ! ! $xhtml .= '<h4>The student was presented with this question note:</h4><p>' . $data['note'] . '</p><p> ! <a href="http://localhost/stack/lib/ui/questionTest.php?id=19&seed=' ! . $data['item']->getQuestionSeed() ! . '"> Click here to try it in the test question interface.</a></p>'; ! $xhtml .= '<h4>They made the following attempts:</h4><p>' . $data['item']->displayAttempts() . '</p>'; ! ! $xhtml .= '<h4>And here is a worked solution:</h4><p>' . $data['item']->getWorkedSolution() . '</p>'; ! ! } else if ($selS) { // just a student selected ! $qsTried = $db->questionsByStudent($_POST['studentSelector']); ! if ($qsTried) { $xhtml .= '<table>'; --- 1355,1381 ---- $xhtml .= $widgets->questionSelector($_POST['questionSelector']); ! $selQ = ! empty($_POST['questionSelector']); $selS = ! empty($_POST['studentSelector']); ! if ($selQ and $selS) { // both question and student selected ! $data = $db->latestAttemptItem($_POST['questionSelector'], $_POST['studentSelector']); //$xhtml .= print_r ($data, true); ! ! if (''!=trim($data['note'])) { ! $xhtml .= '<h4>The student was presented with this question note:</h4><p>' . $data['note'] . '</p>'; ! } ! $xhtml .= '<p><a href="'.$root.'/lib/ui/questionTest.php?id='.$selQ.'&seed='.$data['item']->getQuestionSeed(). '"> Click here to try it in the test question interface.</a></p>'; ! $xhtml .= '<h4>They made the following attempts:</h4><p>' . $data['item']->displayAttempts() . '</p>'; ! ! $xhtml .= '<h4>And here is a worked solution:</h4><p>' . $data['item']->getWorkedSolution() . '</p>'; ! ! } else if ($selS) { // just a student selected ! $qsTried = $db->questionsByStudent($_POST['studentSelector']); ! if ($qsTried) { $xhtml .= '<table>'; *************** *** 1399,1411 **** $xhtml .= '<p>It would appear this student has never tried a question.</p>'; } ! } else if ($selQ) { // just a question selected ! // Some question notes ! $xhtml .= '<h4>The question has the following question notes</h4>'; ! $qNotes = $db->questionNotes($_POST['questionSelector']); ! if ($qNotes) { foreach ($qNotes as $note) { --- 1401,1413 ---- $xhtml .= '<p>It would appear this student has never tried a question.</p>'; } ! } else if ($selQ) { // just a question selected ! // Some question notes ! $xhtml .= '<h4>The question has the following question notes</h4>'; ! $qNotes = $db->questionNotes($_POST['questionSelector']); ! if ($qNotes) { foreach ($qNotes as $note) { *************** *** 1415,1429 **** $xhtml .= "<p>There are no question notes!</p>"; } ! /* // Lots of PRTs ! $xhtml .= '<h4>PRTs for this question</h4>'; ! $prts = $db->PRTs($_POST['questionSelector']); ! $xhtml .= '<div style="display: block; border: 1px solid #000; padding: 10px; margin: 10px;"> prts by q gives <pre>' . print_r($prts,1) . '</pre></div>'; ! foreach ($prts as $name => $prt) { $xhtml .= "<h5>$name has {$prt['total']} had attempt(s) made at it</h5>"; --- 1417,1431 ---- $xhtml .= "<p>There are no question notes!</p>"; } ! /* // Lots of PRTs ! $xhtml .= '<h4>PRTs for this question</h4>'; ! $prts = $db->PRTs($_POST['questionSelector']); ! $xhtml .= '<div style="display: block; border: 1px solid #000; padding: 10px; margin: 10px;"> prts by q gives <pre>' . print_r($prts,1) . '</pre></div>'; ! foreach ($prts as $name => $prt) { $xhtml .= "<h5>$name has {$prt['total']} had attempt(s) made at it</h5>"; *************** *** 1435,1452 **** } $xhtml .= '<th>Total attempts</td><th>Percentage</th></tr>'; ! // And the rest is to be done in the MORNING, well later in the morning. // refer to report.js:409 ! $xhtml .= '</table>'; } */ ! // and lots of students ! $xhtml .= '<h4>Students who attempted this question</h4>'; ! $ssTried = $db->studentsByQuestion($_POST['questionSelector']); ! if ($ssTried) { $xhtml .= '<table>'; --- 1437,1454 ---- } $xhtml .= '<th>Total attempts</td><th>Percentage</th></tr>'; ! // And the rest is to be done in the MORNING, well later in the morning. // refer to report.js:409 ! $xhtml .= '</table>'; } */ ! // and lots of students ! $xhtml .= '<h4>Students who attempted this question</h4>'; ! $ssTried = $db->studentsByQuestion($_POST['questionSelector']); ! if ($ssTried) { $xhtml .= '<table>'; *************** *** 1472,1478 **** $xhtml .= '<p>Apparently no attempt has ever been made at this question.</p>'; } ! } ! $xhtml .= '</form>'; $xhtml .= '</div>'; --- 1474,1480 ---- $xhtml .= '<p>Apparently no attempt has ever been made at this question.</p>'; } ! } ! $xhtml .= '</form>'; $xhtml .= '</div>'; |
|
From: Chris S. <san...@us...> - 2010-12-20 17:35:53
|
Update of /cvsroot/stack/stack-dev/sample_questions In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv13304/sample_questions Modified Files: test_8.xml Log Message: Index: test_8.xml =================================================================== RCS file: /cvsroot/stack/stack-dev/sample_questions/test_8.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** test_8.xml 23 Jun 2009 14:39:35 -0000 1.2 --- test_8.xml 20 Dec 2010 17:35:44 -0000 1.3 *************** *** 3,5 **** \[ z^@n@=@p^n@.\] Enter your answer as a set of numbers. ! #ans1# <IEfeedback>ans1</IEfeedback><PRTfeedback>ans</PRTfeedback></castext><forbidFloats>false</forbidFloats><simplify>true</simplify></questionStem><questionVariables type="RawKeyVal"><rawKeyVals>n = rand(2)+3; p = rand(3)+2; ta = setify(makelist(p*%e^(2*%pi*%i*k/n),k,1,n))</rawKeyVals><forbidFloats>false</forbidFloats><simplify>true</simplify></questionVariables><workedSolution type="CasText"><castext></castext><forbidFloats>false</forbidFloats><simplify>true</simplify></workedSolution><questionNote type="CasText"><castext></castext><forbidFloats>false</forbidFloats><simplify>true</simplify></questionNote></questionCasValues><questionparts><questionpart><name>ans1</name><inputType type="Meta"><selection>Algebraic Input</selection><default>Algebraic Input</default><values/></inputType><boxsize>30</boxsize><teachersAns type="CasString"><casString>ta</casString><forbidFloats>false</forbidFloats><simplify>true</simplify></teachersAns><studentAnsKey>ans1</studentAnsKey><syntax type="Meta"><selection>{?,?,...,?}</selection><default></default><values/></syntax><stackoption><name>formalSyntax</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey></casKey><casType></casType><selected>true</selected></stackoption><stackoption><name>forbidFloats</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>OPT_NoFloats</casKey><casType>ex</casType><selected>true</selected></stackoption><stackoption><name>insertStars</name><type>list</type><default>false</default><values><value>true</value><value>false</value></values><casKey></casKey><casType></casType><selected>false</selected></stackoption><stackoption><name>sameType</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey></casKey><casType></casType><selected>true</selected></stackoption><stackoption><name>lowestTerms</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>OPT_LowestTerms</casKey><casType>ex</casType><selected>true</selected></stackoption><inputTypesParameters/></questionpart></questionparts><PotentialResponseTrees><PotentialResponseTree><prtname>PotResTree_ans</prtname><questionValue>1</questionValue><autoSimplify>true</autoSimplify><feedbackVariables>a1 = listify(ans1); a1 = maplist(lambda([x],x^n-p^n),a1); a1 = setify(a1)</feedbackVariables><description type="Meta"><selection></selection><default></default><values/></description><PotentialResponses><PR id="0"><answerTest>AlgEquiv</answerTest><teachersAns>ta</teachersAns><studentAns>ans1</studentAns><testoptions></testoptions><quietAnsTest>1</quietAnsTest><true><rawModMark>=</rawModMark><rawMark>1</rawMark><feedback></feedback><ansnote>ans-0-T </ansnote><nextPR>-1</nextPR></true><false><rawModMark>=</rawModMark><rawMark>0</rawMark><feedback></feedback><ansnote>ans-0-F </ansnote><nextPR>1</nextPR></false><teacherNote></teacherNote></PR><PR id="1"><answerTest>AlgEquiv</answerTest><teachersAns>{p}</teachersAns><studentAns>ans1</studentAns><testoptions></testoptions><quietAnsTest>1</quietAnsTest><true><rawModMark>=</rawModMark><rawMark>0</rawMark><feedback>There are more answers that just the single real number. Please consider complex solutions to this problem!</feedback><ansnote>ans-1-T </ansnote><nextPR>-1</nextPR></true><false><rawModMark>=</rawModMark><rawMark>0</rawMark><feedback></feedback><ansnote>ans-1-F </ansnote><nextPR>2</nextPR></false><teacherNote></teacherNote></PR><PR id="2"><answerTest>AlgEquiv</answerTest><teachersAns>{0}</teachersAns><studentAns>a1</studentAns><testoptions></testoptions><quietAnsTest>1</quietAnsTest><true><rawModMark>=</rawModMark><rawMark>0</rawMark><feedback>All your answers satisfy the equation. But, you have missed some of the solutions.</feedback><ansnote>ans-2-T </ansnote><nextPR>-1</nextPR></true><false><rawModMark>=</rawModMark><rawMark>0</rawMark><feedback></feedback><ansnote>ans-2-F </ansnote><nextPR>-1</nextPR></false><teacherNote></teacherNote></PR></PotentialResponses></PotentialResponseTree></PotentialResponseTrees><MetaData><dc:Publisher stackname="lastUserEditor" type="Meta"><selection>2</selection><default></default><values/></dc:Publisher><dc:language stackname="language" type="Meta"><selection>en</selection><default>en</default><values><value key="en">en</value><value key="fr">fr</value><value key="nl">nl</value><value key="es">es</value><value key="unspecified">Unspecified</value></values></dc:language><dc:title stackname="questionName" type="Meta"><selection>test_8</selection><default></default><values/></dc:title><dc:description stackname="questionDescription" type="Meta"><selection>complex numbers, roots of unity</selection><default></default><values/></dc:description><dc:publisher stackname="questionPublisher" type="Meta"><selection>http://localhost/stack-dev</selection><default>http://localhost/stack-cache</default><values/></dc:publisher><dc:format stackname="questionFormat" type="Meta"><selection>text/xml; charset="utf-8"</selection><default>text/xml; charset="utf-8"</default><values><value key="0">application</value><value key="1">audio</value><value key="2">image</value><value key="3">message</value><value key="4">model</value><value key="5">text</value><value key="6">video</value><value key="7">multipart</value></values></dc:format><lom:context stackname="questionLearningContext" type="Meta"><selection>unspecified</selection><default>unspecified</default><values><value key="PrimaryEducation">Primary Education</value><value key="SecondaryEducation">Secondary Education</value><value key="HigherEducation">Higher Education</value><value key="UniversityFirstCycle">University First Cycle</value><value key="UniversitySecondCycle">University Second Cycle</value><value key="UniversityPostGrade">University Post Grade</value><value key="TechnicalSchoolFirstCycle">Technical School First Cycle</value><value key="TechnicalSchoolSecondCycle">Technical School Second Cycle</value><value key="ProfessionalFormation">Professional Formation</value><value key="ContinuousFormation">Continuous Formation</value><value key="VocationalTraining">Vocational Training</value><value key="unspecified">Unspecified</value></values></lom:context><lom:difficulty stackname="questionDifficulty" type="Meta"><selection>unspecified</selection><default>unspecified</default><values><value key="VeryEasy">Very Easy</value><value key="Easy">Easy</value><value key="Medium">Medium</value><value key="Difficult">Difficult</value><value key="VeryDifficult">Very Difficult</value><value key="unspecified">Unspecified</value></values></lom:difficulty><questionCompetency type="Meta"><selection>unspecified</selection><default>unspecified</default><values><value key="Think">Think</value><value key="Argue">Argue</value><value key="Solve">Solve</value><value key="Represent">Represent</value><value key="Language">Language</value><value key="Communicate">Communicate</value><value key="Tools">Tools</value><value key="unspecified">Unspecified</value></values></questionCompetency><questionCompentencyLevel type="Meta"><selection>unspecified</selection><default>unspecified</default><values><value key="Elementary">Elementary</value><value key="SimpleConceptual">Simple conceptual</value><value key="Multi-step">Multi-step</value><value key="Complex">Complex</value><value key="unspecified">Unspecified</value></values></questionCompentencyLevel><lom:typicallearningtime stackname="questionTimeAllocated" type="Meta"><selection>00:00:00</selection><default>00:00:00</default><values/></lom:typicallearningtime><dc:rights stackname="questionRights" type="Meta"><selection>http://www.gnu.org/copyleft/gpl.html</selection><default>http://www.gnu.org/copyleft/gpl.html</default><values/></dc:rights><questionExerciseType type="Meta"><selection>AlgebraicExpression</selection><default>AlgebraicExpression</default><values><value key="AlgebraicExpression">Algebraic Expression</value><value key="MCQSingleAnswer">MCQ Single Answer</value><value key="MCQMultpleAnswer">MCQ Multiple Answer</value><value key="FillInBlank">Fill in blank</value><value key="Unspecified">Unspecified</value></values></questionExerciseType><dc:date stackname="questionDateLastEdited" type="Meta"><selection>2009-03-10 13:17:11</selection><default>2009-03-10 13:02:50</default><values/></dc:date><lom:status stackname="questionStatus" type="Meta"><selection>Draft</selection><default>Draft</default><values><value key="Draft">Draft</value><value key="Deployed">Deployed</value><value key="Buggy">Buggy</value></values></lom:status><published type="Meta"><selection>Unpublished</selection><default>Unpublished</default><values><value key="Unpublished">Unpublished</value><value key="Published">Published</value><value key="Private">Private</value></values></published><lom:keyword stackname="keywords" type="Meta"><selection>equation, </selection><default>equation, </default><values/></lom:keyword></MetaData><ItemOptions><stackoption><name>Display</name><type>list</type><default>LaTeX</default><values><value>LaTeX</value><value>MathML</value></values><casKey>OPT_OUTPUT</casKey><casType>string</casType><selected>LaTeX</selected></stackoption><stackoption><name>MultiplicationSign</name><type>list</type><default>dot</default><values><value>(none)</value><value>dot</value><value>cross</value></values><casKey>make_multsgn</casKey><casType>fun</casType><selected>dot</selected></stackoption><stackoption><name>ComplexNo</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>make_complexI</casKey><casType>fun</casType><selected>true</selected></stackoption><stackoption><name>Floats</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>OPT_NoFloats</casKey><casType>ex</casType><selected>true</selected></stackoption><stackoption><name>SqrtSign</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>sqrtdispflag</casKey><casType>ex</casType><selected>true</selected></stackoption><stackoption><name>Simplify</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>simp</casKey><casType>ex</casType><selected>true</selected></stackoption><stackoption><name>MarkModMethod</name><type>list</type><default>Penalty</default><values><value>Penalty</value><value>First Answer</value><value>Last Answer</value></values><casKey></casKey><casType></casType><selected>Penalty</selected></stackoption><stackoption><name>AssumePos</name><type>list</type><default>false</default><values><value>true</value><value>false</value></values><casKey>assume_pos</casKey><casType>ex</casType><selected>false</selected></stackoption><stackoption><name>TeacherEmail</name><type>string</type><default></default><casKey></casKey><casType></casType><selected></selected></stackoption><stackoption><name>Feedback</name><type>list</type><default>TGS</default><values><value>TGS</value><value>TG</value><value>GS</value><value>T</value><value>G</value><value>S</value><value>none</value></values><casKey></casKey><casType></casType><selected>TGS</selected></stackoption><stackoption><name>FeedbackGenericCorrect</name><type>html</type><default><span class='correct'>Correct answer, well done.</span></default><casKey></casKey><casType></casType><selected><span class='correct'>Correct answer, well done.</span></selected></stackoption><stackoption><name>FeedbackGenericIncorrect</name><type>html</type><default><span class='incorrect'>Incorrect answer.</span></default><casKey></casKey><casType></casType><selected><span class='incorrect'>Incorrect answer.</span></selected></stackoption><stackoption><name>FeedbackGenericPCorrect</name><type>html</type><default><span class='partially'>Your answer is partially correct.</span></default><casKey></casKey><casType></casType><selected><span class='partially'>Your answer is partially correct.</span></selected></stackoption></ItemOptions><ItemTests><test><col><key>IE_ans1</key><value>ta</value></col><col><key>PRT_PotResTree_ans</key><value>ans-0-T </value></col></test><test><col><key>IE_ans1</key><value>{p}</value></col><col><key>PRT_PotResTree_ans</key><value>ans-1-T </value></col></test><test><col><key>IE_ans1</key><value>{p,p*%e^(2*%pi*%i/n)}</value></col><col><key>PRT_PotResTree_ans</key><value>ans-2-T </value></col></test></ItemTests></assessmentItem> --- 3,5 ---- \[ z^@n@=@p^n@.\] Enter your answer as a set of numbers. ! #ans1# <IEfeedback>ans1</IEfeedback><PRTfeedback>ans</PRTfeedback></castext><forbidFloats>false</forbidFloats><simplify>true</simplify></questionStem><questionVariables type="RawKeyVal"><rawKeyVals>n = rand(2)+3; p = rand(3)+2; ta = setify(makelist(p*%e^(2*%pi*%i*k/n),k,1,n))</rawKeyVals><forbidFloats>false</forbidFloats><simplify>true</simplify></questionVariables><workedSolution type="CasText"><castext></castext><forbidFloats>false</forbidFloats><simplify>true</simplify></workedSolution><questionNote type="CasText"><castext>@ta@</castext><forbidFloats>false</forbidFloats><simplify>true</simplify></questionNote></questionCasValues><questionparts><questionpart><name>ans1</name><inputType type="Meta"><selection>Algebraic Input</selection><default>Algebraic Input</default><values/></inputType><boxsize>20</boxsize><teachersAns type="CasString"><casString>ta</casString><forbidFloats>false</forbidFloats><simplify>true</simplify></teachersAns><studentAnsKey>ans1</studentAnsKey><syntax type="Meta"><selection>{?,?,...,?}</selection><default></default><values/></syntax><stackoption><name>formalSyntax</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey></casKey><casType></casType><selected>true</selected></stackoption><stackoption><name>forbidFloats</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>OPT_NoFloats</casKey><casType>ex</casType><selected>true</selected></stackoption><stackoption><name>insertStars</name><type>list</type><default>false</default><values><value>true</value><value>false</value></values><casKey></casKey><casType></casType><selected>false</selected></stackoption><stackoption><name>sameType</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey></casKey><casType></casType><selected>true</selected></stackoption><stackoption><name>lowestTerms</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>OPT_LowestTerms</casKey><casType>ex</casType><selected>true</selected></stackoption><inputTypesParameters/></questionpart></questionparts><PotentialResponseTrees><PotentialResponseTree><prtname>PotResTree_ans</prtname><questionValue>1</questionValue><autoSimplify>true</autoSimplify><feedbackVariables>a1 = listify(ans1); a1 = maplist(lambda([x],x^n-p^n),a1); a1 = setify(a1)</feedbackVariables><description type="Meta"><selection></selection><default></default><values/></description><PotentialResponses><PR id="0"><answerTest>AlgEquiv</answerTest><teachersAns>ta</teachersAns><studentAns>ans1</studentAns><testoptions></testoptions><quietAnsTest>1</quietAnsTest><true><rawModMark>=</rawModMark><rawMark>1</rawMark><feedback></feedback><ansnote>ans-0-T </ansnote><nextPR>-1</nextPR></true><false><rawModMark>=</rawModMark><rawMark>0</rawMark><feedback></feedback><ansnote>ans-0-F </ansnote><nextPR>1</nextPR></false><teacherNote></teacherNote></PR><PR id="1"><answerTest>AlgEquiv</answerTest><teachersAns>{p}</teachersAns><studentAns>ans1</studentAns><testoptions></testoptions><quietAnsTest>1</quietAnsTest><true><rawModMark>=</rawModMark><rawMark>0</rawMark><feedback>There are more answers that just the single real number. Please consider complex solutions to this problem!</feedback><ansnote>ans-1-T </ansnote><nextPR>-1</nextPR></true><false><rawModMark>=</rawModMark><rawMark>0</rawMark><feedback></feedback><ansnote>ans-1-F </ansnote><nextPR>2</nextPR></false><teacherNote></teacherNote></PR><PR id="2"><answerTest>AlgEquiv</answerTest><teachersAns>{0}</teachersAns><studentAns>a1</studentAns><testoptions></testoptions><quietAnsTest>1</quietAnsTest><true><rawModMark>=</rawModMark><rawMark>0</rawMark><feedback>All your answers satisfy the equation. But, you have missed some of the solutions.</feedback><ansnote>ans-2-T </ansnote><nextPR>-1</nextPR></true><false><rawModMark>=</rawModMark><rawMark>0</rawMark><feedback></feedback><ansnote>ans-2-F </ansnote><nextPR>-1</nextPR></false><teacherNote></teacherNote></PR></PotentialResponses></PotentialResponseTree></PotentialResponseTrees><MetaData><dc:Publisher stackname="lastUserEditor" type="Meta"><selection>2</selection><default></default><values/></dc:Publisher><dc:language stackname="language" type="Meta"><selection>en</selection><default>en</default><values><value key="en">en</value><value key="fr">fr</value><value key="nl">nl</value><value key="es">es</value><value key="unspecified">Unspecified</value></values></dc:language><dc:title stackname="questionName" type="Meta"><selection>test_8</selection><default></default><values/></dc:title><dc:description stackname="questionDescription" type="Meta"><selection>complex numbers, roots of unity</selection><default></default><values/></dc:description><dc:publisher stackname="questionPublisher" type="Meta"><selection>http://localhost/stack-dev</selection><default>http://localhost/stack-dev</default><values/></dc:publisher><dc:format stackname="questionFormat" type="Meta"><selection>text/xml; charset="utf-8"</selection><default>text/xml; charset="utf-8"</default><values><value key="0">application</value><value key="1">audio</value><value key="2">image</value><value key="3">message</value><value key="4">model</value><value key="5">text</value><value key="6">video</value><value key="7">multipart</value></values></dc:format><lom:context stackname="questionLearningContext" type="Meta"><selection>unspecified</selection><default>unspecified</default><values><value key="PrimaryEducation">Primary Education</value><value key="SecondaryEducation">Secondary Education</value><value key="HigherEducation">Higher Education</value><value key="UniversityFirstCycle">University First Cycle</value><value key="UniversitySecondCycle">University Second Cycle</value><value key="UniversityPostGrade">University Post Grade</value><value key="TechnicalSchoolFirstCycle">Technical School First Cycle</value><value key="TechnicalSchoolSecondCycle">Technical School Second Cycle</value><value key="ProfessionalFormation">Professional Formation</value><value key="ContinuousFormation">Continuous Formation</value><value key="VocationalTraining">Vocational Training</value><value key="unspecified">Unspecified</value></values></lom:context><lom:difficulty stackname="questionDifficulty" type="Meta"><selection>unspecified</selection><default>unspecified</default><values><value key="VeryEasy">Very Easy</value><value key="Easy">Easy</value><value key="Medium">Medium</value><value key="Difficult">Difficult</value><value key="VeryDifficult">Very Difficult</value><value key="unspecified">Unspecified</value></values></lom:difficulty><questionCompetency type="Meta"><selection>unspecified</selection><default>unspecified</default><values><value key="Think">Think</value><value key="Argue">Argue</value><value key="Solve">Solve</value><value key="Represent">Represent</value><value key="Language">Language</value><value key="Communicate">Communicate</value><value key="Tools">Tools</value><value key="unspecified">Unspecified</value></values></questionCompetency><questionCompentencyLevel type="Meta"><selection>unspecified</selection><default>unspecified</default><values><value key="Elementary">Elementary</value><value key="SimpleConceptual">Simple conceptual</value><value key="Multi-step">Multi-step</value><value key="Complex">Complex</value><value key="unspecified">Unspecified</value></values></questionCompentencyLevel><lom:typicallearningtime stackname="questionTimeAllocated" type="Meta"><selection>00:00:00</selection><default>00:00:00</default><values/></lom:typicallearningtime><dc:rights stackname="questionRights" type="Meta"><selection>http://www.gnu.org/copyleft/gpl.html</selection><default>http://www.gnu.org/copyleft/gpl.html</default><values/></dc:rights><questionExerciseType type="Meta"><selection>AlgebraicExpression</selection><default>AlgebraicExpression</default><values><value key="AlgebraicExpression">Algebraic Expression</value><value key="MCQSingleAnswer">MCQ Single Answer</value><value key="MCQMultpleAnswer">MCQ Multiple Answer</value><value key="FillInBlank">Fill in blank</value><value key="Unspecified">Unspecified</value></values></questionExerciseType><dc:date stackname="questionDateLastEdited" type="Meta"><selection>2010-12-20 17:34:53</selection><default>2010-12-20 17:33:12</default><values/></dc:date><lom:status stackname="questionStatus" type="Meta"><selection>Draft</selection><default>Draft</default><values><value key="Draft">Draft</value><value key="Deployed">Deployed</value><value key="Buggy">Buggy</value></values></lom:status><published type="Meta"><selection>Unpublished</selection><default>Unpublished</default><values><value key="Unpublished">Unpublished</value><value key="Published">Published</value><value key="Private">Private</value></values></published><lom:keyword stackname="keywords" type="Meta"><selection>equation</selection><default>equation</default><values/></lom:keyword></MetaData><ItemOptions><stackoption><name>Display</name><type>list</type><default>LaTeX</default><values><value>LaTeX</value><value>MathML</value></values><casKey>OPT_OUTPUT</casKey><casType>string</casType><selected>LaTeX</selected></stackoption><stackoption><name>MultiplicationSign</name><type>list</type><default>dot</default><values><value>(none)</value><value>dot</value><value>cross</value></values><casKey>make_multsgn</casKey><casType>fun</casType><selected>dot</selected></stackoption><stackoption><name>ComplexNo</name><type>list</type><default>i</default><values><value>i</value><value>j</value><value>symi</value><value>symj</value></values><casKey>make_complexJ</casKey><casType>fun</casType><selected>i</selected></stackoption><stackoption><name>Floats</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>OPT_NoFloats</casKey><casType>ex</casType><selected>true</selected></stackoption><stackoption><name>SqrtSign</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>sqrtdispflag</casKey><casType>ex</casType><selected>true</selected></stackoption><stackoption><name>Simplify</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>simp</casKey><casType>ex</casType><selected>true</selected></stackoption><stackoption><name>MarkModMethod</name><type>list</type><default>Penalty</default><values><value>Penalty</value><value>First Answer</value><value>Last Answer</value></values><casKey></casKey><casType></casType><selected>Penalty</selected></stackoption><stackoption><name>AssumePos</name><type>list</type><default>false</default><values><value>true</value><value>false</value></values><casKey>assume_pos</casKey><casType>ex</casType><selected>false</selected></stackoption><stackoption><name>TeacherEmail</name><type>string</type><default></default><casKey></casKey><casType></casType><selected></selected></stackoption><stackoption><name>Feedback</name><type>list</type><default>TGS</default><values><value>TGS</value><value>TG</value><value>GS</value><value>T</value><value>G</value><value>S</value><value>none</value></values><casKey></casKey><casType></casType><selected>TGS</selected></stackoption><stackoption><name>FeedbackGenericCorrect</name><type>html</type><default><span class='correct'>Correct answer, well done.</span></default><casKey></casKey><casType></casType><selected><span class='correct'>Correct answer, well done.</span></selected></stackoption><stackoption><name>FeedbackGenericIncorrect</name><type>html</type><default><span class='incorrect'>Incorrect answer.</span></default><casKey></casKey><casType></casType><selected><span class='incorrect'>Incorrect answer.</span></selected></stackoption><stackoption><name>FeedbackGenericPCorrect</name><type>html</type><default><span class='partially'>Your answer is partially correct.</span></default><casKey></casKey><casType></casType><selected><span class='partially'>Your answer is partially correct.</span></selected></stackoption><stackoption><name>OptWorkedSol</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey></casKey><casType></casType><selected>true</selected></stackoption></ItemOptions><ItemTests><test><col><key>IE_ans1</key><value>ta</value></col><col><key>PRT_PotResTree_ans</key><value>ans-0-T </value></col></test><test><col><key>IE_ans1</key><value>{p}</value></col><col><key>PRT_PotResTree_ans</key><value>ans-1-T </value></col></test><test><col><key>IE_ans1</key><value>{p,p*%e^(2*%pi*%i/n)}</value></col><col><key>PRT_PotResTree_ans</key><value>ans-2-T </value></col></test></ItemTests></assessmentItem> |
|
From: Chris S. <san...@us...> - 2010-12-20 17:24:57
|
Update of /cvsroot/stack/stack-dev/sample_questions In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv11200/sample_questions Modified Files: test_1.xml Log Message: Index: test_1.xml =================================================================== RCS file: /cvsroot/stack/stack-dev/sample_questions/test_1.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** test_1.xml 23 Jun 2009 15:12:22 -0000 1.7 --- test_1.xml 20 Dec 2010 17:24:48 -0000 1.8 *************** *** 11,13 **** = \frac{u^@n+1@}{@n+1@}+c = @ta@+c.\] ! </castext><forbidFloats>false</forbidFloats><simplify>true</simplify></workedSolution><questionNote type="CasText"><castext>$\int @p@ d@v@ = @ta@$</castext><forbidFloats>false</forbidFloats><simplify>true</simplify></questionNote></questionCasValues><questionparts><questionpart><name>ans1</name><inputType type="Meta"><selection>Algebraic Input</selection><default>Algebraic Input</default><values/></inputType><boxsize>15</boxsize><teachersAns type="CasString"><casString>ta+c</casString><forbidFloats>false</forbidFloats><simplify>true</simplify></teachersAns><studentAnsKey>ans1</studentAnsKey><syntax type="Meta"><selection></selection><default></default><values/></syntax><stackoption><name>formalSyntax</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey></casKey><casType></casType><selected>true</selected></stackoption><stackoption><name>forbidFloats</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>OPT_NoFloats</casKey><casType>ex</casType><selected>true</selected></stackoption><stackoption><name>insertStars</name><type>list</type><default>false</default><values><value>true</value><value>false</value></values><casKey></casKey><casType></casType><selected>false</selected></stackoption><stackoption><name>sameType</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey></casKey><casType></casType><selected>true</selected></stackoption><stackoption><name>lowestTerms</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>OPT_LowestTerms</casKey><casType>ex</casType><selected>true</selected></stackoption><inputTypesParameters/></questionpart></questionparts><PotentialResponseTrees><PotentialResponseTree><prtname>PotResTree_1</prtname><questionValue>1</questionValue><autoSimplify>true</autoSimplify><feedbackVariables></feedbackVariables><description type="Meta"><selection></selection><default></default><values/></description><PotentialResponses><PR id="0"><answerTest>Int</answerTest><teachersAns>ta</teachersAns><studentAns>ans1</studentAns><testoptions>x</testoptions><quietAnsTest></quietAnsTest><true><rawModMark>=</rawModMark><rawMark>1</rawMark><feedback></feedback><ansnote>1-0-T </ansnote><nextPR>-1</nextPR></true><false><rawModMark>=</rawModMark><rawMark>0</rawMark><feedback></feedback><ansnote>1-0-F </ansnote><nextPR>-1</nextPR></false><teacherNote></teacherNote></PR></PotentialResponses></PotentialResponseTree></PotentialResponseTrees><MetaData><dc:Publisher stackname="lastUserEditor" type="Meta"><selection>2</selection><default></default><values/></dc:Publisher><dc:language stackname="language" type="Meta"><selection>en</selection><default>en</default><values><value key="en">en</value><value key="fr">fr</value><value key="nl">nl</value><value key="es">es</value><value key="unspecified">Unspecified</value></values></dc:language><dc:title stackname="questionName" type="Meta"><selection>test_1</selection><default></default><values/></dc:title><dc:description stackname="questionDescription" type="Meta"><selection>Randomly generated question, feedback from CAS, worked solution</selection><default></default><values/></dc:description><dc:publisher stackname="questionPublisher" type="Meta"><selection>http://localhost/stack-dev</selection><default>http://localhost/stack-dev</default><values/></dc:publisher><dc:format stackname="questionFormat" type="Meta"><selection>text/xml; charset="utf-8"</selection><default>text/xml; charset="utf-8"</default><values><value key="0">application</value><value key="1">audio</value><value key="2">image</value><value key="3">message</value><value key="4">model</value><value key="5">text</value><value key="6">video</value><value key="7">multipart</value></values></dc:format><lom:context stackname="questionLearningContext" type="Meta"><selection>PrimaryEducation</selection><default>unspecified</default><values><value key="PrimaryEducation">Primary Education</value><value key="SecondaryEducation">Secondary Education</value><value key="HigherEducation">Higher Education</value><value key="UniversityFirstCycle">University First Cycle</value><value key="UniversitySecondCycle">University Second Cycle</value><value key="UniversityPostGrade">University Post Grade</value><value key="TechnicalSchoolFirstCycle">Technical School First Cycle</value><value key="TechnicalSchoolSecondCycle">Technical School Second Cycle</value><value key="ProfessionalFormation">Professional Formation</value><value key="ContinuousFormation">Continuous Formation</value><value key="VocationalTraining">Vocational Training</value><value key="unspecified">Unspecified</value></values></lom:context><lom:difficulty stackname="questionDifficulty" type="Meta"><selection>VeryEasy</selection><default>unspecified</default><values><value key="VeryEasy">Very Easy</value><value key="Easy">Easy</value><value key="Medium">Medium</value><value key="Difficult">Difficult</value><value key="VeryDifficult">Very Difficult</value><value key="unspecified">Unspecified</value></values></lom:difficulty><questionCompetency type="Meta"><selection>Think</selection><default>unspecified</default><values><value key="Think">Think</value><value key="Argue">Argue</value><value key="Solve">Solve</value><value key="Represent">Represent</value><value key="Language">Language</value><value key="Communicate">Communicate</value><value key="Tools">Tools</value><value key="unspecified">Unspecified</value></values></questionCompetency><questionCompentencyLevel type="Meta"><selection>Elementary</selection><default>unspecified</default><values><value key="Elementary">Elementary</value><value key="SimpleConceptual">Simple conceptual</value><value key="Multi-step">Multi-step</value><value key="Complex">Complex</value><value key="unspecified">Unspecified</value></values></questionCompentencyLevel><lom:typicallearningtime stackname="questionTimeAllocated" type="Meta"><selection>00:00:00</selection><default>00:00:00</default><values/></lom:typicallearningtime><dc:rights stackname="questionRights" type="Meta"><selection>http://www.gnu.org/copyleft/gpl.html</selection><default>http://www.gnu.org/copyleft/gpl.html</default><values/></dc:rights><questionExerciseType type="Meta"><selection>AlgebraicExpression</selection><default>AlgebraicExpression</default><values><value key="AlgebraicExpression">Algebraic Expression</value><value key="MCQSingleAnswer">MCQ Single Answer</value><value key="MCQMultpleAnswer">MCQ Multiple Answer</value><value key="FillInBlank">Fill in blank</value><value key="Unspecified">Unspecified</value></values></questionExerciseType><dc:date stackname="questionDateLastEdited" type="Meta"><selection>2009-06-23 16:11:31</selection><default>2009-06-23 16:10:28</default><values/></dc:date><lom:status stackname="questionStatus" type="Meta"><selection>Draft</selection><default>Draft</default><values><value key="Draft">Draft</value><value key="Deployed">Deployed</value><value key="Buggy">Buggy</value></values></lom:status><published type="Meta"><selection>Published</selection><default>Unpublished</default><values><value key="Unpublished">Unpublished</value><value key="Published">Published</value><value key="Private">Private</value></values></published><lom:keyword stackname="keywords" type="Meta"><selection></selection><default></default><values/></lom:keyword></MetaData><ItemOptions><stackoption><name>Display</name><type>list</type><default>LaTeX</default><values><value>LaTeX</value><value>MathML</value></values><casKey>OPT_OUTPUT</casKey><casType>string</casType><selected>LaTeX</selected></stackoption><stackoption><name>MultiplicationSign</name><type>list</type><default>dot</default><values><value>(none)</value><value>dot</value><value>cross</value></values><casKey>make_multsgn</casKey><casType>fun</casType><selected>dot</selected></stackoption><stackoption><name>ComplexNo</name><type>list</type><default>i</default><values><value>i</value><value>j</value></values><casKey>make_complexJ</casKey><casType>fun</casType><selected>i</selected></stackoption><stackoption><name>Floats</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>OPT_NoFloats</casKey><casType>ex</casType><selected>true</selected></stackoption><stackoption><name>SqrtSign</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>sqrtdispflag</casKey><casType>ex</casType><selected>true</selected></stackoption><stackoption><name>Simplify</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>simp</casKey><casType>ex</casType><selected>true</selected></stackoption><stackoption><name>MarkModMethod</name><type>list</type><default>Penalty</default><values><value>Penalty</value><value>First Answer</value><value>Last Answer</value></values><casKey></casKey><casType></casType><selected>Penalty</selected></stackoption><stackoption><name>AssumePos</name><type>list</type><default>false</default><values><value>true</value><value>false</value></values><casKey>assume_pos</casKey><casType>ex</casType><selected>false</selected></stackoption><stackoption><name>TeacherEmail</name><type>string</type><default></default><casKey></casKey><casType></casType><selected></selected></stackoption><stackoption><name>Feedback</name><type>list</type><default>TGS</default><values><value>TGS</value><value>TG</value><value>GS</value><value>G</value><value>S</value><value>none</value></values><casKey></casKey><casType></casType><selected>TGS</selected></stackoption><stackoption><name>FeedbackGenericCorrect</name><type>html</type><default><span class='correct'>Correct answer, well done.</span></default><casKey></casKey><casType></casType><selected><span class='correct'>Correct answer, well done.</span></selected></stackoption><stackoption><name>FeedbackGenericIncorrect</name><type>html</type><default><span class='incorrect'>Incorrect answer.</span></default><casKey></casKey><casType></casType><selected><span class='incorrect'>Incorrect answer.</span></selected></stackoption><stackoption><name>FeedbackGenericPCorrect</name><type>html</type><default><span class='partially'>Your answer is partially correct.</span></default><casKey></casKey><casType></casType><selected><span class='partially'>Your answer is partially correct.</span></selected></stackoption><stackoption><name>InformalSyntax</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey></casKey><casType></casType><selected>true</selected></stackoption><stackoption><name>SyntaxHint</name><type>string</type><default></default><casKey></casKey><casType></casType><selected></selected></stackoption><stackoption><name>Language</name><type>list</type><default>en</default><values><value>en</value><value>es</value><value>fr</value><value>nl</value></values><casKey></casKey><casType></casType><selected>en</selected></stackoption><stackoption><name>QuValue</name><type>number</type><default>1</default><casKey></casKey><casType></casType><selected>1</selected></stackoption><stackoption><name>Forbid</name><type>string</type><default></default><casKey></casKey><casType></casType><selected></selected></stackoption><stackoption><name>Forbid_implicit</name><type>string</type><default></default><casKey></casKey><casType></casType><selected></selected></stackoption><stackoption><name>Allow</name><type>string</type><default></default><casKey></casKey><casType></casType><selected></selected></stackoption><stackoption><name>AnsTesOpt</name><type>string</type><default></default><casKey></casKey><casType></casType><selected></selected></stackoption><stackoption><name>QuizMode</name><type>list</type><default>Practice</default><values><value>Practice</value><value>Assessment</value><value>Strict</value></values><casKey></casKey><casType></casType><selected>Practice</selected></stackoption><stackoption><name>SubjectMode</name><type>list</type><default>the class list only</default><values><value>all, including guests</value><value>any system user</value><value>the class list only</value></values><casKey></casKey><casType></casType><selected>the class list only</selected></stackoption></ItemOptions><ItemTests><test><col><key>IE_ans1</key><value>ta+c</value></col><col><key>PRT_PotResTree_1</key><value>1-0-T </value></col></test><test><col><key>IE_ans1</key><value>ta</value></col><col><key>PRT_PotResTree_1</key><value>1-0-F </value></col></test><test><col><key>IE_ans1</key><value>n*(v-a)^(n-1)</value></col><col><key>PRT_PotResTree_1</key><value>1-0-F </value></col></test><test><col><key>IE_ans1</key><value>(v-a)^(n+1)</value></col><col><key>PRT_PotResTree_1</key><value>1-0-F </value></col></test></ItemTests></assessmentItem> --- 11,13 ---- = \frac{u^@n+1@}{@n+1@}+c = @ta@+c.\] ! </castext><forbidFloats>false</forbidFloats><simplify>true</simplify></workedSolution><questionNote type="CasText"><castext>$\int @p@ d@v@ = @ta@$</castext><forbidFloats>false</forbidFloats><simplify>true</simplify></questionNote></questionCasValues><questionparts><questionpart><name>ans1</name><inputType type="Meta"><selection>Algebraic Input</selection><default>Algebraic Input</default><values/></inputType><boxsize>20</boxsize><teachersAns type="CasString"><casString>ta+c</casString><forbidFloats>false</forbidFloats><simplify>true</simplify></teachersAns><studentAnsKey>ans1</studentAnsKey><syntax type="Meta"><selection></selection><default></default><values/></syntax><stackoption><name>formalSyntax</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey></casKey><casType></casType><selected>true</selected></stackoption><stackoption><name>forbidFloats</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>OPT_NoFloats</casKey><casType>ex</casType><selected>true</selected></stackoption><stackoption><name>insertStars</name><type>list</type><default>false</default><values><value>true</value><value>false</value></values><casKey></casKey><casType></casType><selected>false</selected></stackoption><stackoption><name>sameType</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey></casKey><casType></casType><selected>true</selected></stackoption><stackoption><name>lowestTerms</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>OPT_LowestTerms</casKey><casType>ex</casType><selected>true</selected></stackoption><inputTypesParameters/><forbiddenWords><Forbid>int</Forbid></forbiddenWords></questionpart></questionparts><PotentialResponseTrees><PotentialResponseTree><prtname>PotResTree_1</prtname><questionValue>1</questionValue><autoSimplify>true</autoSimplify><feedbackVariables></feedbackVariables><description type="Meta"><selection></selection><default></default><values/></description><PotentialResponses><PR id="0"><answerTest>Int</answerTest><teachersAns>ta</teachersAns><studentAns>ans1</studentAns><testoptions>x</testoptions><quietAnsTest></quietAnsTest><true><rawModMark>=</rawModMark><rawMark>1</rawMark><feedback></feedback><ansnote>1-0-T </ansnote><nextPR>-1</nextPR></true><false><rawModMark>=</rawModMark><rawMark>0</rawMark><feedback></feedback><ansnote>1-0-F </ansnote><nextPR>-1</nextPR></false><teacherNote></teacherNote></PR></PotentialResponses></PotentialResponseTree></PotentialResponseTrees><MetaData><dc:Publisher stackname="lastUserEditor" type="Meta"><selection>2</selection><default></default><values/></dc:Publisher><dc:language stackname="language" type="Meta"><selection>en</selection><default>en</default><values><value key="en">en</value><value key="fr">fr</value><value key="nl">nl</value><value key="es">es</value><value key="unspecified">Unspecified</value></values></dc:language><dc:title stackname="questionName" type="Meta"><selection>test_1</selection><default></default><values/></dc:title><dc:description stackname="questionDescription" type="Meta"><selection>Randomly generated question, feedback from CAS, worked solution</selection><default></default><values/></dc:description><dc:publisher stackname="questionPublisher" type="Meta"><selection>http://localhost/stack-dev</selection><default>http://localhost/stack-dev</default><values/></dc:publisher><dc:format stackname="questionFormat" type="Meta"><selection>text/xml; charset="utf-8"</selection><default>text/xml; charset="utf-8"</default><values><value key="0">application</value><value key="1">audio</value><value key="2">image</value><value key="3">message</value><value key="4">model</value><value key="5">text</value><value key="6">video</value><value key="7">multipart</value></values></dc:format><lom:context stackname="questionLearningContext" type="Meta"><selection>unspecified</selection><default>unspecified</default><values><value key="PrimaryEducation">Primary Education</value><value key="SecondaryEducation">Secondary Education</value><value key="HigherEducation">Higher Education</value><value key="UniversityFirstCycle">University First Cycle</value><value key="UniversitySecondCycle">University Second Cycle</value><value key="UniversityPostGrade">University Post Grade</value><value key="TechnicalSchoolFirstCycle">Technical School First Cycle</value><value key="TechnicalSchoolSecondCycle">Technical School Second Cycle</value><value key="ProfessionalFormation">Professional Formation</value><value key="ContinuousFormation">Continuous Formation</value><value key="VocationalTraining">Vocational Training</value><value key="unspecified">Unspecified</value></values></lom:context><lom:difficulty stackname="questionDifficulty" type="Meta"><selection>unspecified</selection><default>unspecified</default><values><value key="VeryEasy">Very Easy</value><value key="Easy">Easy</value><value key="Medium">Medium</value><value key="Difficult">Difficult</value><value key="VeryDifficult">Very Difficult</value><value key="unspecified">Unspecified</value></values></lom:difficulty><questionCompetency type="Meta"><selection>unspecified</selection><default>unspecified</default><values><value key="Think">Think</value><value key="Argue">Argue</value><value key="Solve">Solve</value><value key="Represent">Represent</value><value key="Language">Language</value><value key="Communicate">Communicate</value><value key="Tools">Tools</value><value key="unspecified">Unspecified</value></values></questionCompetency><questionCompentencyLevel type="Meta"><selection>unspecified</selection><default>unspecified</default><values><value key="Elementary">Elementary</value><value key="SimpleConceptual">Simple conceptual</value><value key="Multi-step">Multi-step</value><value key="Complex">Complex</value><value key="unspecified">Unspecified</value></values></questionCompentencyLevel><lom:typicallearningtime stackname="questionTimeAllocated" type="Meta"><selection>00:00:00</selection><default>00:00:00</default><values/></lom:typicallearningtime><dc:rights stackname="questionRights" type="Meta"><selection>http://www.gnu.org/copyleft/gpl.html</selection><default>http://www.gnu.org/copyleft/gpl.html</default><values/></dc:rights><questionExerciseType type="Meta"><selection>AlgebraicExpression</selection><default>AlgebraicExpression</default><values><value key="AlgebraicExpression">Algebraic Expression</value><value key="MCQSingleAnswer">MCQ Single Answer</value><value key="MCQMultpleAnswer">MCQ Multiple Answer</value><value key="FillInBlank">Fill in blank</value><value key="Unspecified">Unspecified</value></values></questionExerciseType><dc:date stackname="questionDateLastEdited" type="Meta"><selection>2010-12-20 17:23:25</selection><default>2010-12-20 17:22:35</default><values/></dc:date><lom:status stackname="questionStatus" type="Meta"><selection>Draft</selection><default>Draft</default><values><value key="Draft">Draft</value><value key="Deployed">Deployed</value><value key="Buggy">Buggy</value></values></lom:status><published type="Meta"><selection>Published</selection><default>Unpublished</default><values><value key="Unpublished">Unpublished</value><value key="Published">Published</value><value key="Private">Private</value></values></published><lom:keyword stackname="keywords" type="Meta"><selection></selection><default></default><values/></lom:keyword></MetaData><ItemOptions><stackoption><name>Display</name><type>list</type><default>LaTeX</default><values><value>LaTeX</value><value>MathML</value></values><casKey>OPT_OUTPUT</casKey><casType>string</casType><selected>LaTeX</selected></stackoption><stackoption><name>MultiplicationSign</name><type>list</type><default>dot</default><values><value>(none)</value><value>dot</value><value>cross</value></values><casKey>make_multsgn</casKey><casType>fun</casType><selected>dot</selected></stackoption><stackoption><name>ComplexNo</name><type>list</type><default>i</default><values><value>i</value><value>j</value><value>symi</value><value>symj</value></values><casKey>make_complexJ</casKey><casType>fun</casType><selected>i</selected></stackoption><stackoption><name>Floats</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>OPT_NoFloats</casKey><casType>ex</casType><selected>true</selected></stackoption><stackoption><name>SqrtSign</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>sqrtdispflag</casKey><casType>ex</casType><selected>true</selected></stackoption><stackoption><name>Simplify</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey>simp</casKey><casType>ex</casType><selected>true</selected></stackoption><stackoption><name>MarkModMethod</name><type>list</type><default>Penalty</default><values><value>Penalty</value><value>First Answer</value><value>Last Answer</value></values><casKey></casKey><casType></casType><selected>Penalty</selected></stackoption><stackoption><name>AssumePos</name><type>list</type><default>false</default><values><value>true</value><value>false</value></values><casKey>assume_pos</casKey><casType>ex</casType><selected>false</selected></stackoption><stackoption><name>TeacherEmail</name><type>string</type><default></default><casKey></casKey><casType></casType><selected></selected></stackoption><stackoption><name>Feedback</name><type>list</type><default>TGS</default><values><value>TGS</value><value>TG</value><value>GS</value><value>T</value><value>G</value><value>S</value><value>none</value></values><casKey></casKey><casType></casType><selected>TGS</selected></stackoption><stackoption><name>FeedbackGenericCorrect</name><type>html</type><default><span class='correct'>Correct answer, well done.</span></default><casKey></casKey><casType></casType><selected><span class='correct'>Correct answer, well done.</span></selected></stackoption><stackoption><name>FeedbackGenericIncorrect</name><type>html</type><default><span class='incorrect'>Incorrect answer.</span></default><casKey></casKey><casType></casType><selected><span class='incorrect'>Incorrect answer.</span></selected></stackoption><stackoption><name>FeedbackGenericPCorrect</name><type>html</type><default><span class='partially'>Your answer is partially correct.</span></default><casKey></casKey><casType></casType><selected><span class='partially'>Your answer is partially correct.</span></selected></stackoption><stackoption><name>OptWorkedSol</name><type>list</type><default>true</default><values><value>true</value><value>false</value></values><casKey></casKey><casType></casType><selected>true</selected></stackoption></ItemOptions><ItemTests><test><col><key>IE_ans1</key><value>ta+c</value></col><col><key>PRT_PotResTree_1</key><value>1-0-T </value></col></test><test><col><key>IE_ans1</key><value>ta</value></col><col><key>PRT_PotResTree_1</key><value>1-0-F </value></col></test><test><col><key>IE_ans1</key><value>n*(v-a)^(n-1)</value></col><col><key>PRT_PotResTree_1</key><value>1-0-F </value></col></test><test><col><key>IE_ans1</key><value>(v-a)^(n+1)</value></col><col><key>PRT_PotResTree_1</key><value>1-0-F </value></col></test></ItemTests></assessmentItem> |
|
From: Ben H. <bdv...@us...> - 2010-12-20 14:38:08
|
Update of /cvsroot/stack/stack-dev/lib/ui In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv14580/lib/ui Modified Files: report.php Log Message: Uncommented links to interactive reporting. With a warning it is still experimental. Index: report.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/ui/report.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** report.php 20 Dec 2010 12:43:50 -0000 1.14 --- report.php 20 Dec 2010 14:38:00 -0000 1.15 *************** *** 82,93 **** echo $report->simpleInterface(); ! /* // Interactive link hidden whilst under development echo ' <div class="section"> ! <h3>Interactive report</h3> <p> <a href="report.php?type=interactive"><button >Load the interactive interface</button></a> </p> </div>'; - */ /* Old interfaces, very likely no longer working. --- 82,93 ---- echo $report->simpleInterface(); ! // Interactive link hidden whilst under development echo ' <div class="section"> ! <h3>Interactive report - Experimental</h3> ! <p>The interactive report is still experimental code, you may expect buggy behaviour.</p> <p> <a href="report.php?type=interactive"><button >Load the interactive interface</button></a> </p> </div>'; /* Old interfaces, very likely no longer working. |
|
From: Ben H. <bdv...@us...> - 2010-12-20 14:19:21
|
Update of /cvsroot/stack/stack-dev/lib/reporting In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv11135/lib/reporting Modified Files: json.php StackReport.php Log Message: Some security for admin pages, requires login Index: StackReport.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/reporting/StackReport.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** StackReport.php 20 Dec 2010 12:43:51 -0000 1.28 --- StackReport.php 20 Dec 2010 14:19:11 -0000 1.29 *************** *** 23,26 **** --- 23,27 ---- global $config; $root = $config->get('docroot'); + require_once $root . '/lib/error.php'; require_once $root . '/lib/database/StackDBReporting.php'; Index: json.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/reporting/json.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** json.php 20 Dec 2010 12:43:51 -0000 1.4 --- json.php 20 Dec 2010 14:19:11 -0000 1.5 *************** *** 20,23 **** --- 20,24 ---- * */ + session_start(); require_once('../../config.php'); *************** *** 26,29 **** --- 27,32 ---- $root = $config->get('docroot'); + require $root . '/lib/ui/AdminInterface.php'; + require_once $root . '/lib/database/StackDBReporting.php'; require_once $root . '/lib/database/StackDBItem.php'; |
|
From: Ben H. <bdv...@us...> - 2010-12-20 12:44:00
|
Update of /cvsroot/stack/stack-dev/lib/ui In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27375/lib/ui Modified Files: report.php report.css Log Message: Made a simplified interface, it has minimal amounts of JS in it but provides almost the same amount of information as the interactive interface. Index: report.css =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/ui/report.css,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** report.css 30 Sep 2010 16:56:15 -0000 1.2 --- report.css 20 Dec 2010 12:43:50 -0000 1.3 *************** *** 76,82 **** } ! .listTable { height: 250px; ! } .dataTables_info { --- 76,82 ---- } ! /*.listTable { height: 250px; ! }*/ .dataTables_info { Index: report.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/ui/report.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** report.php 24 Nov 2010 16:44:25 -0000 1.13 --- report.php 20 Dec 2010 12:43:50 -0000 1.14 *************** *** 79,101 **** echo '<h1>Select a report type</h1>'; ! /*echo ' <div class="section"> <h3>Interactive report</h3> <p> <a href="report.php?type=interactive"><button >Load the interactive interface</button></a> </p> </div>'; */ - echo '<form action="report.php?type=question" method="post">' - . $report->questionFilterInterface($_REQUEST) - . '</form>'; ! echo '<form action="report.php?type=student" method="post">' ! . $report->studentFilterInterface($_REQUEST) ! . '</form>'; ! /* ! echo '<form action="report.php?type=simple" method="post">' ! . $report->simpleInterface($_REQUEST) ! . '<input type="submit" value"submit" />' ! . '</form>'; */ } ?> --- 79,105 ---- echo '<h1>Select a report type</h1>'; + + echo $report->simpleInterface(); ! /* ! // Interactive link hidden whilst under development ! ! echo ' <div class="section"> <h3>Interactive report</h3> <p> <a href="report.php?type=interactive"><button >Load the interactive interface</button></a> </p> </div>'; */ ! /* Old interfaces, very likely no longer working. ! ! echo '<form action="report.php?type=question" method="post">' ! . $report->questionFilterInterface($_REQUEST) ! . '</form>'; ! ! echo '<form action="report.php?type=student" method="post">' ! . $report->studentFilterInterface($_REQUEST) ! . '</form>'; */ + } ?> |
|
From: Ben H. <bdv...@us...> - 2010-12-20 12:44:00
|
Update of /cvsroot/stack/stack-dev/lib/reporting In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27375/lib/reporting Modified Files: json.php StackReport.php ReportWidgets.php Log Message: Made a simplified interface, it has minimal amounts of JS in it but provides almost the same amount of information as the interactive interface. Index: ReportWidgets.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/reporting/ReportWidgets.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ReportWidgets.php 30 Sep 2010 16:56:15 -0000 1.8 --- ReportWidgets.php 20 Dec 2010 12:43:51 -0000 1.9 *************** *** 35,41 **** * Makes an html selector given an array of value : text pairs. */ ! private function selector($options, $name, $selected = null) { ! $sel .= "<select name=\"$name\">"; foreach ($options as $value => $text) { --- 35,41 ---- * Makes an html selector given an array of value : text pairs. */ ! private function selector($options, $name, $selected = null, $extra = null) { ! $sel .= "<select name=\"$name\" $extra>"; foreach ($options as $value => $text) { *************** *** 50,54 **** /** ! * Makes an HTML select element with questions as options */ public function questionSelector ($selected = null) { --- 50,54 ---- /** ! * Makes an HTML select element with questions as options for the simple reporting interface */ public function questionSelector ($selected = null) { *************** *** 61,73 **** } else { foreach ($qs as $q) { $options[$q[0]] = $q[0] . ' - ' . substr($q[1], 0, 40); // abreviate the name } } ! return $this->selector($options, 'questionSelector', $selected); } /** ! * Makes an HTML select element with questions as options */ public function studentSelector ($selected = null) { --- 61,74 ---- } else { foreach ($qs as $q) { + $options[''] = 'All questions'; $options[$q[0]] = $q[0] . ' - ' . substr($q[1], 0, 40); // abreviate the name } } ! return $this->selector($options, 'questionSelector', $selected, 'onChange = "this.parentElement.submit()"'); } /** ! * Makes an HTML select element with questions as options for the simple reporting interface */ public function studentSelector ($selected = null) { *************** *** 80,88 **** } else { foreach ($students as $s) { $options[$s[0]] = $s[0] . ' - ' . $s[2] . ' ' . $s[3]; // abreviate the name } } ! return $this->selector($options, 'studentSelector', $selected); } --- 81,90 ---- } else { foreach ($students as $s) { + $options[''] = 'All students'; $options[$s[0]] = $s[0] . ' - ' . $s[2] . ' ' . $s[3]; // abreviate the name } } ! return $this->selector($options, 'studentSelector', $selected, 'onChange = this.parentElement.submit()'); } Index: StackReport.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/reporting/StackReport.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** StackReport.php 1 Dec 2010 12:05:14 -0000 1.27 --- StackReport.php 20 Dec 2010 12:43:51 -0000 1.28 *************** *** 29,32 **** --- 29,36 ---- require_once $root . '/lib/database/StackDBUser.php'; + // used in simple report + require_once $root . '/lib/database/StackDBItem.php'; + require_once $root . '/lib/ui/DisplayItem.php'; + require_once $root . '/lib/dateTime.php'; require_once $root . '/lib/translator.php'; *************** *** 60,64 **** break; ! case 'question': $qID = $posted['questionSelector']; --- 64,74 ---- break; ! case 'simple': ! $xhtml .= $this->simpleInterface(); ! break; ! ! // The rest probably aren't worth considering anymore. ! ! case 'question': $qID = $posted['questionSelector']; *************** *** 66,70 **** $result = $db->questionSearch($posted); ! echo "<pre>here";print_r($result); $xhtml .= $this->questionSummaryBox($result, $posted); --- 76,80 ---- $result = $db->questionSearch($posted); ! echo "<pre>here"; print_r($result); echo "</pre>"; $xhtml .= $this->questionSummaryBox($result, $posted); *************** *** 82,89 **** break; - case 'simple': - $xhtml .= $this->simpleInterface(); - break; - default: --- 92,95 ---- *************** *** 1337,1401 **** public function simpleInterface() { $xhtml = '<div class="section"><h3>Quick report</h3>'; ! $db = new StackDBReporting(); ! $db->connect(); ! $students = $db->studentList(); - $widgets = new ReportWidgets(); - - $xhtml .= print_r($_POST,1); - - $xhtml .= "<form id='form1' method='POST' action='report.php?type=simple'>"; ! $xhtml .= "<select name='studentSelector' onChange='document.getElementById(\"form1\").submit()'>"; ! $xhtml .= "<option value=''>All students</option>"; ! foreach($students as $student) { ! $xhtml .= "<option value='$student[0]'"; ! if($student[0] == $_POST['studentSelector']) $xhtml .= " SELECTED"; ! $xhtml .= ">$student[2] $student[3]</option>"; ! } ! $xhtml .= "</select>"; ! $questions = $db->questionList(); ! $xhtml .= "<select name='questionSelector' onChange='document.getElementById(\"form1\").submit()'>"; ! $xhtml .= "<option value=''>All questions</option>"; ! foreach($questions as $question) { ! $xhtml .= "<option value='$question[0]'"; ! if($question[0] == $_POST['questionSelector']) $xhtml .= " SELECTED"; ! $xhtml .= ">$question[1]</option>"; ! } ! $xhtml .= "</select>"; ! ! ! //$xhtml .= print_r($questions,1); ! /* ! $xhtml .= $db->getStudentSelector('student'). ! ' or '. ! $db->getQuestionSelector('question', 1, $_POST['question']);*/ ! //$xhtml .= $widgets->studentSelector($_POST['studentSelector']); ! //$xhtml .= '<input type="submit" name="submit" value="student report" /><p />'; ! //$xhtml .= $widgets->questionSelector($_POST['questionSelector']); ! // $xhtml .= '<input type="submit" name="submit" value="question report" />'; ! $xhtml .= '</form>'; ! if(!empty($_POST['studentSelector'])) { ! $xhtml .= print_r($db->questionsByStudent($_POST['studentSelector']),1); ! $questions = $db->questionsByStudent($_POST['studentSelector']); ! if($questions) { ! foreach($questions as $key => $val) { ! $q['questionSelector'] = $key; ! $xhtml .= $db->answerNoteStatistics($q); } } ! } ! if(!empty($_POST['questionSelector'])) { ! //$xhtml .= print_r($db->studentAnswerNotes($_POST['questionSelector']),1); ! $xhtml .= print_r($_POST['questionSelector'],1); ! $xhtml .= $db->answerNoteChart($_POST['questionSelector']); } $xhtml .= '</div>'; - $xhtml .= $_POST['questionSelector']; return $xhtml; } --- 1343,1479 ---- public function simpleInterface() { + + $db = new StackDBReporting(); + $widgets = new ReportWidgets(); + $xhtml = '<div class="section"><h3>Quick report</h3>'; ! $xhtml .= "<form method='POST' action='report.php?type=simple'>"; ! $xhtml .= $widgets->studentSelector($_POST['studentSelector']); ! $xhtml .= $widgets->questionSelector($_POST['questionSelector']); ! $selQ = ! empty($_POST['questionSelector']); ! $selS = ! empty($_POST['studentSelector']); ! if ($selQ and $selS) { // both question and student selected ! ! $data = $db->latestAttemptItem($_POST['questionSelector'], $_POST['studentSelector']); ! //$xhtml .= print_r ($data, true); ! ! $xhtml .= '<h4>The student was presented with this question note:</h4><p>' . $data['note'] . '</p><p> ! <a href="http://localhost/stack/lib/ui/questionTest.php?id=19&seed=' ! . $data['item']->getQuestionSeed() ! . '"> Click here to try it in the test question interface.</a></p>'; ! ! $xhtml .= '<h4>They made the following attempts:</h4><p>' . $data['item']->displayAttempts() . '</p>'; ! ! $xhtml .= '<h4>And here is a worked solution:</h4><p>' . $data['item']->getWorkedSolution() . '</p>'; ! ! ! } else if ($selS) { // just a student selected ! ! $qsTried = $db->questionsByStudent($_POST['studentSelector']); ! ! if ($qsTried) { ! $xhtml .= '<table>'; ! $xhtml .= '<thead><tr> ! <th>They tried this question</th> ! <th>This many times</th> ! <th>With a score of</th> ! <th>Select this question for more info about attempts</th> ! </tr></thead>'; ! foreach ($qsTried as $q => $stats) { ! $xhtml .= "<tr> ! <td>$q</td> ! <td>{$stats['attempts']}</td> ! <td>{$stats['mark']}</td> ! <td><input type=\"submit\" value=\"Select $q\" onClick=\"document.getElementsByName('questionSelector')[0].value = $q\" /></td> ! </tr>"; } + + $xhtml .= '</table>'; + } else { + $xhtml .= '<p>It would appear this student has never tried a question.</p>'; } ! ! } else if ($selQ) { // just a question selected ! ! // Some question notes ! ! $xhtml .= '<h4>The question has the following question notes</h4>'; ! ! $qNotes = $db->questionNotes($_POST['questionSelector']); ! ! if ($qNotes) { ! foreach ($qNotes as $note) { ! $xhtml .= "<p>{$note['note']}</p>"; ! } ! } else { ! $xhtml .= "<p>There are no question notes!</p>"; ! } ! ! /* ! // Lots of PRTs ! ! $xhtml .= '<h4>PRTs for this question</h4>'; ! ! $prts = $db->PRTs($_POST['questionSelector']); ! ! $xhtml .= '<div style="display: block; border: 1px solid #000; padding: 10px; margin: 10px;"> ! prts by q gives <pre>' . print_r($prts,1) . '</pre></div>'; ! ! foreach ($prts as $name => $prt) { ! $xhtml .= "<h5>$name has {$prt['total']} had attempt(s) made at it</h5>"; ! $xhtml .= '<table>'; ! $xhtml .= '<tbody><tr><td colspan="2"></td><th colspan="' . count($qNotes) . '">Question Notes</th><td colspan="2"></td></tr>'; ! $xhtml .= '<tr><th>Answer note</th><th>Score</th>'; ! foreach ($qNotes as $n) { ! $xhtml .= "<th>{$n['note']}</th>"; ! } ! $xhtml .= '<th>Total attempts</td><th>Percentage</th></tr>'; ! ! // And the rest is to be done in the MORNING, well later in the morning. ! // refer to report.js:409 ! ! $xhtml .= '</table>'; ! } ! */ ! ! // and lots of students ! ! $xhtml .= '<h4>Students who attempted this question</h4>'; ! ! $ssTried = $db->studentsByQuestion($_POST['questionSelector']); ! ! if ($ssTried) { ! $xhtml .= '<table>'; ! $xhtml .= '<thead><tr> ! <th>Who tried this question</th> ! <th>This many times</th> ! <th>With a score of</th> ! <th>Select this student for more info about attempts</th> ! </tr></thead>'; ! foreach ($ssTried as $s => $stats) { ! ! $xhtml .= "<tr> ! <td>$s</td> ! <td>{$stats['attempts']}</td> ! <td>{$stats['mark']}</td> ! <td><input type=\"submit\" value=\"Select $s\" onClick=\"document.getElementsByName('studentSelector')[0].value = $s\" /></td> ! </tr>"; ! } ! ! $xhtml .= '</table>'; ! } else { ! $xhtml .= '<p>Apparently no attempt has ever been made at this question.</p>'; ! } ! } + + $xhtml .= '</form>'; $xhtml .= '</div>'; return $xhtml; } Index: json.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/reporting/json.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** json.php 29 Nov 2010 08:21:46 -0000 1.3 --- json.php 20 Dec 2010 12:43:51 -0000 1.4 *************** *** 83,87 **** $question = $_GET['question']; $result = $db->latestAttemptItem($question, $student); ! if ($db != null) { echo json_encode(array( 'history' => $result['item']->displayAttempts(), --- 83,87 ---- $question = $_GET['question']; $result = $db->latestAttemptItem($question, $student); ! if ($result != null) { echo json_encode(array( 'history' => $result['item']->displayAttempts(), |
|
From: Chris S. <san...@us...> - 2010-12-16 13:37:04
|
Update of /cvsroot/stack/stack-dev/maxima In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10394/maxima Modified Files: assessment.mac rtest_assessment_simpboth.mac rtest_assessment_simpfalse.mac rtest_assessment_simptrue.mac Log Message: Index: rtest_assessment_simpboth.mac =================================================================== RCS file: /cvsroot/stack/stack-dev/maxima/rtest_assessment_simpboth.mac,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rtest_assessment_simpboth.mac 6 Dec 2010 19:18:25 -0000 1.3 --- rtest_assessment_simpboth.mac 16 Dec 2010 13:36:55 -0000 1.4 *************** *** 5,8 **** --- 5,10 ---- decimalplaces(1.1292,2); 1.13$ + decimalplaces(-1.1292,2); + -1.13$ decimalplaces(%pi,5); 3.14159$ *************** *** 24,27 **** --- 26,31 ---- scientific_notation(1123); 1123.0$ + significantfigures(-0.99,1); + -1$ all_listp(real_numberp,[1,exp(1)^(%i*%pi),sqrt(2)+1,sin(1)]); Index: rtest_assessment_simpfalse.mac =================================================================== RCS file: /cvsroot/stack/stack-dev/maxima/rtest_assessment_simpfalse.mac,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rtest_assessment_simpfalse.mac 6 Dec 2010 16:03:38 -0000 1.3 --- rtest_assessment_simpfalse.mac 16 Dec 2010 13:36:55 -0000 1.4 *************** *** 1,2 **** --- 1,5 ---- + scientific_notation(123.456); + 1.23456*10^2$ + factorp(x); true$ *************** *** 113,114 **** --- 116,121 ---- buggy_pow(sin(sqrt(a+b))); sin(sqrt(a)+sqrt(b))$ + + mediant(1/2,2/3); + (1+2)/(2+3)$ + Index: assessment.mac =================================================================== RCS file: /cvsroot/stack/stack-dev/maxima/assessment.mac,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** assessment.mac 6 Dec 2010 19:18:25 -0000 1.3 --- assessment.mac 16 Dec 2010 13:36:55 -0000 1.4 *************** *** 90,98 **** /* Write the number x in n decimal places */ ! decimalplaces(x,n) := block([simp:true,fpprintprec],fpprintprec:n,float(round(10^n*float(x))/(10^n)))$ /* Write numbers in significant figures */ significantfigures(x,n) := block([fpprec:128,fpprintprec,simp:true,ex,ex2], ! ex:floor(float(log(x)/log(10))), ex2:round(float(x/10^(ex-n+1))), ex2:float(ex2*10^(ex-n+1)), --- 90,98 ---- /* Write the number x in n decimal places */ ! decimalplaces(x,n) := block([fpprintprec],fpprintprec:n,ev(float(round(10^n*float(x))/(10^n)),simp))$ /* Write numbers in significant figures */ significantfigures(x,n) := block([fpprec:128,fpprintprec,simp:true,ex,ex2], ! ex:floor(float(log(abs(x))/log(10))), ex2:round(float(x/10^(ex-n+1))), ex2:float(ex2*10^(ex-n+1)), *************** *** 101,108 **** ); ! scientific_notation(x) := block([simp:true,fpprintprec,ex,ex2], ! ex:floor(float(log(x)/log(10))), ! ex2:float(x/10^ex), ! return((ex2)*10^(ex)) ); --- 101,111 ---- ); ! scientific_notation(x) := block([simp:false,fpprintprec,ex,ex2,ex3], ! if real_numberp(x) and ev(x>0,simp) then ( ! ex:ev(floor(float(log(x)/log(10))),simp), ! ex2:ev(float(x/10^ex),simp), ! ex3:ex2*10^ex, ! return(ex3) ! ) else return (x) ); *************** *** 306,313 **** /* ********************************** */ ! /* Noun arithmatic */ /* ********************************** */ ! /* ** Noun forms of the arithmatic functions ** */ /* These function define arithmetic functions which do --- 309,316 ---- /* ********************************** */ ! /* Noun arithmetic */ /* ********************************** */ ! /* ** Noun forms of the arithmetic functions ** */ /* These function define arithmetic functions which do *************** *** 378,382 **** ex:subst("noun+","+",ex), ex:subst("noun*","*",ex), ! ex:subst(lambda([ex],UNARY_MINUS noun* ex),"-",ex), /* Unary minus really communtes with multipication*/ ex:subst(lambda([ex1,ex2], ex1 noun* (UNARY_RECIP ex2)),DIV_OP,ex), /* Turn 1/x into x^(-1), in a special form */ ex:subst("noun^","^",ex), --- 381,385 ---- ex:subst("noun+","+",ex), ex:subst("noun*","*",ex), ! ex:subst(lambda([ex],UNARY_MINUS noun* ex),"-",ex), /* Unary minus really communtes with multiplication*/ ex:subst(lambda([ex1,ex2], ex1 noun* (UNARY_RECIP ex2)),DIV_OP,ex), /* Turn 1/x into x^(-1), in a special form */ ex:subst("noun^","^",ex), *************** *** 503,504 **** --- 506,510 ---- print(op(ex)) )$ + + /* Naive adding of fractions! But see Farey sequences. */ + mediant(ex1,ex2) := (num(ex1)+num(ex2))/(denom(ex1)+denom(ex2)); Index: rtest_assessment_simptrue.mac =================================================================== RCS file: /cvsroot/stack/stack-dev/maxima/rtest_assessment_simptrue.mac,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rtest_assessment_simptrue.mac 1 Dec 2010 18:32:25 -0000 1.2 --- rtest_assessment_simptrue.mac 16 Dec 2010 13:36:55 -0000 1.3 *************** *** 8,9 **** --- 8,16 ---- "1-x"$ + mediant(1/2,2/3); + 3/5$ + mediant(1,1); + 1$ + mediant(x/y,z); + (x+z)/(y+1)$ + |
|
From: Simon H. <sim...@us...> - 2010-12-09 14:25:10
|
Update of /cvsroot/stack/stack-dev/lib/items In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30562/lib/items Modified Files: Tag: item_state_separation StudentAns.php ItemOption.php Log Message: Intermediate debugging Index: ItemOption.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/items/ItemOption.php,v retrieving revision 1.19.8.4 retrieving revision 1.19.8.5 diff -C2 -d -r1.19.8.4 -r1.19.8.5 *** ItemOption.php 1 Dec 2010 18:21:32 -0000 1.19.8.4 --- ItemOption.php 9 Dec 2010 14:25:00 -0000 1.19.8.5 *************** *** 29,53 **** * from the question itself * ! * All questions are stored in a options array and are made up of StackOptions * which are responsible for validating themselves. - * */ class ItemOption { ! // Attributes ! /** ! * List of default stackOptions in format name => stackOption ! * ! * @var array(stackOption) ! * @access private ! */ ! static private $options; // the defaults ! ! /** ! * Selected values for stackOptions in format name => stackOption ! * ! * @var array(name=>value) ! * @access private ! */ ! private $selected; // the selected values - SPH /** --- 29,52 ---- * from the question itself * ! * All questions are stored in an options array and are made up of StackOptions * which are responsible for validating themselves. */ class ItemOption { ! // Attributes ! /** ! * List of default stackOptions in format name => stackOption ! * ! * @var array(stackOption) ! * @access private ! */ ! static public $options; // the defaults ! ! /** ! * Selected values for stackOptions in format name => stackOption ! * ! * @var array(name=>value) ! * @access private ! */ ! private $selected; // the selected values - SPH /** *************** *** 107,117 **** $this->addOption('OptWorkedSol','list','true',array('true' => get_string('stack_True','stack',''),'false' => get_string('stack_False', 'stack','')),'',''); } ! /* public function __clone() { // obsolete? ! echo "6:17pm:";var_dump(self::$options); } ! */ /** * Validates every option. --- 106,116 ---- $this->addOption('OptWorkedSol','list','true',array('true' => get_string('stack_True','stack',''),'false' => get_string('stack_False', 'stack','')),'',''); } ! public function __clone() { // obsolete? ! //echo "6:17pm:";var_dump(self::$options); } ! //*/ /** * Validates every option. *************** *** 157,160 **** --- 156,160 ---- { self::$options[$name] = $tmp; // new option for ItemOption + //echo "domut123:";print_r(self::$options[$name], 1); $this->selected[$name] = $default; // and value set for the instance } *************** *** 367,372 **** public function setSelected($name, $value) { ! echo "6pm:";var_dump(self::$options); ! if(array_key_exists($name, self::$options)) // we have the option { $this->selected[$name] = $value; --- 367,372 ---- public function setSelected($name, $value) { ! //echo "6pm:";print_r(debug_backtrace());var_dump(ItemOption::$options); ! if(array_key_exists($name, ItemOption::$options)) // we have the option { $this->selected[$name] = $value; *************** *** 467,470 **** --- 467,474 ---- return true; } + + public function debug() { + return 'from debug():<pre>DEAFULTS'.print_r(self::$options, 1).'SELECTED'.print_r($this->selected, 1).'</pre>'; + } } ?> \ No newline at end of file Index: StudentAns.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/items/StudentAns.php,v retrieving revision 1.42.6.2.2.2 retrieving revision 1.42.6.2.2.3 diff -C2 -d -r1.42.6.2.2.2 -r1.42.6.2.2.3 *** StudentAns.php 1 Dec 2010 18:21:32 -0000 1.42.6.2.2.2 --- StudentAns.php 9 Dec 2010 14:25:00 -0000 1.42.6.2.2.3 *************** *** 217,221 **** { $itemOptions = clone $itemOpts; ! echo "snow:<pre>";print_r($itemOpts); $toReturn = true; foreach($this->studentAnswers as $label => $sAns) --- 217,222 ---- { $itemOptions = clone $itemOpts; ! //echo "snow:<pre>".$itemOpts->debug(); ! //print_r(ItemOption::$options,1); $toReturn = true; foreach($this->studentAnswers as $label => $sAns) |
|
From: Simon H. <sim...@us...> - 2010-12-09 14:25:10
|
Update of /cvsroot/stack/stack-dev/lib/ui/inputTypes In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30562/lib/ui/inputTypes Modified Files: Tag: item_state_separation Slider.php Log Message: Intermediate debugging Index: Slider.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/ui/inputTypes/Slider.php,v retrieving revision 1.2.4.2 retrieving revision 1.2.4.3 diff -C2 -d -r1.2.4.2 -r1.2.4.3 *** Slider.php 9 Nov 2010 16:51:35 -0000 1.2.4.2 --- Slider.php 9 Dec 2010 14:25:00 -0000 1.2.4.3 *************** *** 24,55 **** class Slider extends AnswerInputType { ! // Attributes ! //protected $min; ! //protected $max; ! //protected $step; ! ! public function __construct($name, $width = null, $default = null, $maxLength = null, $height = null, $param = null) { - //if (!isset($width)) $width = '200'; $this->name = $name; ! $this->boxWidth = $width; ! ! if($param == NULL) ! { ! $this->parameters['slider_min'] = new Meta('required', '0'); ! $this->parameters['slider_max'] = new Meta('required', '100'); ! $this->parameters['slider_step'] = new Meta('required', '1'); ! } else $this->parameters = $param; ! ! // parent::__construct($name, $width); ! //$this->min = $param['min']; ! //$this->max = $param['max']; ! //$this->step = $param['step']; ! parent::__construct($name, $width, $default, $maxLength, $height, $param); ! } ! public function getXHTML() { $url = $GLOBALS['config']->get('weburl'); --- 24,44 ---- class Slider extends AnswerInputType { ! public function __construct($name, $width = null, $default = null, $maxLength = null, $height = null, $param = null) { $this->name = $name; ! $this->boxWidth = $width; ! parent::__construct($name, $width, $default, $maxLength, $height, $param); ! // slider values hard-wired for now ! $this->parameters['slider_min'] = new Meta('required', '0'); ! $this->parameters['slider_max'] = new Meta('required', '100'); ! $this->parameters['slider_step'] = new Meta('required', '25'); ! } ! public function getXHTML() { ! $min = $this->parameters['slider_min']->getSelection(); ! $max = $this->parameters['slider_max']->getSelection(); ! $step = $this->parameters['slider_step']->getSelection(); $url = $GLOBALS['config']->get('weburl'); *************** *** 68,76 **** $("#' . $this->name . '_slider").slider({' . (is_numeric($this->default) ? "value: {$this->default}," : '') ! . (isset($this->parameters['slider_min']) ? "min: {$this->parameters['slider_min']}," : '') ! . (isset($this->parameters['slider_max']) ? "max: {$this->parameters['slider_max']}," : '') ! . (isset($this->parameters['slider_step']) ? "step: {$this->parameters['slider_step']}," : '') ! . ' slide: function(event, ui) { ! $("#' . $this->name . '").val(ui.value) $("#' . $this->name . '_value").text(ui.value); } --- 57,63 ---- $("#' . $this->name . '_slider").slider({' . (is_numeric($this->default) ? "value: {$this->default}," : '') ! . "min: $min, max: $max, step: $step,". ! ' slide: function(event, ui) { ! $("#' . $this->name . '").val(ui.value); $("#' . $this->name . '_value").text(ui.value); } *************** *** 78,107 **** }); </script>'; ! return $slider; ! } ! ! /** ! * Modifies the default parameters of this Input type based on the authors inputs ! * If authors input is null, returns the defaults. ! * ! * @access public ! * @param array $param ! * @return array ! */ ! public function getDefaultParam($param=NULL) ! { ! if(!empty($param['slider_min'])) ! { ! $this->parameters['slider_min']->setSelection($param['slider_min']); ! } ! if(!empty($param['slider_max'])) ! { ! $this->parameters['slider_max']->setSelection($param['slider_max']); ! } ! return $this->parameters; ! } --- 65,93 ---- }); </script>'; + return $slider; + } ! /** ! * Modifies the default parameters of this Input type based on the authors inputs ! * If authors input is null, returns the defaults. ! * ! * @access public ! * @param array $param ! * @return array ! */ ! public function getDefaultParam($param=NULL) ! { ! if(!empty($param['slider_min'])) ! { ! $this->parameters['slider_min']->setSelection($param['slider_min']); ! } ! if(!empty($param['slider_max'])) ! { ! $this->parameters['slider_max']->setSelection($param['slider_max']); ! } ! return $this->parameters; ! } |
|
From: Simon H. <sim...@us...> - 2010-12-09 14:25:10
|
Update of /cvsroot/stack/stack-dev/opaque In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30562/opaque Modified Files: Tag: item_state_separation MoodleDisplayItem.php Log Message: Intermediate debugging Index: MoodleDisplayItem.php =================================================================== RCS file: /cvsroot/stack/stack-dev/opaque/MoodleDisplayItem.php,v retrieving revision 1.11.6.1.2.3 retrieving revision 1.11.6.1.2.4 diff -C2 -d -r1.11.6.1.2.3 -r1.11.6.1.2.4 *** MoodleDisplayItem.php 19 Nov 2010 18:16:19 -0000 1.11.6.1.2.3 --- MoodleDisplayItem.php 9 Dec 2010 14:25:00 -0000 1.11.6.1.2.4 *************** *** 234,244 **** } ! /* ! * Process Item with STACK event. ! */ private function processItem($posted, $processRequest, $event) { // get connection to cache $cache = new StackDBCache(); ! $cache->connect(); // is this a user-initiated event or not? --- 234,244 ---- } ! /* ! * Process Item with STACK event. ! */ private function processItem($posted, $processRequest, $event) { // get connection to cache $cache = new StackDBCache(); ! $cache->connect(); // is this a user-initiated event or not? *************** *** 250,259 **** // try updating cache from currentState with posted ! $xhtml = $this->fetchCache($posted, $event); // stateID may be updated ! // if nothing in cache then grow the cache tree, possibly with a loop-back ! if(NULL !== $xhtml) { ! $this->logger->debug("Question state cached (to state ".$this->stateID.") so no need to process."); ! } else { $this->logger->debug("Question state not cached so must process from id=".$this->stateID." Event: ".$event); --- 250,259 ---- // try updating cache from currentState with posted ! $xhtml = $this->fetchCache($posted, $event); // stateID may be updated ! // if nothing in cache then grow the cache tree, possibly with a loop-back ! if(NULL !== $xhtml) { ! $this->logger->debug("Question state cached (to state ".$this->stateID.") so no need to process."); ! } else { $this->logger->debug("Question state not cached so must process from id=".$this->stateID." Event: ".$event); *************** *** 264,270 **** --- 264,273 ---- if(is_a($state, "DisplayItem")) { // retrofitting to prior caches + echo "ISA DisplayItem"; $item = $state; } else { + echo "IS NOT A DisplayItem"; $item = new DisplayItem($state['ItemOptions'], $state['qID']); // base question + echo '$state in processItem:'.print_r($state,1); $item->setState($state); // specific state } |
|
From: Simon H. <sim...@us...> - 2010-12-09 14:25:10
|
Update of /cvsroot/stack/stack-dev/lib/ui In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30562/lib/ui Modified Files: Tag: item_state_separation DisplayItem.php Log Message: Intermediate debugging Index: DisplayItem.php =================================================================== RCS file: /cvsroot/stack/stack-dev/lib/ui/DisplayItem.php,v retrieving revision 1.91.2.4.2.7 retrieving revision 1.91.2.4.2.8 diff -C2 -d -r1.91.2.4.2.7 -r1.91.2.4.2.8 *** DisplayItem.php 1 Dec 2010 18:21:32 -0000 1.91.2.4.2.7 --- DisplayItem.php 9 Dec 2010 14:25:00 -0000 1.91.2.4.2.8 *************** *** 214,218 **** $this->itemOpts = new ItemOption(); // but will load the options stored with the question - check line a little below //$this->itemOpts = NULL; ! //echo "jellyfish:<pre>";var_dump(ItemOption::$options);//$this->itemOpts); $this->item = new InstantiatedItem($questionId, $this->itemOpts, $this->seed, $userId); --- 214,218 ---- $this->itemOpts = new ItemOption(); // but will load the options stored with the question - check line a little below //$this->itemOpts = NULL; ! //echo "jellyfish:<pre>".$this->itemOpts->debug(); $this->item = new InstantiatedItem($questionId, $this->itemOpts, $this->seed, $userId); *************** *** 226,232 **** } ! if($this->itemOps == NULL) { //use the item options stored with the question. $this->itemOpts = $this->item->itemOptions; } --- 226,233 ---- } ! if($this->itemOpts == NULL) { //use the item options stored with the question. + echo "using the item options stored with the question."; $this->itemOpts = $this->item->itemOptions; } *************** *** 313,316 **** --- 314,318 ---- { global $config; + //check question is marked as valid if($this->item->valid != true) *************** *** 324,327 **** --- 326,330 ---- else { + //echo "home time 1".$this->itemOpts->debug(); if($posted == NULL) { *************** *** 353,356 **** --- 356,360 ---- else // posted != NULL { + // echo "home time 2".$this->itemOpts->debug();// good //check if worked solution has been requested $wsRequest = $this->updateWorkedSolution($posted); *************** *** 366,370 **** // update student answers, add attempt, update answerboxes. $this->updateSAnswer($posted, $processRequest); ! $xhtml .= $this->cachedQuestionStem; --- 370,374 ---- // update student answers, add attempt, update answerboxes. $this->updateSAnswer($posted, $processRequest); ! $xhtml .= $this->cachedQuestionStem; *************** *** 743,747 **** //for example the matrix input type needs to join multiple answers into one maxima command. ! //echo "ipad:<pre>";var_dump($this->itemOpts); //echo "<pre>";print_r($posted); --- 747,751 ---- //for example the matrix input type needs to join multiple answers into one maxima command. ! //echo "ipad:<pre>".$this->itemOpts->debug();;//var_dump($this->itemOpts); //echo "<pre>";print_r($posted); |
