test/Tools/isac/Interpret/inform.sml
changeset 55402 d580d7fc9b8e
parent 55279 130688f277ba
child 55445 33b0f6db720c
     1.1 --- a/test/Tools/isac/Interpret/inform.sml	Sat Mar 08 11:07:52 2014 +0100
     1.2 +++ b/test/Tools/isac/Interpret/inform.sml	Mon Mar 10 21:07:35 2014 +0100
     1.3 @@ -60,7 +60,7 @@
     1.4   autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1);(*x + 1 = 2*)
     1.5   autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1);(*x + 1 + -1 * 2 = 0*);
     1.6  
     1.7 - appendFormula 1 "-2 * 1 + (1 + x) = 0"; refFormula 1 (get_pos 1 1);
     1.8 + appendFormula 1 "-2 * 1 + (1 + x) = 0" |> Future.join; refFormula 1 (get_pos 1 1);
     1.9   val ((pt,_),_) = get_calc 1;
    1.10   val str = pr_ptree pr_short pt;
    1.11  if str =
    1.12 @@ -143,7 +143,7 @@
    1.13   Iterator 1; moveActiveRoot 1;
    1.14   autoCalculate 1 CompleteCalcHead;
    1.15   autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1) (*x + 1 = 2*);
    1.16 - appendFormula 1 "2+ -1 + x = 2"; refFormula 1 (get_pos 1 1);
    1.17 + appendFormula 1 "2+ -1 + x = 2" |> Future.join; refFormula 1 (get_pos 1 1);
    1.18  
    1.19   moveDown 1 ([],Pbl); refFormula 1 ([1],Frm) (*x + 1 = 2*);
    1.20  
    1.21 @@ -180,7 +180,7 @@
    1.22   autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1);(*x + 1 = 2*)
    1.23   autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1);(*x + 1 + -1 * 2 = 0*);
    1.24  
    1.25 - appendFormula 1 "x = 2";
    1.26 + appendFormula 1 "x = 2" |> Future.join;
    1.27   val ((pt,p),_) = get_calc 1;
    1.28   val str = pr_ptree pr_short pt;
    1.29   writeln str;
    1.30 @@ -210,7 +210,7 @@
    1.31   autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1);(*x + 1 = 2*)
    1.32   autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1);(*x + 1 + -1 * 2 = 0*);
    1.33  
    1.34 - appendFormula 1 "x = 1";
    1.35 + appendFormula 1 "x = 1" |> Future.join;
    1.36   val ((pt,p),_) = get_calc 1;
    1.37   val str = pr_ptree pr_short pt;
    1.38   writeln str;
    1.39 @@ -239,7 +239,7 @@
    1.40   autoCalculate 1 CompleteCalcHead;
    1.41   autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1);(*x + 1 = 2*)
    1.42   autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1);(*x + 1 + -1 * 2 = 0*);
    1.43 - appendFormula 1 "[x = 3 + -2*1]";
    1.44 + appendFormula 1 "[x = 3 + -2*1]" |> Future.join;
    1.45   val ((pt,p),_) = get_calc 1;
    1.46   val str = pr_ptree pr_short pt;
    1.47   writeln str;
    1.48 @@ -525,7 +525,7 @@
    1.49  (([1], Res), a / b + c / d + e / f)] 
    1.50  *)
    1.51  "--- (1) input an arbitrary next formula";
    1.52 -appendFormula 1 "((a * d) + (c * b)) / (b * d) + e / f";
    1.53 +appendFormula 1 "((a * d) + (c * b)) / (b * d) + e / f" |> Future.join;
    1.54  val ((pt, p), _) = get_calc 1;
    1.55  (*show_pt pt;
    1.56  [
    1.57 @@ -556,7 +556,7 @@
    1.58  (([2], Res), (a * d + c * b) / (b * d) + e / f),
    1.59  (([3], Res), (b * d * e + b * c * f + a * d * f) / (b * d * f))]   <--- input this
    1.60  *)
    1.61 -appendFormula 1 "(b * d * e + b * c * f + a * d * f) / (b * d * f)";
    1.62 +appendFormula 1 "(b * d * e + b * c * f + a * d * f) / (b * d * f)" |> Future.join;
    1.63  val ((pt, p), _) = get_calc 1;
    1.64  (*show_pt pt;
    1.65  [
    1.66 @@ -573,7 +573,7 @@
    1.67  else error ("inform.sml: [rational,simplification] 2");
    1.68  
    1.69  "--- (3) input the exact final result";
    1.70 -appendFormula 1 "(b * d * e + b * c * f + a * d * f) / (b * d * f)";
    1.71 +appendFormula 1 "(b * d * e + b * c * f + a * d * f) / (b * d * f)" |> Future.join;
    1.72  val ((pt, p), _) = get_calc 1;
    1.73  (*show_pt pt;
    1.74  [
    1.75 @@ -1119,7 +1119,7 @@
    1.76  autoCalculate 1 CompleteCalcHead;
    1.77  autoCalculate 1 (Step 1);
    1.78  autoCalculate 1 (Step 1);(*([1], Res), d_d x (x ^^^ 2) + d_d x (sin (x ^^^ 4))*)
    1.79 -appendFormula 1 "d_d x (x ^ 2) + cos (4 * x ^ 3)";
    1.80 +appendFormula 1 "d_d x (x ^ 2) + cos (4 * x ^ 3)" |> Future.join;
    1.81    (*<CALCMESSAGE> error pattern #chain-rule-diff-both# </CALCMESSAGE>*)
    1.82    (*or
    1.83      <CALCMESSAGE> no derivation found </CALCMESSAGE>*)
    1.84 @@ -1201,7 +1201,7 @@
    1.85  autoCalculate 1 CompleteCalcHead;
    1.86  autoCalculate 1 (Step 1);
    1.87  autoCalculate 1 (Step 1);(*([1], Res), d_d x (x ^^^ 2) + d_d x (sin (x ^^^ 4))*)
    1.88 -appendFormula 1 "d_d x (x ^ 2) + cos (4 * x ^ 3)"; (*<<<<<<<=========================*)
    1.89 +appendFormula 1 "d_d x (x ^ 2) + cos (4 * x ^ 3)" |> Future.join; (*<<<<<<<=========================*)
    1.90  (* the check for errpat is maximally liberal (whole term modulo "nrls" from "type met"),
    1.91    would recognize "cos (4 * x ^ (4 - 1)) + 2 * x" as well.
    1.92    results in <CALCMESSAGE> error pattern #chain-rule-diff-both# </CALCMESSAGE>