1.1 --- a/test/Tools/isac/Interpret/me.sml Thu Dec 22 11:12:18 2016 +0100
1.2 +++ b/test/Tools/isac/Interpret/me.sml Thu Dec 22 11:36:20 2016 +0100
1.3 @@ -10,9 +10,9 @@
1.4 "-----------------------------------------------------------------";
1.5 "table of contents -----------------------------------------------";
1.6 "-----------------------------------------------------------------";
1.7 -"=====new ptree 1: crippled by cut_level_'_ ======================";
1.8 +"=====new ctree 1: crippled by cut_level_'_ ======================";
1.9 "-------------- get_interval from ctree with move_dn:modspec.sml -";
1.10 -"=====new ptree 2 without changes ================================";
1.11 +"=====new ctree 2 without changes ================================";
1.12 "-------------- getFormulaeFromTo --------------------------------";
1.13 "autoCalculate";
1.14 "--------- solve_linear as rootpbl AUTOCALCULATE CompleteModel ---";
1.15 @@ -25,9 +25,9 @@
1.16
1.17
1.18
1.19 -"=====new ptree 1: crippled by cut_level_'_ ======================";
1.20 -"=====new ptree 1: crippled by cut_level_'_ ======================";
1.21 -"=====new ptree 1: crippled by cut_level_'_ ======================";
1.22 +"=====new ctree 1: crippled by cut_level_'_ ======================";
1.23 +"=====new ctree 1: crippled by cut_level_'_ ======================";
1.24 +"=====new ctree 1: crippled by cut_level_'_ ======================";
1.25 reset_states ();
1.26 CalcTree
1.27 [(["equality (x/(x^2 - 6*x+9) - 1/(x^2 - 3*x) =1/x)",
1.28 @@ -60,12 +60,12 @@
1.29 moveActiveFormula 1 ([4,2],Res)(*4.2.1.*);
1.30 interSteps 1 ([4,2],Res)(*..is activeFormula !?!*);
1.31 val ((pt,_),_) = get_calc 1;
1.32 -writeln(pr_ptree pr_short pt);
1.33 +writeln(pr_ctree pr_short pt);
1.34 (*delete [4,1] in order to make pos [4],[4,4] for pblobjs differen [4],[4,3]:
1.35 ###########################################################################*)
1.36 val (pt, _) = cut_level_'_ [] [] pt ([4,1],Frm); (*#*)
1.37 (*##########################################################################*)
1.38 -writeln(pr_ptree pr_short pt);
1.39 +writeln(pr_ctree pr_short pt);
1.40 (*##########################################################################
1.41 attention: the ctree in states is still the old (perfect) !!!
1.42 ############################################################################*)
1.43 @@ -75,7 +75,7 @@
1.44 "-------------- get_interval from ctree with move_dn:modspec.sml -";
1.45 "-------------- get_interval from ctree with move_dn:modspec.sml -";
1.46 "-------------- get_interval from ctree with move_dn:modspec.sml -";
1.47 -writeln(pr_ptree pr_short pt);
1.48 +writeln(pr_ctree pr_short pt);
1.49 writeln(posterms2str (get_interval ([],Frm) ([],Res) 99999 pt));
1.50
1.51 case map fst (get_interval ([],Frm) ([],Res) 99999 pt) of
1.52 @@ -219,9 +219,9 @@
1.53
1.54
1.55
1.56 -"=====new ptree 2 without changes ================================";
1.57 -"=====new ptree 2 without changes ================================";
1.58 -"=====new ptree 2 without changes ================================";
1.59 +"=====new ctree 2 without changes ================================";
1.60 +"=====new ctree 2 without changes ================================";
1.61 +"=====new ctree 2 without changes ================================";
1.62 reset_states ();
1.63 CalcTree
1.64 [(["equality (x/(x^2 - 6*x+9) - 1/(x^2 - 3*x) =1/x)",
1.65 @@ -233,8 +233,8 @@
1.66 val p = get_pos 1 1;
1.67 val (Form f, tac, asms) = pt_extract (pt, p);
1.68 if term2str f = "[x = 6 / 5]" andalso p = ([], Res) then ()
1.69 - else error "after ===new ptree 2 without changes ===";
1.70 -writeln(pr_ptree pr_short pt);
1.71 + else error "after ===new ctree 2 without changes ===";
1.72 +writeln(pr_ctree pr_short pt);
1.73
1.74
1.75 "-------------- getFormulaeFromTo --------------------------------";