1.1 --- a/test/Tools/isac/Knowledge/polyeq.sml Tue Sep 13 10:51:56 2011 +0200
1.2 +++ b/test/Tools/isac/Knowledge/polyeq.sml Sun Sep 18 15:21:46 2011 +0200
1.3 @@ -25,8 +25,6 @@
1.4 "-----------------------------------------------------------------";
1.5 "-----------------------------------------------------------------";
1.6
1.7 -val c = []; print_depth 5;
1.8 -
1.9 "----------- tests on predicates in problems ---------------------";
1.10 "----------- tests on predicates in problems ---------------------";
1.11 "----------- tests on predicates in problems ---------------------";
1.12 @@ -112,35 +110,34 @@
1.13 "----------- lin.eq degree_0 -------------------------------------";
1.14 "----------- lin.eq degree_0 -------------------------------------";
1.15 "----- d0_false ------";
1.16 -(*=== inhibit exn WN110906 ======================================================
1.17 +(*=== inhibit exn WN110914: declare_constraints doesnt work with num_str ========
1.18 val fmz = ["equality (1 = (0::real))", "solveFor x", "solutions L"];
1.19 val (dI',pI',mI') = ("PolyEq",["degree_0","polynomial","univariate","equation"],
1.20 ["PolyEq","solve_d0_polyeq_equation"]);
1.21 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.22 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.23 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.24 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.25 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.26 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.27 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.28 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.29 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.30 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.31 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.32 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.33 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.34 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[]")) => ()
1.35 | _ => error "polyeq.sml: diff.behav. in 1 = 0 -> []";
1.36
1.37 "----- d0_true ------";
1.38 -(*EP-7*)
1.39 val fmz = ["equality (0 = (0::real))", "solveFor x","solutions L"];
1.40 val (dI',pI',mI') = ("PolyEq",["degree_0","polynomial","univariate","equation"],
1.41 ["PolyEq","solve_d0_polyeq_equation"]);
1.42 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.43 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.44 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.45 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.46 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.47 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.48 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.49 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.50 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.51 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.52 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.53 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.54 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.55 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"UniversalList")) => ()
1.56 | _ => error "polyeq.sml: diff.behav. in 0 = 0 -> UniversalList";
1.57 -============ inhibit exn WN110906 ============================================*)
1.58 +============ inhibit exn WN110914 ============================================*)
1.59
1.60 "----------- test thm's d2_pq_formulsxx[_neg]---------------------";
1.61 "----------- test thm's d2_pq_formulsxx[_neg]---------------------";
1.62 @@ -230,47 +227,51 @@
1.63 term2str consts';
1.64 if consts = consts' (*WAS false*) then () else error "Check_elementwise changed";
1.65 (*[z = 1 / 8 + sqrt (9 / 16) / 2, z = 1 / 8 + -1 * sqrt (9 / 16) / 2] TODO sqrt*)
1.66 +*}
1.67 +
1.68 +
1.69 +ML {*
1.70
1.71 "----- d2_pqformula1_neg ------";
1.72 -(*EP-8*)
1.73 -val fmz = ["equality ( 2 +(-1)*x + x^^^2 = 0)", "solveFor x","solutions L"];
1.74 +val fmz = ["equality (2 +(-1)*x + x^^^2 = (0::real))", "solveFor x","solutions L"];
1.75 val (dI',pI',mI') = ("PolyEq",["pqFormula","degree_2","polynomial","univariate","equation"], ["PolyEq","solve_d2_polyeq_pq_equation"]);
1.76 -(*val p = e_pos'; val c = [];
1.77 -val (mI,m) = ("Init_Proof",Init_Proof (fmz, (dI',pI',mI')));
1.78 -val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.79 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.80 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.81 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.82 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.83 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.84 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.85 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.86 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.87 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.88 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.89 +*}
1.90 +ML {*
1.91 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.92 (*### or2list False
1.93 ([1],Res) False Or_to_List)*)
1.94 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.95 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.96 (*### or2list False
1.97 ([2],Res) [] Check_elementwise "Assumptions"*)
1.98 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.99 -val (p,_,f,nxt,_,pt) = me nxt p c 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 asm = get_assumptions_ pt p;
1.103 if f = Form' (FormKF (~1,EdUndef,0,Nundef,"[]")) andalso asm = [] then ()
1.104 else error "polyeq.sml: diff.behav. in 2 +(-1)*x + x^^^2 = 0";
1.105 +*}
1.106 +ML {*
1.107
1.108 "----- d2_pqformula2 ------";
1.109 val fmz = ["equality (-2 +(-1)*x + 1*x^^^2 = 0)", "solveFor x","solutions L"];
1.110 val (dI',pI',mI') = ("PolyEq",["pqFormula","degree_2","polynomial","univariate","equation"],
1.111 ["PolyEq","solve_d2_polyeq_pq_equation"]);
1.112 -(*val p = e_pos'; val c = [];
1.113 +(*val p = e_pos';
1.114 val (mI,m) = ("Init_Proof",Init_Proof (fmz, (dI',pI',mI')));
1.115 -val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.116 +val (p,_,f,nxt,_,pt) = me (mI,m) p [] EmptyPtree;*)
1.117 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.118 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.119 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.120 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.121 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.122 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.123 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.124 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.125 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.126 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.127 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.128 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.129 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.130 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.131 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.132 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.133 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.134 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -1]")) => ()
1.135 | _ => error "polyeq.sml: diff.behav. in -2 + (-1)*x + x^2 = 0 -> [x = 2, x = -1]";
1.136
1.137 @@ -283,13 +284,13 @@
1.138 val (mI,m) = ("Init_Proof",Init_Proof (fmz, (dI',pI',mI')));
1.139 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.140 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.141 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.142 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.143 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.144 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.145 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.146 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.147 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.148 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.149 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.150 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.151 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.152 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.153 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.154 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.155 "TODO 2 +(-1)*x + 1*x^^^2 = 0";
1.156 "TODO 2 +(-1)*x + 1*x^^^2 = 0";
1.157 "TODO 2 +(-1)*x + 1*x^^^2 = 0";
1.158 @@ -304,14 +305,14 @@
1.159 val (mI,m) = ("Init_Proof",Init_Proof (fmz, (dI',pI',mI')));
1.160 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.161 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.162 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.163 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.164 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.165 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.166 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.167 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.168 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.169 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.170 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.171 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.172 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.173 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.174 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.175 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.176 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.177 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.178 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1, x = -2]")) => ()
1.179 | _ => error "polyeq.sml: diff.behav. in -2 + x + x^2 = 0-> [x = 1, x = -2]";
1.180
1.181 @@ -323,13 +324,13 @@
1.182 val (mI,m) = ("Init_Proof",Init_Proof (fmz, (dI',pI',mI')));
1.183 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.184 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.185 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.186 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.187 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.188 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.189 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.190 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.191 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.192 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.193 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.194 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.195 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.196 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.197 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.198 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.199 "TODO 2 + x + x^^^2 = 0";
1.200 "TODO 2 + x + x^^^2 = 0";
1.201 "TODO 2 + x + x^^^2 = 0";
1.202 @@ -343,14 +344,14 @@
1.203 val (mI,m) = ("Init_Proof",Init_Proof (fmz, (dI',pI',mI')));
1.204 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.205 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.206 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.207 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.208 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.209 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.210 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.211 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.212 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.213 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.214 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.215 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.216 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.217 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.218 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.219 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.220 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.221 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.222 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1, x = -2]")) => ()
1.223 | _ => error "polyeq.sml: diff.behav. in -2 + x + 1*x^^^2 = 0 -> [x = 1, x = -2]";
1.224
1.225 @@ -362,12 +363,12 @@
1.226 val (mI,m) = ("Init_Proof",Init_Proof (fmz, (dI',pI',mI')));
1.227 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.228 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.229 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.230 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.231 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.232 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.233 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.234 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.235 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.236 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.237 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.238 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.239 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.240 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.241 "TODO 2 + x + 1*x^^^2 = 0";
1.242 "TODO 2 + x + 1*x^^^2 = 0";
1.243 "TODO 2 + x + 1*x^^^2 = 0";
1.244 @@ -380,14 +381,14 @@
1.245 val (mI,m) = ("Init_Proof",Init_Proof (fmz, (dI',pI',mI')));
1.246 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.247 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.248 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.249 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.250 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.251 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.252 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.253 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.254 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.255 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.256 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.257 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.258 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.259 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.260 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.261 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.262 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.263 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.264 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 0, x = -1]")) => ()
1.265 | _ => error "polyeq.sml: diff.behav. in 1*x + x^2 = 0 -> [x = 0, x = -1]";
1.266
1.267 @@ -399,14 +400,14 @@
1.268 val (mI,m) = ("Init_Proof",Init_Proof (fmz, (dI',pI',mI')));
1.269 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.270 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.271 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.272 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.273 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.274 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.275 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.276 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.277 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.278 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.279 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.280 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.281 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.282 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.283 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.284 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.285 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.286 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.287 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 0, x = -1]")) => ()
1.288 | _ => error "polyeq.sml: diff.behav. in 1*x + 1*x^2 = 0 -> [x = 0, x = -1]";
1.289
1.290 @@ -419,14 +420,14 @@
1.291 val (mI,m) = ("Init_Proof",Init_Proof (fmz, (dI',pI',mI')));
1.292 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.293 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.294 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.295 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.296 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.297 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.298 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.299 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.300 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.301 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.302 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.303 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.304 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.305 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.306 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.307 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.308 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.309 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.310 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 0, x = -1]")) => ()
1.311 | _ => error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1]";
1.312
1.313 @@ -439,14 +440,14 @@
1.314 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.315
1.316 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.317 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.318 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.319 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.320 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.321 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.322 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.323 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.324 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.325 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.326 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.327 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.328 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.329 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.330 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.331 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.332 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.333 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 0, x = -1]")) => ()
1.334 | _ => error "polyeq.sml: diff.behav. in x + 1*x^2 = 0 -> [x = 0, x = -1]";
1.335
1.336 @@ -459,13 +460,13 @@
1.337 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.338
1.339 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.340 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.341 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.342 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.343 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.344 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.345 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.346 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.347 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.348 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.349 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.350 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.351 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.352 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.353 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.354 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -2]")) => ()
1.355 | _ => error "polyeq.sml: diff.behav. in -4 + x^2 = 0 -> [x = 2, x = -2]";
1.356
1.357 @@ -479,13 +480,13 @@
1.358 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.359
1.360 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.361 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.362 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.363 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.364 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.365 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.366 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.367 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.368 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.369 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.370 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.371 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.372 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.373 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.374 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.375 "TODO 4 + x^^^2 = 0";
1.376 "TODO 4 + x^^^2 = 0";
1.377 "TODO 4 + x^^^2 = 0";
1.378 @@ -499,13 +500,13 @@
1.379 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.380
1.381 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.382 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.383 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.384 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.385 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.386 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.387 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.388 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.389 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.390 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.391 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.392 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.393 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.394 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.395 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.396 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -2]")) => ()
1.397 | _ => error "polyeq.sml: diff.behav. in -4 + 1*x^2 = 0 -> [x = 2, x = -2]";
1.398
1.399 @@ -518,12 +519,12 @@
1.400 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.401
1.402 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.403 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.404 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.405 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.406 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.407 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.408 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.409 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.410 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.411 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.412 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.413 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.414 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.415 "TODO 4 + 1*x^^^2 = 0";
1.416 "TODO 4 + 1*x^^^2 = 0";
1.417 "TODO 4 + 1*x^^^2 = 0";
1.418 @@ -540,13 +541,13 @@
1.419 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.420
1.421 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.422 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.423 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.424 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.425 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.426 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.427 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.428 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.429 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.430 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.431 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.432 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.433 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.434 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.435 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.436 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1, x = -1 / 2]")) => ()
1.437 | _ => error "polyeq.sml: diff.behav. in -1 + (-1)*x + 2*x^2 = 0 -> [x = 1, x = -1/2]";
1.438
1.439 @@ -558,12 +559,12 @@
1.440 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.441
1.442 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.443 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.444 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.445 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.446 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.447 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.448 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.449 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.450 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.451 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.452 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.453 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.454 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.455 "TODO 1 +(-1)*x + 2*x^^^2 = 0";
1.456 "TODO 1 +(-1)*x + 2*x^^^2 = 0";
1.457 "TODO 1 +(-1)*x + 2*x^^^2 = 0";
1.458 @@ -577,13 +578,13 @@
1.459 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.460
1.461 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.462 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.463 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.464 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.465 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.466 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.467 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.468 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.469 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.470 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.471 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.472 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.473 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.474 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.475 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.476 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1 / 2, x = -1]")) => ()
1.477 | _ => error "polyeq.sml: diff.behav. in -1 + x + 2*x^2 = 0 -> [x = 1/2, x = -1]";
1.478
1.479 @@ -595,13 +596,13 @@
1.480 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.481
1.482 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.483 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.484 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.485 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.486 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.487 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.488 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.489 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.490 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.491 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.492 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.493 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.494 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.495 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.496 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.497 "TODO 1 + x + 2*x^^^2 = 0";
1.498 "TODO 1 + x + 2*x^^^2 = 0";
1.499 "TODO 1 + x + 2*x^^^2 = 0";
1.500 @@ -614,13 +615,13 @@
1.501 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.502
1.503 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.504 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.505 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.506 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.507 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.508 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.509 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.510 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.511 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.512 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.513 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.514 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.515 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.516 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.517 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.518 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1, x = -2]")) => ()
1.519 | _ => error "polyeq.sml: diff.behav. in -2 + 1*x + x^2 = 0 -> [x = 1, x = -2]";
1.520
1.521 @@ -632,13 +633,13 @@
1.522 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.523
1.524 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.525 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.526 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.527 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.528 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.529 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.530 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.531 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.532 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.533 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.534 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.535 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.536 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.537 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.538 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.539 "TODO 2 + 1*x + x^^^2 = 0";
1.540 "TODO 2 + 1*x + x^^^2 = 0";
1.541 "TODO 2 + 1*x + x^^^2 = 0";
1.542 @@ -652,13 +653,13 @@
1.543 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.544
1.545 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.546 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.547 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.548 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.549 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.550 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.551 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.552 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.553 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.554 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.555 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.556 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.557 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.558 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.559 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.560 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1, x = -2]")) => ()
1.561 | _ => error "polyeq.sml: diff.behav. in -2 + x + x^2 = 0 -> [x = 1, x = -2]";
1.562
1.563 @@ -670,13 +671,13 @@
1.564 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.565
1.566 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.567 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.568 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.569 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.570 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.571 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.572 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.573 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.574 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.575 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.576 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.577 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.578 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.579 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.580 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.581 "TODO 2 + x + x^^^2 = 0";
1.582 "TODO 2 + x + x^^^2 = 0";
1.583 "TODO 2 + x + x^^^2 = 0";
1.584 @@ -690,13 +691,13 @@
1.585 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.586
1.587 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.588 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.589 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.590 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.591 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.592 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.593 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.594 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.595 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.596 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.597 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.598 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.599 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.600 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.601 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.602 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -2]")) => ()
1.603 | _ => error "polyeq.sml: diff.behav. in -8 + 2*x^2 = 0 -> [x = 2, x = -2]";
1.604
1.605 @@ -708,12 +709,12 @@
1.606 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.607
1.608 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.609 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.610 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.611 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.612 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.613 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.614 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.615 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.616 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.617 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.618 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.619 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.620 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.621 "TODO 8+ 2*x^^^2 = 0";
1.622 "TODO 8+ 2*x^^^2 = 0";
1.623 "TODO 8+ 2*x^^^2 = 0";
1.624 @@ -726,13 +727,13 @@
1.625 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.626
1.627 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.628 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.629 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.630 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.631 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.632 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.633 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.634 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.635 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.636 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.637 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.638 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.639 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.640 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.641 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.642 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -2]")) => ()
1.643 | _ => error "polyeq.sml: diff.behav. in -4 + x^2 = 0 -> [x = 2, x = -2]";
1.644
1.645 @@ -744,12 +745,12 @@
1.646 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.647
1.648 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.649 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.650 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.651 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.652 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.653 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.654 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.655 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.656 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.657 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.658 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.659 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.660 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.661 "TODO 4+ x^^^2 = 0";
1.662 "TODO 4+ x^^^2 = 0";
1.663 "TODO 4+ x^^^2 = 0";
1.664 @@ -763,13 +764,13 @@
1.665 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.666
1.667 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.668 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.669 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.670 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.671 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.672 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.673 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.674 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.675 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.676 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.677 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.678 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.679 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.680 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.681 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.682 case f of Form' (FormKF (~1,EdUndef,_,Nundef,"[x = 0, x = -1]")) => ()
1.683 | _ => error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1]";
1.684
1.685 @@ -781,13 +782,13 @@
1.686 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.687
1.688 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.689 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.690 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.691 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.692 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.693 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.694 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.695 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.696 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.697 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.698 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.699 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.700 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.701 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.702 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.703 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 0, x = -1]")) => ()
1.704 | _ => error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1]";
1.705
1.706 @@ -800,13 +801,13 @@
1.707 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.708
1.709 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.710 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.711 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.712 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.713 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.714 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.715 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.716 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.717 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.718 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.719 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.720 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.721 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.722 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.723 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.724 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 0, x = -1 / 2]")) => ()
1.725 | _ => error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1 / 2]";
1.726
1.727 @@ -819,13 +820,13 @@
1.728 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.729
1.730 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.731 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.732 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.733 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.734 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.735 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.736 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.737 -val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.738 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.739 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.740 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.741 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.742 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.743 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.744 +val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.745 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 0, x = -1]")) => ()
1.746 | _ => error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1]";
1.747
1.748 @@ -842,37 +843,37 @@
1.749 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.750
1.751 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.752 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.753 - val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.754 - val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.755 - val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.756 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.757 + val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.758 + val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.759 + val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.760 (*Apply_Method ("PolyEq","complete_square")*)
1.761 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.762 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.763 (*"-8 - 2 * x + x ^^^ 2 = 0", nxt = Rewrite_Set_Inst ... "complete_square*)
1.764 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.765 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.766 (*"-8 + (2 / 2 - x) ^^^ 2 = (2 / 2) ^^^ 2", nxt = Rewrite("square_explicit1"*)
1.767 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.768 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.769 (*"(2 / 2 - x) ^^^ 2 = (2 / 2) ^^^ 2 - -8" nxt = Rewrite("root_plus_minus*)
1.770 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.771 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.772 (*"2 / 2 - x = sqrt ((2 / 2) ^^^ 2 - -8) |
1.773 2 / 2 - x = - sqrt ((2 / 2) ^^^ 2 - -8)" nxt = Rewr_Inst("bdv_explicit2"*)
1.774 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.775 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.776 (*"2 / 2 - x = sqrt ((2 / 2) ^^^ 2 - -8) |
1.777 -1*x = - (2 / 2) + - sqrt ((2 / 2) ^^^ 2 - -8)"nxt = R_Inst("bdv_explt2"*)
1.778 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.779 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.780 (*"-1 * x = - (2 / 2) + sqrt ((2 / 2) ^^^ 2 - -8) |
1.781 -1 * x = (- (2 / 2) + - sqrt ((2 / 2) ^^^ 2 - -8))"nxt = bdv_explicit3*)
1.782 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.783 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.784 (*"-1 * x = - (2 / 2) + sqrt ((2 / 2) ^^^ 2 - -8) |
1.785 x = -1 * (- (2 / 2) + - sqrt ((2 / 2) ^^^ 2 - -8))" nxt = bdv_explicit3*)
1.786 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.787 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.788 (*"x = -1 * (- (2 / 2) + sqrt ((2 / 2) ^^^ 2 - -8)) |
1.789 x = -1 * (- (2 / 2) + - sqrt ((2 / 2) ^^^ 2 - -8))"nxt = calculate_Ration*)
1.790 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.791 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.792 (*"x = -2 | x = 4" nxt = Or_to_List*)
1.793 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.794 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.795 (*"[x = -2, x = 4]" nxt = Check_Postcond*)
1.796 - val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
1.797 + val (p,_,f,nxt,_,pt) = me nxt p [] pt; f2str f;
1.798 (* FIXXXME
1.799 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = -2, x = 4]")) => () TODO
1.800 | _ => error "polyeq.sml: diff.behav. in [x = -2, x = 4]";
1.801 @@ -901,15 +902,15 @@
1.802 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.803
1.804 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.805 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.806 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.807 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.808 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.809 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.810 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.811 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.812 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.813 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.814 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.815 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.816 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.817 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.818 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.819 (*Apply_Method ("PolyEq","complete_square")*)
1.820 - val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
1.821 + val (p,_,f,nxt,_,pt) = me nxt p [] pt; f2str f;
1.822
1.823 "----------- (-16 + 4*x + 2*x^^^2 = 0), --------------------------";
1.824 "----------- (-16 + 4*x + 2*x^^^2 = 0), --------------------------";
1.825 @@ -924,24 +925,24 @@
1.826 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.827
1.828 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.829 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.830 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.831 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.832 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.833 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.834 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.835 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.836 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.837 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.838 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.839 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.840 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.841 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.842 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.843 (*Apply_Method ("PolyEq","complete_square")*)
1.844 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.845 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.846 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.847 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.848 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.849 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.850 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.851 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.852 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.853 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.854 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.855 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.856 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.857 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.858 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.859 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.860 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.861 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.862 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.863 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.864 (* FIXXXXME n1.,
1.865 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -4]")) => () TODO
1.866 | _ => error "polyeq.sml: diff.behav. in [x = 2, x = -4]";
1.867 @@ -960,25 +961,25 @@
1.868 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.869
1.870 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.871 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.872 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.873 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.874 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.875 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.876 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.877 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.878 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.879 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.880 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.881 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.882 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.883 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.884 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.885 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.886 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.887 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.888 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.889 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.890 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.891
1.892 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.893 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.894 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.895 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.896 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.897 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.898 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.899 - val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
1.900 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.901 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.902 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.903 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.904 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.905 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.906 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.907 + val (p,_,f,nxt,_,pt) = me nxt p [] pt; f2str f;
1.908 (*WN.2.5.03 TODO FIXME Matthias ?
1.909 case f of
1.910 Form'
1.911 @@ -1003,19 +1004,19 @@
1.912 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.913
1.914 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.915 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.916 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.917 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.918 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.919 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.920 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.921 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.922 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.923 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.924 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.925 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.926 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.927 - val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
1.928 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.929 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.930 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.931 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.932 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.933 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.934 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.935 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.936 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.937 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.938 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.939 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.940 + val (p,_,f,nxt,_,pt) = me nxt p [] pt; f2str f;
1.941 (*WN.2.5.03 TODO "[x = sqrt (0 - -64), x = -1 * sqrt (0 - -64)]"
1.942 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 8, x = -8]")) => ()
1.943 | _ => error "polyeq.sml: diff.behav. in [x = 8, x = -8]";
1.944 @@ -1034,14 +1035,14 @@
1.945 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.946
1.947 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.948 -val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.949 - val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.950 - val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.951 - val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.952 - val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.953 - val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.954 - val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.955 - val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.956 +val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.957 + val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.958 + val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.959 + val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.960 + val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.961 + val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.962 + val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.963 + val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.964 (*WN.2.5.03 TODO "[x = sqrt (0 - -49), x = -1 * sqrt (0 - -49)]"
1.965 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 7, x = -7]")) => ()
1.966 | _ => error "polyeq.sml: diff.behav. in [x = 7, x = -7]";