1.1 --- a/test/Tools/isac/Knowledge/partial_fractions.sml	Sun Feb 19 10:04:04 2012 +0100
     1.2 +++ b/test/Tools/isac/Knowledge/partial_fractions.sml	Mon Feb 20 18:18:03 2012 +0100
     1.3 @@ -11,6 +11,7 @@
     1.4  "----------- fun factors_from_solution ------------------";
     1.5  "----------- Logic.unvarify_global ----------------------";
     1.6  "----------- eval_drop_questionmarks --------------------";
     1.7 +"----------- = me for met_partial_fraction --------------";
     1.8  "--------------------------------------------------------";
     1.9  "--------------------------------------------------------";
    1.10  "--------------------------------------------------------";
    1.11 @@ -74,7 +75,7 @@
    1.12  val SOME t = parseNEW ctxt "factors_from_solution [(z::real) = 1 / 2, z = -1 / 4]";
    1.13  val SOME (_, t') = eval_factors_from_solution "" 0 t thy;
    1.14  if term2str t' =
    1.15 - "factors_from_solution [z = 1 / 2, z = -1 / 4] =\n(z + -1 * (1 / 2)) * (z + -1 * (-1 / 4))"
    1.16 + "factors_from_solution [z = 1 / 2, z = -1 / 4] = (z - 1 / 2) * (z - -1 / 4)"
    1.17  then () else error "factors_from_solution broken";
    1.18  
    1.19  "----------- Logic.unvarify_global ----------------------";
    1.20 @@ -110,3 +111,111 @@
    1.21    "\nA / (z + -1 * (1 / 2)) + B / (z + -1 * (-1 / 4))"
    1.22  then () else error "eval_drop_questionmarks broken";
    1.23  
    1.24 +"----------- = me for met_partial_fraction --------------";
    1.25 +"----------- = me for met_partial_fraction --------------";
    1.26 +"----------- = me for met_partial_fraction --------------";
    1.27 +  val fmz =                                             
    1.28 +    ["functionTerm (3 / (z * (z - 1 / 4 + -1 / 8 * (1 / z))))", 
    1.29 +      "solveFor z", "decomposedFunction p_p"];
    1.30 +  val (dI',pI',mI') =
    1.31 +    ("Partial_Fractions", 
    1.32 +      ["partial_fraction", "rational", "simplification"],
    1.33 +      ["simplification","of_rationals","to_partial_fraction"]);
    1.34 +  val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
    1.35 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.36 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.37 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.38 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.39 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.40 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.41 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.42 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.43 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.44 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.45 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.46 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.47 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.48 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.49 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.50 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.51 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.52 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.53 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.54 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.55 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.56 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.57 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.58 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.59 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.60 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.61 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.62 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.63 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.64 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.65 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.66 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.67 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.68 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.69 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.70 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.71 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.72 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.73 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.74 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.75 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.76 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.77 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.78 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.79 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.80 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.81 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.82 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.83 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.84 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.85 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.86 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.87 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.88 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.89 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.90 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.91 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.92 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.93 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.94 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.95 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.96 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.97 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.98 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
    1.99 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.100 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.101 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.102 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.103 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.104 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.105 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.106 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.107 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt; 
   1.108 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.109 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.110 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.111 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.112 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.113 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.114 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.115 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.116 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.117 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.118 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.119 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.120 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.121 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.122 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.123 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.124 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.125 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt;
   1.126 +  val (p,_,f,nxt,_,pt) = me nxt p [] pt; 
   1.127 +
   1.128 +show_pt pt;
   1.129 +if f2str f = "4 / (z - 1 / 2) + -4 / (z - -1 / 4)" then() 
   1.130 +else error "= me .. met_partial_fraction broken";
   1.131 +