Menu
▾
▴
[Stack-cvs] stack-dev/install answer_test_testsuite.php, 1.56, 1.57 p3.php, 1.28, 1.29 installFunctions.php, 1.41, 1.42
|
From: Chris S. <san...@us...> - 2010-10-27 13:40:59
|
Update of /cvsroot/stack/stack-dev/install In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12304/install Modified Files: answer_test_testsuite.php p3.php installFunctions.php Log Message: Support for Maxima 5.22.1 Index: p3.php =================================================================== RCS file: /cvsroot/stack/stack-dev/install/p3.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** p3.php 24 May 2010 10:22:15 -0000 1.28 --- p3.php 27 Oct 2010 13:40:51 -0000 1.29 *************** *** 265,269 **** <?php ! $maximaVersions = array('5.21.1','5.20.1','5.19.2','5.18.1','5.17.0','5.16.3','5.15.0'); foreach($maximaVersions as $mVer) { --- 265,269 ---- <?php ! $maximaVersions = array('5.22.1','5.21.1','5.20.1','5.19.2','5.18.1','5.17.0','5.16.3','5.15.0'); foreach($maximaVersions as $mVer) { Index: installFunctions.php =================================================================== RCS file: /cvsroot/stack/stack-dev/install/installFunctions.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** installFunctions.php 30 Sep 2010 16:56:19 -0000 1.41 --- installFunctions.php 27 Oct 2010 13:40:51 -0000 1.42 *************** *** 223,227 **** break; ! case "5.21.1": $this->casArray["command"] = $this->configArray["docroot"]."/maxima/stackmaxima_5.20.1.bat"; break; --- 223,231 ---- break; ! case "5.21.1": ! $this->casArray["command"] = $this->configArray["docroot"]."/maxima/stackmaxima_5.20.1.bat"; ! break; ! ! case "5.21.2": $this->casArray["command"] = $this->configArray["docroot"]."/maxima/stackmaxima_5.20.1.bat"; break; Index: answer_test_testsuite.php =================================================================== RCS file: /cvsroot/stack/stack-dev/install/answer_test_testsuite.php,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** answer_test_testsuite.php 24 May 2010 10:22:15 -0000 1.56 --- answer_test_testsuite.php 27 Oct 2010 13:40:51 -0000 1.57 *************** *** 64,68 **** $testsuite[] = stack_testsuite_construct('AlgEquiv','x-1','(x^2-1)/(x+1)',1,'',''); $testsuite[] = stack_testsuite_construct('AlgEquiv','a^b*a^c','a^(b+c)',1,'',''); - $testsuite[] = stack_testsuite_construct('AlgEquiv','-%i/sqrt(x)','sqrt(-1/x)',1,'',''); $testsuite[] = stack_testsuite_construct('AlgEquiv','(4*sqrt(3)*%i+4)^(1/5)','6^(1/5)*cos(%pi/15)-6^(1/5)*%i*sin(%pi/15)',0,'',''); --- 64,67 ---- *************** *** 133,136 **** --- 132,136 ---- $testsuite[] = stack_testsuite_construct('AlgEquiv','n/n!','1/(n-1)!',1,'',''); $testsuite[] = stack_testsuite_construct('AlgEquiv','2/%i*ln(sqrt((1+z)/2)+%i*sqrt((1-z)/2))','-%i*ln(z+i*sqrt(1-z^2))',1,'','These currently fail'); + $testsuite[] = stack_testsuite_construct('AlgEquiv','-%i/sqrt(x)','sqrt(-1/x)',1,'',''); // SubstEquiv Answer tests. *************** *** 235,241 **** // Factored form - $testsuite[] = stack_testsuite_construct('FacForm','1/0','0',0,'',''); $testsuite[] = stack_testsuite_construct('FacForm','1/0','0',0,'x',''); $testsuite[] = stack_testsuite_construct('FacForm','0','1/0',0,'x',''); $testsuite[] = stack_testsuite_construct('FacForm','2','2',1,'x','Trivial cases'); $testsuite[] = stack_testsuite_construct('FacForm','1/3','1/3',1,'x',''); --- 235,241 ---- // Factored form $testsuite[] = stack_testsuite_construct('FacForm','1/0','0',0,'x',''); $testsuite[] = stack_testsuite_construct('FacForm','0','1/0',0,'x',''); + $testsuite[] = stack_testsuite_construct('FacForm','0','0',0,'1/0',''); $testsuite[] = stack_testsuite_construct('FacForm','2','2',1,'x','Trivial cases'); $testsuite[] = stack_testsuite_construct('FacForm','1/3','1/3',1,'x',''); *************** *** 277,280 **** --- 277,281 ---- $testsuite[] = stack_testsuite_construct('FacForm','(x-1)*(x+(1+sqrt(3)*%i)/2)*(x+(1-sqrt(3)*%i)/2)','x^3-1',1,'x',''); + $testsuite[] = stack_testsuite_construct('CompSquare','1/0','0',0,'',''); $testsuite[] = stack_testsuite_construct('CompSquare','1/0','0',0,'x',''); *************** *** 318,321 **** --- 319,323 ---- $testsuite[] = stack_testsuite_construct('PartFrac','1/0','3*x^2',0,'',''); $testsuite[] = stack_testsuite_construct('PartFrac','1/0','3*x^2',0,'x',''); + $testsuite[] = stack_testsuite_construct('PartFrac','0','0',0,'1/0',''); $testsuite[] = stack_testsuite_construct('PartFrac','0','1/0',0,'x',''); $testsuite[] = stack_testsuite_construct('PartFrac','1/m','1/n',0,'n','Basic tests'); *************** *** 353,356 **** --- 355,359 ---- $testsuite[] = stack_testsuite_construct('Diff','1/0','3*x^2',0,'x',''); $testsuite[] = stack_testsuite_construct('Diff','0','1/0',0,'x',''); + $testsuite[] = stack_testsuite_construct('Diff','0','0',0,'1/0',''); $testsuite[] = stack_testsuite_construct('Diff','x^4/4+c','',0,'x',''); $testsuite[] = stack_testsuite_construct('Diff','3*x^2','3*x^2',1,'x','Basic tests'); *************** *** 372,375 **** --- 375,379 ---- $testsuite[] = stack_testsuite_construct('Int','1/0','1',0,'x',''); $testsuite[] = stack_testsuite_construct('Int','1','1/0',0,'x',''); + $testsuite[] = stack_testsuite_construct('Int','0','0',0,'1/0',''); $testsuite[] = stack_testsuite_construct('Int','x^3/3','x^3/3',0,'x','Basic tests'); $testsuite[] = stack_testsuite_construct('Int','x^3/3+1','x^3/3',0,'x',''); *************** *** 381,385 **** --- 385,393 ---- $testsuite[] = stack_testsuite_construct('Int','X^3/3+c','x^3/3',0,'x',''); $testsuite[] = stack_testsuite_construct('Int','sin(2*x)','x^3/3',0,'x',''); + $testsuite[] = stack_testsuite_construct('Int','x^2/2-2*x+2+c','(x-2)^2/2',1,'x',''); $testsuite[] = stack_testsuite_construct('Int','(t-1)^5/5+c','(t-1)^5/5',1,'t',''); + $testsuite[] = stack_testsuite_construct('Int','x^3/3+c','x^3/3+c',1,'x','The teacher adds a constant'); + $testsuite[] = stack_testsuite_construct('Int','x^2/2-2*x+2+c','(x-2)^2/2+k',1,'x',''); + $testsuite[] = stack_testsuite_construct('Int','exp(x)+c','exp(x)',1,'x','Special case'); $testsuite[] = stack_testsuite_construct('Int','2*x','x^3/3',0,'x','Student differentiates by mistake'); $testsuite[] = stack_testsuite_construct('Int','2*x+c','x^3/3',0,'x',''); *************** *** 412,417 **** $testsuite[] = stack_testsuite_construct('Int','(tan(2*t)-2*t)/2+c','-(t*sin(4*t)^2-sin(4*t)+t*cos(4*t)^2+2*t*cos(4*t)+t)/(sin(4*t)^2+cos(4*t)^2+2*cos(4*t)+1)',1,'t',''); $testsuite[] = stack_testsuite_construct('Int','tan(x)-x+c','tan(x)-x',1,'x',''); - $testsuite[] = stack_testsuite_construct('Int','e^x+c','e^x',1,'x','These tests currently fail'); - $testsuite[] = stack_testsuite_construct('GT','1/0','1',0,'',''); --- 420,423 ---- *************** *** 433,436 **** --- 439,445 ---- + $testsuite[] = stack_testsuite_construct('NumRelative','1/0','0',0,'','Basic tests'); + $testsuite[] = stack_testsuite_construct('NumRelative','0','1/0',0,'',''); + $testsuite[] = stack_testsuite_construct('NumRelative','0','0',0,'1/0',''); $testsuite[] = stack_testsuite_construct('NumRelative','1.1','1',0,'','No option, so 5%'); $testsuite[] = stack_testsuite_construct('NumRelative','1.05','1',1,'',''); *************** *** 447,450 **** --- 456,461 ---- $testsuite[] = stack_testsuite_construct('NumSigFigs','1/0','3',0,'0','Basic tests'); + $testsuite[] = stack_testsuite_construct('NumSigFigs','0','1/0',0,'0',''); + $testsuite[] = stack_testsuite_construct('NumSigFigs','0','0',0,'1/0',''); $testsuite[] = stack_testsuite_construct('NumSigFigs','1','3',0,'pi',''); $testsuite[] = stack_testsuite_construct('NumSigFigs','1','3',0,'[3,x]',''); *************** *** 536,540 **** C: cd \xampp\htdocs\stack-dev\install\ ! \xampp\php\php.exe answer_test_testsuite.php > test.html */ --- 547,551 ---- C: cd \xampp\htdocs\stack-dev\install\ ! \xampp\php\php.exe answer_test_testsuite.php > c:\tmp\test.html */ *************** *** 617,621 **** //$maxima_str .= 'AT'.$ts['AnswerTest'].'('.$ts['SAns'].',['.$ts['TAns'].','.$ts['AnsTestOpt']."]);\n"; - $err = ''; --- 628,631 ---- |
