Update of /cvsroot/stack/stack-1-0/scripts/maxima
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12739/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.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** stackmaxima.mac 29 Jul 2005 15:59:32 -0000 1.23
--- stackmaxima.mac 5 Aug 2005 09:13:44 -0000 1.24
***************
*** 644,649 ****
ret: quadTest(sExpr,tExpr,wrt)
else if sDeg = 3 then
! ret: tripTest(sExpr, tExpr, wrt))
)
),
if (quiet) then FeedBack:"",
--- 644,652 ----
ret: quadTest(sExpr,tExpr,wrt)
else if sDeg = 3 then
! ret: tripTest(sExpr, tExpr, wrt)
! else
! ret: singTest(sExpr, tExpr)
)
+ )
),
if (quiet) then FeedBack:"",
***************
*** 749,752 ****
--- 752,756 ----
/* quadTest(sExpr, tExpr, wrt) */
/* sameVars(expr1, expr2) */
+ /* singTest(sExpr, tExpr) */
/* tripTest(sExpr, tExpr, wrt) */
/* ***************************** */
***************
*** 950,956 ****
if list1=list2 then true
else false
! );
!
!
/* ****************3rd Degree Partial Fraction***************** */
--- 954,991 ----
if list1=list2 then true
else false
! );
!
!
! /* ****************1st Degree Partial Fraction***************** */
! /* Use: Degree of Expression is 1, expressions not equivalent */
! /* Requires: SExpr - Students Expression */
! /* TExpr - Teachers Expression */
! /* Returns: StackReturnOb */
! /* CASE 1: different Numerators - factored sExpr */
! /* CASE 2: diff denominators - sDenom and tDenom */
! /* CASE 3: Other wise - Factored sExpr */
! /* ************************************************************ */
!
! singTest(sExpr, tExpr):=
! ( [val, rawmk, ansnote, fb],
! tE: factor(tExpr),
! sE: factor(sExpr),
! if (isDenomSame(sE,tE) = false) then
! BLOCK(
! val:"true",
! rawmk: String(0),
! ansnote: "ATPartFrac_denom_ret",
! fb: StackAddFeedback("","ATPartFrac_denom_ret", StackDISP(denom(sE),"\$"), StackDISP(denom(tE),"\$"))
! )
! else
! BLOCK(
! val:"true",
! rawmk: String(0),
! ansnote: "ATPartFrac_ret_expression",
! fb: StackAddFeedback("", "ATPartFrac_ret_expression", StackDISP(sE,"\$"))
! ),
! ret: StackReturnOb(val, rawmk, ansnote, fb),
! RETURN(ret)
! );
/* ****************3rd Degree Partial Fraction***************** */
|
