1.1 --- a/test/Tools/isac/Knowledge/simplify.sml Mon Jul 25 08:07:35 2016 +0200
1.2 +++ b/test/Tools/isac/Knowledge/simplify.sml Sat Aug 06 14:35:29 2016 +0200
1.3 @@ -22,22 +22,17 @@
1.4 "----------- CAS-command Simplify -----------------------";
1.5 "----------- CAS-command Simplify -----------------------";
1.6 "----------- CAS-command Simplify -----------------------";
1.7 -(*============ inhibit exn WN120321 ==============================================
1.8 -WN120321.TODO reanimate test/../simplify.sml: CAS-command Simplify
1.9 -
1.10 reset_states ();
1.11 CalcTree [([], ("e_domID", ["e_pblID"], ["e_metID"]))];
1.12 Iterator 1;
1.13 moveActiveRoot 1;
1.14 replaceFormula 1 "Simplify (2*a + 3*a)";
1.15 -autoCalculate' 1 (Step 1);
1.16 -autoCalculate' 1 CompleteCalc;
1.17 +autoCalculate 1 (Step 1);
1.18 +autoCalculate 1 CompleteCalc;
1.19 val ((pt,p),_) = get_calc 1;
1.20 val Form res = (#1 o pt_extract) (pt, ([],Res)); show_pt pt; term2str res;
1.21 if p = ([], Res) andalso term2str res = "5 * a" then ()
1.22 else error "simplify.sml: diff.behav. CAScmd: Simplify (2*a + 3*a)";
1.23 -============ inhibit exn WN120321 ==============================================*)
1.24 -
1.25
1.26 "----------- append inform with final result ------------";
1.27 "----------- append inform with final result ------------";
1.28 @@ -47,13 +42,13 @@
1.29 ("Rational", ["rational","simplification"], ["simplification","of_rationals"]))];
1.30 Iterator 1;
1.31 moveActiveRoot 1;
1.32 -autoCalculate' 1 CompleteCalcHead;
1.33 +autoCalculate 1 CompleteCalcHead;
1.34 val ((pt,p),_) = get_calc 1; show_pt pt;
1.35 (*[
1.36 (([], Frm), Simplify (14 * x * y / (x * y)))] *)
1.37 pt_extract (pt, p); (*determines SOME (Apply_Method ["simplification", "of_rationals"])*)
1.38
1.39 -autoCalculate' 1 (Step 1);
1.40 +autoCalculate 1 (Step 1);
1.41 val ((pt,p),_) = get_calc 1; show_pt pt;
1.42 (*[
1.43 (([], Frm), Simplify (14 * x * y / (x * y))),
1.44 @@ -70,7 +65,7 @@
1.45 (([1,3], Res), 14),
1.46 (([1], Res), 14)]*)
1.47
1.48 -autoCalculate' 1 (Step 1);
1.49 +autoCalculate 1 (Step 1);
1.50 val ((pt,p),_) = get_calc 1; show_pt pt;
1.51 (*[
1.52 (([], Frm), Simplify (14 * x * y / (x * y))),