Update of /cvsroot/stack/stack-1-0/scripts/maxima
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11689/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.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** stackmaxima.mac 12 Sep 2005 08:24:02 -0000 1.33
--- stackmaxima.mac 17 Sep 2005 11:31:04 -0000 1.34
***************
*** 575,578 ****
--- 575,604 ----
)$
+ /* SA>SB? */
+ 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" )
+ else
+ ( AnswerNote:"Incorrect" ),
+ RETURN(StackReturnOb("true",STRING(RawMark),AnswerNote,FeedBack))
+ )$
+
+ /* SA>=SB? */
+ 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" )
+ else
+ ( AnswerNote:"Incorrect" ),
+ RETURN(StackReturnOb("true",STRING(RawMark),AnswerNote,FeedBack))
+ )$
+
/* irred_Q(p,v) is TRUE iff */
|
