1.1 --- a/test/Tools/isac/Interpret/inform.sml Thu Dec 22 11:12:18 2016 +0100
1.2 +++ b/test/Tools/isac/Interpret/inform.sml Thu Dec 22 11:36:20 2016 +0100
1.3 @@ -63,7 +63,7 @@
1.4
1.5 appendFormula 1 "-2 * 1 + (1 + x) = 0" (*|> Future.join*); refFormula 1 (get_pos 1 1);
1.6 val ((pt,_),_) = get_calc 1;
1.7 - val str = pr_ptree pr_short pt;
1.8 + val str = pr_ctree pr_short pt;
1.9 if str =
1.10 (". ----- pblobj -----\n" ^
1.11 "1. x + 1 = 2\n" ^
1.12 @@ -183,7 +183,7 @@
1.13
1.14 appendFormula 1 "x = 2" (*|> Future.join*);
1.15 val ((pt,p),_) = get_calc 1;
1.16 - val str = pr_ptree pr_short pt;
1.17 + val str = pr_ctree pr_short pt;
1.18 writeln str;
1.19 if str = ". ----- pblobj -----\n1. x + 1 = 2\n" andalso p = ([1], Res)
1.20 then ()
1.21 @@ -213,7 +213,7 @@
1.22
1.23 appendFormula 1 "x = 1" (*|> Future.join*);
1.24 val ((pt,p),_) = get_calc 1;
1.25 - val str = pr_ptree pr_short pt;
1.26 + val str = pr_ctree pr_short pt;
1.27 writeln str;
1.28 if str = ". ----- pblobj -----\n1. x + 1 = 2\n2. x + 1 + -1 * 2 = 0\n3. ----- pblobj -----\n3.1. -1 + x = 0\n3.2. x = 0 + -1 * -1\n3.2.1. x = 0 + -1 * -1\n3.2.2. x = 0 + 1\n" andalso p = ([3,2], Res)
1.29 then () (*finds 1 step too early: ([3,2], Res) "x = 1" also by script !!!*)
1.30 @@ -242,7 +242,7 @@
1.31 autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1);(*x + 1 + -1 * 2 = 0*);
1.32 appendFormula 1 "[x = 3 + -2*1]" (*|> Future.join*);
1.33 val ((pt,p),_) = get_calc 1;
1.34 - val str = pr_ptree pr_short pt;
1.35 + val str = pr_ctree pr_short pt;
1.36 writeln str;
1.37 if str=". ----- pblobj -----\n1. x + 1 = 2\n2. x + 1 + -1 * 2 = 0\n3. ----- pblobj -----\n3.1. -1 + x = 0\n3.2. x = 0 + -1 * -1\n4. [x = 1]\n4.1. [x = 1]\n4.2. [x = -2 + 3]\n4.3. [x = 3 + -2]\n" then ()
1.38 else error "inform.sml: diff.behav.appendFormula: Res + latEE 1";
1.39 @@ -268,7 +268,7 @@
1.40
1.41 replaceFormula 1 "-2 * 1 + (1 + x) = 0"; refFormula 1 (get_pos 1 1);
1.42 val ((pt,_),_) = get_calc 1;
1.43 - val str = pr_ptree pr_short pt;
1.44 + val str = pr_ctree pr_short pt;
1.45
1.46 (* before AK110725 this was
1.47 ". ----- pblobj -----\n
1.48 @@ -313,7 +313,7 @@
1.49
1.50 replaceFormula 1 "x + 1 = 4 + -2"; refFormula 1 (get_pos 1 1);
1.51 val ((pt,_),_) = get_calc 1;
1.52 - val str = pr_ptree pr_short pt;
1.53 + val str = pr_ctree pr_short pt;
1.54 writeln str;
1.55 if str= ". ----- pblobj -----\n1. x + 1 = 2\n1.1. x + 1 = 2\n1.2. 1 + x = 2\n1.3. 1 + x = -2 + 4\n1.4. x + 1 = -2 + 4\n" then ()
1.56 else error "inform.sml: diff.behav.replaceFormula: on Res 1 + = 1";
1.57 @@ -336,7 +336,7 @@
1.58
1.59 replaceFormula 1 "x + 1 = 4 + -2"; refFormula 1 (get_pos 1 1);
1.60 val ((pt,_),_) = get_calc 1;
1.61 - val str = pr_ptree pr_short pt;
1.62 + val str = pr_ctree pr_short pt;
1.63 writeln str;
1.64 if str= ". ----- pblobj -----\n1. x + 1 = 2\n1.1. x + 1 = 2\n1.2. 1 + x = 2\n1.3. 1 + x = -2 + 4\n1.4. x + 1 = -2 + 4\n" then ()
1.65 else error "inform.sml: diff.behav.replaceFormula: on Frm 1 + = 1";
1.66 @@ -361,7 +361,7 @@
1.67
1.68 replaceFormula 1 "x + 1 = 4 + -2"; refFormula 1 (get_pos 1 1);
1.69 val ((pt,p),_) = get_calc 1;
1.70 - val str = pr_ptree pr_short pt;
1.71 + val str = pr_ctree pr_short pt;
1.72 writeln str;
1.73 if p = ([1], Res) then ()
1.74 else error "inform.sml: diff.behav. cut calculation 2";
1.75 @@ -457,7 +457,7 @@
1.76
1.77 appendFormula 1 " x - "; (*<ERROR> syntax error in ' x - ' </ERROR>*)
1.78 val ((pt,_),_) = get_calc 1;
1.79 - val str = pr_ptree pr_short pt;
1.80 + val str = pr_ctree pr_short pt;
1.81 writeln str;
1.82 if str = ". ----- pblobj -----\n1. x + 1 = 2\n" then ()
1.83 else error "inform.sml: diff.behav.appendFormula: syntax error";