1.1 --- a/test/Tools/isac/Knowledge/polyminus.sml Fri Jun 13 12:06:38 2014 +0200
1.2 +++ b/test/Tools/isac/Knowledge/polyminus.sml Fri Jun 13 12:42:15 2014 +0200
1.3 @@ -276,7 +276,7 @@
1.4 ("PolyMinus",["plus_minus","polynom","vereinfachen"],
1.5 ["simplification","for_polynomials","with_minus"]))];
1.6 moveActiveRoot 1;
1.7 -autoCalculate 1 CompleteCalc;
1.8 +autoCalculate' 1 CompleteCalc;
1.9 val ((pt,p),_) = get_calc 1; show_pt pt;
1.10 if p = ([], Res) andalso
1.11 term2str (get_obj g_res pt (fst p)) = "3 - 2 * e + 2 * f + 2 * g"
1.12 @@ -289,7 +289,7 @@
1.13 ("PolyMinus",["plus_minus","polynom","vereinfachen"],
1.14 ["simplification","for_polynomials","with_minus"]))];
1.15 moveActiveRoot 1;
1.16 -autoCalculate 1 CompleteCalc;
1.17 +autoCalculate' 1 CompleteCalc;
1.18 val ((pt,p),_) = get_calc 1; show_pt pt;
1.19 if p = ([], Res) andalso
1.20 term2str (get_obj g_res pt (fst p)) = "3 + 3 * r + 6 * s - 8 * t"
1.21 @@ -302,7 +302,7 @@
1.22 ("PolyMinus",["plus_minus","polynom","vereinfachen"],
1.23 ["simplification","for_polynomials","with_minus"]))];
1.24 moveActiveRoot 1;
1.25 -autoCalculate 1 CompleteCalc;
1.26 +autoCalculate' 1 CompleteCalc;
1.27 val ((pt,p),_) = get_calc 1; show_pt pt;
1.28 if p = ([], Res) andalso
1.29 term2str (get_obj g_res pt (fst p)) = "- (3 * f)"
1.30 @@ -315,7 +315,7 @@
1.31 ("PolyMinus",["plus_minus","polynom","vereinfachen"],
1.32 ["simplification","for_polynomials","with_minus"]))];
1.33 moveActiveRoot 1;
1.34 -autoCalculate 1 CompleteCalc;
1.35 +autoCalculate' 1 CompleteCalc;
1.36 val ((pt,p),_) = get_calc 1; show_pt pt;
1.37 if p = ([], Res) andalso
1.38 term2str (get_obj g_res pt (fst p)) = "-3 * u - v"
1.39 @@ -328,7 +328,7 @@
1.40 ("PolyMinus",["plus_minus","polynom","vereinfachen"],
1.41 ["simplification","for_polynomials","with_minus"]))];
1.42 moveActiveRoot 1;
1.43 -autoCalculate 1 CompleteCalc;
1.44 +autoCalculate' 1 CompleteCalc;
1.45 val ((pt,p),_) = get_calc 1; show_pt pt;
1.46 if p = ([], Res) andalso
1.47 term2str (get_obj g_res pt (fst p)) = "-4 * u + 2 * v"
1.48 @@ -358,10 +358,10 @@
1.49 ("PolyMinus",["polynom","probe"],
1.50 ["probe","fuer_polynom"]))];
1.51 moveActiveRoot 1;
1.52 -autoCalculate 1 CompleteCalc;
1.53 -(* autoCalculate 1 CompleteCalcHead;
1.54 - autoCalculate 1 (Step 1);
1.55 - autoCalculate 1 (Step 1);
1.56 +autoCalculate' 1 CompleteCalc;
1.57 +(* autoCalculate' 1 CompleteCalcHead;
1.58 + autoCalculate' 1 (Step 1);
1.59 + autoCalculate' 1 (Step 1);
1.60 val ((pt,p),_) = get_calc 1; term2str (get_obj g_res pt (fst p));
1.61 @@@@@WN081114 gives "??.empty", all "Pruefe" are the same,
1.62 although analogies work in interface.sml: FIXME.WN081114 in "Pruefe"*)
1.63 @@ -379,7 +379,7 @@
1.64 ("PolyMinus",["klammer","polynom","vereinfachen"],
1.65 ["simplification","for_polynomials","with_parentheses"]))];
1.66 moveActiveRoot 1;
1.67 -autoCalculate 1 CompleteCalc;
1.68 +autoCalculate' 1 CompleteCalc;
1.69 val ((pt,p),_) = get_calc 1;
1.70 if p = ([], Res) andalso
1.71 term2str (get_obj g_res pt (fst p)) = "1 + 14 * u"
1.72 @@ -394,7 +394,7 @@
1.73 ("PolyMinus",["polynom","probe"],
1.74 ["probe","fuer_polynom"]))];
1.75 moveActiveRoot 1;
1.76 -autoCalculate 1 CompleteCalc;
1.77 +autoCalculate' 1 CompleteCalc;
1.78 val ((pt,p),_) = get_calc 1;
1.79 if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "29 = 29"
1.80 then () else error "polyminus.sml: Probe 29 = 29";
1.81 @@ -409,9 +409,9 @@
1.82 ("PolyMinus",["plus_minus","polynom","vereinfachen"],
1.83 ["simplification","for_polynomials","with_minus"]))];
1.84 moveActiveRoot 1;
1.85 -autoCalculate 1 CompleteCalcHead;
1.86 -autoCalculate 1 (Step 1);
1.87 -autoCalculate 1 (Step 1);
1.88 +autoCalculate' 1 CompleteCalcHead;
1.89 +autoCalculate' 1 (Step 1);
1.90 +autoCalculate' 1 (Step 1);
1.91 val ((pt,p),_) = get_calc 1; show_pt pt;
1.92 "----- 1 ^^^";
1.93 fetchApplicableTactics 1 0 p;
1.94 @@ -455,7 +455,7 @@
1.95 val ((pt,p),_) = get_calc 1; show_pt pt;
1.96 "----- 7 ^^^";
1.97 *)
1.98 -autoCalculate 1 CompleteCalc;
1.99 +autoCalculate' 1 CompleteCalc;
1.100 val ((pt,p),_) = get_calc 1; show_pt pt;
1.101 (*independent from failure above: met_simp_poly_minus not confluent:
1.102 (([9], Res), - (8 * g) + 10 * g + (3 - 2 * e + 2 * f)),
1.103 @@ -470,7 +470,7 @@
1.104 ("PolyMinus",["plus_minus","polynom","vereinfachen"],
1.105 ["simplification","for_polynomials","with_minus"]))];
1.106 moveActiveRoot 1;
1.107 -autoCalculate 1 CompleteCalc;
1.108 +autoCalculate' 1 CompleteCalc;
1.109 val ((pt,p),_) = get_calc 1; show_pt pt;
1.110 if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "2 * g + h"
1.111 then () else error "polyminus.sml: addiere_vor_minus";
1.112 @@ -483,7 +483,7 @@
1.113 ("PolyMinus",["plus_minus","polynom","vereinfachen"],
1.114 ["simplification","for_polynomials","with_minus"]))];
1.115 moveActiveRoot 1;
1.116 -autoCalculate 1 CompleteCalc;
1.117 +autoCalculate' 1 CompleteCalc;
1.118 val ((pt,p),_) = get_calc 1; show_pt pt;
1.119 if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "f + 2 * g"
1.120 then () else error "polyminus.sml: tausche_vor_plus";
1.121 @@ -527,7 +527,7 @@
1.122 ("PolyMinus",["binom_klammer","polynom","vereinfachen"],
1.123 ["simplification","for_polynomials","with_parentheses_mult"]))];
1.124 moveActiveRoot 1;
1.125 -autoCalculate 1 CompleteCalc;
1.126 +autoCalculate' 1 CompleteCalc;
1.127 val ((pt,p),_) = get_calc 1; show_pt pt;
1.128 if p = ([], Res) andalso
1.129 term2str (get_obj g_res pt (fst p)) = "-2 + 12 * a ^^^ 2 + 5 * a"
1.130 @@ -541,7 +541,7 @@
1.131 ("PolyMinus",["binom_klammer","polynom","vereinfachen"],
1.132 ["simplification","for_polynomials","with_parentheses_mult"]))];
1.133 moveActiveRoot 1;
1.134 -autoCalculate 1 CompleteCalc;
1.135 +autoCalculate' 1 CompleteCalc;
1.136 val ((pt,p),_) = get_calc 1; show_pt pt;
1.137 if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "12 * a - 16 * q"
1.138 then () else error "pbl binom polynom vereinfachen: cube";