1.1 --- a/test/Tools/isac/Knowledge/polyminus.sml Thu May 14 16:58:33 2020 +0200
1.2 +++ b/test/Tools/isac/Knowledge/polyminus.sml Fri May 15 11:46:43 2020 +0200
1.3 @@ -278,7 +278,7 @@
1.4 ["simplification","for_polynomials","with_minus"]))];
1.5 moveActiveRoot 1;
1.6 autoCalculate 1 CompleteCalc;
1.7 -val ((pt,p),_) = get_calc 1; show_pt pt;
1.8 +val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.9 if p = ([], Res) andalso
1.10 UnparseC.term (get_obj g_res pt (fst p)) = "3 - 2 * e + 2 * f + 2 * g"
1.11 then () else error "polyminus.sml: Vereinfache (3 - 2 * e + 2 * f...";
1.12 @@ -291,7 +291,7 @@
1.13 ["simplification","for_polynomials","with_minus"]))];
1.14 moveActiveRoot 1;
1.15 autoCalculate 1 CompleteCalc;
1.16 -val ((pt,p),_) = get_calc 1; show_pt pt;
1.17 +val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.18 if p = ([], Res) andalso
1.19 UnparseC.term (get_obj g_res pt (fst p)) = "3 + 3 * r + 6 * s - 8 * t"
1.20 then () else error "polyminus.sml: Vereinfache 140 d)";
1.21 @@ -304,7 +304,7 @@
1.22 ["simplification","for_polynomials","with_minus"]))];
1.23 moveActiveRoot 1;
1.24 autoCalculate 1 CompleteCalc;
1.25 -val ((pt,p),_) = get_calc 1; show_pt pt;
1.26 +val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.27 if p = ([], Res) andalso
1.28 UnparseC.term (get_obj g_res pt (fst p)) = "- (3 * f)"
1.29 then () else error "polyminus.sml: Vereinfache 139 c)";
1.30 @@ -317,7 +317,7 @@
1.31 ["simplification","for_polynomials","with_minus"]))];
1.32 moveActiveRoot 1;
1.33 autoCalculate 1 CompleteCalc;
1.34 -val ((pt,p),_) = get_calc 1; show_pt pt;
1.35 +val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.36 if p = ([], Res) andalso
1.37 UnparseC.term (get_obj g_res pt (fst p)) = "-3 * u - v"
1.38 then () else error "polyminus.sml: Vereinfache 139 b)";
1.39 @@ -330,7 +330,7 @@
1.40 ["simplification","for_polynomials","with_minus"]))];
1.41 moveActiveRoot 1;
1.42 autoCalculate 1 CompleteCalc;
1.43 -val ((pt,p),_) = get_calc 1; show_pt pt;
1.44 +val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.45 if p = ([], Res) andalso
1.46 UnparseC.term (get_obj g_res pt (fst p)) = "-4 * u + 2 * v"
1.47 then () else error "polyminus.sml: Vereinfache 138 a)";
1.48 @@ -369,7 +369,7 @@
1.49 val ((pt,p),_) = get_calc 1;
1.50 if p = ([], Res) andalso UnparseC.term (get_obj g_res pt (fst p)) = "11 = 11"
1.51 then () else error "polyminus.sml: Probe 11 = 11";
1.52 -show_pt pt;
1.53 +Test_Tool.show_pt pt;
1.54
1.55 "----------- pbl klammer polynom vereinfachen p.34 ---------------";
1.56 "----------- pbl klammer polynom vereinfachen p.34 ---------------";
1.57 @@ -385,7 +385,7 @@
1.58 if p = ([], Res) andalso
1.59 UnparseC.term (get_obj g_res pt (fst p)) = "1 + 14 * u"
1.60 then () else error "polyminus.sml: Vereinfache (2*u - 5 - (3 - ...";
1.61 -show_pt pt;
1.62 +Test_Tool.show_pt pt;
1.63
1.64 "======= probe p.34 -----";
1.65 reset_states ();
1.66 @@ -399,7 +399,7 @@
1.67 val ((pt,p),_) = get_calc 1;
1.68 if p = ([], Res) andalso UnparseC.term (get_obj g_res pt (fst p)) = "29 = 29"
1.69 then () else error "polyminus.sml: Probe 29 = 29";
1.70 -show_pt pt;
1.71 +Test_Tool.show_pt pt;
1.72
1.73 "----------- try fun applyTactics --------------------------------";
1.74 "----------- try fun applyTactics --------------------------------";
1.75 @@ -413,12 +413,12 @@
1.76 autoCalculate 1 CompleteCalcHead;
1.77 autoCalculate 1 (Steps 1);
1.78 autoCalculate 1 (Steps 1);
1.79 -val ((pt,p),_) = get_calc 1; show_pt pt;
1.80 +val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.81 "----- 1 ^^^";
1.82 fetchApplicableTactics 1 0 p;
1.83 val appltacs = specific_from_prog pt p;
1.84 applyTactic 1 p (hd appltacs) (*addiere_x_plus_minus*);
1.85 -val ((pt,p),_) = get_calc 1; show_pt pt;
1.86 +val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.87 "----- 2 ^^^";
1.88 (*Rewrite.trace_on := true; ..stopped Test_Isac.thy*)
1.89 val erls = erls_ordne_alphabetisch;
1.90 @@ -439,25 +439,25 @@
1.91
1.92
1.93 applyTactic 1 p (hd (specific_from_prog pt p)) (*tausche_minus*);
1.94 -val ((pt,p),_) = get_calc 1; show_pt pt;
1.95 +val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.96 "----- 3 ^^^";
1.97 applyTactic 1 p (hd (specific_from_prog pt p)) (**);
1.98 -val ((pt,p),_) = get_calc 1; show_pt pt;
1.99 +val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.100 "----- 4 ^^^";
1.101 applyTactic 1 p (hd (specific_from_prog pt p)) (**);
1.102 -val ((pt,p),_) = get_calc 1; show_pt pt;
1.103 +val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.104 "----- 5 ^^^";
1.105 applyTactic 1 p (hd (specific_from_prog pt p)) (**);
1.106 -val ((pt,p),_) = get_calc 1; show_pt pt;
1.107 +val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.108 "----- 6 ^^^";
1.109
1.110 (*<CALCMESSAGE> failure </CALCMESSAGE>
1.111 applyTactic 1 p (hd (specific_from_prog pt p)) (**);
1.112 -val ((pt,p),_) = get_calc 1; show_pt pt;
1.113 +val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.114 "----- 7 ^^^";
1.115 *)
1.116 autoCalculate 1 CompleteCalc;
1.117 -val ((pt,p),_) = get_calc 1; show_pt pt;
1.118 +val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.119 (*independent from failure above: met_simp_poly_minus not confluent:
1.120 (([9], Res), - (8 * g) + 10 * g + (3 - 2 * e + 2 * f)),
1.121 (([], Res), - (8 * g) + 10 * g + (3 - 2 * e + 2 * f))]
1.122 @@ -472,7 +472,7 @@
1.123 ["simplification","for_polynomials","with_minus"]))];
1.124 moveActiveRoot 1;
1.125 autoCalculate 1 CompleteCalc;
1.126 -val ((pt,p),_) = get_calc 1; show_pt pt;
1.127 +val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.128 if p = ([], Res) andalso UnparseC.term (get_obj g_res pt (fst p)) = "2 * g + h"
1.129 then () else error "polyminus.sml: addiere_vor_minus";
1.130
1.131 @@ -485,7 +485,7 @@
1.132 ["simplification","for_polynomials","with_minus"]))];
1.133 moveActiveRoot 1;
1.134 autoCalculate 1 CompleteCalc;
1.135 -val ((pt,p),_) = get_calc 1; show_pt pt;
1.136 +val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.137 if p = ([], Res) andalso UnparseC.term (get_obj g_res pt (fst p)) = "f + 2 * g"
1.138 then () else error "polyminus.sml: tausche_vor_plus";
1.139
1.140 @@ -529,7 +529,7 @@
1.141 ["simplification","for_polynomials","with_parentheses_mult"]))];
1.142 moveActiveRoot 1;
1.143 autoCalculate 1 CompleteCalc;
1.144 -val ((pt,p),_) = get_calc 1; show_pt pt;
1.145 +val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.146 if p = ([], Res) andalso
1.147 UnparseC.term (get_obj g_res pt (fst p)) = "-2 + 12 * a ^^^ 2 + 5 * a"
1.148 then () else error "polyminus.sml: Vereinfache (2*u - 5 - (3 - ...";
1.149 @@ -543,7 +543,7 @@
1.150 ["simplification","for_polynomials","with_parentheses_mult"]))];
1.151 moveActiveRoot 1;
1.152 autoCalculate 1 CompleteCalc;
1.153 -val ((pt,p),_) = get_calc 1; show_pt pt;
1.154 +val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.155 if p = ([], Res) andalso UnparseC.term (get_obj g_res pt (fst p)) = "12 * a - 16 * q"
1.156 then () else error "pbl binom polynom vereinfachen: cube";
1.157