[Stack-cvs] stack-1-0/scripts/maxima stackmaxima.mac,1.21,1.22

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/stack/stack-1-0/scripts/maxima
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10188/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.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** stackmaxima.mac	18 Jul 2005 11:58:22 -0000	1.21
--- stackmaxima.mac	25 Jul 2005 10:09:32 -0000	1.22
***************
*** 723,737 ****
  
  /*****************************************************************/
! /* Partial Fractions answer Test functions           */
! /* Author: LastRenshai                       */
  /*****************************************************************/
  
  /* *******Functions Used******** */
! /* deg(Expr)             */
  /* isDenomSame(sExpr, tExpr)     */
! /* isNumSame(sExpr, tExpr)   */
  /* isPartFrac(sExpr, tExpr, wrt) */
  /* quadTest(sExpr, tExpr, wrt)   */
! /* sameVars(expr1, expr2)    */
  /* tripTest(sExpr, tExpr, wrt)   */
  /* ***************************** */
--- 723,737 ----
  
  /*****************************************************************/
! /* Partial Fractions answer Test functions                       */
! /* Author: LastRenshai                                           */
  /*****************************************************************/
  
  /* *******Functions Used******** */
! /* deg(Expr)                     */
  /* isDenomSame(sExpr, tExpr)     */
! /* isNumSame(sExpr, tExpr)       */
  /* isPartFrac(sExpr, tExpr, wrt) */
  /* quadTest(sExpr, tExpr, wrt)   */
! /* sameVars(expr1, expr2)        */
  /* tripTest(sExpr, tExpr, wrt)   */
  /* ***************************** */
***************
*** 739,744 ****
  /* ******************Degree Of Polynomial Test************************* */
  /* Assumes expression isn't already expanded and contains a val of x    */
! /* requires : expression with variable such as x            */
! /* returns  : degree of highest power of var            */ 
  /* ******************************************************************** */
  deg(expr):=
--- 739,744 ----
  /* ******************Degree Of Polynomial Test************************* */
  /* Assumes expression isn't already expanded and contains a val of x    */
! /* requires : expression with variable such as x                        */
! /* returns  : degree of highest power of var                            */ 
  /* ******************************************************************** */
  deg(expr):=
***************
*** 774,781 ****
          
  /* ************Denominator Same Test*************************** */
! /* requires:    Students partial Fraction part          */
! /*      Teachers Partial Fraction part          */
! /* returns: Boolean TRUE iff denominators are equivalent    */
! /*      false otherwise                 */
  /* ************************************************************ */
  
--- 774,781 ----
          
  /* ************Denominator Same Test*************************** */
! /* requires:    Students partial Fraction part                  */
! /*      Teachers Partial Fraction part                          */
! /* returns: Boolean TRUE iff denominators are equivalent        */
! /*      false otherwise                                         */
  /* ************************************************************ */
  
***************
*** 791,798 ****
      
  /* **************Numerator Same Test*************************** */
! /* requires:    Students partial Fraction part          */
! /*      Teachers Partial Fraction part          */
! /* returns: Boolean TRUE iff numerators are equivalent  */
! /*      false otherwise                 */
  /* ************************************************************ */
  
--- 791,798 ----
      
  /* **************Numerator Same Test*************************** */
! /* requires:    Students partial Fraction part                  */
! /*      Teachers Partial Fraction part                          */
! /* returns: Boolean TRUE iff numerators are equivalent          */
! /*      false otherwise                                         */
  /* ************************************************************ */
  
***************
*** 809,822 ****
      
  /* **************************PartFrac Test***************************** */
! /* requires:    Student Answer                      */
! /*      Teachers Question                   */
! /*      Respect To which the fractions are parted       */
! /* returns: StackReturnOb                       */
! /*      CASE 1: topOp is divisor - single fraction      */
! /*      CASE 2: CORRECT answer - true               */
! /*      CASE 3: Different Variables - diff vars         */
! /*      CASE 4: Different amount of parts - Diff parts      */
! /*      CASE 5: Different Numerator - ret factored expression   */
! /*      CASE 6: Different Denominator - ret sDenom and tDenom   */
  /* ******************************************************************** */
  
