[Stack-cvs] stack-1-0/scripts/maxima stackmaxima.mac,1.35,1.36

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

Update of /cvsroot/stack/stack-1-0/scripts/maxima
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14443/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.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** stackmaxima.mac	17 Sep 2005 11:49:12 -0000	1.35
--- stackmaxima.mac	26 Sep 2005 10:15:34 -0000	1.36
***************
*** 48,51 ****
--- 48,53 ----
  ALIAS(int,integrate);        /* Allows integrate to be called with int() */
  ALIAS(simplify,fullratsimp); /* Allows simplify to be something */
+ decimalplaces(x,n) := float(round(10^n*float(x))/(10^n));
+ 
  
  /* Synonyms to help students */
***************
*** 738,743 ****
  ATPartFrac(SA,SBL) := BLOCK([NEGDISTRIB,val,rawmk,fb,ansnote,SB,v,quiet,facdum],
      NEGDISTRIB:FALSE,
!     /* Check for floats */
!     val:"", rawmk:1, fb:StackAddFeedback("","AT_NOTIMPLEMENTED"), ansnote:"",
      /* SBL is a list: the teacher's answer, the variable, and whether formative feedback is to be provided. */
      if listp(SBL) then (tExpr:SBL[1], wrt:SBL[2], quiet:SBL[3])  else
--- 740,744 ----
  ATPartFrac(SA,SBL) := BLOCK([NEGDISTRIB,val,rawmk,fb,ansnote,SB,v,quiet,facdum],
      NEGDISTRIB:FALSE,
!     val:"true", rawmk:1, fb:StackAddFeedback("","AT_NOTIMPLEMENTED"), ansnote:"",
      /* SBL is a list: the teacher's answer, the variable, and whether formative feedback is to be provided. */
      if listp(SBL) then (tExpr:SBL[1], wrt:SBL[2], quiet:SBL[3])  else
***************
*** 745,751 ****
      /* If we don't have an atom as the teacher's variable, then we need to make a substitution */
      if atom(v)#TRUE then (SA:subst(facdum,wrt,SA),tExpr:subst(facdum,wrt,tExpr),wrt:facdum),
!     BLOCK(
!             sExpr: SA,
!         [val, rawmk, ansnote, fb],
          rawmk: 0, fb: "", ansnote: "", ret: StackReturnOb(val,rawmk,ansnote,fb),
          if factor( expand( sExpr ) ) = factor( expand( tExpr ) ) then
--- 746,751 ----
      /* If we don't have an atom as the teacher's variable, then we need to make a substitution */
      if atom(v)#TRUE then (SA:subst(facdum,wrt,SA),tExpr:subst(facdum,wrt,tExpr),wrt:facdum),
!     BLOCK([val, rawmk, ansnote, fb],
!         sExpr: SA,
          rawmk: 0, fb: "", ansnote: "", ret: StackReturnOb(val,rawmk,ansnote,fb),
          if factor( expand( sExpr ) ) = factor( expand( tExpr ) ) then