1.1 --- a/test/Tools/isac/Knowledge/polyeq-1.sml Sun May 10 15:55:30 2020 +0200
1.2 +++ b/test/Tools/isac/Knowledge/polyeq-1.sml Sun May 10 17:26:36 2020 +0200
1.3 @@ -310,7 +310,7 @@
1.4 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.5 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.6 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.7 -case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[]")) => ()
1.8 +case f of Form' (Test_Out.FormKF (~1,EdUndef,0,Nundef,"[]")) => ()
1.9 | _ => error "polyeq.sml: diff.behav. in 1 = 0 -> []";
1.10
1.11 "----- d0_true ------";
1.12 @@ -324,7 +324,7 @@
1.13 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.14 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.15 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.16 -case f of Form' (FormKF (~1,EdUndef,0,Nundef,"UniversalList")) => ()
1.17 +case f of Form' (Test_Out.FormKF (~1,EdUndef,0,Nundef,"UniversalList")) => ()
1.18 | _ => error "polyeq.sml: diff.behav. in 0 = 0 -> UniversalList";
1.19 ============ inhibit exn WN110914 ============================================*)
1.20
1.21 @@ -400,7 +400,7 @@
1.22 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.23 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.24 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.25 -case f of FormKF "[x = 2, x = -1]" => ()
1.26 +case f of Test_Out.FormKF "[x = 2, x = -1]" => ()
1.27 | _ => error "polyeq.sml: diff.behav. in -2 + (-1)*x + x^2 = 0 -> [x = 2, x = -1]";
1.28
1.29
1.30 @@ -422,7 +422,7 @@
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;
1.34 -case f of FormKF "[x = 1, x = -2]" => ()
1.35 +case f of Test_Out.FormKF "[x = 1, x = -2]" => ()
1.36 | _ => error "polyeq.sml: diff.behav. in -2 + x + x^2 = 0-> [x = 1, x = -2]";
1.37
1.38
1.39 @@ -462,7 +462,7 @@
1.40 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.41 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.42 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.43 -case f of FormKF "[x = 1, x = -2]" => ()
1.44 +case f of Test_Out.FormKF "[x = 1, x = -2]" => ()
1.45 | _ => error "polyeq.sml: diff.behav. in -2 + x + 1*x^^^2 = 0 -> [x = 1, x = -2]";
1.46
1.47 "----------- equality (1*x + x^^^2 = 0) ----------------------------------------------------";
1.48 @@ -481,7 +481,7 @@
1.49 val (p,_,f,nxt,_,pt) = me nxt p [] pt; 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;
1.52 -case f of FormKF "[x = 0, x = -1]" => ()
1.53 +case f of Test_Out.FormKF "[x = 0, x = -1]" => ()
1.54 | _ => error "polyeq.sml: diff.behav. in 1*x + x^2 = 0 -> [x = 0, x = -1]";
1.55
1.56 "----------- equality (1*x + 1*x^^^2 = 0) ----------------------------------------------------";
1.57 @@ -500,7 +500,7 @@
1.58 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.59 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.60 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.61 -case f of FormKF "[x = 0, x = -1]" => ()
1.62 +case f of Test_Out.FormKF "[x = 0, x = -1]" => ()
1.63 | _ => error "polyeq.sml: diff.behav. in 1*x + 1*x^2 = 0 -> [x = 0, x = -1]";
1.64
1.65 "----------- equality (x + x^^^2 = 0) ------------------------------------------------------";
1.66 @@ -520,7 +520,7 @@
1.67 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.68 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.69 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.70 -case f of FormKF "[x = 0, x = -1]" => ()
1.71 +case f of Test_Out.FormKF "[x = 0, x = -1]" => ()
1.72 | _ => error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1]";
1.73
1.74 "----------- equality (x + 1*x^^^2 = 0) ------------------------------------------------------";
1.75 @@ -539,7 +539,7 @@
1.76 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.77 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.78 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.79 -case f of FormKF "[x = 0, x = -1]" => ()
1.80 +case f of Test_Out.FormKF "[x = 0, x = -1]" => ()
1.81 | _ => error "polyeq.sml: diff.behav. in x + 1*x^2 = 0 -> [x = 0, x = -1]";
1.82
1.83 "----------- equality (-4 + x^^^2 = 0) -------------------------------------------------------";
1.84 @@ -557,7 +557,7 @@
1.85 val (p,_,f,nxt,_,pt) = me nxt p [] pt; 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 -case f of FormKF "[x = 2, x = -2]" => ()
1.89 +case f of Test_Out.FormKF "[x = 2, x = -2]" => ()
1.90 | _ => error "polyeq.sml: diff.behav. in -4 + x^2 = 0 -> [x = 2, x = -2]";
1.91
1.92
1.93 @@ -593,7 +593,7 @@
1.94 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.95 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.96 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.97 -case f of FormKF "[x = 1, x = -1 / 2]" => ()
1.98 +case f of Test_Out.FormKF "[x = 1, x = -1 / 2]" => ()
1.99 | _ => error "polyeq.sml: diff.behav. in -1 + (-1)*x + 2*x^2 = 0 -> [x = 1, x = -1/2]";
1.100
1.101 "----------- equality (1 +(-1)*x + 2*x^^^2 = 0) ----------------------------------------------";
1.102 @@ -632,7 +632,7 @@
1.103 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.104
1.105 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.106 -case f of FormKF "[x = 1 / 2, x = -1]" => ()
1.107 +case f of Test_Out.FormKF "[x = 1 / 2, x = -1]" => ()
1.108 | _ => error "polyeq.sml: diff.behav. in -1 + x + 2*x^2 = 0 -> [x = 1/2, x = -1]";
1.109
1.110
1.111 @@ -667,7 +667,7 @@
1.112 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.113 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.114 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.115 -case f of FormKF "[x = 1, x = -2]" => ()
1.116 +case f of Test_Out.FormKF "[x = 1, x = -2]" => ()
1.117 | _ => error "polyeq.sml: diff.behav. in -2 + 1*x + x^2 = 0 -> [x = 1, x = -2]";
1.118
1.119 val fmz = ["equality ( 2 + 1*x + x^^^2 = 0)", "solveFor x","solutions L"];
1.120 @@ -697,7 +697,7 @@
1.121 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.122 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.123 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.124 -case f of FormKF "[x = 1, x = -2]" => ()
1.125 +case f of Test_Out.FormKF "[x = 1, x = -2]" => ()
1.126 | _ => error "polyeq.sml: diff.behav. in -2 + x + x^2 = 0 -> [x = 1, x = -2]";
1.127
1.128 val fmz = ["equality ( 2 + x + x^^^2 = 0)", "solveFor x","solutions L"];
1.129 @@ -727,7 +727,7 @@
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 -case f of FormKF "[x = 2, x = -2]" => ()
1.134 +case f of Test_Out.FormKF "[x = 2, x = -2]" => ()
1.135 | _ => error "polyeq.sml: diff.behav. in -8 + 2*x^2 = 0 -> [x = 2, x = -2]";
1.136
1.137 val fmz = ["equality ( 8+ 2*x^^^2 = 0)", "solveFor x","solutions L"];
1.138 @@ -755,7 +755,7 @@
1.139 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.140 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.141 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.142 -case f of FormKF "[x = 2, x = -2]" => ()
1.143 +case f of Test_Out.FormKF "[x = 2, x = -2]" => ()
1.144 | _ => error "polyeq.sml: diff.behav. in -4 + x^2 = 0 -> [x = 2, x = -2]";
1.145
1.146
1.147 @@ -784,7 +784,7 @@
1.148 val (p,_,f,nxt,_,pt) = me nxt p [] pt; 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 -case f of FormKF "[x = 0, x = -1]" => ()
1.152 +case f of Test_Out.FormKF "[x = 0, x = -1]" => ()
1.153 | _ => error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1]";
1.154
1.155 val fmz = ["equality (1*x + x^^^2 = 0)", "solveFor x","solutions L"];
1.156 @@ -798,7 +798,7 @@
1.157 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.158 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.159 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.160 -case f of FormKF "[x = 0, x = -1]" => ()
1.161 +case f of Test_Out.FormKF "[x = 0, x = -1]" => ()
1.162 | _ => error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1]";
1.163
1.164 (*EP-16*)
1.165 @@ -813,7 +813,7 @@
1.166 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.167 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.168 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.169 -case f of FormKF "[x = 0, x = -1 / 2]" => ()
1.170 +case f of Test_Out.FormKF "[x = 0, x = -1 / 2]" => ()
1.171 | _ => error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1 / 2]";
1.172
1.173 (*EP-//*)
1.174 @@ -828,7 +828,7 @@
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; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.178 -case f of FormKF "[x = 0, x = -1]" => ()
1.179 +case f of Test_Out.FormKF "[x = 0, x = -1]" => ()
1.180 | _ => error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1]";
1.181
1.182
1.183 @@ -880,7 +880,7 @@
1.184 (*"[x = -2, x = 4]" nxt = Check_Postcond*)
1.185 val (p,_,f,nxt,_,pt) = me nxt p [] pt; f2str f;
1.186 (* FIXXXME
1.187 - case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = -2, x = 4]")) => () TODO
1.188 + case f of Form' (Test_Out.FormKF (~1,EdUndef,0,Nundef,"[x = -2, x = 4]")) => () TODO
1.189 | _ => error "polyeq.sml: diff.behav. in [x = -2, x = 4]";
1.190 *)
1.191 if f2str f =
1.192 @@ -991,7 +991,7 @@
1.193 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.194 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.195 (* FIXXXXME n1.,
1.196 - case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -4]")) => () TODO
1.197 + case f of Form' (Test_Out.FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -4]")) => () TODO
1.198 | _ => error "polyeq.sml: diff.behav. in [x = 2, x = -4]";
1.199 *)
1.200