diff -r 33b0f6db720c -r 42c45d1241d7 test/Tools/isac/Knowledge/polyminus.sml --- a/test/Tools/isac/Knowledge/polyminus.sml Fri Jun 13 12:06:38 2014 +0200 +++ b/test/Tools/isac/Knowledge/polyminus.sml Fri Jun 13 12:42:15 2014 +0200 @@ -276,7 +276,7 @@ ("PolyMinus",["plus_minus","polynom","vereinfachen"], ["simplification","for_polynomials","with_minus"]))]; moveActiveRoot 1; -autoCalculate 1 CompleteCalc; +autoCalculate' 1 CompleteCalc; val ((pt,p),_) = get_calc 1; show_pt pt; if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "3 - 2 * e + 2 * f + 2 * g" @@ -289,7 +289,7 @@ ("PolyMinus",["plus_minus","polynom","vereinfachen"], ["simplification","for_polynomials","with_minus"]))]; moveActiveRoot 1; -autoCalculate 1 CompleteCalc; +autoCalculate' 1 CompleteCalc; val ((pt,p),_) = get_calc 1; show_pt pt; if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "3 + 3 * r + 6 * s - 8 * t" @@ -302,7 +302,7 @@ ("PolyMinus",["plus_minus","polynom","vereinfachen"], ["simplification","for_polynomials","with_minus"]))]; moveActiveRoot 1; -autoCalculate 1 CompleteCalc; +autoCalculate' 1 CompleteCalc; val ((pt,p),_) = get_calc 1; show_pt pt; if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "- (3 * f)" @@ -315,7 +315,7 @@ ("PolyMinus",["plus_minus","polynom","vereinfachen"], ["simplification","for_polynomials","with_minus"]))]; moveActiveRoot 1; -autoCalculate 1 CompleteCalc; +autoCalculate' 1 CompleteCalc; val ((pt,p),_) = get_calc 1; show_pt pt; if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "-3 * u - v" @@ -328,7 +328,7 @@ ("PolyMinus",["plus_minus","polynom","vereinfachen"], ["simplification","for_polynomials","with_minus"]))]; moveActiveRoot 1; -autoCalculate 1 CompleteCalc; +autoCalculate' 1 CompleteCalc; val ((pt,p),_) = get_calc 1; show_pt pt; if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "-4 * u + 2 * v" @@ -358,10 +358,10 @@ ("PolyMinus",["polynom","probe"], ["probe","fuer_polynom"]))]; moveActiveRoot 1; -autoCalculate 1 CompleteCalc; -(* autoCalculate 1 CompleteCalcHead; - autoCalculate 1 (Step 1); - autoCalculate 1 (Step 1); +autoCalculate' 1 CompleteCalc; +(* autoCalculate' 1 CompleteCalcHead; + autoCalculate' 1 (Step 1); + autoCalculate' 1 (Step 1); val ((pt,p),_) = get_calc 1; term2str (get_obj g_res pt (fst p)); @@@@@WN081114 gives "??.empty", all "Pruefe" are the same, although analogies work in interface.sml: FIXME.WN081114 in "Pruefe"*) @@ -379,7 +379,7 @@ ("PolyMinus",["klammer","polynom","vereinfachen"], ["simplification","for_polynomials","with_parentheses"]))]; moveActiveRoot 1; -autoCalculate 1 CompleteCalc; +autoCalculate' 1 CompleteCalc; val ((pt,p),_) = get_calc 1; if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "1 + 14 * u" @@ -394,7 +394,7 @@ ("PolyMinus",["polynom","probe"], ["probe","fuer_polynom"]))]; moveActiveRoot 1; -autoCalculate 1 CompleteCalc; +autoCalculate' 1 CompleteCalc; val ((pt,p),_) = get_calc 1; if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "29 = 29" then () else error "polyminus.sml: Probe 29 = 29"; @@ -409,9 +409,9 @@ ("PolyMinus",["plus_minus","polynom","vereinfachen"], ["simplification","for_polynomials","with_minus"]))]; moveActiveRoot 1; -autoCalculate 1 CompleteCalcHead; -autoCalculate 1 (Step 1); -autoCalculate 1 (Step 1); +autoCalculate' 1 CompleteCalcHead; +autoCalculate' 1 (Step 1); +autoCalculate' 1 (Step 1); val ((pt,p),_) = get_calc 1; show_pt pt; "----- 1 ^^^"; fetchApplicableTactics 1 0 p; @@ -455,7 +455,7 @@ val ((pt,p),_) = get_calc 1; show_pt pt; "----- 7 ^^^"; *) -autoCalculate 1 CompleteCalc; +autoCalculate' 1 CompleteCalc; val ((pt,p),_) = get_calc 1; show_pt pt; (*independent from failure above: met_simp_poly_minus not confluent: (([9], Res), - (8 * g) + 10 * g + (3 - 2 * e + 2 * f)), @@ -470,7 +470,7 @@ ("PolyMinus",["plus_minus","polynom","vereinfachen"], ["simplification","for_polynomials","with_minus"]))]; moveActiveRoot 1; -autoCalculate 1 CompleteCalc; +autoCalculate' 1 CompleteCalc; val ((pt,p),_) = get_calc 1; show_pt pt; if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "2 * g + h" then () else error "polyminus.sml: addiere_vor_minus"; @@ -483,7 +483,7 @@ ("PolyMinus",["plus_minus","polynom","vereinfachen"], ["simplification","for_polynomials","with_minus"]))]; moveActiveRoot 1; -autoCalculate 1 CompleteCalc; +autoCalculate' 1 CompleteCalc; val ((pt,p),_) = get_calc 1; show_pt pt; if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "f + 2 * g" then () else error "polyminus.sml: tausche_vor_plus"; @@ -527,7 +527,7 @@ ("PolyMinus",["binom_klammer","polynom","vereinfachen"], ["simplification","for_polynomials","with_parentheses_mult"]))]; moveActiveRoot 1; -autoCalculate 1 CompleteCalc; +autoCalculate' 1 CompleteCalc; val ((pt,p),_) = get_calc 1; show_pt pt; if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "-2 + 12 * a ^^^ 2 + 5 * a" @@ -541,7 +541,7 @@ ("PolyMinus",["binom_klammer","polynom","vereinfachen"], ["simplification","for_polynomials","with_parentheses_mult"]))]; moveActiveRoot 1; -autoCalculate 1 CompleteCalc; +autoCalculate' 1 CompleteCalc; val ((pt,p),_) = get_calc 1; show_pt pt; if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "12 * a - 16 * q" then () else error "pbl binom polynom vereinfachen: cube";