1.1 --- a/test/Tools/isac/OLDTESTS/subp-rooteq.sml	Thu Nov 21 17:31:20 2013 +0100
     1.2 +++ b/test/Tools/isac/OLDTESTS/subp-rooteq.sml	Thu Nov 21 18:12:17 2013 +0100
     1.3 @@ -99,7 +99,7 @@
     1.4                                    ########## OK*)
     1.5    p;
     1.6    writeln(istate2str (fst (get_istate pt ([3],Frm))));
     1.7 -(*val nxt = ("Model_Problem",Model_Problem ["linear","univariate","equation"]*)
     1.8 +(*val nxt = ("Model_Problem",Model_Problem ["LINEAR","univariate","equation"]*)
     1.9  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.10  (*val nxt = ("Add_Given",Add_Given "equality (-1 + x = 0)") *)
    1.11  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.12 @@ -109,7 +109,7 @@
    1.13  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.14  (*val nxt = ("Specify_Theory",Specify_Theory "Test")*)
    1.15  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.16 -(*("Specify_Problem",Specify_Problem ["linear","univariate","equation"])*)
    1.17 +(*("Specify_Problem",Specify_Problem ["LINEAR","univariate","equation"])*)
    1.18  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.19  (*val nxt = ("Specify_Method",Specify_Method ("Test","solve_linear"))*)
    1.20    val Prog sc = (#scr o get_met) ["Test","solve_linear"];
    1.21 @@ -122,7 +122,7 @@
    1.22  (*val nxt = ("Rewrite_Set",Rewrite_Set "Test_simplify")*)
    1.23  
    1.24  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.25 -(*val nxt = ("Check_Postcond",Check_Postcond ["linear","univariate","eq*)
    1.26 +(*val nxt = ("Check_Postcond",Check_Postcond ["LINEAR","univariate","eq*)
    1.27  
    1.28  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.29    p;
    1.30 @@ -142,7 +142,7 @@
    1.31  val fmz = ["equality (1+-1*2+x=(0::real))",
    1.32  	   "solveFor x","solutions L"];
    1.33  val (dI',pI',mI') =
    1.34 -  ("Test",["linear","univariate","equation","test"],
    1.35 +  ("Test",["LINEAR","univariate","equation","test"],
    1.36     ["Test","solve_linear"]);
    1.37  
    1.38  val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))]; 
    1.39 @@ -257,9 +257,9 @@
    1.40  (*"x ^^^ 2 + 5 * x + -1 * (4 + (x ^^^ 2 + 4 * x)) = 0"*)
    1.41  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.42  (*"-4 + x = 0"
    1.43 -  val nxt =("Subproblem",Subproblem ("Test",["linear","univariate"...*)
    1.44 +  val nxt =("Subproblem",Subproblem ("Test",["LINEAR","univariate"...*)
    1.45  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.46 -(*val nxt =("Model_Problem",Model_Problem ["linear","univariate"...*)
    1.47 +(*val nxt =("Model_Problem",Model_Problem ["LINEAR","univariate"...*)
    1.48  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.49  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.50  
    1.51 @@ -267,14 +267,14 @@
    1.52  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.53  (*val nxt = ("Specify_Theory",Specify_Theory "Test")*)
    1.54  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.55 -(*("Specify_Problem",Specify_Problem ["linear","univariate","equation"])*)
    1.56 +(*("Specify_Problem",Specify_Problem ["LINEAR","univariate","equation"])*)
    1.57  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.58  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.59  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.60  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.61  (*"x = 0 + -1 * -4", nxt Test_simplify*)
    1.62  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.63 -(*"x = 4", nxt Check_Postcond ["linear","univariate","equation","test"]*)
    1.64 +(*"x = 4", nxt Check_Postcond ["LINEAR","univariate","equation","test"]*)
    1.65  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.66  (*"[x = 4]", nxt Check_elementwise "Assumptions"*)
    1.67  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.68 @@ -402,14 +402,14 @@
    1.69  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.70  (*"-4 + x = 0", nxt Subproblem ("Test",["univariate","equation"]))*)
    1.71  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.72 -(*val nxt =("Model_Problem",Model_Problem ["linear","univar...*)
    1.73 +(*val nxt =("Model_Problem",Model_Problem ["LINEAR","univar...*)
    1.74  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.75  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.76  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.77  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.78  (*val nxt = ("Specify_Theory",Specify_Theory "Test")*)
    1.79  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.80 -(*val nxt = ("Specify_Problem",Specify_Problem ["linear","univariate","equ*)
    1.81 +(*val nxt = ("Specify_Problem",Specify_Problem ["LINEAR","univariate","equ*)
    1.82  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.83  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.84  (*Apply_Method ("Test","norm_univar_equation")*)
    1.85 @@ -514,7 +514,7 @@
    1.86  val (p,_,f,nxt,_,pt) = me nxt p c pt;
    1.87  (*val nxt = ("Subproblem",Subproblem ("Test",["univariate","equation"])*)
    1.88  val (p,_,f,nxt,_,pt) = me nxt p c pt;
    1.89 -(*val nxt = ("Model_Problem",Model_Problem ["linear","univariate","equation"]*)
    1.90 +(*val nxt = ("Model_Problem",Model_Problem ["LINEAR","univariate","equation"]*)
    1.91  val (p,_,f,nxt,_,pt) = me nxt p c pt;
    1.92  val (p,_,f,nxt,_,pt) = me nxt p c pt;
    1.93  val (p,_,f,nxt,_,pt) = me nxt p c pt;
    1.94 @@ -526,7 +526,7 @@
    1.95  val (p,_,f,nxt,_,pt) = me nxt p c pt;
    1.96  val (p,_,f,nxt,_,pt) = me nxt p c pt;
    1.97  val (p,_,f,nxt,_,pt) = me nxt p c pt;
    1.98 -(*val nxt = ("Check_Postcond",Check_Postcond ["linear","univariate","equatio*)
    1.99 +(*val nxt = ("Check_Postcond",Check_Postcond ["LINEAR","univariate","equatio*)
   1.100  val (p,_,f,nxt,_,pt) = me nxt p c pt;
   1.101  (*val nxt = ("Check_Postcond",Check_Postcond ["normalize","univariate","equa*)
   1.102  val (p,_,Form' (FormKF (_,_,_,_,f)),nxt,_,_) =