1.1 --- a/test/Tools/isac/Knowledge/polyeq-2.sml Wed Oct 19 15:39:15 2022 +0200
1.2 +++ b/test/Tools/isac/Knowledge/polyeq-2.sml Thu Oct 20 10:23:38 2022 +0200
1.3 @@ -31,7 +31,7 @@
1.4 val (dI',pI',mI') =
1.5 ("PolyEq",["degree_2", "expanded", "univariate", "equation"],
1.6 ["PolyEq", "complete_square"]);
1.7 -val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.8 +val (p,_,f,nxt,_,pt) = Test_Code.init_calc @{context} [(fmz, (dI',pI',mI'))];
1.9 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.10 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.11 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.12 @@ -69,7 +69,7 @@
1.13 val (dI',pI',mI') =
1.14 ("PolyEq",["degree_2", "expanded", "univariate", "equation"],
1.15 ["PolyEq", "complete_square"]);
1.16 -val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.17 +val (p,_,f,nxt,_,pt) = Test_Code.init_calc @{context} [(fmz, (dI',pI',mI'))];
1.18 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.19 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.20 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.21 @@ -96,7 +96,7 @@
1.22 val (dI',pI',mI') =
1.23 ("PolyEq",["degree_2", "expanded", "univariate", "equation"],
1.24 ["PolyEq", "complete_square"]);
1.25 -val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.26 +val (p,_,f,nxt,_,pt) = Test_Code.init_calc @{context} [(fmz, (dI',pI',mI'))];
1.27 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.28 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.29 val (p,_,f,nxt,_,pt) = me nxt p [] pt; val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.30 @@ -121,7 +121,7 @@
1.31 (* Refine.refine fmz ["univariate", "equation"];
1.32 *)
1.33 val (dI',pI',mI') = ("PolyEq",["univariate", "equation"],["no_met"]);
1.34 -val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.35 +val (p,_,f,nxt,_,pt) = Test_Code.init_calc @{context} [(fmz, (dI',pI',mI'))];
1.36 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.37 (* val nxt =
1.38 ("Model_Problem",
1.39 @@ -159,7 +159,7 @@
1.40 val fmz = ["equality ((x+1)*(x+2) - (3*x - 2) \<up> 2=(2*x - 1) \<up> 2+(3*x - 1)*(x+1))",
1.41 "solveFor x", "solutions L"];
1.42 val (dI',pI',mI') = ("PolyEq",["univariate", "equation"],["no_met"]);
1.43 -val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.44 +val (p,_,f,nxt,_,pt) = Test_Code.init_calc @{context} [(fmz, (dI',pI',mI'))];
1.45 (*val nxt = ("Refine_Tacitly",Refine_Tacitly ["univariate", "equation"])*)
1.46 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.47 (* val nxt =
1.48 @@ -199,7 +199,7 @@
1.49 (* val fmz = ["equality (1 + x \<up> 2 =0)", "solveFor x", "solutions L"];*)
1.50 (*val fmz = ["equality (0 =0)", "solveFor x", "solutions L"];*)
1.51 val (dI',pI',mI') = ("PolyEq",["univariate", "equation"],["no_met"]);
1.52 -val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.53 +val (p,_,f,nxt,_,pt) = Test_Code.init_calc @{context} [(fmz, (dI',pI',mI'))];
1.54
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 @@ -263,7 +263,7 @@
1.58 "----------- interSteps ([1],Res); on Schalk Is86Bsp5-------------";
1.59 "----------- interSteps ([1],Res); on Schalk Is86Bsp5-------------";
1.60 States.reset ();
1.61 -CalcTree
1.62 +CalcTree @{context}
1.63 [(["equality ((3::real)*x - 1 - (5*x - (2 - 4*x)) = - 11)", "solveFor x", "solutions L"],
1.64 ("PolyEq",["univariate", "equation"],["no_met"]))];
1.65 Iterator 1;