[Stack-cvs] stack-1-0/scripts/maxima stackmaxima.mac,1.15,1.16

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

Update of /cvsroot/stack/stack-1-0/scripts/maxima
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32203/scripts/maxima

Modified Files:
	stackmaxima.mac 
Log Message:
Problems with trig expansions in the Int Answer test.

Index: stackmaxima.mac
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/maxima/stackmaxima.mac,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** stackmaxima.mac	21 Jun 2005 14:52:25 -0000	1.15
--- stackmaxima.mac	1 Jul 2005 15:22:40 -0000	1.16
***************
*** 578,582 ****
  /* sa is the students' ansewer, sbl is a list consisting of (1) the integrand, and (2) the variable */
  ATInt(sa,sbl) := 
!     BLOCK([KEEPFLOAT,DEMOIVRE,TRIGEXPAND,RawMark,FeedBack,AnswerNote,str,da,db,dd,dc,sb,var,cont],
      RawMark:0, FeedBack:"", AnswerNote:"",
      /* SBL is a list: the teacher's answer, the variable, and whether formative feedback is to be provided. */
--- 578,582 ----
  /* sa is the students' ansewer, sbl is a list consisting of (1) the integrand, and (2) the variable */
  ATInt(sa,sbl) := 
!     BLOCK([KEEPFLOAT,DEMOIVRE,RawMark,FeedBack,AnswerNote,str,da,db,dd,dc,sb,var,cont,ans],
      RawMark:0, FeedBack:"", AnswerNote:"",
      /* SBL is a list: the teacher's answer, the variable, and whether formative feedback is to be provided. */