1.1 --- a/test/Tools/isac/Knowledge/polyminus.sml Wed Oct 19 15:39:15 2022 +0200
1.2 +++ b/test/Tools/isac/Knowledge/polyminus.sml Thu Oct 20 10:23:38 2022 +0200
1.3 @@ -346,7 +346,7 @@
1.4 "----------- me simplification.for_polynomials.with_minus";
1.5 val c = [];
1.6 val (p,_,f,nxt,_,pt) =
1.7 - CalcTreeTEST
1.8 + Test_Code.init_calc @{context}
1.9 [(["Term (5*e + 6*f - 8*g - 9 - 7*e - 4*f + 10*g + 12)",
1.10 "normalform N"],
1.11 ("PolyMinus",["plus_minus", "polynom", "vereinfachen"],
1.12 @@ -372,7 +372,7 @@
1.13 "----------- pbl polynom vereinfachen p.33 -----------------------";
1.14 "----------- 140 c ---";
1.15 States.reset ();
1.16 -CalcTree [(["Term (5*e + 6*f - 8*g - 9 - 7*e - 4*f + 10*g + 12)",
1.17 +CalcTree @{context} [(["Term (5*e + 6*f - 8*g - 9 - 7*e - 4*f + 10*g + 12)",
1.18 "normalform N"],
1.19 ("PolyMinus",["plus_minus", "polynom", "vereinfachen"],
1.20 ["simplification", "for_polynomials", "with_minus"]))];
1.21 @@ -385,7 +385,7 @@
1.22
1.23 "======= 140 d ---";
1.24 States.reset ();
1.25 -CalcTree [(["Term (-r - 2*s - 3*t + 5 + 4*r + 8*s - 5*t - 2)",
1.26 +CalcTree @{context} [(["Term (-r - 2*s - 3*t + 5 + 4*r + 8*s - 5*t - 2)",
1.27 "normalform N"],
1.28 ("PolyMinus",["plus_minus", "polynom", "vereinfachen"],
1.29 ["simplification", "for_polynomials", "with_minus"]))];
1.30 @@ -398,7 +398,7 @@
1.31
1.32 "======= 139 c ---";
1.33 States.reset ();
1.34 -CalcTree [(["Term (3*e - 6*f - 8*e - 4*f + 5*e + 7*f)",
1.35 +CalcTree @{context} [(["Term (3*e - 6*f - 8*e - 4*f + 5*e + 7*f)",
1.36 "normalform N"],
1.37 ("PolyMinus",["plus_minus", "polynom", "vereinfachen"],
1.38 ["simplification", "for_polynomials", "with_minus"]))];
1.39 @@ -411,7 +411,7 @@
1.40
1.41 "======= 139 b ---";
1.42 States.reset ();
1.43 -CalcTree [(["Term (8*u - 5*v - 5*u + 7*v - 6*u - 3*v)",
1.44 +CalcTree @{context} [(["Term (8*u - 5*v - 5*u + 7*v - 6*u - 3*v)",
1.45 "normalform N"],
1.46 ("PolyMinus",["plus_minus", "polynom", "vereinfachen"],
1.47 ["simplification", "for_polynomials", "with_minus"]))];
1.48 @@ -424,7 +424,7 @@
1.49
1.50 "======= 138 a ---";
1.51 States.reset ();
1.52 -CalcTree [(["Term (2*u - 3*v - 6*u + 5*v)",
1.53 +CalcTree @{context} [(["Term (2*u - 3*v - 6*u + 5*v)",
1.54 "normalform N"],
1.55 ("PolyMinus",["plus_minus", "polynom", "vereinfachen"],
1.56 ["simplification", "for_polynomials", "with_minus"]))];
1.57 @@ -452,7 +452,7 @@
1.58 "----------- pbl polynom probe -----------------------------------";
1.59 "----------- pbl polynom probe -----------------------------------";
1.60 States.reset ();
1.61 -CalcTree [(["Pruefe ((5::int)*e + 6*f - 8*g - 9 - 7*e - 4*f + 10*g + 12 =\
1.62 +CalcTree @{context} [(["Pruefe ((5::int)*e + 6*f - 8*g - 9 - 7*e - 4*f + 10*g + 12 =\
1.63 \3 - 2 * e + 2 * f + 2 * (g::int))",
1.64 "mitWert [e = (1::int), f = (2::int), g = (3::int)]",
1.65 "Geprueft b"],
1.66 @@ -476,7 +476,7 @@
1.67 "----------- pbl klammer polynom vereinfachen p.34 ---------------";
1.68 "----------- pbl klammer polynom vereinfachen p.34 ---------------";
1.69 States.reset ();
1.70 -CalcTree [(["Term (2*u - 5 - (3 - 4*u) + (8*u + 9))",
1.71 +CalcTree @{context} [(["Term (2*u - 5 - (3 - 4*u) + (8*u + 9))",
1.72 "normalform N"],
1.73 ("PolyMinus",["klammer", "polynom", "vereinfachen"],
1.74 ["simplification", "for_polynomials", "with_parentheses"]))];
1.75 @@ -490,7 +490,7 @@
1.76
1.77 "======= probe p.34 -----";
1.78 States.reset ();
1.79 -CalcTree [(["Pruefe (2*u - 5 - (3 - 4*u) + (8*u + 9) = 1 + 14 * (u::int))",
1.80 +CalcTree @{context} [(["Pruefe (2*u - 5 - (3 - 4*u) + (8*u + 9) = 1 + 14 * (u::int))",
1.81 "mitWert [u = (2::int)]",
1.82 "Geprueft b"],
1.83 ("PolyMinus",["polynom", "probe"],
1.84 @@ -507,7 +507,7 @@
1.85 "----------- try fun applyTactics --------------------------------";
1.86 "----------- try fun applyTactics --------------------------------";
1.87 States.reset ();
1.88 -CalcTree [(["Term (5*e + 6*f - 8*g - 9 - 7*e - 4*f + 10*g + 12)",
1.89 +CalcTree @{context} [(["Term (5*e + 6*f - 8*g - 9 - 7*e - 4*f + 10*g + 12)",
1.90 "normalform N"],
1.91 ("PolyMinus",["plus_minus", "polynom", "vereinfachen"],
1.92 ["simplification", "for_polynomials", "with_minus"]))];
1.93 @@ -570,7 +570,7 @@
1.94
1.95 "#############################################################################";
1.96 States.reset ();
1.97 -CalcTree [(["Term (- (8 * g) + 10 * g + h)",
1.98 +CalcTree @{context} [(["Term (- (8 * g) + 10 * g + h)",
1.99 "normalform N"],
1.100 ("PolyMinus",["plus_minus", "polynom", "vereinfachen"],
1.101 ["simplification", "for_polynomials", "with_minus"]))];
1.102 @@ -583,7 +583,7 @@
1.103
1.104 "#############################################################################";
1.105 States.reset ();
1.106 -CalcTree [(["Term (- (8 * g) + 10 * g + f)",
1.107 +CalcTree @{context} [(["Term (- (8 * g) + 10 * g + f)",
1.108 "normalform N"],
1.109 ("PolyMinus",["plus_minus", "polynom", "vereinfachen"],
1.110 ["simplification", "for_polynomials", "with_minus"]))];
1.111 @@ -628,7 +628,7 @@
1.112
1.113 (*@@@@@@@*)
1.114 States.reset ();
1.115 -CalcTree [(["Term ((3*a + 2) * (4*a - 1))",
1.116 +CalcTree @{context} [(["Term ((3*a + 2) * (4*a - 1))",
1.117 "normalform N"],
1.118 ("PolyMinus",["binom_klammer", "polynom", "vereinfachen"],
1.119 ["simplification", "for_polynomials", "with_parentheses_mult"]))];
1.120 @@ -645,7 +645,7 @@
1.121 "----------- pbl binom polynom vereinfachen: cube ----------------";
1.122 "----------- pbl binom polynom vereinfachen: cube ----------------";
1.123 States.reset ();
1.124 -CalcTree [(["Term (8*(a - q) + a - 2*q + 3*(a - 2*q))", "normalform N"],
1.125 +CalcTree @{context} [(["Term (8*(a - q) + a - 2*q + 3*(a - 2*q))", "normalform N"],
1.126 ("PolyMinus",["binom_klammer", "polynom", "vereinfachen"],
1.127 ["simplification", "for_polynomials", "with_parentheses_mult"]))];
1.128 moveActiveRoot 1;