Menu
▾
▴
[Stack-cvs] stack-1-0/lang/en/doc author_gettingstarted.php,1.7,1.8 author_maxima.php,1.1,1.2 author_testsuite.php,1.13,1.14 en_doc.php,1.12,1.13
|
From: Chris S. <san...@us...> - 2005-11-08 19:39:53
|
Update of /cvsroot/stack/stack-1-0/lang/en/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11909/lang/en/doc Modified Files: author_gettingstarted.php author_maxima.php author_testsuite.php en_doc.php Log Message: Index: author_testsuite.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/lang/en/doc/author_testsuite.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** author_testsuite.php 8 Nov 2005 09:41:39 -0000 1.13 --- author_testsuite.php 8 Nov 2005 19:39:42 -0000 1.14 *************** *** 165,170 **** $testsuite[] = stack_testsuite_construct('PartFrac','3/(x+1) + 3/(x+2)','3*(2*x+3)/((x+1)*(x+2))',1,'x','2 answers to the same question'); $testsuite[] = stack_testsuite_construct('PartFrac','3*(1/(x+1) + 1/(x+2))','3*(2*x+3)/((x+1)*(x+2))',1,'x',''); ! $testsuite[] = stack_testsuite_construct('PartFrac','3*x*(1/(x+1) + 2/(x+2))','3*x/(x+1)+6*x/(x+2)',1,'x','Correct Answer, factored'); ! $testsuite[] = stack_testsuite_construct('PartFrac','(3*x+3)*(1/(x+1) + 2/(x+2))','(3*x+3)/(x+1)+(6*x+6)/(x+2)',1,'x',''); $testsuite[] = stack_testsuite_construct('PartFrac','10/(x+3) - 2/(x+2) + x -2','(x^3 + 3*x^2 + 4*x +2)/((x+2)*(x+3))',1,'x','Correct Answer, Numerator > Denominator'); $testsuite[] = stack_testsuite_construct('PartFrac','1/(n*(n-1))','1/(n*(n-1))',0,'n','Simple mistakes'); --- 165,170 ---- $testsuite[] = stack_testsuite_construct('PartFrac','3/(x+1) + 3/(x+2)','3*(2*x+3)/((x+1)*(x+2))',1,'x','2 answers to the same question'); $testsuite[] = stack_testsuite_construct('PartFrac','3*(1/(x+1) + 1/(x+2))','3*(2*x+3)/((x+1)*(x+2))',1,'x',''); ! $testsuite[] = stack_testsuite_construct('PartFrac','3*x*(1/(x+1) + 2/(x+2))','-12/(x+2)-3/(x+1)+9',0,'x','Incorrect algebraic factors, but algebraically equivalent'); ! $testsuite[] = stack_testsuite_construct('PartFrac','(3*x+3)*(1/(x+1) + 2/(x+2))','9-6/(x+2)',0,'x',''); $testsuite[] = stack_testsuite_construct('PartFrac','10/(x+3) - 2/(x+2) + x -2','(x^3 + 3*x^2 + 4*x +2)/((x+2)*(x+3))',1,'x','Correct Answer, Numerator > Denominator'); $testsuite[] = stack_testsuite_construct('PartFrac','1/(n*(n-1))','1/(n*(n-1))',0,'n','Simple mistakes'); *************** *** 172,175 **** --- 172,176 ---- $testsuite[] = stack_testsuite_construct('PartFrac','1/(n-1)-1/n','1/(n-1)+1/n',0,'n',''); $testsuite[] = stack_testsuite_construct('PartFrac','1/(x+1)-1/x','1/(x-1)+1/x',0,'x',''); + $testsuite[] = stack_testsuite_construct('PartFrac','1/(n*(n+1))+1/n','2/n-1/(n+1)',0,'n',''); $testsuite[] = stack_testsuite_construct('PartFrac','2/(x+1)-1/(x+2)','s/((s+1)*(s+2))',0,'s','Different Variables'); $testsuite[] = stack_testsuite_construct('PartFrac','s/((s+1)^2) + s/(s+2) - 1/(s+1)','s/((s+1)*(s+2))',0,'s','Too many parts in the partial fraction'); *************** *** 180,183 **** --- 181,185 ---- $testsuite[] = stack_testsuite_construct('PartFrac','(2*x+1)/(x^2+1)-2/(x-1)','(2*x+1)/(x^2+1)-2/(x-1)',1,'x',''); + $testsuite[] = stack_testsuite_construct('SA_factored','1/0','0',0,'x',''); $testsuite[] = stack_testsuite_construct('SA_factored','2*(x-2)','0',1,'x','Linear integer factors'); Index: author_gettingstarted.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/lang/en/doc/author_gettingstarted.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** author_gettingstarted.php 7 Oct 2005 06:26:38 -0000 1.7 --- author_gettingstarted.php 8 Nov 2005 19:39:42 -0000 1.8 *************** *** 14,17 **** --- 14,18 ---- include_once("$stack_root/scripts/stackDoc.php"); include_once("{$stack_root}/scripts/maxima/maximafun.php"); + include_once("$stack_root/lang/en/doc/en_doc.php"); ?> *************** *** 458,463 **** </pre> - - <p>It is also possible to define functions within the Question Variables for use within a question. This is not recommended, --- 459,462 ---- *************** *** 471,472 **** --- 470,506 ---- ?> + + <h2>Lists, sets, equations, inequalities and matrices</h2> + + It is possible for the student to enter expressions which are + lists, sets, equations, inequalities and matrices. + + The <?php stack_doc_dispstackqfield('AnsTest','stackOptions'); ?> <tt>AlgEquiv</tt> can + be applied to all of these kinds of objects. + + <h3>Lists</h3> + In Maxima ordered lists are entered using square brackets, for example as + <pre>p:[1,1,2,x^2]</pre> + An element is accessed using the syntax <tt>p[1]</tt> + + <h3>Sets</h3> + In Maxima sets are not native and so STACK uses + <a href="maximadocs/maxdoc/nset.html"><tt>nset</tt></a> which is automatically loaded. + Note that, in addition to Maxima's use of <tt>set(a1,a2,...,an)</tt> + to construct a set with members <em>a1,a2,...,an</em>, STACK allows the use of + curly braces: <tt>{a1,a2,...,an}.</tt> + + <h3>Equations and Inequalities</h3> + It is possible for the student to enter an equation, such as + <pre> y=x^2-1</pre> + The <tt>AlgEquiv</tt> answer test is useful here. You might like to consider + looking at the <?php stack_doc_dispstackqfield('SyntaxHint','stackOptions'); ?> option. + + <h3>Matrices</h3> + The basic syntax for a matric is + <pre> + p:matrix([1,2],[3,4]) + </pre> + Each row is a <em>list</em>. Elements are accessed as <tt>p[1,2]</tt> etc. + + <p>Please read Section 6 of <a href="maximadocs/minimal-maxima.pdf">Minimal-Maxima</a> for more examples.</p> Index: author_maxima.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/lang/en/doc/author_maxima.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** author_maxima.php 14 Jul 2005 08:46:53 -0000 1.1 --- author_maxima.php 8 Nov 2005 19:39:42 -0000 1.2 *************** *** 20,22 **** --- 20,24 ---- <li>The actual <a href="maximadocs/maxdoc/maxima_toc.html">documentation</a></li> <li><a href="documentation.php?action=functions">Lists of commands</a>, and who may use them</li> + <li><a href="maximadocs/minimal-maxima.pdf">Minimal-Maxima</a>. A PDF file about Maxima and its data + structures. This contains a lot of useful information about sets, lists, matrices and simplification.</li> </ul> Index: en_doc.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/lang/en/doc/en_doc.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** en_doc.php 8 Nov 2005 09:41:39 -0000 1.12 --- en_doc.php 8 Nov 2005 19:39:42 -0000 1.13 *************** *** 330,337 **** $stackAnswerTest['AlgEquiv']['doc']="This is full algebraic simplification, as far as is possible within the computer algebra system. This is the default ! test. In essence we take <tt>StudentAnswer-TeacherAnswer</tt> and shake it around in as many ways as possible. If the result is zero ! we return true. This test will cope with expressions as well as ! equations, inequalities, sets, lists and matrices. This test disregards whether simplification is switched on, it always fully simplifies all its arguments."; --- 330,344 ---- $stackAnswerTest['AlgEquiv']['doc']="This is full algebraic simplification, as far as is possible within the computer algebra system. This is the default ! test. ! ! <p>This test will work with a variety of mathematical objects, including ! lists, sets, equations, inequalities and matrices. Exactly what it does depends ! on what objects are given to it. If the student enters the an object of a different ! <em>type</em> as that of the teacher, the result will be considred invalid.</p> ! ! <p>For mathematical expressions, in essence we take ! <tt>StudentAnswer-TeacherAnswer</tt> and shake it around in as many ways as possible. If the result is zero ! we return true. This test disregards whether simplification is switched on, it always fully simplifies all its arguments."; *************** *** 383,387 **** $stackAnswerTest['SA_factored']['doc']="This test checks to see if the expression ! in <tt>SAns</tt> is considered to be \"factored\". It shares code as the AnswerTest <tt>FacForm</tt>, so that the two tests should agree. However it provides no feedback and any <tt>TAns</tt> is ignored. It still needs the variable as an AnswerTest option. --- 390,394 ---- $stackAnswerTest['SA_factored']['doc']="This test checks to see if the expression ! in <tt>SAns</tt> is considered to be \"factored\". It shares code with the AnswerTest <tt>FacForm</tt>, so that the two tests should agree. However it provides no feedback and any <tt>TAns</tt> is ignored. It still needs the variable as an AnswerTest option. *************** *** 402,417 **** Literally in Maxima, is <tt>expand(SA)=SA</tt>?"; ! $stackAnswerTest['PartFrac']['doc']="This test checks to see if the expression in <tt>SA</tt> is ! the partial fraction of <tt>tExpr</tt> which is the first part of the list SBL. It uses functions found in ! stackMaxima.mac in order to give feedback.<p> ! The function takes in the Students Answer (<tt>SA</tt>), and a List (<tt>SBL</tt>), SBL consist of ! 3 parts, the Teachers Expression (<tt>tExpr</tt>), the variable to which the partial fraction has respect to, and whether ! formative feedback is required. <p> ! Feedback comes in several forms, <tt>TRUE</tt> if and only if the answer is the partial fraction of ! the Teacher's Expression, whether it be a factored form or not. Feedback is also given based on ! incorrect answers in order to guide the student to the right answer. For exmaple the common denominator is returned ! in order for the student to check the denominators of their partial fraction. See the AnswerTest <tt>AT_PartFrac</tt> ! for more details."; $stackAnswerTest['Diff']['doc']="This test is a general differentiation test. --- 409,422 ---- Literally in Maxima, is <tt>expand(SA)=SA</tt>?"; ! $stackAnswerTest['PartFrac']['doc']="This test checks (i) that <tt>SAns</tt> is algebraically ! equivalent to <tt>TAns</tt>, and (ii) that <tt>SAns</tt> is in \"partial fraction form\". ! The answer test expects the first argument to be the student's answer, the second ! to the teachers answer and the AnswerTest options to be the ! variable."; + $stackAnswerTest['SA_partfrac']['doc']="This test checks to see if the expression + in <tt>SAns</tt> is in \"partial fraction form\". It shares code with the AnswerTest <tt>PartFrac</tt>, + so that the two tests should agree. However it provides no feedback and any <tt>TAns</tt> is ignored. It + still needs the variable as an AnswerTest option."; $stackAnswerTest['Diff']['doc']="This test is a general differentiation test. |