--- 809,822 ----
      
  /* **************************PartFrac Test***************************** */
! /* requires:    Student Answer                                          */
! /*      Teachers Question                                               */
! /*      Respect To which the fractions are parted                       */
! /* returns: StackReturnOb                                               */
! /*      CASE 1: topOp is divisor - single fraction                      */
! /*      CASE 2: CORRECT answer - true                                   */
! /*      CASE 3: Different Variables - diff vars                         */
! /*      CASE 4: Different amount of parts - Diff parts                  */
! /*      CASE 5: Different Numerator - ret factored expression           */
! /*      CASE 6: Different Denominator - ret sDenom and tDenom           */
  /* ******************************************************************** */
  
***************
*** 876,886 ****
  /* **********************QUAD TEST***************************** */
  /* Use: Degree of Expression is 2, expressions not equivalent   */
! /* Requires:    SExpr - Students Expression         */
! /*      TExpr - Teachers Expression         */
! /*      wrt   - Variable part frac occurs       */
! /* Returns:     StackReturnOb                   */
! /*      CASE 1: different Numerators - factored sExpr   */
! /*      CASE 2: diff denominators - sDenom and tDenom   */
! /*      CASE 3: Other wise - Factored sExpr     */
  /* ************************************************************ */
  
--- 876,886 ----
  /* **********************QUAD TEST***************************** */
  /* Use: Degree of Expression is 2, expressions not equivalent   */
! /* Requires:    SExpr - Students Expression                     */
! /*      TExpr - Teachers Expression                             */
! /*      wrt   - Variable part frac occurs                       */
! /* Returns:     StackReturnOb                                   */
! /*      CASE 1: different Numerators - factored sExpr           */
! /*      CASE 2: diff denominators - sDenom and tDenom           */
! /*      CASE 3: Other wise - Factored sExpr                     */
  /* ************************************************************ */
  
***************
*** 900,904 ****
                  rawmk:  String(0),
                  ansnote: "ATPartFrac_ret_expression",
!                 fb: Sconcat("AtPartFrac_ret_expression ", factor(sExpr))
              )                                   
          else if (isDenomSame(sExprL, tExprL) = false and isDenomSame(sExprL, tExprR) = false)
--- 900,904 ----
                  rawmk:  String(0),
                  ansnote: "ATPartFrac_ret_expression",
!                 fb: StackAddFeedback("", "ATPartFrac_ret_expression", StackDISP(factor(sExpr)),"\$")
              )                                   
          else if (isDenomSame(sExprL, tExprL) = false and isDenomSame(sExprL, tExprR) = false)
***************
*** 908,912 ****
                  rawmk: String(0),
                  ansnote: "ATPartFrac_denom_ret",
!                 fb: Sconcat("AtPartFrac_denom_ret ", denom(factor(sExpr)), " " , denom(factor(tExpr)))
                  )                                   
          else 
--- 908,912 ----
                  rawmk: String(0),
                  ansnote: "ATPartFrac_denom_ret",
!                 fb: StackAddFeedback("","ATPartFrac_denom_ret", StackDISP(denom(factor(sExpr)),"\$"), StackDISP(denom(factor(tExpr)),"\$"))
                  )                                   
          else 
***************
*** 915,919 ****
                  rawmk: String(0),
                  ansnote: "ATPartFrac_ret_expression",
!                 fb: Sconcat("AtPartFrac_ret_expression ", factor(sExpr))
                  ),
          ret: StackReturnOb(val, rawmk,ansnote,fb),
--- 915,919 ----
                  rawmk: String(0),
                  ansnote: "ATPartFrac_ret_expression",
