1.1 --- a/test/Tools/isac/Interpret/ctree.sml Wed Oct 05 10:51:25 2016 +0200
1.2 +++ b/test/Tools/isac/Interpret/ctree.sml Wed Oct 05 13:09:54 2016 +0200
1.3 @@ -389,7 +389,7 @@
1.4 ("Test", ["sqroot-test","univariate","equation","test"],
1.5 ["Test","squ-equ-test-subpbl1"]))];
1.6 Iterator 1; moveActiveRoot 1;
1.7 - autoCalculate' 1 CompleteCalc;
1.8 + autoCalculate 1 CompleteCalc;
1.9
1.10 interSteps 1 ([3,2],Res);
1.11
1.12 @@ -557,7 +557,7 @@
1.13 ("Test", ["sqroot-test","univariate","equation","test"],
1.14 ["Test","squ-equ-test-subpbl1"]))];
1.15 Iterator 1; moveActiveRoot 1;
1.16 - autoCalculate' 1 CompleteCalc;
1.17 + autoCalculate 1 CompleteCalc;
1.18
1.19 val ((pt,_),_) = get_calc 1;
1.20 show_pt pt;
1.21 @@ -594,8 +594,8 @@
1.22 ["LINEAR","univariate","equation","test"],
1.23 ["Test","solve_linear"]))];
1.24 Iterator 1; moveActiveRoot 1;
1.25 - autoCalculate' 1 CompleteCalcHead;
1.26 - autoCalculate' 1 (Step 1);
1.27 + autoCalculate 1 CompleteCalcHead;
1.28 + autoCalculate 1 (Step 1);
1.29 refFormula 1 (get_pos 1 1);
1.30
1.31 moveActiveRoot 1;
1.32 @@ -604,7 +604,7 @@
1.33 else error "ctree.sml: diff.behav. in move_dn: Frm -> Res (1)";
1.34 moveActiveDown 1; (*<ERROR> pos does not exist </ERROR>*)
1.35
1.36 - autoCalculate' 1 (Step 1);
1.37 + autoCalculate 1 (Step 1);
1.38 refFormula 1 (get_pos 1 1);
1.39
1.40 moveActiveDown 1; (*<ERROR> pos does not exist </ERROR>*)
1.41 @@ -639,7 +639,7 @@
1.42 ("Test", ["sqroot-test","univariate","equation","test"],
1.43 ["Test","squ-equ-test-subpbl1"]))];
1.44 Iterator 1; moveActiveRoot 1;
1.45 - autoCalculate' 1 CompleteCalc;
1.46 + autoCalculate 1 CompleteCalc;
1.47 moveActiveRoot 1;
1.48 moveActiveDown 1;
1.49 moveActiveDown 1;
1.50 @@ -671,10 +671,10 @@
1.51 ("Test", ["sqroot-test","univariate","equation","test"],
1.52 ["Test","squ-equ-test-subpbl1"]))];
1.53 Iterator 1; moveActiveRoot 1;
1.54 - autoCalculate' 1 CompleteCalcHead;
1.55 - autoCalculate' 1 (Step 1);
1.56 - autoCalculate' 1 (Step 1);
1.57 - autoCalculate' 1 (Step 1);
1.58 + autoCalculate 1 CompleteCalcHead;
1.59 + autoCalculate 1 (Step 1);
1.60 + autoCalculate 1 (Step 1);
1.61 + autoCalculate 1 (Step 1);
1.62 val ((pt,_),_) = get_calc 1;
1.63 val p = move_dn [] pt ([],Pbl) (*-> ([1], Frm)*);
1.64 val p = move_dn [] pt ([1], Frm) (*-> ([1], Res)*);
1.65 @@ -705,7 +705,7 @@
1.66 "solveFor x","solutions L"],
1.67 ("RatEq",["univariate","equation"],["no_met"]))];
1.68 Iterator 1; moveActiveRoot 1;
1.69 -autoCalculate' 1 CompleteCalc;
1.70 +autoCalculate 1 CompleteCalc;
1.71
1.72 getTactic 1 ([1],Res);(*Rewrite_Set RatEq_simplify*)
1.73 getTactic 1 ([2],Res);(*Rewrite_Set norm_Rational*)
1.74 @@ -899,7 +899,7 @@
1.75 "solveFor x","solutions L"],
1.76 ("RatEq",["univariate","equation"],["no_met"]))];
1.77 Iterator 1; moveActiveRoot 1;
1.78 -autoCalculate' 1 CompleteCalc;
1.79 +autoCalculate 1 CompleteCalc;
1.80 val ((pt,_),_) = get_calc 1;
1.81 val p = get_pos 1 1;
1.82 val (Form f, tac, asms) = pt_extract (pt, p);
1.83 @@ -947,7 +947,7 @@
1.84 ("Test", ["sqroot-test","univariate","equation","test"],
1.85 ["Test","squ-equ-test-subpbl1"]))];
1.86 Iterator 1; moveActiveRoot 1;
1.87 -autoCalculate' 1 CompleteCalc;
1.88 +autoCalculate 1 CompleteCalc;
1.89 val ((pt,_),_) = get_calc 1;
1.90 show_pt pt;
1.91
1.92 @@ -1026,7 +1026,7 @@
1.93 ("Test", ["sqroot-test","univariate","equation","test"],
1.94 ["Test","squ-equ-test-subpbl1"]))];
1.95 Iterator 1; moveActiveRoot 1;
1.96 -autoCalculate' 1 CompleteCalc;
1.97 +autoCalculate 1 CompleteCalc;
1.98 interSteps 1 ([2],Res);
1.99 interSteps 1 ([3,2],Res);
1.100 val ((pt,_),_) = get_calc 1;