1.1 --- a/test/Tools/isac/Knowledge/polyminus.sml Tue May 19 12:33:35 2020 +0200
1.2 +++ b/test/Tools/isac/Knowledge/polyminus.sml Wed May 20 12:52:09 2020 +0200
1.3 @@ -249,8 +249,8 @@
1.4 CalcTreeTEST
1.5 [(["Term (5*e + 6*f - 8*g - 9 - 7*e - 4*f + 10*g + 12)",
1.6 "normalform N"],
1.7 - ("PolyMinus",["plus_minus","polynom","vereinfachen"],
1.8 - ["simplification","for_polynomials","with_minus"]))];
1.9 + ("PolyMinus",["plus_minus", "polynom", "vereinfachen"],
1.10 + ["simplification", "for_polynomials", "with_minus"]))];
1.11 val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.12 val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.13 val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.14 @@ -274,8 +274,8 @@
1.15 reset_states ();
1.16 CalcTree [(["Term (5*e + 6*f - 8*g - 9 - 7*e - 4*f + 10*g + 12)",
1.17 "normalform N"],
1.18 - ("PolyMinus",["plus_minus","polynom","vereinfachen"],
1.19 - ["simplification","for_polynomials","with_minus"]))];
1.20 + ("PolyMinus",["plus_minus", "polynom", "vereinfachen"],
1.21 + ["simplification", "for_polynomials", "with_minus"]))];
1.22 moveActiveRoot 1;
1.23 autoCalculate 1 CompleteCalc;
1.24 val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.25 @@ -287,8 +287,8 @@
1.26 reset_states ();
1.27 CalcTree [(["Term (-r - 2*s - 3*t + 5 + 4*r + 8*s - 5*t - 2)",
1.28 "normalform N"],
1.29 - ("PolyMinus",["plus_minus","polynom","vereinfachen"],
1.30 - ["simplification","for_polynomials","with_minus"]))];
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 val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.36 @@ -300,8 +300,8 @@
1.37 reset_states ();
1.38 CalcTree [(["Term (3*e - 6*f - 8*e - 4*f + 5*e + 7*f)",
1.39 "normalform N"],
1.40 - ("PolyMinus",["plus_minus","polynom","vereinfachen"],
1.41 - ["simplification","for_polynomials","with_minus"]))];
1.42 + ("PolyMinus",["plus_minus", "polynom", "vereinfachen"],
1.43 + ["simplification", "for_polynomials", "with_minus"]))];
1.44 moveActiveRoot 1;
1.45 autoCalculate 1 CompleteCalc;
1.46 val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.47 @@ -313,8 +313,8 @@
1.48 reset_states ();
1.49 CalcTree [(["Term (8*u - 5*v - 5*u + 7*v - 6*u - 3*v)",
1.50 "normalform N"],
1.51 - ("PolyMinus",["plus_minus","polynom","vereinfachen"],
1.52 - ["simplification","for_polynomials","with_minus"]))];
1.53 + ("PolyMinus",["plus_minus", "polynom", "vereinfachen"],
1.54 + ["simplification", "for_polynomials", "with_minus"]))];
1.55 moveActiveRoot 1;
1.56 autoCalculate 1 CompleteCalc;
1.57 val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.58 @@ -326,8 +326,8 @@
1.59 reset_states ();
1.60 CalcTree [(["Term (2*u - 3*v - 6*u + 5*v)",
1.61 "normalform N"],
1.62 - ("PolyMinus",["plus_minus","polynom","vereinfachen"],
1.63 - ["simplification","for_polynomials","with_minus"]))];
1.64 + ("PolyMinus",["plus_minus", "polynom", "vereinfachen"],
1.65 + ["simplification", "for_polynomials", "with_minus"]))];
1.66 moveActiveRoot 1;
1.67 autoCalculate 1 CompleteCalc;
1.68 val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.69 @@ -356,8 +356,8 @@
1.70 \3 - 2 * e + 2 * f + 2 * (g::int))",
1.71 "mitWert [e = (1::int), f = (2::int), g = (3::int)]",
1.72 "Geprueft b"],
1.73 - ("PolyMinus",["polynom","probe"],
1.74 - ["probe","fuer_polynom"]))];
1.75 + ("PolyMinus",["polynom", "probe"],
1.76 + ["probe", "fuer_polynom"]))];
1.77 moveActiveRoot 1;
1.78 autoCalculate 1 CompleteCalc;
1.79 (* autoCalculate 1 CompleteCalcHead;
1.80 @@ -377,8 +377,8 @@
1.81 reset_states ();
1.82 CalcTree [(["Term (2*u - 5 - (3 - 4*u) + (8*u + 9))",
1.83 "normalform N"],
1.84 - ("PolyMinus",["klammer","polynom","vereinfachen"],
1.85 - ["simplification","for_polynomials","with_parentheses"]))];
1.86 + ("PolyMinus",["klammer", "polynom", "vereinfachen"],
1.87 + ["simplification", "for_polynomials", "with_parentheses"]))];
1.88 moveActiveRoot 1;
1.89 autoCalculate 1 CompleteCalc;
1.90 val ((pt,p),_) = get_calc 1;
1.91 @@ -392,8 +392,8 @@
1.92 CalcTree [(["Pruefe (2*u - 5 - (3 - 4*u) + (8*u + 9) = 1 + 14 * (u::int))",
1.93 "mitWert [u = (2::int)]",
1.94 "Geprueft b"],
1.95 - ("PolyMinus",["polynom","probe"],
1.96 - ["probe","fuer_polynom"]))];
1.97 + ("PolyMinus",["polynom", "probe"],
1.98 + ["probe", "fuer_polynom"]))];
1.99 moveActiveRoot 1;
1.100 autoCalculate 1 CompleteCalc;
1.101 val ((pt,p),_) = get_calc 1;
1.102 @@ -407,8 +407,8 @@
1.103 reset_states ();
1.104 CalcTree [(["Term (5*e + 6*f - 8*g - 9 - 7*e - 4*f + 10*g + 12)",
1.105 "normalform N"],
1.106 - ("PolyMinus",["plus_minus","polynom","vereinfachen"],
1.107 - ["simplification","for_polynomials","with_minus"]))];
1.108 + ("PolyMinus",["plus_minus", "polynom", "vereinfachen"],
1.109 + ["simplification", "for_polynomials", "with_minus"]))];
1.110 moveActiveRoot 1;
1.111 autoCalculate 1 CompleteCalcHead;
1.112 autoCalculate 1 (Steps 1);
1.113 @@ -468,8 +468,8 @@
1.114 reset_states ();
1.115 CalcTree [(["Term (- (8 * g) + 10 * g + h)",
1.116 "normalform N"],
1.117 - ("PolyMinus",["plus_minus","polynom","vereinfachen"],
1.118 - ["simplification","for_polynomials","with_minus"]))];
1.119 + ("PolyMinus",["plus_minus", "polynom", "vereinfachen"],
1.120 + ["simplification", "for_polynomials", "with_minus"]))];
1.121 moveActiveRoot 1;
1.122 autoCalculate 1 CompleteCalc;
1.123 val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.124 @@ -481,8 +481,8 @@
1.125 reset_states ();
1.126 CalcTree [(["Term (- (8 * g) + 10 * g + f)",
1.127 "normalform N"],
1.128 - ("PolyMinus",["plus_minus","polynom","vereinfachen"],
1.129 - ["simplification","for_polynomials","with_minus"]))];
1.130 + ("PolyMinus",["plus_minus", "polynom", "vereinfachen"],
1.131 + ["simplification", "for_polynomials", "with_minus"]))];
1.132 moveActiveRoot 1;
1.133 autoCalculate 1 CompleteCalc;
1.134 val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.135 @@ -525,8 +525,8 @@
1.136 reset_states ();
1.137 CalcTree [(["Term ((3*a + 2) * (4*a - 1))",
1.138 "normalform N"],
1.139 - ("PolyMinus",["binom_klammer","polynom","vereinfachen"],
1.140 - ["simplification","for_polynomials","with_parentheses_mult"]))];
1.141 + ("PolyMinus",["binom_klammer", "polynom", "vereinfachen"],
1.142 + ["simplification", "for_polynomials", "with_parentheses_mult"]))];
1.143 moveActiveRoot 1;
1.144 autoCalculate 1 CompleteCalc;
1.145 val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;
1.146 @@ -539,8 +539,8 @@
1.147 "----------- pbl binom polynom vereinfachen: cube ----------------";
1.148 reset_states ();
1.149 CalcTree [(["Term (8*(a - q) + a - 2*q + 3*(a - 2*q))", "normalform N"],
1.150 - ("PolyMinus",["binom_klammer","polynom","vereinfachen"],
1.151 - ["simplification","for_polynomials","with_parentheses_mult"]))];
1.152 + ("PolyMinus",["binom_klammer", "polynom", "vereinfachen"],
1.153 + ["simplification", "for_polynomials", "with_parentheses_mult"]))];
1.154 moveActiveRoot 1;
1.155 autoCalculate 1 CompleteCalc;
1.156 val ((pt,p),_) = get_calc 1; Test_Tool.show_pt pt;