From: Chris S. <san...@us...> - 2010-11-15 14:18:33
|
Update of /cvsroot/stack/stack-dev/maxima In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26802/maxima Modified Files: Tag: grobner stackmaxima.mac Log Message: Index: stackmaxima.mac =================================================================== RCS file: /cvsroot/stack/stack-dev/maxima/stackmaxima.mac,v retrieving revision 1.84.2.2 retrieving revision 1.84.2.3 diff -C2 -d -r1.84.2.2 -r1.84.2.3 *** stackmaxima.mac 9 Nov 2010 14:50:41 -0000 1.84.2.2 --- stackmaxima.mac 15 Nov 2010 14:18:25 -0000 1.84.2.3 *************** *** 2011,2040 **** )$ ! /* ===================== ATEquations ===================== */ ! ATEquations(SA,SBl) := ! block([old_simp,keepfloat,RawMark,FeedBack,AnswerNote,cont:true,ret,SB,AT,var:0], ! old_simp:simp, simp:true, RawMark:0, FeedBack:"", AnswerNote:"", ! /* SBL is a list: the teacher's answer, the variable, and whether formative feedback is to be provided. */ ! if listp(SBl) then ! (var:SBl[2], SB:SBl[1], cont:true) ! else ! (cont:false, ret:[false,0,"ATEquation_list","ATEquation_list"]), ! if listp(var) then ! (AT:var[2], var:var[1],cont:true) ! else ! (cont:false, ret:[false,0,"ATEquation_list_var","ATEquation_list_var"]), ! /* Check we really do have a variable */ ! if not(AT="AE") then ! if atom(var) then ! (if stringp(var) or numberp(var) then ! (cont:false, ret:[false,0,"ATEquation_var_wrong",""]) ! ) ! else ! (cont:false, ret:[false,0,"ATEquation_var_wrong",""]), ! /* If ok, we perform the test */ ! if cont then ret:ATEquationfun(SA,SB,var,AT), ! ret:StackReturnOb(string(ret[2]),ret[3],ret[4]), ! return(ret) ! )$ /* --- 2011,2018 ---- )$ ! ! /*********************/ ! /* Matrix operations */ ! /*********************/ /* |