[Stack-cvs] stack-dev/maxima stackmaxima.mac,1.85,1.86

[Chris S. <san...@us...>]

Update of /cvsroot/stack/stack-dev/maxima
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22370

Modified Files:
	stackmaxima.mac 
Log Message:


Index: stackmaxima.mac
===================================================================
RCS file: /cvsroot/stack/stack-dev/maxima/stackmaxima.mac,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** stackmaxima.mac	9 Nov 2010 13:41:57 -0000	1.85
--- stackmaxima.mac	28 Nov 2010 17:34:18 -0000	1.86
***************
*** 635,638 ****
--- 635,643 ----
  
  /* ********************************** */
+ /* Logarithms to the base 10          */
+ /* ********************************** */
+ 
+ 
+ /* ********************************** */
  /* Algebraic tests                    */
  /* ********************************** */
***************
*** 1093,1097 ****
      if (is(SBB=[STACKERROR]) or is(SBB=[])) then return(StackReturnOb("0","ATGT_STACKERROR_TAns","")),
  
!     ex:ev(float(trigreduce(trigexpand(trigrat(SA-SB)))),simp),
      if numberp(ex) then
      if ex>0 then
--- 1098,1102 ----
      if (is(SBB=[STACKERROR]) or is(SBB=[])) then return(StackReturnOb("0","ATGT_STACKERROR_TAns","")),
  
!     ex:ev(float(trigreduce(trigexpand(SA-SB))),simp),
      if numberp(ex) then
      if ex>0 then
***************
*** 1113,1117 ****
      if (is(SBB=[STACKERROR]) or is(SBB=[])) then return(StackReturnOb("0","ATGTE_STACKERROR_TAns","")),
  
!     ex:ev(float(trigreduce(trigexpand(trigrat(SA-SB)))),simp),
      if numberp(ex) then
      if ex>=0 then
--- 1118,1122 ----
      if (is(SBB=[STACKERROR]) or is(SBB=[])) then return(StackReturnOb("0","ATGTE_STACKERROR_TAns","")),
  
!     ex:ev(float(trigreduce(trigexpand(SA-SB))),simp),
      if numberp(ex) then
      if ex>=0 then
***************
*** 1848,1878 ****
      )$
  
- /* ===================== 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)
- )$
- 
  /*
    Description : forme echelonne par lignes d'une matrice rectangulaire
--- 1853,1856 ----