1.1 --- a/test/Tools/isac/Interpret/inform.sml Fri Jun 13 10:29:06 2014 +0200
1.2 +++ b/test/Tools/isac/Interpret/inform.sml Fri Jun 13 12:06:38 2014 +0200
1.3 @@ -51,7 +51,7 @@
1.4 val Prog sc = (#scr o get_met) ["Test","solve_linear"];
1.5 (writeln o term2str) sc;
1.6
1.7 - states:=[];
1.8 + reset_states ();
1.9 CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.10 ("Test", ["sqroot-test","univariate","equation","test"],
1.11 ["Test","squ-equ-test-subpbl1"]))];
1.12 @@ -136,7 +136,7 @@
1.13 "--------- appendFormula: on Frm + equ_nrls ----------------------";
1.14 "--------- appendFormula: on Frm + equ_nrls ----------------------";
1.15 "--------- appendFormula: on Frm + equ_nrls ----------------------";
1.16 - states:=[];
1.17 + reset_states ();
1.18 CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.19 ("Test", ["sqroot-test","univariate","equation","test"],
1.20 ["Test","squ-equ-test-subpbl1"]))];
1.21 @@ -171,7 +171,7 @@
1.22 "--------- appendFormula: on Res + NO deriv ----------------------";
1.23 "--------- appendFormula: on Res + NO deriv ----------------------";
1.24 "--------- appendFormula: on Res + NO deriv ----------------------";
1.25 - states:=[];
1.26 + reset_states ();
1.27 CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.28 ("Test", ["sqroot-test","univariate","equation","test"],
1.29 ["Test","squ-equ-test-subpbl1"]))];
1.30 @@ -201,7 +201,7 @@
1.31 "--------- appendFormula: on Res + late deriv --------------------";
1.32 "--------- appendFormula: on Res + late deriv --------------------";
1.33 "--------- appendFormula: on Res + late deriv --------------------";
1.34 - states:=[];
1.35 + reset_states ();
1.36 CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.37 ("Test", ["sqroot-test","univariate","equation","test"],
1.38 ["Test","squ-equ-test-subpbl1"]))];
1.39 @@ -231,7 +231,7 @@
1.40 "--------- appendFormula: on Res + late deriv [x = 3 + -2]---///--";
1.41 "--------- appendFormula: on Res + late deriv [x = 3 + -2]---///--";
1.42 "--------- appendFormula: on Res + late deriv [x = 3 + -2]---///--";
1.43 - states:=[];
1.44 + reset_states ();
1.45 CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.46 ("Test", ["sqroot-test","univariate","equation","test"],
1.47 ["Test","squ-equ-test-subpbl1"]))];
1.48 @@ -256,7 +256,7 @@
1.49 "--------- replaceFormula: on Res + = ----------------------------";
1.50 "--------- replaceFormula: on Res + = ----------------------------";
1.51 "--------- replaceFormula: on Res + = ----------------------------";
1.52 - states:=[];
1.53 + reset_states ();
1.54 CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.55 ("Test", ["sqroot-test","univariate","equation","test"],
1.56 ["Test","squ-equ-test-subpbl1"]))];
1.57 @@ -301,7 +301,7 @@
1.58 "--------- replaceFormula: on Res + = 1st Nd ---------------------";
1.59 "--------- replaceFormula: on Res + = 1st Nd ---------------------";
1.60 "--------- replaceFormula: on Res + = 1st Nd ---------------------";
1.61 - states:=[];
1.62 + reset_states ();
1.63 CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.64 ("Test", ["sqroot-test","univariate","equation","test"],
1.65 ["Test","squ-equ-test-subpbl1"]))];
1.66 @@ -325,7 +325,7 @@
1.67 "--------- replaceFormula: on Frm + = 1st Nd ---------------------";
1.68 "--------- replaceFormula: on Frm + = 1st Nd ---------------------";
1.69 "--------- replaceFormula: on Frm + = 1st Nd ---------------------";
1.70 - states:=[];
1.71 + reset_states ();
1.72 CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.73 ("Test", ["sqroot-test","univariate","equation","test"],
1.74 ["Test","squ-equ-test-subpbl1"]))];
1.75 @@ -348,7 +348,7 @@
1.76 "--------- replaceFormula: cut calculation -----------------------";
1.77 "--------- replaceFormula: cut calculation -----------------------";
1.78 "--------- replaceFormula: cut calculation -----------------------";
1.79 - states:=[];
1.80 + reset_states ();
1.81 CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.82 ("Test", ["sqroot-test","univariate","equation","test"],
1.83 ["Test","squ-equ-test-subpbl1"]))];
1.84 @@ -444,7 +444,7 @@
1.85 "--------- syntax error ------------------------------------------";
1.86 "--------- syntax error ------------------------------------------";
1.87 "--------- syntax error ------------------------------------------";
1.88 - states:=[];
1.89 + reset_states ();
1.90 CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.91 ("Test", ["sqroot-test","univariate","equation","test"],
1.92 ["Test","squ-equ-test-subpbl1"]))];
1.93 @@ -478,7 +478,7 @@
1.94 "--------- CAS-command on ([],Pbl) FE-interface ------------------";
1.95 "--------- CAS-command on ([],Pbl) FE-interface ------------------";
1.96 "--------- CAS-command on ([],Pbl) FE-interface ------------------";
1.97 -states:=[];
1.98 +reset_states ();
1.99 CalcTree [([], ("e_domID", ["e_pblID"], ["e_metID"]))];
1.100 Iterator 1;
1.101 moveActiveRoot 1;
1.102 @@ -493,7 +493,7 @@
1.103 "--------- inform [rational,simplification] ----------------------";
1.104 "--------- inform [rational,simplification] ----------------------";
1.105 "--------- inform [rational,simplification] ----------------------";
1.106 -states := [];
1.107 +reset_states ();
1.108 CalcTree [(["Term (a * x / (b * x) + c * x / (d * x) + e / f)", "normalform N"],
1.109 ("Rational", ["rational", "simplification"], ["simplification", "of_rationals"]))];
1.110 Iterator 1; moveActiveRoot 1;
1.111 @@ -629,7 +629,7 @@
1.112 error "diff.sml behav.changed for CAS Diff (..., x)";
1.113 atomty t;
1.114 "-----------------------------------------------------------------";
1.115 -(*1>*)states:=[];
1.116 +(*1>*)reset_states ();
1.117 (*2>*)CalcTree [([], ("e_domID", ["e_pblID"], ["e_metID"]))];
1.118 (*3>*)Iterator 1;moveActiveRoot 1;
1.119 "----- here the Headline has been finished";
1.120 @@ -690,7 +690,7 @@
1.121 "--------- Take as 1st tac, start from exp -----------------------";
1.122 (*the following input is copied from BridgeLog Java <==> SML,
1.123 omitting unnecessary inputs*)
1.124 -(*1>*)states:=[];
1.125 +(*1>*)reset_states ();
1.126 (*2>*)CalcTree [(["functionTerm (x^2 + x + 1)", "differentiateFor x", "derivative f_'_f"],("Isac",["derivative_of","function"],["diff","differentiate_on_R"]))];
1.127 (*3>*)Iterator 1; moveActiveRoot 1;
1.128
1.129 @@ -729,7 +729,7 @@
1.130 "--------- init_form, start with <NEW> (CAS input) ---------------";
1.131 "--------- init_form, start with <NEW> (CAS input) ---------------";
1.132 "--------- init_form, start with <NEW> (CAS input) ---------------";
1.133 -states:=[];
1.134 +reset_states ();
1.135 CalcTree [([], ("e_domID", ["e_pblID"], ["e_metID"]))];
1.136 (*[[from sml: > @@@@@begin@@@@@
1.137 [[from sml: 1
1.138 @@ -990,7 +990,7 @@
1.139 "--------- embed fun check_error_patterns ------------------------";
1.140 "--------- embed fun check_error_patterns ------------------------";
1.141 "--------- embed fun check_error_patterns ------------------------";
1.142 -states:=[];
1.143 +reset_states ();
1.144 CalcTree
1.145 [(["functionTerm (x ^ 2 + sin (x ^ 4))", "differentiateFor x", "derivative f_f'"],
1.146 ("Isac", ["derivative_of","function"], ["diff","differentiate_on_R"]))];
1.147 @@ -1110,7 +1110,7 @@
1.148 "--------- embed fun find_fillpatterns ---------------------------";
1.149 "--------- embed fun find_fillpatterns ---------------------------";
1.150 "--------- embed fun find_fillpatterns ---------------------------";
1.151 -states:=[];
1.152 +reset_states ();
1.153 CalcTree
1.154 [(["functionTerm (x ^ 2 + sin (x ^ 4))", "differentiateFor x", "derivative f_f'"],
1.155 ("Isac", ["derivative_of","function"], ["diff","differentiate_on_R"]))];
1.156 @@ -1192,7 +1192,7 @@
1.157 "--------- build fun is_exactly_equal, inputFillFormula ----------";
1.158 "--------- build fun is_exactly_equal, inputFillFormula ----------";
1.159 "--------- build fun is_exactly_equal, inputFillFormula ----------";
1.160 -states := [];
1.161 +reset_states ();
1.162 CalcTree
1.163 [(["functionTerm (x ^ 2 + sin (x ^ 4))", "differentiateFor x", "derivative f_f'"],
1.164 ("Isac", ["derivative_of","function"], ["diff","differentiate_on_R"]))];