1.1 --- a/test/Tools/isac/Interpret/mathengine.sml	Fri Jun 13 12:06:38 2014 +0200
     1.2 +++ b/test/Tools/isac/Interpret/mathengine.sml	Fri Jun 13 12:42:15 2014 +0200
     1.3 @@ -12,7 +12,7 @@
     1.4  "----------- fun step: Apply_Method without init_form ---";
     1.5  "----------- fun step -----------------------------------";
     1.6  "----------- fun autocalc -------------------------------";
     1.7 -"----------- fun autoCalculate --------------------------";
     1.8 +"----------- fun autoCalculate' --------------------------";
     1.9  "----------- fun autoCalculate..CompleteCalc ------------";
    1.10  "----------- search for Or_to_List ----------------------";
    1.11  "----------- check thy in CalcTreeTEST ------------------";
    1.12 @@ -196,7 +196,7 @@
    1.13  	    "solveFor x", "solutions L"],
    1.14  	   ("RatEq",["univariate","equation"],["no_met"]))];
    1.15  Iterator 1;
    1.16 -moveActiveRoot 1; autoCalculate 1 CompleteCalc;
    1.17 +moveActiveRoot 1; autoCalculate' 1 CompleteCalc;
    1.18  
    1.19  refineProblem 1 ([1],Res) "pbl_equ_univ" 
    1.20  (*gives "pbl_equ_univ_rat" correct*);
    1.21 @@ -221,7 +221,7 @@
    1.22  moveActiveRoot 1; 
    1.23  getFormulaeFromTo 1 ([],Pbl) ([],Pbl) 0 false; 
    1.24  getFormulaeFromTo 1 ([],Pbl) ([],Pbl) 0 false; 
    1.25 -(*completeCalcHead*)autoCalculate 1 CompleteCalcHead; 
    1.26 +(*completeCalcHead*)autoCalculate' 1 CompleteCalcHead; 
    1.27  (*completeCalcHead*)getActiveFormula 1 ; 
    1.28  (*completeCalcHead*)refFormula 1 ([],Met); 
    1.29  refFormula 1 ([],Pbl); 
    1.30 @@ -326,9 +326,9 @@
    1.31  ========== inhibit exn AK110718 ==============================================*)
    1.32  
    1.33  
    1.34 -"----------- fun autoCalculate -----------------------------------";
    1.35 -"----------- fun autoCalculate -----------------------------------";
    1.36 -"----------- fun autoCalculate -----------------------------------";
    1.37 +"----------- fun autoCalculate' -----------------------------------";
    1.38 +"----------- fun autoCalculate' -----------------------------------";
    1.39 +"----------- fun autoCalculate' -----------------------------------";
    1.40  reset_states ();
    1.41  CalcTree (*ATTENTION: encode_fmz ... unlike CalcTreeTEST*)
    1.42      [(["functionTerm (x^2 + 1)", "integrateBy x", "antiDerivative FF"],
    1.43 @@ -339,42 +339,42 @@
    1.44  modeling is skipped FIXME 
    1.45  see test/../interface -- solve_linear as rootpbl FE -- for OTHER expl:
    1.46   setNextTactic 1 (Add_Given "equality (1 + -1 * 2 + x = 0)");
    1.47 - autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1); (*equality added*);
    1.48 + autoCalculate' 1 (Step 1); refFormula 1 (get_pos 1 1); (*equality added*);
    1.49  
    1.50   fetchProposedTactic 1;
    1.51   setNextTactic 1 (Add_Given "solveFor x");
    1.52 - autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1);
    1.53 + autoCalculate' 1 (Step 1); refFormula 1 (get_pos 1 1);
    1.54  
    1.55   fetchProposedTactic 1;
    1.56   setNextTactic 1 (Add_Find "solutions L");
    1.57 - autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1);
    1.58 + autoCalculate' 1 (Step 1); refFormula 1 (get_pos 1 1);
    1.59  
    1.60   fetchProposedTactic 1;
    1.61   setNextTactic 1 (Specify_Theory "Test");
    1.62 - autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1);
    1.63 + autoCalculate' 1 (Step 1); refFormula 1 (get_pos 1 1);
    1.64  *-----since Model_Problem + complete_mod_ in case cas of SOME-----*)
    1.65 -autoCalculate 1 (Step 1); 
    1.66 +autoCalculate' 1 (Step 1); 
    1.67  "----- step 1 ---";
    1.68 -autoCalculate 1 (Step 1);
    1.69 +autoCalculate' 1 (Step 1);
    1.70  "----- step 2 ---";
    1.71 -autoCalculate 1 (Step 1);
    1.72 +autoCalculate' 1 (Step 1);
    1.73  "----- step 3 ---";
    1.74 -autoCalculate 1 (Step 1);
    1.75 +autoCalculate' 1 (Step 1);
    1.76  "----- step 4 ---";
    1.77 -autoCalculate 1 (Step 1);
    1.78 +autoCalculate' 1 (Step 1);
    1.79  "----- step 5 ---";
    1.80 -autoCalculate 1 (Step 1);
    1.81 +autoCalculate' 1 (Step 1);
    1.82  "----- step 6 ---";
    1.83 -autoCalculate 1 (Step 1);
    1.84 +autoCalculate' 1 (Step 1);
    1.85  "----- step 7 ---";
    1.86 -autoCalculate 1 (Step 1);
    1.87 +autoCalculate' 1 (Step 1);
    1.88  "----- step 8 ---";
    1.89 -autoCalculate 1 (Step 1);
    1.90 +autoCalculate' 1 (Step 1);
    1.91  val (ptp as (_, p), _) = get_calc 1;
    1.92  val (Form t,_,_) = pt_extract ptp;
    1.93  
    1.94  if term2str t = "c + x + 1 / 3 * x ^^^ 3" andalso p = ([], Res) then ()
    1.95 -else error "mathengine.sml -- fun autoCalculate -- end";
    1.96 +else error "mathengine.sml -- fun autoCalculate' -- end";
    1.97  
    1.98  "----------- fun autoCalculate..CompleteCalc ------------";
    1.99  "----------- fun autoCalculate..CompleteCalc ------------";
   1.100 @@ -385,7 +385,7 @@
   1.101      ["Test","squ-equ-test-subpbl1"]))];
   1.102   Iterator 1;
   1.103   moveActiveRoot 1; 
   1.104 -(*autoCalculate 1 CompleteCalc; (*WAS <SYSERROR>..<ERROR> error in kernel </ERROR>*)*)
   1.105 +(*autoCalculate' 1 CompleteCalc; (*WAS <SYSERROR>..<ERROR> error in kernel </ERROR>*)*)
   1.106  "~~~~~ fun autoCalculate, args:"; val (cI, auto) = (1, CompleteCalc);
   1.107  val pold = get_pos cI 1;
   1.108  (*autocalc [] pold (get_calc cI) auto;  (*WAS Type unification failed