1.1 --- a/test/Tools/isac/Knowledge/rlang.sml Sat Feb 10 16:21:12 2018 +0100
1.2 +++ b/test/Tools/isac/Knowledge/rlang.sml Tue Feb 13 15:14:55 2018 +0100
1.3 @@ -402,7 +402,7 @@
1.4 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.5 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.6 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.7 - (*"12 * x + 4 * x ^^^ 2 = 4 * (-4 + x ^^^ 2)",Subproblem["normalize", "poly*)
1.8 + (*"12 * x + 4 * x ^^^ 2 = 4 * (-4 + x ^^^ 2)",Subproblem["normalise", "poly*)
1.9 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.10 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.11 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.12 @@ -517,7 +517,7 @@
1.13 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.14 (*nxt = Subproblem ("RatEq",["univariate","equation"])) *)
1.15 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.16 -(*val nxt =Model_Problem ["normalize","polynomial","univariate","equation"])*)
1.17 +(*val nxt =Model_Problem ["normalise","polynomial","univariate","equation"])*)
1.18 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.19 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.20 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.21 @@ -552,7 +552,7 @@
1.22 val nxt = Check_Postcond ["degree_1","polynomial","univariate","equation"])*)
1.23 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.24 (*val f = "[v = -1 * (f * w + -1 * u * v0 + -1 * v0 * w) / f]")) : mout
1.25 -val nxt = Check_Postcond ["normalize","polynomial","univariate","equation"])*)
1.26 +val nxt = Check_Postcond ["normalise","polynomial","univariate","equation"])*)
1.27 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.28 (*val f = "[v = -1 * (f * w + -1 * u * v0 + -1 * v0 * w) / f]")) : mout
1.29 val nxt = ("Check_elementwise",Check_elementwise "Assumptions")*)
1.30 @@ -873,7 +873,7 @@
1.31 val (mI,m) = ("Init_Proof",Init_Proof (fmz, (dI',pI',mI')));
1.32 val (p,_,f,nxt,_,pt) = me (mI,m) p c EmptyPtree;*)
1.33 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.34 -(* val nxt = ("Model_Problem",Model_Problem ["normalize","root'","univariate","equation"])*)
1.35 +(* val nxt = ("Model_Problem",Model_Problem ["normalise","root'","univariate","equation"])*)
1.36 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.37 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.38 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.39 @@ -896,7 +896,7 @@
1.40 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.41 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.42 get_assumptions_ pt p;
1.43 -(* val nxt = ("Model_Problem", Model_Problem ["normalize","polynomial","univariate","equation"])*)
1.44 +(* val nxt = ("Model_Problem", Model_Problem ["normalise","polynomial","univariate","equation"])*)
1.45 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.46 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.47 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.48 @@ -1081,7 +1081,7 @@
1.49 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.50 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.51 (*val nxt = ("Model_Problem",
1.52 - Model_Problem ["normalize","polynomial","univariate","equation"])*)
1.53 + Model_Problem ["normalise","polynomial","univariate","equation"])*)
1.54 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.55 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.56 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.57 @@ -1386,7 +1386,7 @@
1.58 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.59 (*val nxt = ("Specify_Theory",Specify_Theory "PolyEq")*)
1.60 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.61 -(* nxt = Specify_Problem ["normalize","polynomial","univariate","equation"])*)
1.62 +(* nxt = Specify_Problem ["normalise","polynomial","univariate","equation"])*)
1.63 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.64 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.65 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.66 @@ -1416,10 +1416,10 @@
1.67 (*val (p,_,f,nxt,_,pt) = me nxt p [1] pt;introducing MGs norm_Rational*)
1.68 (*val p = ([4,6,5],Res) val f ="[x =\n (2 * a * b + -1 * a ^^^ 2 + -1 * b ^^^ 2 +\n sqrt\n (a ^^^ 4 + b ^^^ 4 + -4 * a * a * b ^^^ 2 + -4 * a * b * a ^^^ 2 +\n -4 * b * b * a ^^^ 2 +\n 4 * a * a * b ^^^ 2 +\n 4 * a * b * a ^^^ 2 +\n 2 * a ^^^ 2 * b ^^^ 2)) /\n (-2 * a + 2 * #"
1.69 nx Check_Postcond["abcFormula","degree_2","polynomial","univariate","equation*)
1.70 -(*9.9.03: -"- ["normalize","polynomial","univar...*)
1.71 +(*9.9.03: -"- ["normalise","polynomial","univar...*)
1.72 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.73 (*val p = ([4,6],Res)
1.74 -val nxt =Check_Postcond ["normalize","polynomial","univariate","equation"])*)
1.75 +val nxt =Check_Postcond ["normalise","polynomial","univariate","equation"])*)
1.76 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.77 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;(*1 additional for MGs norm_Rational*)
1.78 if p = ([],Res) andalso f = Form' (FormKF (~1,EdUndef,0,Nundef,
1.79 @@ -1537,7 +1537,7 @@
1.80 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.81 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.82 (*val nxt = ("Model_Problem",
1.83 - Model_Problem ["normalize","polynomial","univariate","equation"])*)
1.84 + Model_Problem ["normalise","polynomial","univariate","equation"])*)
1.85 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.86 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.87 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.88 @@ -1590,7 +1590,7 @@
1.89 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.90 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.91 (* val nxt = ("Model_Problem",
1.92 - Model_Problem ["normalize","polynomial","univariate","equation"])*)
1.93 + Model_Problem ["normalise","polynomial","univariate","equation"])*)
1.94 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.95 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.96 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.97 @@ -1693,7 +1693,7 @@
1.98 "solveFor a","solutions L"];
1.99 val (dI',pI',mI') = ("PolyEq",["univariate","equation"],["no_met"]);
1.100 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.101 -(* Model_Problem ["normalize","polynomial","univariate","equation"])*)
1.102 +(* Model_Problem ["normalise","polynomial","univariate","equation"])*)
1.103 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.104 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.105 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.106 @@ -1740,7 +1740,7 @@
1.107 val (dI',pI',mI') = ("PolyEq",["univariate","equation"],["no_met"]);
1.108
1.109 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.110 -(* Model_Problem ["normalize","root'","univariate","equation"])*)
1.111 +(* Model_Problem ["normalise","root'","univariate","equation"])*)
1.112 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.113 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.114 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.115 @@ -1770,7 +1770,7 @@
1.116 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.117 (*val nxt = Subproblem ("RootEq",["univariate","equation"]))*)
1.118 val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.119 -(*val nxt = Model_Problem ["normalize","polynomial","univariate","equation"]) *)
1.120 +(*val nxt = Model_Problem ["normalise","polynomial","univariate","equation"]) *)
1.121 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.122 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.123 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;