1.1 --- a/test/Tools/isac/Interpret/inform.sml Tue May 03 15:58:04 2011 +0200
1.2 +++ b/test/Tools/isac/Interpret/inform.sml Tue May 03 16:20:55 2011 +0200
1.3 @@ -50,9 +50,8 @@
1.4 (writeln o term2str) sc;
1.5
1.6 states:=[];
1.7 - CalcTree [(["equality (x+1=2)", "solveFor x","solutions L"],
1.8 - ("Test",
1.9 - ["sqroot-test","univariate","equation","test"],
1.10 + CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.11 + ("Test", ["sqroot-test","univariate","equation","test"],
1.12 ["Test","squ-equ-test-subpbl1"]))];
1.13 Iterator 1; moveActiveRoot 1;
1.14 autoCalculate 1 CompleteCalcHead;
1.15 @@ -123,9 +122,8 @@
1.16 "--------- appendFormula: on Frm + equ_nrls ----------------------";
1.17 "--------- appendFormula: on Frm + equ_nrls ----------------------";
1.18 states:=[];
1.19 - CalcTree [(["equality (x+1=2)", "solveFor x","solutions L"],
1.20 - ("Test",
1.21 - ["sqroot-test","univariate","equation","test"],
1.22 + CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.23 + ("Test", ["sqroot-test","univariate","equation","test"],
1.24 ["Test","squ-equ-test-subpbl1"]))];
1.25 Iterator 1; moveActiveRoot 1;
1.26 autoCalculate 1 CompleteCalcHead;
1.27 @@ -160,9 +158,8 @@
1.28 "--------- appendFormula: on Res + NO deriv ----------------------";
1.29 "--------- appendFormula: on Res + NO deriv ----------------------";
1.30 states:=[];
1.31 - CalcTree [(["equality (x+1=2)", "solveFor x","solutions L"],
1.32 - ("Test",
1.33 - ["sqroot-test","univariate","equation","test"],
1.34 + CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.35 + ("Test", ["sqroot-test","univariate","equation","test"],
1.36 ["Test","squ-equ-test-subpbl1"]))];
1.37 Iterator 1; moveActiveRoot 1;
1.38 autoCalculate 1 CompleteCalcHead;
1.39 @@ -191,9 +188,8 @@
1.40 "--------- appendFormula: on Res + late deriv --------------------";
1.41 "--------- appendFormula: on Res + late deriv --------------------";
1.42 states:=[];
1.43 - CalcTree [(["equality (x+1=2)", "solveFor x","solutions L"],
1.44 - ("Test",
1.45 - ["sqroot-test","univariate","equation","test"],
1.46 + CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.47 + ("Test", ["sqroot-test","univariate","equation","test"],
1.48 ["Test","squ-equ-test-subpbl1"]))];
1.49 Iterator 1; moveActiveRoot 1;
1.50 autoCalculate 1 CompleteCalcHead;
1.51 @@ -222,9 +218,8 @@
1.52 "--------- appendFormula: on Res + late deriv [x = 3 + -2]---///--";
1.53 "--------- appendFormula: on Res + late deriv [x = 3 + -2]---///--";
1.54 states:=[];
1.55 - CalcTree [(["equality (x+1=2)", "solveFor x","solutions L"],
1.56 - ("Test",
1.57 - ["sqroot-test","univariate","equation","test"],
1.58 + CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.59 + ("Test", ["sqroot-test","univariate","equation","test"],
1.60 ["Test","squ-equ-test-subpbl1"]))];
1.61 Iterator 1; moveActiveRoot 1;
1.62 autoCalculate 1 CompleteCalcHead;
1.63 @@ -248,9 +243,8 @@
1.64 "--------- replaceFormula: on Res + = ----------------------------";
1.65 "--------- replaceFormula: on Res + = ----------------------------";
1.66 states:=[];
1.67 - CalcTree [(["equality (x+1=2)", "solveFor x","solutions L"],
1.68 - ("Test",
1.69 - ["sqroot-test","univariate","equation","test"],
1.70 + CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.71 + ("Test", ["sqroot-test","univariate","equation","test"],
1.72 ["Test","squ-equ-test-subpbl1"]))];
1.73 Iterator 1; moveActiveRoot 1;
1.74 autoCalculate 1 CompleteCalcHead;
1.75 @@ -274,9 +268,8 @@
1.76 "--------- replaceFormula: on Res + = 1st Nd ---------------------";
1.77 "--------- replaceFormula: on Res + = 1st Nd ---------------------";
1.78 states:=[];
1.79 - CalcTree [(["equality (x+1=2)", "solveFor x","solutions L"],
1.80 - ("Test",
1.81 - ["sqroot-test","univariate","equation","test"],
1.82 + CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.83 + ("Test", ["sqroot-test","univariate","equation","test"],
1.84 ["Test","squ-equ-test-subpbl1"]))];
1.85 Iterator 1; moveActiveRoot 1;
1.86 autoCalculate 1 CompleteCalcHead;
1.87 @@ -299,9 +292,8 @@
1.88 "--------- replaceFormula: on Frm + = 1st Nd ---------------------";
1.89 "--------- replaceFormula: on Frm + = 1st Nd ---------------------";
1.90 states:=[];
1.91 - CalcTree [(["equality (x+1=2)", "solveFor x","solutions L"],
1.92 - ("Test",
1.93 - ["sqroot-test","univariate","equation","test"],
1.94 + CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.95 + ("Test", ["sqroot-test","univariate","equation","test"],
1.96 ["Test","squ-equ-test-subpbl1"]))];
1.97 Iterator 1; moveActiveRoot 1;
1.98 autoCalculate 1 CompleteCalcHead;
1.99 @@ -323,9 +315,8 @@
1.100 "--------- replaceFormula: cut calculation -----------------------";
1.101 "--------- replaceFormula: cut calculation -----------------------";
1.102 states:=[];
1.103 - CalcTree [(["equality (x+1=2)", "solveFor x","solutions L"],
1.104 - ("Test",
1.105 - ["sqroot-test","univariate","equation","test"],
1.106 + CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.107 + ("Test", ["sqroot-test","univariate","equation","test"],
1.108 ["Test","squ-equ-test-subpbl1"]))];
1.109 Iterator 1; moveActiveRoot 1;
1.110 autoCalculate 1 CompleteCalc;
1.111 @@ -421,9 +412,8 @@
1.112 "--------- syntax error ------------------------------------------";
1.113 "--------- syntax error ------------------------------------------";
1.114 states:=[];
1.115 - CalcTree [(["equality (x+1=2)", "solveFor x","solutions L"],
1.116 - ("Test",
1.117 - ["sqroot-test","univariate","equation","test"],
1.118 + CalcTree [(["equality (x+1=(2::real))", "solveFor x","solutions L"],
1.119 + ("Test", ["sqroot-test","univariate","equation","test"],
1.120 ["Test","squ-equ-test-subpbl1"]))];
1.121 Iterator 1; moveActiveRoot 1;
1.122 autoCalculate 1 CompleteCalcHead;