1.1 --- a/test/Tools/isac/Interpret/calchead.sml Tue Sep 28 08:58:06 2010 +0200
1.2 +++ b/test/Tools/isac/Interpret/calchead.sml Tue Sep 28 09:06:56 2010 +0200
1.3 @@ -45,13 +45,13 @@
1.4 [([], Pbl), ([1], Frm),([1], Res), ([2], Res), ([3], Pbl), ([3, 1], Frm),
1.5 ([3, 1], Res), ([3, 2, 1], Frm), ([3, 2, 1], Res), ([3, 2, 2], Res),
1.6 ([3, 2], Res)] then () else
1.7 -raise error "calchead.sml: diff.behav. get_interval after replace} other 2 a";
1.8 +error "calchead.sml: diff.behav. get_interval after replace} other 2 a";
1.9
1.10 print_depth 99;map fst (get_interval ([3, 2, 1], Res) ([],Res) 9999 pt);
1.11 print_depth 3;
1.12 if map fst (get_interval ([3, 2, 1], Res) ([],Res) 9999 pt) =
1.13 [([3, 2, 1], Res), ([3, 2, 2], Res), ([3, 2], Res)] then () else
1.14 -raise error "modspec.sml: diff.behav. get_interval after replace} other 2 b";
1.15 +error "modspec.sml: diff.behav. get_interval after replace} other 2 b";
1.16
1.17
1.18
1.19 @@ -98,7 +98,7 @@
1.20 {Find=[Incompl "maximum",Incompl "valuesFor [a]"],
1.21 Given=[Correct "fixedValues [r = Arbfix]"],
1.22 Relate=[Incompl "relations []"], Where=[],With=[]})
1.23 -then raise error "test-maximum.sml: model stepwise - different behaviour"
1.24 +then error "test-maximum.sml: model stepwise - different behaviour"
1.25 else (); (*different with show_types !!!*)
1.26 6.5.03---*)
1.27
1.28 @@ -119,14 +119,14 @@
1.29 {Find=[Incompl "maximum",Incompl "valuesFor"],
1.30 Given=[Correct "fixedValues [r = Arbfix]"],
1.31 Relate=[Incompl "relations []"], Where=[],With=[]})
1.32 -then raise error "diffappl.sml: Specify_Problem different behaviour"
1.33 +then error "diffappl.sml: Specify_Problem different behaviour"
1.34 else ();
1.35 (* WN.3.9.03 (#391) Model_Specify did init_pbl newly
1.36 if ppc<>(Problem ["maximum_of","function"],
1.37 {Find=[Missing "maximum m_",Missing "valuesFor vs_"],
1.38 Given=[Correct "fixedValues [r = Arbfix]"],
1.39 Relate=[Missing "relations rs_"],Where=[],With=[]})
1.40 -then raise error "diffappl.sml: Specify_Problem different behaviour"
1.41 +then error "diffappl.sml: Specify_Problem different behaviour"
1.42 else ();*)
1.43
1.44 val nxt = tac2tac_ pt p(Specify_Method ["DiffApp","max_by_calculus"]);
1.45 @@ -138,7 +138,7 @@
1.46 Given=[Correct "fixedValues [r = Arbfix]",Missing "boundVariable v_v",
1.47 Missing "interval itv_",Missing "errorBound err_"],
1.48 Relate=[Incompl "relations []"],Where=[],With=[]})
1.49 -then raise error "diffappl.sml: Specify_Method different behaviour"
1.50 +then error "diffappl.sml: Specify_Method different behaviour"
1.51 else ();
1.52 (* WN.3.9.03 (#391) Model_Specify did init_pbl newly
1.53 if ppc<>(Method ["DiffApp","max_by_calculus"],
1.54 @@ -146,7 +146,7 @@
1.55 Given=[Correct "fixedValues [r = Arbfix]",Missing "boundVariable v_v",
1.56 Missing "interval itv_",Missing "errorBound err_"],
1.57 Relate=[Missing "relations rs_"],Where=[],With=[]})
1.58 -then raise error "diffappl.sml: Specify_Method different behaviour"
1.59 +then error "diffappl.sml: Specify_Method different behaviour"
1.60 else ();*)
1.61
1.62
1.63 @@ -204,7 +204,7 @@
1.64
1.65 if nxt<>(Add_Relation
1.66 "relations [(a / 2) ^^^ 2 + (b / 2) ^^^ 2 = r ^^^ 2]")
1.67 -then raise error "test specify, fmz <> []: nxt <> Add_Relation (a/2)^2.." else (); (*different with show_types !!!*)
1.68 +then error "test specify, fmz <> []: nxt <> Add_Relation (a/2)^2.." else (); (*different with show_types !!!*)
1.69
1.70 val nxt = tac2tac_ pt p nxt;
1.71 val(p,_,Form'(PpcKF(_,_,_,_,ppc)),nxt,_,pt) = specify nxt p [] pt;
1.72 @@ -238,7 +238,7 @@
1.73 val(p,_,Form'(PpcKF(_,_,_,_,ppc)),nxt,_,pt) = specify nxt p [] pt;
1.74 (*val nxt = Apply_Method ("DiffApp.thy","max_by_calculus") *)
1.75 if nxt<>(Apply_Method ["DiffApp","max_by_calculus"])
1.76 -then raise error "test specify, fmz <> []: nxt <> Apply_Method max_by_calculus" else ();
1.77 +then error "test specify, fmz <> []: nxt <> Apply_Method max_by_calculus" else ();
1.78
1.79
1.80 "--------- maximum example with 'specify', fmz = [] --------------";
1.81 @@ -286,7 +286,7 @@
1.82
1.83 (*30.8.01 ... funktioniert nicht mehr nach Einfuehrung env ....
1.84 if nxt<>(Add_Relation "relations []")
1.85 -then raise error "test specify, fmz <> []: nxt <> Add_Relation.."
1.86 +then error "test specify, fmz <> []: nxt <> Add_Relation.."
1.87 else (); (*different with show_types !!!*)
1.88 *)
1.89
1.90 @@ -316,7 +316,7 @@
1.91 (*val nxt = Apply_Method ("DiffApp","max_by_calculus") *)
1.92 (*30.8.01 ... funktioniert nicht mehr nach Einfuehrung env ....
1.93 if nxt<>(Apply_Method ("DiffApp.thy","max_by_calculus"))
1.94 -then raise error "test specify, fmz <> []: nxt <> Add_Relation.."
1.95 +then error "test specify, fmz <> []: nxt <> Add_Relation.."
1.96 else ();
1.97 *)
1.98
1.99 @@ -352,7 +352,7 @@
1.100 [ _ $ Free ("c", _) $ _, _ $ Free ("c_2", _) $ _]),
1.101 (3, [1], "#Find", Const ("EqSystem.solution", _), [Free ("ss'''", _)])]
1.102 =>()
1.103 - | _ => raise error "calchead.sml match_ags 2 args Nok ----------------";
1.104 + | _ => error "calchead.sml match_ags 2 args Nok ----------------";
1.105
1.106
1.107 "-b------------------------------------------------------";
1.108 @@ -379,7 +379,7 @@
1.109 (3, [1], "#Find", Const ("EqSystem.solution", _), [Free ("ss'''", _)])]
1.110 (* type of Find: [Free ("ss'''", "bool List.list")]*)
1.111 =>()
1.112 - | _ => raise error "calchead.sml match_ags copy-named dropped --------";
1.113 + | _ => error "calchead.sml match_ags copy-named dropped --------";
1.114
1.115
1.116 "-c---ERROR case: stac is missing #Given equalities e_s--";
1.117 @@ -425,7 +425,7 @@
1.118 case ((match_ags (theory "EqSystem") pats ags)
1.119 handle ERROR _ => []) of (*why not TYPE ?WN100920*)
1.120 [] => match_ags_msg pI stac ags
1.121 - | _ => raise error "calchead.sml match_ags 1st arg missing --------";
1.122 + | _ => error "calchead.sml match_ags 1st arg missing --------";
1.123
1.124
1.125 "-d------------------------------------------------------";
1.126 @@ -516,24 +516,24 @@
1.127 (2, [1], "#Given", Const ("Descript.solveFor", _), [Free ("x", _)]),
1.128 (3, [1], "#Find", Const ("Descript.solutions", _), [Free ("x_i", _)])]
1.129 => ()
1.130 - | _ => raise error "calchead.sml match_ags [univariate,equation,test]--";
1.131 + | _ => error "calchead.sml match_ags [univariate,equation,test]--";
1.132
1.133
1.134 "--------- regression test fun is_copy_named ------------";
1.135 "--------- regression test fun is_copy_named ------------";
1.136 "--------- regression test fun is_copy_named ------------";
1.137 val trm = (1, (2, @{term "v'i'"}));
1.138 -if is_copy_named trm then () else raise error "regr. is_copy_named 1";
1.139 +if is_copy_named trm then () else error "regr. is_copy_named 1";
1.140 val trm = (1, (2, @{term "e_e"}));
1.141 -if is_copy_named trm then raise error "regr. is_copy_named 2" else ();
1.142 +if is_copy_named trm then error "regr. is_copy_named 2" else ();
1.143 val trm = (1, (2, @{term "L'''"}));
1.144 -if is_copy_named trm then () else raise error "regr. is_copy_named 3";
1.145 +if is_copy_named trm then () else error "regr. is_copy_named 3";
1.146
1.147 (* out-comment 'structure CalcHead'...
1.148 val trm = (1, (2, @{term "v'i'"}));
1.149 -if is_copy_named_generating trm then () else raise error "regr. is_copy_named";
1.150 +if is_copy_named_generating trm then () else error "regr. is_copy_named";
1.151 val trm = (1, (2, @{term "L'''"}));
1.152 -if is_copy_named_generating trm then raise error "regr. is_copy_named" else ();
1.153 +if is_copy_named_generating trm then error "regr. is_copy_named" else ();
1.154 *)
1.155
1.156 "--------- regr.test fun cpy_nam ------------------------";
1.157 @@ -551,7 +551,7 @@
1.158
1.159 case cpy_nam pbt oris (hd cy) of
1.160 ([1], "#Find", Const ("Descript.solutions", _), [Free ("x_i", _)]) => ()
1.161 - | _ => raise error "calchead.sml regr.test cpy_nam-1-";
1.162 + | _ => error "calchead.sml regr.test cpy_nam-1-";
1.163
1.164 (*new data: cpy_nam without changing the name*)
1.165 @{term "equalities"}; type_of @{term "[x_1+1=2,x_2=0]"};
1.166 @@ -568,4 +568,4 @@
1.167
1.168 case cpy_nam pbt oris (hd cy) of
1.169 ([1], "#Find", Const ("EqSystem.solution", _), [Free ("ss'''", _)]) => ()
1.170 - | _ => raise error "calchead.sml regr.test cpy_nam-2-";
1.171 + | _ => error "calchead.sml regr.test cpy_nam-2-";