!                 fb: StackAddFeedback("", "ATPartFrac_ret_expression", StackDISP(factor(sExpr)),"\$")
                  ),
          ret: StackReturnOb(val, rawmk,ansnote,fb),
***************
*** 924,930 ****
      
  /* ***************Variables used the Same********************** */
! /* requires:    2 Expressions                   */
  /* returns:     TRUE: iff expr 1 and expr2 contain same vars    */
! /*      FALSE: otherwise                */
  /* ************************************************************ */
  
--- 924,930 ----
      
  /* ***************Variables used the Same********************** */
! /* requires:    2 Expressions                                   */
  /* returns:     TRUE: iff expr 1 and expr2 contain same vars    */
! /*      FALSE: otherwise                                        */
  /* ************************************************************ */
  
***************
*** 941,951 ****
  /* ****************3rd Degree Partial Fraction***************** */
  /* Use: Degree of Expression is 3, expressions not equivalent   */
! /* Requires:    SExpr - Students Expression         */
! /*      TExpr - Teachers Expression         */
! /*      wrt   - Variable part frac occurs       */
! /* Returns:     StackReturnOb                   */
! /*      CASE 1: different Numerators - factored sExpr   */
! /*      CASE 2: diff denominators - sDenom and tDenom   */
! /*      CASE 3: Other wise - Factored sExpr     */
  /* ************************************************************ */
  
--- 941,951 ----
  /* ****************3rd Degree Partial Fraction***************** */
  /* Use: Degree of Expression is 3, expressions not equivalent   */
! /* Requires:    SExpr - Students Expression                     */
! /*      TExpr - Teachers Expression                             */
! /*      wrt   - Variable part frac occurs                       */
! /* Returns:     StackReturnOb                                   */
! /*      CASE 1: different Numerators - factored sExpr           */
! /*      CASE 2: diff denominators - sDenom and tDenom           */
! /*      CASE 3: Other wise - Factored sExpr                     */
  /* ************************************************************ */
  
***************
*** 967,971 ****
                  rawmk: String(0),
                  ansnote: "ATPartFrac_ret_expression",
!                 fb: Sconcat("AtPartFrac_single_Fraction ", factor(sExpr))
                  )
          else if (isDenomSame(s1,t1) = false and isDenomSame(s1,t2) = false and isDenomSame(s1, t3) = false)
--- 967,971 ----
                  rawmk: String(0),
                  ansnote: "ATPartFrac_ret_expression",
!                 fb: StackAddFeedback("", "ATPartFrac_ret_expression", StackDISP(factor(sExpr)),"\$")
                  )
          else if (isDenomSame(s1,t1) = false and isDenomSame(s1,t2) = false and isDenomSame(s1, t3) = false)
***************
*** 976,980 ****
                  rawmk: String(0),
                  ansnote: "ATPartFrac_denom_ret",
!                 fb: Sconcat("AtPartFrac_denom_ret ", denom(factor(sExpr)), " " , denom(factor(tExpr)))
                  )
          else    
--- 976,980 ----
                  rawmk: String(0),
                  ansnote: "ATPartFrac_denom_ret",
!                 fb: StackAddFeedback("","ATPartFrac_denom_ret", StackDISP(denom(factor(sExpr)),"\$"), StackDISP(denom(factor(tExpr)),"\$"))
                  )
          else    
***************
*** 983,987 ****
                  rawmk:  String(0),
                  ansnote: "ATPartFrac_ret_expression",
!                 fb: Sconcat("AtPartFrac_ret_expression ", factor(sExpr))
                  ),
          ret: StackReturnOb(val, rawmk, ansnote, fb),
--- 983,987 ----
                  rawmk:  String(0),
                  ansnote: "ATPartFrac_ret_expression",
!                 fb: StackAddFeedback("", "ATPartFrac_ret_expression", StackDISP(factor(sExpr)),"\$")
                  ),
          ret: StackReturnOb(val, rawmk, ansnote, fb),