1.1 --- a/test/Tools/isac/MathEngBasic/ctree.sml Sun Oct 23 16:08:27 2022 +0200
1.2 +++ b/test/Tools/isac/MathEngBasic/ctree.sml Sun Oct 23 17:21:04 2022 +0200
1.3 @@ -229,7 +229,7 @@
1.4 error "ctree.sml: diff:behav. in cut_level 1ab";
1.5 ============ inhibit exn AK110726 ==============================================*)
1.6 (*============ inhibit exn AK110726 ==============================================
1.7 -if map fst3 (ME_Misc.get_interval ([],Frm) ([],Res) 9999 pt') =
1.8 +if map fst3 (ME_Misc.get_interval ctxt ([],Frm) ([],Res) 9999 pt') =
1.9 [([], Frm),
1.10 ([1], Frm),
1.11 ([1], Res),
1.12 @@ -300,7 +300,7 @@
1.13 if res = TermC.empty (*WN050219 done by cut_tree*) then () else
1.14 error "ctree.sml: diff:behav. in cut_tree 1ac";
1.15
1.16 -if map fst3 (ME_Misc.get_interval ([],Frm) ([],Res) 9999 pt') =
1.17 +if map fst3 (ME_Misc.get_interval ctxt ([],Frm) ([],Res) 9999 pt') =
1.18 [([], Frm),
1.19 ([1], Frm),
1.20 ([1], Res)] then () else
1.21 @@ -373,7 +373,7 @@
1.22 Test_Tool.show_pt pt;
1.23 Test_Tool.show_pt pt';
1.24 (*default_print_depth 99;*)cuts;(*default_print_depth 3;*)
1.25 -(*default_print_depth 99;*)map fst3 (ME_Misc.get_interval ([],Frm) ([],Res) 9999 pt');(*default_print_depth 3;*)
1.26 +(*default_print_depth 99;*)map fst3 (ME_Misc.get_interval ctxt ([],Frm) ([],Res) 9999 pt');(*default_print_depth 3;*)
1.27 ####################################################################*)
1.28
1.29
1.30 @@ -886,7 +886,7 @@
1.31 "-------------- ME_Misc.pt_extract form, tac, asm<>[] --------------------";
1.32 "-------------- ME_Misc.pt_extract form, tac, asm<>[] --------------------";
1.33 "-------------- ME_Misc.pt_extract form, tac, asm<>[] --------------------";
1.34 -val (Form form, SOME tac, asm) = ME_Misc.pt_extract (pt, ([3], Res));
1.35 +val (Form form, SOME tac, asm) = ME_Misc.pt_extract ctxt (pt, ([3], Res));
1.36 case (UnparseC.term form, tac, UnparseC.terms_to_strings asm) of
1.37 ("(3 + - 1 * x + x \<up> 2) * x = 1 * (9 * x + - 6 * x \<up> 2 + x \<up> 3)",
1.38 Subproblem
1.39 @@ -924,68 +924,68 @@
1.40 "-------------- ME_Misc.pt_extract form, tac, asm ------------------------";
1.41 "-------------- ME_Misc.pt_extract form, tac, asm ------------------------";
1.42 "-------------- ME_Misc.pt_extract form, tac, asm ------------------------";
1.43 -val (ModSpec (_,_,form,_,_,_), SOME tac, asm) = ME_Misc.pt_extract (pt, ([], Frm));
1.44 +val (ModSpec (_,_,form,_,_,_), SOME tac, asm) = ME_Misc.pt_extract ctxt (pt, ([], Frm));
1.45 case (UnparseC.term form, tac, UnparseC.terms_to_strings asm) of
1.46 ("solve (x + 1 = 2, x)",
1.47 Apply_Method ["Test", "squ-equ-test-subpbl1"],
1.48 []) => ()
1.49 - | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ([], Pbl)";
1.50 + | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ctxt ([], Pbl)";
1.51
1.52 -val (Form form, SOME tac, asm) = ME_Misc.pt_extract (pt, ([1], Frm));
1.53 +val (Form form, SOME tac, asm) = ME_Misc.pt_extract ctxt (pt, ([1], Frm));
1.54 case (UnparseC.term form, tac, UnparseC.terms_to_strings asm) of
1.55 ("x + 1 = 2", Rewrite_Set "norm_equation", []) => ()
1.56 - | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ([1], Frm)";
1.57 + | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ctxt ([1], Frm)";
1.58
1.59 -val (Form form, SOME tac, asm) = ME_Misc.pt_extract (pt, ([1], Res));
1.60 +val (Form form, SOME tac, asm) = ME_Misc.pt_extract ctxt (pt, ([1], Res));
1.61 case (UnparseC.term form, tac, UnparseC.terms_to_strings asm) of
1.62 ("x + 1 + - 1 * 2 = 0", Rewrite_Set "Test_simplify", []) => ()
1.63 - | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ([1], Res)";
1.64 + | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ctxt ([1], Res)";
1.65
1.66 -val (Form form, SOME tac, asm) = ME_Misc.pt_extract (pt, ([2], Res));
1.67 +val (Form form, SOME tac, asm) = ME_Misc.pt_extract ctxt (pt, ([2], Res));
1.68 case (UnparseC.term form, tac, UnparseC.terms_to_strings asm) of
1.69 ("- 1 + x = 0",
1.70 Subproblem ("Test", ["LINEAR", "univariate", "equation", "test"]),
1.71 []) => ()
1.72 - | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ([2], Res)";
1.73 + | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ctxt ([2], Res)";
1.74
1.75 -val (ModSpec (_,_,form,_,_,_), SOME tac, asm) = ME_Misc.pt_extract (pt, ([3], Pbl));
1.76 +val (ModSpec (_,_,form,_,_,_), SOME tac, asm) = ME_Misc.pt_extract ctxt (pt, ([3], Pbl));
1.77 case (UnparseC.term form, tac, UnparseC.terms_to_strings asm) of
1.78 ("solve (- 1 + x = 0, x)", Apply_Method ["Test", "solve_linear"], []) => ()
1.79 - | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ([3], Pbl)";
1.80 + | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ctxt ([3], Pbl)";
1.81
1.82 -val (Form form, SOME tac, asm) = ME_Misc.pt_extract (pt, ([3,1], Frm));
1.83 +val (Form form, SOME tac, asm) = ME_Misc.pt_extract ctxt (pt, ([3,1], Frm));
1.84 case (UnparseC.term form, tac, UnparseC.terms_to_strings asm) of
1.85 ("- 1 + x = 0", Rewrite_Set_Inst (["(''bdv'', x)"], "isolate_bdv"), []) => ()
1.86 - | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ([3,1], Frm)";
1.87 + | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ctxt ([3,1], Frm)";
1.88
1.89 -val (Form form, SOME tac, asm) = ME_Misc.pt_extract (pt, ([3,1], Res));
1.90 +val (Form form, SOME tac, asm) = ME_Misc.pt_extract ctxt (pt, ([3,1], Res));
1.91 case (UnparseC.term form, tac, UnparseC.terms_to_strings asm) of
1.92 ("x = 0 + - 1 * - 1", Rewrite_Set "Test_simplify", []) => ()
1.93 - | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ([3,1], Res)";
1.94 + | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ctxt ([3,1], Res)";
1.95
1.96 -val (Form form, SOME tac, asm) = ME_Misc.pt_extract (pt, ([3,2], Res));
1.97 +val (Form form, SOME tac, asm) = ME_Misc.pt_extract ctxt (pt, ([3,2], Res));
1.98 case (UnparseC.term form, tac, UnparseC.terms_to_strings asm) of
1.99 ("x = 1", Check_Postcond ["LINEAR", "univariate", "equation", "test"],
1.100 []) => ()
1.101 - | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ([3,2], Res)";
1.102 + | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ctxt ([3,2], Res)";
1.103
1.104 (*========== inhibit exn AK110719 ==============================================
1.105 -val (Form form, SOME tac, asm) = ME_Misc.pt_extract (pt, ([3], Res));
1.106 +val (Form form, SOME tac, asm) = ME_Misc.pt_extract ctxt (pt, ([3], Res));
1.107 case (UnparseC.term form, tac, UnparseC.terms_to_strings asm) of
1.108 ("[x = 1]", Check_elementwise "Assumptions", []) => ()
1.109 - | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ([3], Res)";
1.110 + | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ctxt ([3], Res)";
1.111
1.112 -val (Form form, SOME tac, asm) = ME_Misc.pt_extract (pt, ([4], Res));
1.113 +val (Form form, SOME tac, asm) = ME_Misc.pt_extract ctxt (pt, ([4], Res));
1.114 case (UnparseC.term form, tac, UnparseC.terms_to_strings asm) of
1.115 ("[x = 1]",
1.116 Check_Postcond ["sqroot-test", "univariate", "equation", "test"],
1.117 []) => ()
1.118 - | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ([4], Res)";
1.119 + | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ctxt ([4], Res)";
1.120
1.121 -val (Form form, tac, asm) = ME_Misc.pt_extract (pt, ([], Res));
1.122 +val (Form form, tac, asm) = ME_Misc.pt_extract ctxt (pt, ([], Res));
1.123 case (UnparseC.term form, tac, UnparseC.terms_to_strings asm) of
1.124 ("[x = 1]", NONE, []) => ()
1.125 - | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ([], Res)";
1.126 + | _ => error "diff.behav.in ctree.sml: ME_Misc.pt_extract ctxt ([], Res)";
1.127 ========== inhibit exn AK110719 ==============================================*)
1.128
1.129 "=====new ctree 6 minisubpbl intersteps ==========================";