1.1 --- a/test/Tools/isac/Knowledge/partial_fractions.sml Fri Jun 13 12:06:38 2014 +0200
1.2 +++ b/test/Tools/isac/Knowledge/partial_fractions.sml Fri Jun 13 12:42:15 2014 +0200
1.3 @@ -12,7 +12,7 @@
1.4 "----------- Logic.unvarify_global ----------------------";
1.5 "----------- eval_drop_questionmarks --------------------";
1.6 "----------- = me for met_partial_fraction --------------";
1.7 -"----------- autoCalculate for met_partial_fraction -----";
1.8 +"----------- autoCalculate' for met_partial_fraction -----";
1.9 "----------- progr.vers.2: check erls for multiply_ansatz";
1.10 "----------- progr.vers.2: improve program --------------";
1.11 "--------------------------------------------------------";
1.12 @@ -222,9 +222,9 @@
1.13 if f2str f = "4 / (z - 1 / 2) + -4 / (z - -1 / 4)" then()
1.14 else error "= me .. met_partial_fraction broken";
1.15
1.16 -"----------- autoCalculate for met_partial_fraction -----";
1.17 -"----------- autoCalculate for met_partial_fraction -----";
1.18 -"----------- autoCalculate for met_partial_fraction -----";
1.19 +"----------- autoCalculate' for met_partial_fraction -----";
1.20 +"----------- autoCalculate' for met_partial_fraction -----";
1.21 +"----------- autoCalculate' for met_partial_fraction -----";
1.22 reset_states ();
1.23 val fmz =
1.24 ["functionTerm (3 / (z * (z - 1 / 4 + -1 / 8 * (1 / z))))",
1.25 @@ -236,11 +236,11 @@
1.26 CalcTree [(fmz, (dI' ,pI' ,mI'))];
1.27 Iterator 1;
1.28 moveActiveRoot 1;
1.29 -autoCalculate 1 CompleteCalc;
1.30 +autoCalculate' 1 CompleteCalc;
1.31
1.32 val ((pt,p),_) = get_calc 1; val ip = get_pos 1 1;
1.33 if p = ip andalso ip = ([], Res) then ()
1.34 - else error "autoCalculate for met_partial_fraction changed: final pos'";
1.35 + else error "autoCalculate' for met_partial_fraction changed: final pos'";
1.36
1.37 val (Form f, tac, asms) = pt_extract (pt, p);
1.38 if term2str f = "4 / (z - 1 / 2) + -4 / (z - -1 / 4)" andalso
1.39 @@ -253,7 +253,7 @@
1.40 "lhs (-1 + -2 * z + 8 * z ^^^ 2 = 0) has_degree_in z = 2," ^
1.41 "lhs (-1 + -2 * z + 8 * z ^^^ 2 = 0) is_poly_in z,z = 1 / 2,z = -1 / 4,z is_polyexp]"
1.42 then ()
1.43 - else error "autoCalculate for met_partial_fraction changed: final result"
1.44 + else error "autoCalculate' for met_partial_fraction changed: final result"
1.45
1.46 show_pt pt;
1.47 (*[