1.1 --- a/test/Tools/isac/Knowledge/rateq.sml Tue Sep 28 08:58:06 2010 +0200
1.2 +++ b/test/Tools/isac/Knowledge/rateq.sml Tue Sep 28 09:06:56 2010 +0200
1.3 @@ -14,30 +14,30 @@
1.4 val t = (term_of o the o (parse RatEq.thy)) "(1/b+1/x=1) is_ratequation_in x";
1.5 val SOME(t_, _) = rewrite_set_ RatEq.thy false RatEq_prls t;
1.6 val result = term2str t_;
1.7 -if result <> "True" then raise error "rateq.sml: new behaviour 1:" else ();
1.8 +if result <> "True" then error "rateq.sml: new behaviour 1:" else ();
1.9
1.10 val t = (term_of o the o (parse RatEq.thy)) "(sqrt(x)=1) is_ratequation_in x";
1.11 val SOME(t_, _) = rewrite_set_ RatEq.thy false RatEq_prls t;
1.12 val result = term2str t_;
1.13 -if result <> "False" then raise error "rateq.sml: new behaviour 2:" else ();
1.14 +if result <> "False" then error "rateq.sml: new behaviour 2:" else ();
1.15
1.16 val t = (term_of o the o (parse RatEq.thy)) "(x=-1) is_ratequation_in x";
1.17 val SOME(t_,_) = rewrite_set_ RatEq.thy false RatEq_prls t;
1.18 val result = term2str t_;
1.19 -if result <> "False" then raise error "rateq.sml: new behaviour 3:" else ();
1.20 +if result <> "False" then error "rateq.sml: new behaviour 3:" else ();
1.21
1.22 val t = (term_of o the o (parse RatEq.thy)) "(3 + x^^^2 + 1/(x^^^2+3)=1) is_ratequation_in x";
1.23 val SOME(t_,_) = rewrite_set_ RatEq.thy false RatEq_prls t;
1.24 val result = term2str t_;
1.25 -if result <> "True" then raise error "rateq.sml: new behaviour 4:" else ();
1.26 +if result <> "True" then error "rateq.sml: new behaviour 4:" else ();
1.27
1.28 val result = match_pbl ["equality (x=1)","solveFor x","solutions L"]
1.29 (get_pbt ["rational","univariate","equation"]);
1.30 -case result of NoMatch' _ => () | _ => raise error "rateq.sml: new behaviour: 5";
1.31 +case result of NoMatch' _ => () | _ => error "rateq.sml: new behaviour: 5";
1.32
1.33 val result = match_pbl ["equality (3 + x^^^2 + 1/(x^^^2+3)=1)","solveFor x","solutions L"]
1.34 (get_pbt ["rational","univariate","equation"]);
1.35 -case result of Matches' _ => () | _ => raise error "rateq.sml: new behaviour: 6";
1.36 +case result of Matches' _ => () | _ => error "rateq.sml: new behaviour: 6";
1.37
1.38
1.39 (*---------rateq---- 23.8.02 ---------------------*)
1.40 @@ -90,7 +90,7 @@
1.41 (* "x = 1 / 5" *)
1.42 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.43 if mout2str(f) = "Form' FormKF (~1,EdUndef,0,Nundef,([x = 1 / 5])" then ()
1.44 -else raise error "rateq.sml: new behaviour: [x = 1 / 5]";
1.45 +else error "rateq.sml: new behaviour: [x = 1 / 5]";
1.46
1.47
1.48
1.49 @@ -140,6 +140,6 @@
1.50 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
1.51 (* "x = -2, x = 10" *)
1.52 if mout2str(f) = "Form' FormKF (~1,EdUndef,0,Nundef,([x = -2, x = 10])" then()
1.53 -else raise error "rateq.sml: new behaviour: [x = -2, x = 10]";
1.54 +else error "rateq.sml: new behaviour: [x = -2, x = 10]";
1.55
1.56 "----------- rateq.sml end--------";