diff -r 56654afad89f -r f1fdb213717b test/Tools/isac/Interpret/error-pattern.sml --- a/test/Tools/isac/Interpret/error-pattern.sml Thu May 14 16:58:33 2020 +0200 +++ b/test/Tools/isac/Interpret/error-pattern.sml Fri May 15 11:46:43 2020 +0200 @@ -480,7 +480,7 @@ Compare tests "CAS-command" in test/../inssort.sml etc. --------------------------------------------------------------------------------------------- -show_pt pt; +Test_Tool.show_pt pt; val nxt = (Apply_Method ["Test","squ-equ-test-subpbl1"]); val (p,_,f,nxt,_,pt) = me nxt p [] pt; if p = ([1], Frm) andalso f2str f = "x + 1 = 2" then () @@ -498,7 +498,7 @@ replaceFormula 1 "solve(x+1=2,x)"; autoCalculate 1 CompleteCalc; val ((pt,p),_) = get_calc 1; -show_pt pt; +Test_Tool.show_pt pt; if p = ([], Res) then () else error "inform.sml: diff.behav. CAScmd ([],Pbl) FE-interface"; DEconstrCalcTree 1; @@ -516,7 +516,7 @@ (* autoCalculate 1 CompleteCalc; val ((pt, p), _) = get_calc 1; -show_pt pt; +Test_Tool.show_pt pt; [ (([], Frm), Simplify (a * x / (b * x) + c * x / (d * x) + e / f)), (([1], Frm), a * x / (b * x) + c * x / (d * x) + e / f), @@ -531,7 +531,7 @@ autoCalculate 1 (Steps 1); autoCalculate 1 (Steps 1); val ((pt, p), _) = get_calc 1; -(*show_pt pt; +(*Test_Tool.show_pt pt; [ (([], Frm), Simplify (a * x / (b * x) + c * x / (d * x) + e / f)), (([1], Frm), a * x / (b * x) + c * x / (d * x) + e / f), @@ -540,7 +540,7 @@ "--- (1) input an arbitrary next formula"; appendFormula 1 "((a * d) + (c * b)) / (b * d) + e / f" (*|> Future.join*); val ((pt, p), _) = get_calc 1; -(*show_pt pt; +(*Test_Tool.show_pt pt; [ (([], Frm), Simplify (a * x / (b * x) + c * x / (d * x) + e / f)), (([1], Frm), a * x / (b * x) + c * x / (d * x) + e / f), @@ -558,7 +558,7 @@ (* generate a preview: autoCalculate 1 (Steps 1); val ((pt, p), _) = get_calc 1; -show_pt pt; +Test_Tool.show_pt pt; [ (([], Frm), Simplify (a * x / (b * x) + c * x / (d * x) + e / f)), (([1], Frm), a * x / (b * x) + c * x / (d * x) + e / f), @@ -571,7 +571,7 @@ *) appendFormula 1 "(b * d * e + b * c * f + a * d * f) / (b * d * f)" (*|> Future.join*); val ((pt, p), _) = get_calc 1; -(*show_pt pt; +(*Test_Tool.show_pt pt; [ (([], Frm), Simplify (a * x / (b * x) + c * x / (d * x) + e / f)), (([1], Frm), a * x / (b * x) + c * x / (d * x) + e / f), @@ -588,7 +588,7 @@ "--- (3) input the exact final result"; appendFormula 1 "(b * d * e + b * c * f + a * d * f) / (b * d * f)" (*|> Future.join*); val ((pt, p), _) = get_calc 1; -(*show_pt pt; +(*Test_Tool.show_pt pt; [ (([], Frm), Simplify (a * x / (b * x) + c * x / (d * x) + e / f)), (([1], Frm), a * x / (b * x) + c * x / (d * x) + e / f), @@ -614,7 +614,7 @@ UnparseC.terms asm =(*"[\"b * d * f \ 0\",\"d \ 0\",\"b \ 0\",\"a * x / (b * x) + c * x / (d * x) + e / f is_ratpolyexp\"]"*) "[]" (*..found broken in child of 33913fe24685, error covered by CAS-command *) then () else error "inform [rational,simplification] changed at end"; -(*show_pt pt; +(*Test_Tool.show_pt pt; [ (([], Frm), Simplify (a * x / (b * x) + c * x / (d * x) + e / f)), (([1], Frm), a * x / (b * x) + c * x / (d * x) + e / f), @@ -692,8 +692,8 @@ (*WN081028 fixed helpless by inform returning ...(.,Met)*) autoCalculate 1 CompleteCalc; val ((pt,p),_) = get_calc 1; -val Form res = (#1 o pt_extract) (pt, ([],Res)); -show_pt pt; +val Form res = (#1 o ME_Misc.pt_extract) (pt, ([],Res)); +Test_Tool.show_pt pt; if p = ([], Res) andalso UnparseC.term res = "1 + 2 * x" then () else error "diff.sml behav.changed for Diff (x^2 + x + 1, x)"; DEconstrCalcTree 1; @@ -734,7 +734,7 @@ (*7>*)fetchProposedTactic 1 (*--> Apply_Method*); autoCalculate 1 (Steps 1); val ((pt,p),_) = get_calc 1; -val Form res = (#1 o pt_extract) (pt, p); +val Form res = (#1 o ME_Misc.pt_extract) (pt, p); if UnparseC.term res = "d_d x (x ^^^ 2 + x + 1)" then () else error "diff.sml Diff (x^2 + x + 1, x) from exp"; DEconstrCalcTree 1; @@ -1165,7 +1165,7 @@ instead of no derivation found *) val ((pt,pos), _) = get_calc 1; val p = get_pos 1 1; - val (Form f, _, asms) = pt_extract (pt, p); + val (Form f, _, asms) = ME_Misc.pt_extract (pt, p); if p = ([1], Res) andalso UnparseC.term f = "d_d x (x ^^^ 2) + d_d x (sin (x ^^^ 4))" then case get_obj g_tac pt (fst p) of Rewrite_Inst (["(''bdv'', x)"], @@ -1181,7 +1181,7 @@ val ((pt,pos),_) = get_calc 1; val p = get_pos 1 1; - val (Form f, _, asms) = pt_extract (pt, p); + val (Form f, _, asms) = ME_Misc.pt_extract (pt, p); if p = ([1], Res) andalso UnparseC.term f = "d_d x (x ^^^ 2) + d_d x (sin (x ^^^ 4))" then case get_obj g_tac pt (fst p) of Rewrite_Inst (["(''bdv'', x)"], ("diff_sum", thm)) => @@ -1194,7 +1194,7 @@ (* ([1], Res) ([2], Res) ([2], Res) *) val ((pt,pos),_) = get_calc 1; val p = get_pos 1 1; - val (Form f, _, asms) = pt_extract (pt, p); + val (Form f, _, asms) = ME_Misc.pt_extract (pt, p); if p = ([1], Res) andalso existpt [2] pt andalso UnparseC.term f = "d_d x (x ^^^ 2) + d_d x (sin (x ^^^ 4))" then case get_obj g_tac pt (fst p) of Rewrite_Inst (["(''bdv'', x)"], @@ -1233,7 +1233,7 @@ "~~~~~ final check:"; val ((pt, _),_) = get_calc 1; val p = get_pos 1 1; -val (Form f, _, asms) = pt_extract (pt, p); +val (Form f, _, asms) = ME_Misc.pt_extract (pt, p); if p = ([2], Res) andalso UnparseC.term f = "d_d x (x ^^^ 2) + cos (x ^^^ 4) * d_d x (x ^^^ 4)" then case get_obj g_tac pt (fst p) of Rewrite_Inst (["(''bdv'', x)"], ("diff_sin_chain", thm)) => @@ -1250,8 +1250,8 @@ ...vvv *) (* val (dI, oris, ppc, pbt, (selct::ss))= - (#1 (some_spec ospec spec), oris, []:I_Model.T, - ((#ppc o Problem.from_store) (#2 (some_spec ospec spec))),(imodel2fstr imodel)); + (#1 (References.select ospec spec), oris, []:I_Model.T, + ((#ppc o Problem.from_store) (#2 (References.select ospec spec))),(imodel2fstr imodel)); val iii = appl_adds dI oris ppc pbt (selct::ss); tracing(I_Model.to_string thy iii);