Update of /cvsroot/stack/stack-1-0/scripts/maxima
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14209/scripts/maxima
Modified Files:
stackmaxima.mac
Log Message:
Index: stackmaxima.mac
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/maxima/stackmaxima.mac,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** stackmaxima.mac 17 Sep 2005 11:31:04 -0000 1.34
--- stackmaxima.mac 17 Sep 2005 11:49:12 -0000 1.35
***************
*** 578,584 ****
ATGT(SA,SB) :=
BLOCK([KEEPFLOAT,RawMark,FeedBack,AnswerNote,str,ex],
! RawMark:0, FeedBack:"", AnswerNote:"",
KEEPFLOAT:TRUE, /* See pg 23 */
ex:trigreduce(trigexpand(trigrat(SA-SB))),
if ex>0 then
(RawMark:1, AnswerNote:"Correct" )
--- 578,585 ----
ATGT(SA,SB) :=
BLOCK([KEEPFLOAT,RawMark,FeedBack,AnswerNote,str,ex],
! RawMark:0, FeedBack:"", AnswerNote:"Not number",
KEEPFLOAT:TRUE, /* See pg 23 */
ex:trigreduce(trigexpand(trigrat(SA-SB))),
+ if numberp(ex) then
if ex>0 then
(RawMark:1, AnswerNote:"Correct" )
***************
*** 591,597 ****
ATGTE(SA,SB) :=
BLOCK([KEEPFLOAT,RawMark,FeedBack,AnswerNote,str,ex],
! RawMark:0, FeedBack:"", AnswerNote:"",
KEEPFLOAT:TRUE, /* See pg 23 */
ex:trigreduce(trigexpand(trigrat(SA-SB))),
if ex>=0 then
(RawMark:1, AnswerNote:"Correct" )
--- 592,599 ----
ATGTE(SA,SB) :=
BLOCK([KEEPFLOAT,RawMark,FeedBack,AnswerNote,str,ex],
! RawMark:0, FeedBack:"", AnswerNote:"Not number",
KEEPFLOAT:TRUE, /* See pg 23 */
ex:trigreduce(trigexpand(trigrat(SA-SB))),
+ if numberp(ex) then
if ex>=0 then
(RawMark:1, AnswerNote:"Correct" )
|
