[Aimmath-commit] AIM/WEB-INF/maple/aim Diff.mpl,1.2.2.1,1.2.2.2

[<gr...@us...>]

Update of /cvsroot/aimmath/AIM/WEB-INF/maple/aim
In directory sc8-pr-cvs1:/tmp/cvs-serv21516/aim

Modified Files:
      Tag: develop_2_1
	Diff.mpl 
Log Message:
Just a few improvements.                                               - GG


Index: Diff.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/aim/Diff.mpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** Diff.mpl	10 Jul 2003 20:10:03 -0000	1.2.2.1
--- Diff.mpl	18 Jul 2003 07:24:46 -0000	1.2.2.2
***************
*** 168,172 ****
    note := "";
  
!   if traperror(simplify(ans - rightans,assume=positive)) = 0 then
     mark := 1;
    else
--- 168,173 ----
    note := "";
  
!   # sometimes an extra simplify is needed ... maybe an eval needed elsewhere?
!   if traperror(simplify(simplify(ans - rightans,assume=positive))) = 0 then
     mark := 1;
    else
***************
*** 202,210 ****
      if type([f],[function]) and
         type([op(0,f)],[symbol]) and 
!        nops(f) = 1 then
       # Check for the mistake (g o h)' = g' o h.
  
!      g := op(0,f)(uu);
!      h := op(1,f);
       wrongans := eval(subs(uu = h,diff(g,uu)));
       if traperror(simplify(ans - wrongans,assume=positive)) = 0 then
--- 203,223 ----
      if type([f],[function]) and
         type([op(0,f)],[symbol]) and 
!        nops(f) = 1 or
!        # f = log[b] (gets ``unwrapped'' by Maple)
!        type([f],[`*`]) and 
!        type([op(1,f)],[function]) and op(0, op(1,f)) = `ln` and
!        type([op(2,f)],[`^`]) and op(2, op(2,f)) = -1 and
!        type([op(1, op(2,f))],[function]) and
!        op(0, op(1, op(2,f))) = `ln` and 
!        type([op(1, op(1, op(2,f)))],[constant]) then
       # Check for the mistake (g o h)' = g' o h.
  
!      if type([f],[function]) then
!        g := op(0,f)(uu);
!        h := op(1,f);
!      else
!        g := ln(uu) * op(2,f);
!        h := op(1, op(1,f));
!      fi;
       wrongans := eval(subs(uu = h,diff(g,uu)));
       if traperror(simplify(ans - wrongans,assume=positive)) = 0 then
***************
*** 234,238 ****
          sprintf(
           __("But this is $%s$, not $%s$."),
!          LaTeX(Diff(fn,newvar)),LaTeX(Diff(fn,var))));
        feedback := feedback,"<latex>\n",msg,"</latex>\n";
       fi;
--- 247,251 ----
          sprintf(
           __("But this is $%s$, not $%s$."),
!          TextStyle(LaTeX(Diff(fn,newvar))),TextStyle(LaTeX(Diff(fn,var)))));
        feedback := feedback,"<latex>\n",msg,"</latex>\n";
       fi;
***************
*** 330,334 ****
            newvar,LaTeX(base),fn,LaTeX(f),LaTeX(newvar^expt)),
           sprintf(
!           __("Then \[ %s = %s = %s, \] which is your answer.\n"),
            LaTeX(Diff(fn,newvar)),
            LaTeX(expt * newvar^(expt - 1)),
--- 343,347 ----
            newvar,LaTeX(base),fn,LaTeX(f),LaTeX(newvar^expt)),
           sprintf(
!           __("Then \\[ %s = %s = %s, \\] which is your answer.\n"),
            LaTeX(Diff(fn,newvar)),
            LaTeX(expt * newvar^(expt - 1)),