1.1 --- a/test/Tools/isac/Interpret/me.sml Tue Sep 28 08:58:06 2010 +0200
1.2 +++ b/test/Tools/isac/Interpret/me.sml Tue Sep 28 09:06:56 2010 +0200
1.3 @@ -106,7 +106,7 @@
1.4 ([4], Res),
1.5 ([5], Res),
1.6 ([], Res)] => ()
1.7 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1f";
1.8 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1f";
1.9 case map fst (get_interval ([],Frm) ([],Res) 1 pt) of
1.10 [([], Frm),
1.11 ([1], Frm),
1.12 @@ -117,11 +117,11 @@
1.13 ([4], Res),
1.14 ([5], Res),
1.15 ([], Res)] => ()
1.16 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1f";
1.17 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1f";
1.18 case map fst (get_interval ([],Frm) ([],Res) 0 pt) of
1.19 [([], Frm),
1.20 ([], Res)] => ()
1.21 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1f";
1.22 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1f";
1.23
1.24 case map fst (get_interval ([1,3],Res) ([4,1,1],Frm) 99999 pt) of
1.25 [([1, 3], Res),
1.26 @@ -132,7 +132,7 @@
1.27 ([4], Pbl),
1.28 ([4, 1], Frm),
1.29 ([4, 1, 1], Frm)] => ()
1.30 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1a";
1.31 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1a";
1.32
1.33 (*this pos' is not generated bu move_dn:......vvv: goes to end of calc*)
1.34 case map fst (get_interval ([2],Res) ([4,3,2],Frm) 99999 pt) of
1.35 @@ -155,7 +155,7 @@
1.36 ([4], Res), (*this is beyond 'to'*)
1.37 ([5], Res), (*this is beyond 'to'*)
1.38 ([], Res)] => () (*this is beyond 'to'*)
1.39 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1b";
1.40 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1b";
1.41 case map fst (get_interval ([1,4],Res) ([4,3,1],Frm) 99999 pt) of
1.42 [([1, 4], Res),
1.43 ([1], Res),
1.44 @@ -169,7 +169,7 @@
1.45 ([4, 2], Res),
1.46 ([4, 3], Pbl),
1.47 ([4, 3, 1], Frm)] => ()
1.48 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1c";
1.49 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1c";
1.50 case map fst (get_interval ([4,2],Res) ([5],Res) 99999 pt) of
1.51 [([4, 2], Res),
1.52 ([4, 3], Pbl),
1.53 @@ -182,7 +182,7 @@
1.54 ([4, 3], Res),
1.55 ([4], Res),
1.56 ([5], Res)]=>()
1.57 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1d";
1.58 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1d";
1.59 case map fst (get_interval ([],Frm) ([4,3,2],Res) 99999 pt) of
1.60 [([], Frm),
1.61 ([1], Frm),
1.62 @@ -204,7 +204,7 @@
1.63 ([4, 3, 1], Frm),
1.64 ([4, 3, 1], Res),
1.65 ([4, 3, 2], Res)] => ()
1.66 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1e";
1.67 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1e";
1.68 case map fst (get_interval ([4,3],Frm) ([4,3],Res) 99999 pt) of
1.69 [([4, 3], Frm),
1.70 ([4, 3, 1], Frm),
1.71 @@ -214,7 +214,7 @@
1.72 ([4, 3, 4], Res),
1.73 ([4, 3, 5], Res),
1.74 ([4, 3], Res)] => ()
1.75 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1g";
1.76 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1g";
1.77
1.78
1.79
1.80 @@ -351,7 +351,7 @@
1.81 (1 ,[1] ,true ,#Given ,Cor equality (1 + -1 * 2 + x = 0) ,(e_, [1 + -1 * 2 + x = 0]))]*)
1.82 val (pt,p) = complete_mod (pt, p);
1.83 if itms2str_ ctxt (get_obj g_pbl pt (fst p)) = "[\n(1 ,[1] ,true ,#Given ,Cor equality (1 + -1 * 2 + x = 0) ,(e_, [1 + -1 * 2 + x = 0])),\n(2 ,[1] ,true ,#Given ,Cor solveFor x ,(v_, [x])),\n(3 ,[1] ,true ,#Find ,Cor solutions L ,(v_i_, [L]))]" then ()
1.84 - else raise error "completetest.sml: new behav. in complete_mod 1";
1.85 + else error "completetest.sml: new behav. in complete_mod 1";
1.86 writeln (itms2str_ ctxt (get_obj g_pbl pt (fst p)));
1.87 (*[
1.88 (1 ,[1] ,true ,#Given ,Cor equality (1 + -1 * 2 + x = 0) ,(e_, [1 + -1 * 2 + x = 0])),
1.89 @@ -359,7 +359,7 @@
1.90 (3 ,[1] ,true ,#Find ,Cor solutions L ,(solutions, [L]))]*)
1.91 val mits = get_obj g_met pt (fst p);
1.92 if itms2str_ ctxt mits = "[\n(1 ,[1] ,true ,#Given ,Cor equality (1 + -1 * 2 + x = 0) ,(e_, [1 + -1 * 2 + x = 0])),\n(2 ,[1] ,true ,#Given ,Cor solveFor x ,(v_, [x])),\n(3 ,[1] ,true ,#Find ,Cor solutions L ,(v_i_, [L]))]"
1.93 - then () else raise error "completetest.sml: new behav. in complete_mod 2";
1.94 + then () else error "completetest.sml: new behav. in complete_mod 2";
1.95 writeln (itms2str_ ctxt mits);
1.96 (*[
1.97 (1 ,[1] ,true ,#Given ,Cor equality (1 + -1 * 2 + x = 0) ,(e_, [1 + -1 * 2 + x = 0])),
1.98 @@ -468,7 +468,7 @@
1.99 0 <= x & x <= 2 * r}])),
1.100 (11 ,[1,2,3] ,true ,#undef ,Cor errorBound (eps = 0) ,(errorBound, [eps = 0]))]*)
1.101 if itms2str_ ctxt mits = "[\n(1 ,[1,2,3] ,true ,#Given ,Cor fixedValues [r = Arbfix] ,(fix_, [[r = Arbfix]])),\n(2 ,[1,2,3] ,true ,#Find ,Cor maximum A ,(m_, [A])),\n(3 ,[1,2,3] ,true ,#Find ,Cor valuesFor [a, b] ,(vs_, [[a, b]])),\n(4 ,[1,2] ,true ,#Relate ,Cor relations [A = a * b, (a / 2) ^^^ 2 + (b / 2) ^^^ 2 = r ^^^ 2] ,(rs_, [[A = a * b, (a / 2) ^^^ 2 + (b / 2) ^^^ 2 = r ^^^ 2]])),\n(6 ,[1] ,true ,#undef ,Cor boundVariable a ,(v_, [a])),\n(9 ,[1,2] ,true ,#undef ,Cor interval {x. 0 <= x & x <= 2 * r} ,(itv_, [{x. 0 <= x & x <= 2 * r}])),\n(11 ,[1,2,3] ,true ,#undef ,Cor errorBound (eps = 0) ,(err_, [eps = 0]))]" then ()
1.102 - else raise error "completetest.sml: new behav. in complete_metitms 1";
1.103 + else error "completetest.sml: new behav. in complete_metitms 1";
1.104
1.105
1.106 "--------- maximum-example: complete_mod -------------------------";
1.107 @@ -503,7 +503,7 @@
1.108 val (pt,p) = complete_mod (pt,p);
1.109 val pits = get_obj g_pbl pt (fst p);
1.110 if itms2str_ ctxt pits = "[\n(1 ,[1,2,3] ,true ,#Given ,Cor fixedValues [r = Arbfix] ,(fix_, [[r = Arbfix]])),\n(2 ,[1,2,3] ,true ,#Find ,Cor maximum A ,(m_, [A])),\n(3 ,[1,2,3] ,true ,#Find ,Cor valuesFor [a, b] ,(vs_, [[a],[b]])),\n(4 ,[1,2] ,true ,#Relate ,Cor relations [A = a * b, (a / 2) ^^^ 2 + (b / 2) ^^^ 2 = r ^^^ 2] ,(rs_, [[A = a * b],[(a / 2) ^^^ 2 + (b / 2) ^^^ 2 = r ^^^ 2]]))]"
1.111 - then () else raise error "completetest.sml: new behav. in complete_mod 3";
1.112 + then () else error "completetest.sml: new behav. in complete_mod 3";
1.113 writeln (itms2str_ ctxt pits);
1.114 (*[
1.115 (1 ,[1,2,3] ,true,#Given,Cor fixedValues [r = Arbfix] ,(fix_, [[r = Arbfix]])),
1.116 @@ -513,7 +513,7 @@
1.117 2 = r ^^^ 2] ,(relations, [[A = a * b],[(a / 2) ^^^ 2 + (b / 2) ^^^ 2 = r ^^^ 2]]))]*)
1.118 val mits = get_obj g_met pt (fst p);
1.119 if itms2str_ ctxt mits = "[\n(1 ,[1,2,3] ,true ,#Given ,Cor fixedValues [r = Arbfix] ,(fix_, [[r = Arbfix]])),\n(2 ,[1,2,3] ,true ,#Find ,Cor maximum A ,(m_, [A])),\n(3 ,[1,2,3] ,true ,#Find ,Cor valuesFor [a, b] ,(vs_, [[a],[b]])),\n(4 ,[1,2] ,true ,#Relate ,Cor relations [A = a * b, (a / 2) ^^^ 2 + (b / 2) ^^^ 2 = r ^^^ 2] ,(rs_, [[A = a * b],[(a / 2) ^^^ 2 + (b / 2) ^^^ 2 = r ^^^ 2]])),\n(6 ,[1] ,true ,#undef ,Cor boundVariable a ,(v_, [a])),\n(9 ,[1,2] ,true ,#undef ,Cor interval {x. 0 <= x & x <= 2 * r} ,(itv_, [{x. 0 <= x & x <= 2 * r}])),\n(11 ,[1,2,3] ,true ,#undef ,Cor errorBound (eps = 0) ,(err_, [eps = 0]))]"
1.120 - then () else raise error "completetest.sml: new behav. in complete_mod 3";
1.121 + then () else error "completetest.sml: new behav. in complete_mod 3";
1.122 writeln (itms2str_ ctxt mits);
1.123 (*[
1.124 (1 ,[1,2,3] ,true ,#Given ,Cor fixedValues [r = Arbfix] ,(fix_, [[r = Arbfix]])),