1.1 --- a/src/Tools/isac/Frontend/messages.sml Tue Sep 28 08:58:06 2010 +0200
1.2 +++ b/src/Tools/isac/Frontend/messages.sml Tue Sep 28 09:06:56 2010 +0200
1.3 @@ -39,5 +39,5 @@
1.4
1.5 (*1000 general*)
1.6
1.7 - | msg2str i l = raise error ("no message for No. "^
1.8 + | msg2str i l = error ("no message for No. "^
1.9 string_of_int i^" "^language2str l);
2.1 --- a/src/Tools/isac/Frontend/states.sml Tue Sep 28 08:58:06 2010 +0200
2.2 +++ b/src/Tools/isac/Frontend/states.sml Tue Sep 28 09:06:56 2010 +0200
2.3 @@ -183,7 +183,7 @@
2.4 (*///7.10.03/// add states to a users active states
2.5 fun get_calcID (uI:iterID) (p:(iterID * (calcID * state) list) list) =
2.6 case assoc (p, uI) of
2.7 - NONE => raise error ("get_calcID: no iterID " ^
2.8 + NONE => error ("get_calcID: no iterID " ^
2.9 (string_of_int uI))
2.10 | SOME ps => (new_key ps 1):calcID;
2.11 > get_calcID 1 (!states);
2.12 @@ -193,7 +193,7 @@
2.13 fun get_iterID (cI:calcID)
2.14 (p:(calcID * (calcstate * (iterID * pos') list)) list) =
2.15 case assoc (p, cI) of
2.16 - NONE => raise error ("get_iterID: no iterID " ^ (string_of_int cI))
2.17 + NONE => error ("get_iterID: no iterID " ^ (string_of_int cI))
2.18 | SOME (_, us) => (new_key us 1):iterID;
2.19 (* get_iterID 3 (!states);
2.20 val it = 2 : iterID*)
2.21 @@ -204,7 +204,7 @@
2.22 (*//////7.10.
2.23 fun get_cal (uI:iterID) (pI:calcID) (p:(iterID * (calcID * state) list) list) =
2.24 (the (assoc2 (p,(uI, pI))))
2.25 - handle _ => raise error ("get_state " ^ (string_of_int uI) ^
2.26 + handle _ => error ("get_state " ^ (string_of_int uI) ^
2.27 " " ^ (string_of_int pI) ^ " not existent");
2.28 > get_cal 3 1 (!states);
2.29 val it = (((EmptyPtree,(#,#)),[]),([],[])) : state
2.30 @@ -216,15 +216,15 @@
2.31 *)
2.32 fun get_calc (cI:calcID) =
2.33 case assoc (!states, cI) of
2.34 - NONE => raise error ("get_calc "^(string_of_int cI)^" not existent")
2.35 + NONE => error ("get_calc "^(string_of_int cI)^" not existent")
2.36 | SOME (c, _) => c;
2.37 fun get_pos (cI:calcID) (uI:iterID) =
2.38 case assoc (!states, cI) of
2.39 - NONE => raise error ("get_pos: calc " ^ (string_of_int cI)
2.40 + NONE => error ("get_pos: calc " ^ (string_of_int cI)
2.41 ^ " not existent")
2.42 | SOME (_, us) =>
2.43 (case assoc (us, uI) of
2.44 - NONE => raise error ("get_pos: user " ^ (string_of_int uI)
2.45 + NONE => error ("get_pos: user " ^ (string_of_int uI)
2.46 ^ " not existent")
2.47 | SOME p => p);
2.48
2.49 @@ -271,27 +271,27 @@
2.50 fun overwrite2 (ps, (((uI:iterID), (pI:calcID)), p)) =
2.51 let val new_ps = overwrite (the (assoc (ps, uI)), (pI, p))
2.52 in (overwrite (ps, (uI, new_ps)))
2.53 - handle _ => raise error ("overwrite2 " ^ (string_of_int uI) ^
2.54 + handle _ => error ("overwrite2 " ^ (string_of_int uI) ^
2.55 " " ^ (string_of_int pI) ^ " not existent")
2.56 end;*)
2.57 fun overwrite2 (ps, (((cI:calcID), (uI:iterID)), p)) =
2.58 case assoc (ps, cI) of
2.59 NONE =>
2.60 - raise error ("overwrite2: calc " ^ (string_of_int uI) ^" not existent")
2.61 + error ("overwrite2: calc " ^ (string_of_int uI) ^" not existent")
2.62 | SOME (cs, us) =>
2.63 overwrite (ps, (cI ,(cs, overwrite (us, (uI, p)))));
2.64
2.65 fun upd_calc (cI:calcID) cs =
2.66 case assoc (!states, cI) of
2.67 - NONE => raise error ("upd_calc "^(string_of_int cI)^" not existent")
2.68 + NONE => error ("upd_calc "^(string_of_int cI)^" not existent")
2.69 | SOME (_, us) => states:= overwrite (!states, (cI, (cs, us)));
2.70 (*WN051210 testing before initac: only 1 taci in calcstate so far:
2.71 fun upd_calc (cI:calcID) (cs as (_, tacis):calcstate) =
2.72 (if length tacis > 1
2.73 - then raise error ("upd_calc, |tacis|>1: "^tacis2str tacis)
2.74 + then error ("upd_calc, |tacis|>1: "^tacis2str tacis)
2.75 else ();
2.76 case assoc (!states, cI) of
2.77 - NONE => raise error ("upd_calc "^(string_of_int cI)^" not existent")
2.78 + NONE => error ("upd_calc "^(string_of_int cI)^" not existent")
2.79 | SOME (_, us) => states:= overwrite (!states, (cI, (cs, us)))
2.80 );*)
2.81
2.82 @@ -304,7 +304,7 @@
2.83 fun upd_tacis (cI:calcID) tacis =
2.84 case assoc (!states, cI) of
2.85 NONE =>
2.86 - raise error ("upd_tacis: calctree "^(string_of_int cI)^" not existent")
2.87 + error ("upd_tacis: calctree "^(string_of_int cI)^" not existent")
2.88 | SOME ((ptp,_), us) =>
2.89 states:= overwrite (!states, (cI, ((ptp, tacis), us)));
2.90 (*///7.10.
2.91 @@ -314,7 +314,7 @@
2.92 fun upd_ipos (cI:calcID) (uI:iterID) (ip:pos') =
2.93 case assoc (!states, cI) of
2.94 NONE =>
2.95 - raise error ("upd_ipos: calctree "^(string_of_int cI)^" not existent")
2.96 + error ("upd_ipos: calctree "^(string_of_int cI)^" not existent")
2.97 | SOME (cs, us) =>
2.98 states:= overwrite2 (!states, ((cI, uI), ip));
2.99
2.100 @@ -348,7 +348,7 @@
2.101 fun add_user (cI:calcID) =
2.102 case assoc (!states, cI) of
2.103 NONE =>
2.104 - raise error ("add_user: calctree "^(string_of_int cI)^" not existent")
2.105 + error ("add_user: calctree "^(string_of_int cI)^" not existent")
2.106 | SOME (cs, us) =>
2.107 let val new_uI = new_key us 1
2.108 in states:= overwrite2 (!states, ((cI, new_uI), e_pos'));
3.1 --- a/src/Tools/isac/Interpret/appl.sml Tue Sep 28 08:58:06 2010 +0200
3.2 +++ b/src/Tools/isac/Interpret/appl.sml Tue Sep 28 09:06:56 2010 +0200
3.3 @@ -13,7 +13,7 @@
3.4 (rew_ord',erls,ca)
3.5 | rew_info (Rrls {erls,rew_ord=(rew_ord',_),calc=ca, ...}) =
3.6 (rew_ord',erls, ca)
3.7 - | rew_info rls = raise error ("rew_info called with '"^rls2str rls^"'");
3.8 + | rew_info rls = error ("rew_info called with '"^rls2str rls^"'");
3.9
3.10 (*FIXME.3.4.03:re-organize from_pblobj_or_detail_thm after rls' --> rls*)
3.11 fun from_pblobj_or_detail_thm thm' p pt =
3.12 @@ -107,7 +107,7 @@
3.13 in (bdv, pred) end
3.14
3.15 | mk_set thy _ _ l _ =
3.16 - raise error ("check_elementwise: no set "^
3.17 + error ("check_elementwise: no set "^
3.18 (Syntax.string_of_term (thy2ctxt thy) l));
3.19 (*> val consts = str2term "[x=#4]";
3.20 > val pred = str2term "Assumptions";
3.21 @@ -373,7 +373,7 @@
3.22 val (f,p) = case p_ of (*p 12.4.00 unnecessary*)
3.23 Frm => (get_obj g_form pt p, p)
3.24 | Res => ((fst o (get_obj g_result pt)) p, lev_on p)
3.25 - | _ => raise error ("applicable_in: call by "^
3.26 + | _ => error ("applicable_in: call by "^
3.27 (pos'2str (p,p_)));
3.28 in
3.29 let val subst = subs2subst thy subs;
3.30 @@ -400,7 +400,7 @@
3.31 val f = case p_ of
3.32 Frm => get_obj g_form pt p
3.33 | Res => (fst o (get_obj g_result pt)) p
3.34 - | _ => raise error ("applicable_in Rewrite: call by "^
3.35 + | _ => error ("applicable_in Rewrite: call by "^
3.36 (pos'2str (p,p_)));
3.37 in if msg = "OK"
3.38 then
3.39 @@ -429,7 +429,7 @@
3.40 val (f,p) = case p_ of (*p 12.4.00 unnecessary*)
3.41 Frm => (get_obj g_form pt p, p)
3.42 | Res => ((fst o (get_obj g_result pt)) p, lev_on p)
3.43 - | _ => raise error ("applicable_in: call by "^
3.44 + | _ => error ("applicable_in: call by "^
3.45 (pos'2str (p,p_)));
3.46 in case rewrite_ thy (assoc_rew_ord ro') erls
3.47 (*put_asm*)false (assoc_thm' thy thm') f of
3.48 @@ -448,7 +448,7 @@
3.49 val {rew_ord'=ro',...} = get_met (get_obj g_metID pt pp);
3.50 val f = case p_ of Frm => get_obj g_form pt p
3.51 | Res => (fst o (get_obj g_result pt)) p
3.52 - | _ => raise error ("applicable_in: call by "^
3.53 + | _ => error ("applicable_in: call by "^
3.54 (pos'2str (p,p_)));
3.55 in
3.56 let val subst = subs2subst thy subs
3.57 @@ -472,7 +472,7 @@
3.58 val (f,p) = case p_ of (*p 12.4.00 unnecessary*)
3.59 Frm => (get_obj g_form pt p, p)
3.60 | Res => ((fst o (get_obj g_result pt)) p, lev_on p)
3.61 - | _ => raise error ("applicable_in: call by "^
3.62 + | _ => error ("applicable_in: call by "^
3.63 (pos'2str (p,p_)));
3.64 in
3.65 let val subst = subs2subst thy subs;
3.66 @@ -493,7 +493,7 @@
3.67 val (f,p) = case p_ of (*p 12.4.00 unnecessary*)
3.68 Frm => (get_obj g_form pt p, p)
3.69 | Res => ((fst o (get_obj g_result pt)) p, lev_on p)
3.70 - | _ => raise error ("applicable_in: call by "^
3.71 + | _ => error ("applicable_in: call by "^
3.72 (pos'2str (p,p_)));
3.73 in case rewrite_set_ (assoc_thy thy') false (assoc_rls rls) f of
3.74 SOME (f',asm) =>
3.75 @@ -511,7 +511,7 @@
3.76 val f = case p_ of
3.77 Frm => get_obj g_form pt p
3.78 | Res => (fst o (get_obj g_result pt)) p
3.79 - | _ => raise error ("applicable_in: call by "^
3.80 + | _ => error ("applicable_in: call by "^
3.81 (pos'2str (p,p_)));
3.82 in case rewrite_set_ (assoc_thy thy') false (assoc_rls rls) f of
3.83 SOME (f',asm) =>
3.84 @@ -520,7 +520,7 @@
3.85
3.86
3.87 | applicable_in p pt (End_Ruleset) =
3.88 - raise error ("applicable_in: not impl. for "^
3.89 + error ("applicable_in: not impl. for "^
3.90 (tac2str End_Ruleset))
3.91
3.92 (* val ((p,p_), pt, (m as Calculate op_)) = (p, pt, m);
3.93 @@ -587,7 +587,7 @@
3.94 ------------------*)
3.95
3.96 | applicable_in p pt (Apply_Assumption cts') =
3.97 - (raise error ("applicable_in: not impl. for "^
3.98 + (error ("applicable_in: not impl. for "^
3.99 (tac2str (Apply_Assumption cts'))))
3.100
3.101 (*'logical' applicability wrt. script in locate: Inconsistent?*)
3.102 @@ -602,11 +602,11 @@
3.103 end
3.104
3.105 | applicable_in p pt (Take_Inst ct') =
3.106 - raise error ("applicable_in: not impl. for "^
3.107 + error ("applicable_in: not impl. for "^
3.108 (tac2str (Take_Inst ct')))
3.109
3.110 | applicable_in p pt (Group (con, ints)) =
3.111 - raise error ("applicable_in: not impl. for "^
3.112 + error ("applicable_in: not impl. for "^
3.113 (tac2str (Group (con, ints))))
3.114
3.115 | applicable_in (p,p_) pt (m as Subproblem (domID, pblID)) =
3.116 @@ -621,24 +621,24 @@
3.117 e_term, [], subpbl domID pblID))
3.118
3.119 | applicable_in p pt (End_Subproblem) =
3.120 - raise error ("applicable_in: not impl. for "^
3.121 + error ("applicable_in: not impl. for "^
3.122 (tac2str (End_Subproblem)))
3.123
3.124 | applicable_in p pt (CAScmd ct') =
3.125 - raise error ("applicable_in: not impl. for "^
3.126 + error ("applicable_in: not impl. for "^
3.127 (tac2str (CAScmd ct')))
3.128
3.129 | applicable_in p pt (Split_And) =
3.130 - raise error ("applicable_in: not impl. for "^
3.131 + error ("applicable_in: not impl. for "^
3.132 (tac2str (Split_And)))
3.133 | applicable_in p pt (Conclude_And) =
3.134 - raise error ("applicable_in: not impl. for "^
3.135 + error ("applicable_in: not impl. for "^
3.136 (tac2str (Conclude_And)))
3.137 | applicable_in p pt (Split_Or) =
3.138 - raise error ("applicable_in: not impl. for "^
3.139 + error ("applicable_in: not impl. for "^
3.140 (tac2str (Split_Or)))
3.141 | applicable_in p pt (Conclude_Or) =
3.142 - raise error ("applicable_in: not impl. for "^
3.143 + error ("applicable_in: not impl. for "^
3.144 (tac2str (Conclude_Or)))
3.145
3.146 | applicable_in (p,p_) pt (Begin_Trans) =
3.147 @@ -647,11 +647,11 @@
3.148 (*_____ implizit Take in gen*)
3.149 Frm => (get_obj g_form pt p, (lev_on o lev_dn) p)
3.150 | Res => ((fst o (get_obj g_result pt)) p, (lev_on o lev_dn o lev_on) p)
3.151 - | _ => raise error ("applicable_in: call by "^
3.152 + | _ => error ("applicable_in: call by "^
3.153 (pos'2str (p,p_)));
3.154 val thy' = get_obj g_domID pt (par_pblobj pt p);
3.155 in (Appl (Begin_Trans' f))
3.156 - handle _ => raise error ("applicable_in: Begin_Trans finds \
3.157 + handle _ => error ("applicable_in: Begin_Trans finds \
3.158 \syntaxerror in '"^(term2str f)^"'") end
3.159
3.160 (*TODO: check parent branches*)
3.161 @@ -665,16 +665,16 @@
3.162 end
3.163
3.164 | applicable_in p pt (Begin_Sequ) =
3.165 - raise error ("applicable_in: not impl. for "^
3.166 + error ("applicable_in: not impl. for "^
3.167 (tac2str (Begin_Sequ)))
3.168 | applicable_in p pt (End_Sequ) =
3.169 - raise error ("applicable_in: not impl. for "^
3.170 + error ("applicable_in: not impl. for "^
3.171 (tac2str (End_Sequ)))
3.172 | applicable_in p pt (Split_Intersect) =
3.173 - raise error ("applicable_in: not impl. for "^
3.174 + error ("applicable_in: not impl. for "^
3.175 (tac2str (Split_Intersect)))
3.176 | applicable_in p pt (End_Intersect) =
3.177 - raise error ("applicable_in: not impl. for "^
3.178 + error ("applicable_in: not impl. for "^
3.179 (tac2str (End_Intersect)))
3.180 (* val Appl (Check_elementwse'(t1,"Assumptions",t2)) = it;
3.181 val (vvv,ppp) = vp;
3.182 @@ -735,7 +735,7 @@
3.183 end
3.184
3.185 | applicable_in p pt (Collect_Trues) =
3.186 - raise error ("applicable_in: not impl. for "^
3.187 + error ("applicable_in: not impl. for "^
3.188 (tac2str (Collect_Trues)))
3.189
3.190 | applicable_in p pt (Empty_Tac) =
3.191 @@ -771,12 +771,12 @@
3.192 | applicable_in p pt End_Proof' = Appl End_Proof''
3.193
3.194 | applicable_in _ _ m =
3.195 - raise error ("applicable_in called for "^(tac2str m));
3.196 + error ("applicable_in called for "^(tac2str m));
3.197
3.198 (*WN060614 unused*)
3.199 fun tac2tac_ pt p m =
3.200 case applicable_in p pt m of
3.201 Appl (m') => m'
3.202 - | Notappl _ => raise error ("tac2mstp': fails with"^
3.203 + | Notappl _ => error ("tac2mstp': fails with"^
3.204 (tac2str m));
3.205
4.1 --- a/src/Tools/isac/Interpret/calchead.sml Tue Sep 28 08:58:06 2010 +0200
4.2 +++ b/src/Tools/isac/Interpret/calchead.sml Tue Sep 28 09:06:56 2010 +0200
4.3 @@ -249,7 +249,7 @@
4.4
4.5 (*FIXXXME.WN020430 intermediate hack for fun ass_up*)
4.6 fun f_mout thy (Form' (FormKF (_,_,_,_,f))) = (term_of o the o (parse thy)) f
4.7 - | f_mout thy _ = raise error "f_mout: not called with formula";
4.8 + | f_mout thy _ = error "f_mout: not called with formula";
4.9
4.10
4.11 (*.is the calchead complete ?.*)
4.12 @@ -434,7 +434,7 @@
4.13 (* 30.1.00 ---
4.14 fun ct_in (Syn (c)) = c
4.15 | ct_in (Typ (c)) = c
4.16 - | ct_in _ = raise error "ct_in called for Cor .. Sup";
4.17 + | ct_in _ = error "ct_in called for Cor .. Sup";
4.18 --- *)
4.19
4.20 (*#############################################################*)
4.21 @@ -560,7 +560,7 @@
4.22 case find_first (test_subset (hd icl)) vors of
4.23 (* val SOME ori = find_first (test_subset (hd icl)) vors;
4.24 *)
4.25 - NONE => raise error "nxt_add: EX itm. not(dat(itm)<=dat(ori))"
4.26 + NONE => error "nxt_add: EX itm. not(dat(itm)<=dat(ori))"
4.27 | SOME ori => SOME (geti_ct thy ori (hd icl))
4.28 end
4.29 end;
4.30 @@ -571,12 +571,12 @@
4.31 | mk_delete thy "#Find" itm_ = Del_Find (itm_out thy itm_)
4.32 | mk_delete thy "#Relate" itm_ = Del_Relation(itm_out thy itm_)
4.33 | mk_delete thy str _ =
4.34 - raise error ("mk_delete: called with field '"^str^"'");
4.35 + error ("mk_delete: called with field '"^str^"'");
4.36 fun mk_additem "#Given" ct = Add_Given ct
4.37 | mk_additem "#Find" ct = Add_Find ct
4.38 | mk_additem "#Relate"ct = Add_Relation ct
4.39 | mk_additem str _ =
4.40 - raise error ("mk_additem: called with field '"^str^"'");
4.41 + error ("mk_additem: called with field '"^str^"'");
4.42
4.43
4.44
4.45 @@ -686,10 +686,10 @@
4.46 fun update_itm (cl,d,ts) ((id,vt,_,sl,Cor (_,_)):itm) =
4.47 (id,vt,cl,sl,Cor (d,ts)):itm
4.48 | update_itm (cl,d,ts) (id,vt,_,sl,Syn (_)) =
4.49 - raise error ("update_itm "^((Syntax.string_of_term (thy2ctxt thy)) (comp_dts thy (d,ts)))^
4.50 + error ("update_itm "^((Syntax.string_of_term (thy2ctxt thy)) (comp_dts thy (d,ts)))^
4.51 " not not for Syn (s:cterm')")
4.52 | update_itm (cl,d,ts) (id,vt,_,sl,Typ (_)) =
4.53 - raise error ("update_itm "^((Syntax.string_of_term (thy2ctxt thy)) (comp_dts thy (d,ts)))^
4.54 + error ("update_itm "^((Syntax.string_of_term (thy2ctxt thy)) (comp_dts thy (d,ts)))^
4.55 " not not for Typ (s:cterm')")
4.56 | update_itm (cl,d,ts) (id,vt,_,sl,Fal (_,_)) =
4.57 (id,vt,cl,sl,Fal (d,ts))
4.58 @@ -721,8 +721,8 @@
4.59 (Cor _) =>
4.60 (if fd = "#undef" then (id,vt,complete,fd,Sup(d,ts'))
4.61 else (id,vt,complete,fd,Cor((d,ts'),(pid, pval)))):itm
4.62 - | (Syn c) => raise error ("ori_2itm wants to overwrite "^c)
4.63 - | (Typ c) => raise error ("ori_2itm wants to overwrite "^c)
4.64 + | (Syn c) => error ("ori_2itm wants to overwrite "^c)
4.65 + | (Typ c) => error ("ori_2itm wants to overwrite "^c)
4.66 | (Inc _) => if complete
4.67 then (id,vt,true ,fd, Cor ((d,ts'),(pid, pval)))
4.68 else (id,vt,false,fd, Inc ((d,ts'),(pid, pval)))
4.69 @@ -790,7 +790,7 @@
4.70
4.71
4.72
4.73 -fun maxl [] = raise error "maxl of []"
4.74 +fun maxl [] = error "maxl of []"
4.75 | maxl (y::ys) =
4.76 let fun mx x [] = x
4.77 | mx x (y::ys) = if x < (y:int) then mx y ys else mx x ys
4.78 @@ -973,7 +973,7 @@
4.79 fun matc thy ([]:pat list) _ (oris:preori list) = oris
4.80 | matc thy pbt [] _ =
4.81 (tracing (dashs 70);
4.82 - raise error ("actual arg(s) missing for '"^pats2str pbt
4.83 + error ("actual arg(s) missing for '"^pats2str pbt
4.84 ^"' i.e. should be 'copy-named' by '*_._'"))
4.85 | matc thy ((p as (s,(d,t)))::pbt) (a::ags) oris =
4.86 (* val (thy, ((p as (s,(d,t)))::pbt), (a::ags), oris) =
4.87 @@ -1019,7 +1019,7 @@
4.88 in ([1], field, dsc, [mk_free (type_of t) cy_ext]):preori end
4.89 else ([1], field, dsc, [t])
4.90 )
4.91 - handle _ => raise error ("cpy_nam: for "^(term2str t));
4.92 + handle _ => error ("cpy_nam: for "^(term2str t));
4.93
4.94 (*.match the actual arguments of a SubProblem with a model-pattern
4.95 and create an ori list (in root-pbl created from formalization).
4.96 @@ -1063,7 +1063,7 @@
4.97 fun overwrite_ppc thy itm ppc =
4.98 let
4.99 fun repl ppc' (_,_,_,_,itm_) [] =
4.100 - raise error ("overwrite_ppc: " ^ (itm_2str_ (thy2ctxt thy) itm_) ^
4.101 + error ("overwrite_ppc: " ^ (itm_2str_ (thy2ctxt thy) itm_) ^
4.102 " not found")
4.103 | repl ppc' itm (p::ppc) =
4.104 if (#1 itm) = (#1 (p:itm)) then ppc' @ [itm] @ ppc
4.105 @@ -1106,7 +1106,7 @@
4.106 fun header p_ pI mI =
4.107 case p_ of Pbl => Problem (if pI = e_pblID then [] else pI)
4.108 | Met => Method mI
4.109 - | pos => raise error ("header called with "^ pos_2str pos);
4.110 + | pos => error ("header called with "^ pos_2str pos);
4.111
4.112
4.113
4.114 @@ -1395,7 +1395,7 @@
4.115 (* itms2itemppc thy [](*mpc*) pre
4.116 *)
4.117 | specify m' _ _ _ =
4.118 - raise error ("specify: not impl. for "^tac_2str m');
4.119 + error ("specify: not impl. for "^tac_2str m');
4.120
4.121 (* val (sel, Add_Given ct, ptp as (pt,(p,Pbl))) = ("#Given", tac, ptp);
4.122 val (sel, Add_Find ct, ptp as (pt,(p,Pbl))) = ("#Find", tac, ptp);
4.123 @@ -1466,7 +1466,7 @@
4.124 *)
4.125 fun ori2Coritm pbt ((i,v,f,d,ts):ori) =
4.126 (i,v,true,f, Cor ((d,ts),(((snd o snd o the o (find_first (eq1 d))) pbt)
4.127 - handle _ => raise error ("ori2Coritm: dsc "^
4.128 + handle _ => error ("ori2Coritm: dsc "^
4.129 term2str d^
4.130 "in ori, but not in pbt")
4.131 ,ts))):itm;
4.132 @@ -1645,7 +1645,7 @@
4.133 (pt, pos)) end
4.134
4.135 | nxt_specif m' _ =
4.136 - raise error ("nxt_specif: not impl. for "^tac2str m');
4.137 + error ("nxt_specif: not impl. for "^tac2str m');
4.138
4.139 (*.get the values from oris; handle the term list w.r.t. penv.*)
4.140
4.141 @@ -1732,7 +1732,7 @@
4.142 (let val gf = (head_of given) $ formal;
4.143 val _ = cterm_of thy gf
4.144 in gf end)
4.145 - handle _ => raise error ("calchead.tag_form: " ^
4.146 + handle _ => error ("calchead.tag_form: " ^
4.147 Syntax.string_of_term (thy2ctxt thy) given ^
4.148 " .. " ^
4.149 Syntax.string_of_term (thy2ctxt thy) formal ^
4.150 @@ -1857,7 +1857,7 @@
4.151 | _ => (snd3 o hd o fst3) (nxt_specif Model_Problem ptp))
4.152 (*all stored in tac_ itms ^^^^^^^^^^*)
4.153 | nxt_model_pbl tac_ _ =
4.154 - raise error ("nxt_model_pbl: called by tac= "^tac_2str tac_);
4.155 + error ("nxt_model_pbl: called by tac= "^tac_2str tac_);
4.156 (* run subp_rooteq.sml ''
4.157 until nxt=("Subproblem",Subproblem ("SqRoot.thy",["univariate","equation"]))
4.158 > val (_, (Subproblem'((_,pblID,metID),_,_,_,_),_,_,_,_,_)) =
4.159 @@ -1901,7 +1901,7 @@
4.160 in (pt, (p,Met):pos') end
4.161 ;
4.162 (*| complete_mod (pt, pos as (p, Met):pos') =
4.163 - raise error ("###complete_mod: only impl.for Pbl, called with "^
4.164 + error ("###complete_mod: only impl.for Pbl, called with "^
4.165 pos'2str pos);*)
4.166
4.167 (*.complete _EMPTY_ calc-head for autocalc (sub-)pbl from oris(+met from fmz);
4.168 @@ -1926,19 +1926,19 @@
4.169 fun is_complete_mod (pt, pos as (p, Pbl): pos') =
4.170 if (is_pblobj o (get_obj I pt)) p
4.171 then (is_complete_mod_ o (get_obj g_pbl pt)) p
4.172 - else raise error ("is_complete_mod: called by PrfObj at "^pos'2str pos)
4.173 + else error ("is_complete_mod: called by PrfObj at "^pos'2str pos)
4.174 | is_complete_mod (pt, pos as (p, Met)) =
4.175 if (is_pblobj o (get_obj I pt)) p
4.176 then (is_complete_mod_ o (get_obj g_met pt)) p
4.177 - else raise error ("is_complete_mod: called by PrfObj at "^pos'2str pos)
4.178 + else error ("is_complete_mod: called by PrfObj at "^pos'2str pos)
4.179 | is_complete_mod (_, pos) =
4.180 - raise error ("is_complete_mod called by "^pos'2str pos^
4.181 + error ("is_complete_mod called by "^pos'2str pos^
4.182 " (should be Pbl or Met)");
4.183
4.184 (*.have (thy, pbl, met) _all_ been specified explicitly ?.*)
4.185 fun is_complete_spec (pt, pos as (p,_): pos') =
4.186 if (not o is_pblobj o (get_obj I pt)) p
4.187 - then raise error ("is_complete_spec: called by PrfObj at "^pos'2str pos)
4.188 + then error ("is_complete_spec: called by PrfObj at "^pos'2str pos)
4.189 else let val (dI,pI,mI) = get_obj g_spec pt p
4.190 in dI<>e_domID andalso pI<>e_pblID andalso mI<>e_metID end;
4.191 (*.complete empty items in specification from origin (pbl, met ev.refined);
5.1 --- a/src/Tools/isac/Interpret/ctree.sml Tue Sep 28 08:58:06 2010 +0200
5.2 +++ b/src/Tools/isac/Interpret/ctree.sml Tue Sep 28 09:06:56 2010 +0200
5.3 @@ -303,7 +303,7 @@
5.4
5.5 fun new_val v (ScrState (env, loc_, topt, _, safe, bool)) =
5.6 (ScrState (env, loc_, topt, v, safe, bool))
5.7 - | new_val _ _ = raise error "new_val: only for ScrState";
5.8 + | new_val _ _ = error "new_val: only for ScrState";
5.9
5.10 datatype con = land | lor;
5.11
5.12 @@ -500,7 +500,7 @@
5.13
5.14 fun rls_of (Rewrite_Set_Inst (_, rls)) = rls
5.15 | rls_of (Rewrite_Set rls) = rls
5.16 - | rls_of tac = raise error ("rls_of: called with tac '"^tac2IDstr tac^"'");
5.17 + | rls_of tac = error ("rls_of: called with tac '"^tac2IDstr tac^"'");
5.18
5.19 fun thm_of_rew (Rewrite_Inst (subs,(thmID,_))) =
5.20 (thmID, SOME ((subs2subst (assoc_thy "Isac.thy") subs):subst))
5.21 @@ -522,7 +522,7 @@
5.22 | rule2tac subst (Rls_ rls) =
5.23 Rewrite_Set_Inst (subst2subs subst, (id_rls rls))
5.24 | rule2tac _ rule =
5.25 - raise error ("rule2tac: called with '" ^ rule2str rule ^ "'");
5.26 + error ("rule2tac: called with '" ^ rule2str rule ^ "'");
5.27
5.28 type fmz_ = cterm' list;
5.29
5.30 @@ -834,7 +834,7 @@
5.31
5.32 (*4.4.00*)
5.33 fun lev_up_ ((p,Res):pos') = (lev_up p,Res):pos'
5.34 - | lev_up_ p' = raise error ("lev_up_: called for "^(pos'2str p'));
5.35 + | lev_up_ p' = error ("lev_up_: called for "^(pos'2str p'));
5.36 fun lev_dn_ ((p,_):pos') = (lev_dn p,Res):pos'
5.37 fun ind ((p,_):pos') = length p; (*WN050108 deprecated in favour of lev_of*)
5.38 fun lev_of ((p,_):pos') = length p;
5.39 @@ -1478,17 +1478,17 @@
5.40 fun get_somespec ((dI,pI,mI):spec) ((dI',pI',mI'):spec) =
5.41 let val domID = if dI = e_domID
5.42 then if dI' = e_domID
5.43 - then raise error"pt_extract: no domID in probl,origin"
5.44 + then error"pt_extract: no domID in probl,origin"
5.45 else dI'
5.46 else dI
5.47 val pblID = if pI = e_pblID
5.48 then if pI' = e_pblID
5.49 - then raise error"pt_extract: no pblID in probl,origin"
5.50 + then error"pt_extract: no pblID in probl,origin"
5.51 else pI'
5.52 else pI
5.53 val metID = if mI = e_metID
5.54 then if pI' = e_metID
5.55 - then raise error"pt_extract: no metID in probl,origin"
5.56 + then error"pt_extract: no metID in probl,origin"
5.57 else mI'
5.58 else mI
5.59 in (domID, pblID, metID):spec end;
5.60 @@ -1735,12 +1735,12 @@
5.61 | lev_on' pt (p, Res) =
5.62 if get_obj g_res pt p = get_obj g_form pt (lev_on p)(*TransitiveB*)
5.63 then if existpt' (lev_on p, Res) pt then (lev_on p, Res)
5.64 - else raise error ("lev_on': (p, Res) -> (p, Res) not existent, \
5.65 + else error ("lev_on': (p, Res) -> (p, Res) not existent, \
5.66 \p = "^ints2str' (lev_on p))
5.67 else (lev_on p, Frm)
5.68 | lev_on' pt (p, _) =
5.69 if existpt' (p, Res) pt then (p, Res)
5.70 - else raise error ("lev_on': (p, Frm) -> (p, Res) not existent, \
5.71 + else error ("lev_on': (p, Frm) -> (p, Res) not existent, \
5.72 \p = "^ints2str' p);
5.73
5.74 fun exist_lev_on' pt p = (lev_on' pt p; true) handle _ => false;
5.75 @@ -2150,5 +2150,5 @@
5.76 (*.get the theory explicitly specified for the rootpbl;
5.77 thus use this function _after_ finishing specification.*)
5.78 fun rootthy (Nd (PblObj {spec=(thyID, _, _),...}, _)) = assoc_thy thyID
5.79 - | rootthy _ = raise error "rootthy";
5.80 + | rootthy _ = error "rootthy";
5.81
6.1 --- a/src/Tools/isac/Interpret/generate.sml Tue Sep 28 08:58:06 2010 +0200
6.2 +++ b/src/Tools/isac/Interpret/generate.sml Tue Sep 28 09:06:56 2010 +0200
6.3 @@ -12,14 +12,14 @@
6.4 (* val Rrls {scr=sc as Rfuns {init_state=ii,...},...} = assoc_rls rls;
6.5 *)
6.6 | Rls {scr=EmptyScr,...} =>
6.7 - raise error ("interSteps>..>init_istate: \""^rls^"\" has EmptyScr."
6.8 + error ("interSteps>..>init_istate: \""^rls^"\" has EmptyScr."
6.9 ^"use prep_rls for storing rule-sets !")
6.10 | Rls {scr=Script s,...} =>
6.11 (* val Rls {scr=Script s,...} = assoc_rls rls;
6.12 *)
6.13 (ScrState ([(one_scr_arg s, t)], [], NONE, e_term, Sundef, true))
6.14 | Seq {scr=EmptyScr,...} =>
6.15 - raise error ("interSteps>..>init_istate: \""^rls^"\" has EmptyScr."
6.16 + error ("interSteps>..>init_istate: \""^rls^"\" has EmptyScr."
6.17 ^"use prep_rls for storing rule-sets !")
6.18 | Seq {srls=srls,scr=Script s,...} =>
6.19 (ScrState ([(one_scr_arg s, t)], [], NONE, e_term, Sundef, true)))
6.20 @@ -29,13 +29,13 @@
6.21 let val (_, v)::_ = subs2subst (assoc_thy "Isac.thy") subs
6.22 in case assoc_rls rls of
6.23 Rls {scr=EmptyScr,...} =>
6.24 - raise error ("interSteps>..>init_istate: \""^rls^"\" has EmptyScr."
6.25 + error ("interSteps>..>init_istate: \""^rls^"\" has EmptyScr."
6.26 ^"use prep_rls for storing rule-sets !")
6.27 | Rls {scr=Script s,...} =>
6.28 let val (a1, a2) = two_scr_arg s
6.29 in (ScrState ([(a1, v), (a2, t)],[], NONE, e_term, Sundef,true)) end
6.30 | Seq {scr=EmptyScr,...} =>
6.31 - raise error ("interSteps>..>init_istate: \""^rls^"\" has EmptyScr."
6.32 + error ("interSteps>..>init_istate: \""^rls^"\" has EmptyScr."
6.33 ^"use prep_rls for storing rule-sets !")
6.34 (* val Seq {scr=Script s,...} = assoc_rls rls;
6.35 *)
6.36 @@ -53,14 +53,14 @@
6.37 (* val Rrls {scr=sc as Rfuns {init_state=ii,...},...} = assoc_rls rls;
6.38 *)
6.39 | Rls {scr=EmptyScr,...} =>
6.40 - raise error ("interSteps>..>init_istate: \""^rls^"\" has EmptyScr."
6.41 + error ("interSteps>..>init_istate: \""^rls^"\" has EmptyScr."
6.42 ^"use prep_rls for storing rule-sets !")
6.43 | Rls {scr=Script s,...} =>
6.44 (* val Rls {scr=Script s,...} = assoc_rls rls;
6.45 *)
6.46 (ScrState ([(one_scr_arg s, t)], [], NONE, e_term, Sundef, true))
6.47 | Seq {scr=EmptyScr,...} =>
6.48 - raise error ("interSteps>..>init_istate: \""^rls^"\" has EmptyScr."
6.49 + error ("interSteps>..>init_istate: \""^rls^"\" has EmptyScr."
6.50 ^"use prep_rls for storing rule-sets !")
6.51 | Seq {srls=srls,scr=Script s,...} =>
6.52 (ScrState ([(one_scr_arg s, t)], [], NONE, e_term, Sundef, true)))
6.53 @@ -71,14 +71,14 @@
6.54 (*...we suppose the substitution of only _one_ bound variable*)
6.55 in case assoc_rls rls of
6.56 Rls {scr=EmptyScr,...} =>
6.57 - raise error ("interSteps>..>init_istate: \""^rls^"\" has EmptyScr."
6.58 + error ("interSteps>..>init_istate: \""^rls^"\" has EmptyScr."
6.59 ^"use prep_rls for storing rule-sets !")
6.60 | Rls {scr=Script s,...} =>
6.61 let val (form, bdv) = two_scr_arg s
6.62 in (ScrState ([(form, t), (bdv, v)],[], NONE, e_term, Sundef,true))
6.63 end
6.64 | Seq {scr=EmptyScr,...} =>
6.65 - raise error ("interSteps>..>init_istate: \""^rls^"\" has EmptyScr."
6.66 + error ("interSteps>..>init_istate: \""^rls^"\" has EmptyScr."
6.67 ^"use prep_rls for storing rule-sets !")
6.68 (* val Seq {scr=Script s,...} = assoc_rls rls;
6.69 *)
6.70 @@ -482,14 +482,14 @@
6.71 in ((p,Pbl), c, Form' (FormKF (~1,EdUndef,(length p), Nundef, f)), pt) end
6.72
6.73 | generate1 thy m' _ _ _ =
6.74 - raise error ("generate1: not impl.for "^(tac_2str m'))
6.75 + error ("generate1: not impl.for "^(tac_2str m'))
6.76 ;
6.77
6.78
6.79 fun generate_hard thy m' (p,p_) pt =
6.80 let
6.81 val p = case p_ of Frm => p | Res => lev_on p
6.82 - | _ => raise error ("generate_hard: call by "^(pos'2str (p,p_)));
6.83 + | _ => error ("generate_hard: call by "^(pos'2str (p,p_)));
6.84 in generate1 thy m' e_istate (p,p_) pt end;
6.85
6.86
6.87 @@ -539,7 +539,7 @@
6.88 fun res_from_taci (_, Rewrite'(_,_,_,_,_,_,(res, asm)), _) = (res, asm)
6.89 | res_from_taci (_, Rewrite_Set'(_,_,_,_,(res, asm)), _) = (res, asm)
6.90 | res_from_taci (_, tac_, _) =
6.91 - raise error ("res_from_taci: called with" ^ tac_2str tac_);
6.92 + error ("res_from_taci: called with" ^ tac_2str tac_);
6.93
6.94 (*.embed the tacis created by a '_deriv'ation; sys.form <> input.form
6.95 tacis are in order, thus are reverted for generate.*)
7.1 --- a/src/Tools/isac/Interpret/inform.sml Tue Sep 28 08:58:06 2010 +0200
7.2 +++ b/src/Tools/isac/Interpret/inform.sml Tue Sep 28 09:06:56 2010 +0200
7.3 @@ -252,7 +252,7 @@
7.4 (*this ^ should raise the exn on unability of re-parsing dts*)
7.5 in itm end handle _ => ((i,v,false,f, Syn (term2str t)):itm))
7.6 | parsitm dI (itm as (i,v,_,f, Par _)) =
7.7 - raise error ("parsitm (" ^ itm2str_ (thy2ctxt dI) itm^
7.8 + error ("parsitm (" ^ itm2str_ (thy2ctxt dI) itm^
7.9 "): Par should be internal");
7.10
7.11 (*separate a list to a pair of elements that do NOT satisfy the predicate,
7.12 @@ -294,7 +294,7 @@
7.13 ("",itm) => itm
7.14 (* val (msg,xx) = is_notyet_input thy ppc all ori' pbt;
7.15 *)
7.16 - | (msg,_) => raise error ("appl_add': "^msg))
7.17 + | (msg,_) => error ("appl_add': "^msg))
7.18 (* val (msg,(_,_,_,d,ts),all) = is_known thy sel oris (term_of ct);
7.19 *)
7.20 | (msg,(i,v,_,d,ts),_) =>
7.21 @@ -392,7 +392,7 @@
7.22
7.23
7.24 fun par2fstr ((_,_,_,f, Par s):itm) = (f, s)
7.25 - | par2fstr itm = raise error ("par2fstr: called with " ^
7.26 + | par2fstr itm = error ("par2fstr: called with " ^
7.27 itm2str_ (thy2ctxt' "Isac") itm);
7.28 fun itms2fstr ((_,_,_,f, Cor ((d,ts),_)):itm) = (f, comp_dts'' (d,ts))
7.29 | itms2fstr (_,_,_,f, Syn str) = (f, str)
7.30 @@ -401,7 +401,7 @@
7.31 | itms2fstr (_,_,_,f, Sup (d,ts)) = (f, comp_dts'' (d,ts))
7.32 | itms2fstr (_,_,_,f, Mis (d,t)) = (f, term2str (d $ t))
7.33 | itms2fstr (itm as (_,_,_,f, Par _)) =
7.34 - raise error ("parsitm ("^itm2str_ (thy2ctxt' "Isac") itm ^
7.35 + error ("parsitm ("^itm2str_ (thy2ctxt' "Isac") itm ^
7.36 "): Par should be internal");
7.37
7.38 fun imodel2fstr iitems =
7.39 @@ -479,7 +479,7 @@
7.40 Met, hdf', mits, pre, spec):ocalhd) end
7.41 end end
7.42 | input_icalhd pt ((p,_), hdf, imodel, _(*Met*), spec as (dI,pI,mI)) =
7.43 - raise error "input_icalhd Met not impl.";
7.44 + error "input_icalhd Met not impl.";
7.45
7.46
7.47 (***. handle an input formula .***)
7.48 @@ -562,13 +562,13 @@
7.49 if equal f1 i1 then
7.50 if equal f2 i2 then dropwhile' equal (f2::fs) (i2::is)
7.51 else (rev (f1::f2::fs), i1::i2::is)
7.52 - else raise error "dropwhile': did not start with equal elements"
7.53 + else error "dropwhile': did not start with equal elements"
7.54 | dropwhile' equal (f::fs) [i] =
7.55 if equal f i then (rev (f::fs), [i])
7.56 - else raise error "dropwhile': did not start with equal elements"
7.57 + else error "dropwhile': did not start with equal elements"
7.58 | dropwhile' equal [f] (i::is) =
7.59 if equal f i then ([f], i::is)
7.60 - else raise error "dropwhile': did not start with equal elements";
7.61 + else error "dropwhile': did not start with equal elements";
7.62 (*
7.63 fun equal a b = a=b;
7.64 val foder = [0,1,2,3,4,5]; val ifoder = [11,12,3,4,5];
8.1 --- a/src/Tools/isac/Interpret/mathengine.sml Tue Sep 28 08:58:06 2010 +0200
8.2 +++ b/src/Tools/isac/Interpret/mathengine.sml Tue Sep 28 09:06:56 2010 +0200
8.3 @@ -140,7 +140,7 @@
8.4 (*----------------------------------------------------from solve.sml*)
8.5 | nxt_solv (Detail_Set'(thy', rls, t)) (pt, p) =
8.6 let (*val rls = the (assoc(!ruleset',rls'))
8.7 - handle _ => raise error ("solve: '"^rls'^"' not known");*)
8.8 + handle _ => error ("solve: '"^rls'^"' not known");*)
8.9 val thy = assoc_thy thy';
8.10 val (srls, sc, is) =
8.11 case rls of
8.12 @@ -154,7 +154,7 @@
8.13 val nx = (tac_2tac o fst3) (next_tac (thy',srls) (pt,p) sc is);
8.14 val aopt = applicable_in p pt nx;
8.15 in case aopt of
8.16 - Notappl s => raise error ("solve Detail_Set: "^s)
8.17 + Notappl s => error ("solve Detail_Set: "^s)
8.18 (* val Appl m = aopt;
8.19 *)
8.20 | Appl m => solve ("discardFIXME",m) p pt end
8.21 @@ -473,16 +473,16 @@
8.22 | ("unsafe-ok", (_, _, ptp)) => ptp
8.23 | ("not-applicable",_) => (pt, p)
8.24 | ("end-of-calculation", (_, _, ptp)) => ptp
8.25 - | ("failure",_) => raise error "sys-error";
8.26 + | ("failure",_) => error "sys-error";
8.27 val (_, ts) =
8.28 (* val (eee, (ts, _, (pt'',_))) = step p ((pt, e_pos'),[]);
8.29 *)
8.30 (case step p ((pt, e_pos'),[]) of
8.31 ("ok", (ts as (tac,_,_)::_, _, _)) => ("",ts)
8.32 | ("helpless",_) => ("helpless: cannot propose tac", [])
8.33 - | ("no-fmz-spec",_) => raise error "no-fmz-spec"
8.34 + | ("no-fmz-spec",_) => error "no-fmz-spec"
8.35 | ("end-of-calculation", (ts, _, _)) => ("",ts))
8.36 - handle _ => raise error "sys-error";
8.37 + handle _ => error "sys-error";
8.38 val tac = case ts of tacis as (_::_) =>
8.39 (* val tacis as (_::_) = ts;
8.40 *)
9.1 --- a/src/Tools/isac/Interpret/mstools.sml Tue Sep 28 08:58:06 2010 +0200
9.2 +++ b/src/Tools/isac/Interpret/mstools.sml Tue Sep 28 09:06:56 2010 +0200
9.3 @@ -210,7 +210,7 @@
9.4 (theory "Isac")
9.5 (*comp_dts:FIXXME stay with term for efficiency !!*)
9.6 (d $ (comp_ts (d, ts)))
9.7 - handle _ => raise error ("comp_dts: "^(term2str d)^
9.8 + handle _ => error ("comp_dts: "^(term2str d)^
9.9 " $ "^(term2str (hd ts))));*)
9.10 fun comp_dts thy (d,[]) =
9.11 (if is_reall_dsc d then (d $ e_listReal)
9.12 @@ -218,7 +218,7 @@
9.13 else d)
9.14 | comp_dts thy (d,ts) =
9.15 (d $ (comp_ts (d, ts)))
9.16 - handle _ => raise error ("comp_dts: "^(term2str d)^
9.17 + handle _ => error ("comp_dts: "^(term2str d)^
9.18 " $ "^(term2str (hd ts)));
9.19 (*25.8.03*)
9.20 fun comp_dts' (d,[]) =
9.21 @@ -226,7 +226,7 @@
9.22 else if is_booll_dsc d then (d $ e_listBool)
9.23 else d
9.24 | comp_dts' (d,ts) = (d $ (comp_ts (d, ts)))
9.25 - handle _ => raise error ("comp_dts': "^(term2str d)^
9.26 + handle _ => error ("comp_dts': "^(term2str d)^
9.27 " $ "^(term2str (hd ts)));
9.28 (*val t = str2term "maximum A";
9.29 > val (d,ts) = split_dts thy t; comp_dts thy (d,ts);
9.30 @@ -288,7 +288,7 @@
9.31 else if is_booll_dsc d then term2str (d $ e_listBool)
9.32 else term2str d
9.33 | comp_dts'' (d,ts) = term2str (d $ (comp_ts (d, ts)))
9.34 - handle _ => raise error ("comp_dts'': "^(term2str d)^
9.35 + handle _ => error ("comp_dts'': "^(term2str d)^
9.36 " $ "^(term2str (hd ts)));
9.37
9.38
9.39 @@ -387,7 +387,7 @@
9.40
9.41 (*. 14.9.01: not used after putting penv-values into itm_
9.42 make the result of split_* a value of problem-environment .*)
9.43 -fun mkval dsc [] = raise error "mkval called with []"
9.44 +fun mkval dsc [] = error "mkval called with []"
9.45 | mkval dsc [t] = t
9.46 | mkval dsc ts = list2isalist ((type_of o hd) ts) ts;
9.47 (*WN.12.12.03*)
9.48 @@ -398,7 +398,7 @@
9.49 (*. get the constant value from a penv .*)
9.50 fun getval (id, values) =
9.51 case values of
9.52 - [] => raise error ("penv_value: no values in '"^
9.53 + [] => error ("penv_value: no values in '"^
9.54 (Syntax.string_of_term (thy2ctxt' "Tools") id))
9.55 | [v] => (id, v)
9.56 | (v1::v2::_) => (case v1 of
9.57 @@ -523,7 +523,7 @@
9.58 fun cnt itms v = (v,(length o (filter (curry op= v)) o
9.59 flat o (map #2)) (itms:itm list));
9.60 fun vts_cnt vts itms = map (cnt itms) vts;
9.61 -fun max2 [] = raise error "max2 of []"
9.62 +fun max2 [] = error "max2 of []"
9.63 | max2 (y::ys) =
9.64 let fun mx (a,x) [] = (a,x)
9.65 | mx (a,x) ((b,y)::ys) =
9.66 @@ -594,7 +594,7 @@
9.67 then [v] (*eg. [r=Arbfix]*)
9.68 else (case v of (*eg. eps=#0*)
9.69 (Const ("op =",_) $ l $ r) => [r,l]
9.70 - | _ => raise error ("pbl_ids Tools.nam: no equality "
9.71 + | _ => error ("pbl_ids Tools.nam: no equality "
9.72 ^(Syntax.string_of_term ctxt v)))
9.73 | pbl_ids ctxt (Const(_,Type("fun",[_,Type("Tools.una",_)]))) v = [v]
9.74 | pbl_ids ctxt (Const(_,Type("fun",[_,Type("Tools.unl",_)]))) v = [v]
9.75 @@ -602,7 +602,7 @@
9.76 | pbl_ids ctxt (Const(_,Type("fun",[_,Type("Tools.toreal",_)]))) v = [v]
9.77 | pbl_ids ctxt (Const(_,Type("fun",[_,Type("Tools.toreall",_)])))v = [v]
9.78 | pbl_ids ctxt (Const(_,Type("fun",[_,Type("Tools.unknown",_)])))v = [v]
9.79 - | pbl_ids ctxt _ v = raise error ("pbl_ids: not implemented for "
9.80 + | pbl_ids ctxt _ v = error ("pbl_ids: not implemented for "
9.81 ^(Syntax.string_of_term ctxt v));
9.82 (*
9.83 val t as t1 $ t2 = str2term "antiDerivativeName M_b";
9.84 @@ -637,10 +637,10 @@
9.85 (*28.8.01: .nam and .una impl. properly, others copied .. TODO*)
9.86 fun pbl_ids' (Const(_,Type("fun",[_,Type("Tools.nam",_)]))) vs =
9.87 (case vs of
9.88 - [] => raise error ("pbl_ids' Tools.nam called with []")
9.89 + [] => error ("pbl_ids' Tools.nam called with []")
9.90 | [t] => (case t of (*eg. eps=#0*)
9.91 (Const ("op =",_) $ l $ r) => [r,l]
9.92 - | _ => raise error ("pbl_ids' Tools.nam: no equality "
9.93 + | _ => error ("pbl_ids' Tools.nam: no equality "
9.94 ^(Syntax.string_of_term (thy2ctxt' "Isac")t)))
9.95 | vs' => vs (*14.9.01: ???TODO *))
9.96 | pbl_ids' (Const(_,Type("fun",[_,Type("Tools.una",_)]))) vs = vs
9.97 @@ -650,7 +650,7 @@
9.98 | pbl_ids' (Const(_,Type("fun",[_,Type("Tools.toreall",_)])))vs = vs
9.99 | pbl_ids' (Const(_,Type("fun",[_,Type("Tools.unknown",_)])))vs = vs
9.100 | pbl_ids' _ vs =
9.101 - raise error ("pbl_ids': not implemented for "
9.102 + error ("pbl_ids': not implemented for "
9.103 ^(terms2str vs));
9.104 (*9.5.03 penv postponed: pbl_ids'*)
9.105 fun pbl_ids' thy d vs = [comp_ts (d, vs)];
10.1 --- a/src/Tools/isac/Interpret/ptyps.sml Tue Sep 28 08:58:06 2010 +0200
10.2 +++ b/src/Tools/isac/Interpret/ptyps.sml Tue Sep 28 09:06:56 2010 +0200
10.3 @@ -59,7 +59,7 @@
10.4 | "#Find" => #Find (ppc:'a ppc)
10.5 | "#With" => #With (ppc:'a ppc)
10.6 | "#Relate" => #Relate (ppc:'a ppc)
10.7 - | _ => raise error ("sel_ppc tried to select by '"^sel^"'");
10.8 + | _ => error ("sel_ppc tried to select by '"^sel^"'");
10.9
10.10 fun repl_sel_ppc sel
10.11 ({Given=gi,Where=wh,Find=fi,With=wi,Relate=re}:'a ppc) x =
10.12 @@ -69,7 +69,7 @@
10.13 | "#Find" => {Given=gi,Where=wh,Find= x,With=wi,Relate=re}
10.14 | "#With" => {Given=gi,Where=wh,Find=fi,With= x,Relate=re}
10.15 | "#Relate" => {Given=gi,Where=wh,Find=fi,With=wi,Relate= x}
10.16 - | _ => raise error ("repl_sel_ppc tried to select by '"^sel^"'");
10.17 + | _ => error ("repl_sel_ppc tried to select by '"^sel^"'");
10.18
10.19 fun add_sel_ppc thy sel
10.20 ({Given=gi,Where=wh,Find=fi,With=wi,Relate=re}:'a ppc) x =
10.21 @@ -79,7 +79,7 @@
10.22 | "#Find" => {Given=gi,Where=wh,Find=fi@[x],With=wi,Relate=re}
10.23 | "#Relate"=> {Given=gi,Where=wh,Find=fi,With=wi,Relate=re@[x]}
10.24 | "#undef" => {Given=gi@[x],Where=wh,Find=fi,With=wi,Relate=re}(*ori2itmSup*)
10.25 - | _ => raise error ("add_sel_ppc tried to select by '"^sel^"'");
10.26 + | _ => error ("add_sel_ppc tried to select by '"^sel^"'");
10.27 fun add_where ({Given=gi,Find=fi,With=wi,Relate=re,...}:'a ppc) wh =
10.28 ({Given=gi,Where=wh,Find=fi,With=wi,Relate=re}:'a ppc);
10.29
10.30 @@ -98,7 +98,7 @@
10.31 then (hd, args)
10.32 else (e_term, [t]) (*??? 9.01 just copied*)
10.33 end)
10.34 - handle _ => raise error ("split_dsc: called with "^
10.35 + handle _ => error ("split_dsc: called with "^
10.36 (Syntax.string_of_term (thy2ctxt' "Isac") t));
10.37 (*
10.38 > val t1 = (term_of o the o (parse thy)) "errorBound err_";
10.39 @@ -120,7 +120,7 @@
10.40 fun split_dsc' t =
10.41 (let val dsc $ var = t
10.42 in var end)
10.43 - handle _ => raise error ("split_dsc': called with "^term2str t);
10.44 + handle _ => error ("split_dsc': called with "^term2str t);
10.45
10.46 (*9.3.00*)
10.47 (* split a term into description and (id | structured variable)
10.48 @@ -128,7 +128,7 @@
10.49 fun split_did t =
10.50 (let val (hd,[arg]) = strip_comb t
10.51 in (hd,arg) end)
10.52 - handle _ => raise error ("split_did: doesn't match (hd,[arg]) for t = "
10.53 + handle _ => error ("split_did: doesn't match (hd,[arg]) for t = "
10.54 ^(Syntax.string_of_term (thy2ctxt' "Script") t));
10.55
10.56
10.57 @@ -198,7 +198,7 @@
10.58 else if d mem (get_dsc_in dscs "#Relate")
10.59 then ("#Relate",d,ts)
10.60 else ("#undef",d,ts);
10.61 -(* 28.1.00 raise error ("add_field: '"^
10.62 +(* 28.1.00 error ("add_field: '"^
10.63 (Syntax.string_of_term (thy2ctxt' "Isac") d)^
10.64 "' not in ppc-description "); *)
10.65 ------9.3. *)
10.66 @@ -210,7 +210,7 @@
10.67 in case filter (eq d) pbt of
10.68 [(fi,(dsc,_))] => (fi,d,ts)
10.69 | [] => ("#undef",d,ts) (*may come with met.ppc*)
10.70 - | _ => raise error ("add_field: "^
10.71 + | _ => error ("add_field: "^
10.72 (Syntax.string_of_term (thy2ctxt' "Isac") d)^
10.73 " more than once in pbt")
10.74 end;
10.75 @@ -225,10 +225,10 @@
10.76 case filter (eq d) mpc of
10.77 [(fi,(dsc,_))] => [(i,v,fi,d,ts)]
10.78 | [] => [] (*25.2.02: dsc in ori, but not in met -> superfluous*)
10.79 - (*raise error ("add_field': "^
10.80 + (*error ("add_field': "^
10.81 (Syntax.string_of_term (thy2ctxt' "Isac") d)^
10.82 " not in met"*)
10.83 - | _ => raise error ("add_field': "^
10.84 + | _ => error ("add_field': "^
10.85 (Syntax.string_of_term (thy2ctxt' "Isac") d)^
10.86 " more than once in met");
10.87 in (flat ((map (repl mpc)) ori)):ori list end;
10.88 @@ -236,7 +236,7 @@
10.89
10.90 (*.mark an element with the position within a plateau;
10.91 a plateau with length 1 is marked with 0 .*)
10.92 -fun mark eq [] = raise error "mark []"
10.93 +fun mark eq [] = error "mark []"
10.94 | mark eq xs =
10.95 let
10.96 fun mar xx eq [x] n = xx @ [(if n=1 then 0 else n,x)]
10.97 @@ -272,12 +272,12 @@
10.98 val it = [1,2,4] : int list
10.99 *)
10.100
10.101 -fun max [] = raise error "max of []"
10.102 +fun max [] = error "max of []"
10.103 | max (y::ys) =
10.104 let fun mx x [] = x
10.105 | mx x (y::ys) = if x < y then mx y ys else mx x ys;
10.106 in mx y ys end;
10.107 -fun gen_max _ [] = raise error "gen_max of []"
10.108 +fun gen_max _ [] = error "gen_max of []"
10.109 | gen_max ord (y::ys) =
10.110 let fun mx x [] = x
10.111 | mx x (y::ys) = if ord (x, y) then mx y ys else mx x ys;
10.112 @@ -301,7 +301,7 @@
10.113 fun replace_0 vm [0] = intsto vm
10.114 | replace_0 vm vs = vs;
10.115
10.116 -fun add_id [] = raise error "add_id []"
10.117 +fun add_id [] = error "add_id []"
10.118 | add_id xs =
10.119 let fun add n [] = []
10.120 | add n (x::xs) = (n,x) :: add (n+1) xs;
10.121 @@ -338,7 +338,7 @@
10.122 val ctopts = map (parse thy) fmz
10.123 val _= (*FIXME.WN060916 improve error report*)
10.124 if null (filter is_none ctopts) then ()
10.125 - else raise error ("prep_ori: SYNTAX ERROR in " ^ strs2str' fmz)
10.126 + else error ("prep_ori: SYNTAX ERROR in " ^ strs2str' fmz)
10.127 val dts = map ((split_dts thy) o term_of o the) ctopts
10.128 val ori = map (add_field thy pbt) dts;
10.129 (* val ori = map (flat3 o (pair "#undef")) dts; *)
10.130 @@ -662,17 +662,17 @@
10.131
10.132 val fi = filter (eq "#Find") dsc_dats;
10.133 val fi = (case fi of
10.134 - [] => [](*28.8.01: ["tool"] ...// raise error
10.135 + [] => [](*28.8.01: ["tool"] ...// error
10.136 ("prep_pbt: no '#Find' in "^(strs2str pblID))*)
10.137 (* val ((_,fi')::[]) = fi;
10.138 *)
10.139 | ((_,fi')::[]) =>
10.140 ((map (split_did o term_of o the o (parse thy)) fi')
10.141 - handle _ => raise error
10.142 + handle _ => error
10.143 ("prep_pbt: syntax error in '#Find' of "^
10.144 (strs2str pblID)))
10.145 | _ =>
10.146 - (raise error ("prep_pbt: more than one '#Find' in "^
10.147 + (error ("prep_pbt: more than one '#Find' in "^
10.148 (strs2str pblID))));
10.149 val fi = map (pair "#Find") fi;
10.150
10.151 @@ -681,11 +681,11 @@
10.152 [] => []
10.153 | ((_,re')::[]) =>
10.154 ((map (split_did o term_of o the o (parse thy)) re')
10.155 - handle _ => raise error
10.156 + handle _ => error
10.157 ("prep_pbt: syntax error in '#Relate' of "^
10.158 (strs2str pblID)))
10.159 | _ =>
10.160 - (raise error ("prep_pbt: more than one '#Relate' in "^
10.161 + (error ("prep_pbt: more than one '#Relate' in "^
10.162 (strs2str pblID))));
10.163 val re = map (pair "#Relate") re;
10.164
10.165 @@ -694,11 +694,11 @@
10.166 [] => []
10.167 | ((_,wh')::[]) =>
10.168 ((map (parse_patt thy) wh')
10.169 - handle _ => raise error
10.170 + handle _ => error
10.171 ("prep_pbt: syntax error in '#Where' of "^
10.172 (strs2str pblID)))
10.173 | _ =>
10.174 - (raise error ("prep_pbt: more than one '#Where' in "^
10.175 + (error ("prep_pbt: more than one '#Where' in "^
10.176 (strs2str pblID))));
10.177 in ({guh=guh,mathauthors=maa,init=init,
10.178 thy=thy,cas= case ca of NONE => NONE
10.179 @@ -732,25 +732,25 @@
10.180 [] => []
10.181 | ((_,gi')::[]) =>
10.182 ((map (split_did o term_of o the o (parse thy)) gi')
10.183 - handle _ => raise error
10.184 + handle _ => error
10.185 ("prep_pbt: syntax error in '#Given' of "^
10.186 (strs2str metID)))
10.187 | _ =>
10.188 - (raise error ("prep_pbt: more than one '#Given' in "^
10.189 + (error ("prep_pbt: more than one '#Given' in "^
10.190 (strs2str metID))));
10.191 val gi = map (pair "#Given") gi;
10.192
10.193 val fi = filter (eq "#Find") ppc;
10.194 val fi = (case fi of
10.195 - [] => [](*28.8.01: ["tool"] ...// raise error
10.196 + [] => [](*28.8.01: ["tool"] ...// error
10.197 ("prep_pbt: no '#Find' in "^(strs2str metID))*)
10.198 | ((_,fi')::[]) =>
10.199 ((map (split_did o term_of o the o (parse thy)) fi')
10.200 - handle _ => raise error
10.201 + handle _ => error
10.202 ("prep_pbt: syntax error in '#Find' of "^
10.203 (strs2str metID)))
10.204 | _ =>
10.205 - (raise error ("prep_pbt: more than one '#Find' in "^
10.206 + (error ("prep_pbt: more than one '#Find' in "^
10.207 (strs2str metID))));
10.208 val fi = map (pair "#Find") fi;
10.209
10.210 @@ -759,11 +759,11 @@
10.211 [] => []
10.212 | ((_,re')::[]) =>
10.213 ((map (split_did o term_of o the o (parse thy)) re')
10.214 - handle _ => raise error
10.215 + handle _ => error
10.216 ("prep_pbt: syntax error in '#Relate' of "^
10.217 (strs2str metID)))
10.218 | _ =>
10.219 - (raise error ("prep_pbt: more than one '#Relate' in "^
10.220 + (error ("prep_pbt: more than one '#Relate' in "^
10.221 (strs2str metID))));
10.222 val re = map (pair "#Relate") re;
10.223
10.224 @@ -772,11 +772,11 @@
10.225 [] => []
10.226 | ((_,wh')::[]) =>
10.227 ((map (parse_patt thy) wh')
10.228 - handle _ => raise error
10.229 + handle _ => error
10.230 ("prep_pbt: syntax error in '#Where' of "^
10.231 (strs2str metID)))
10.232 | _ =>
10.233 - (raise error ("prep_pbt: more than one '#Where' in "^
10.234 + (error ("prep_pbt: more than one '#Where' in "^
10.235 (strs2str metID))));
10.236 val sc = (((inst_abs thy) o term_of o the o (parse thy)) scr)
10.237 in ({guh=guh,mathauthors=maa,init=init,
10.238 @@ -907,7 +907,7 @@
10.239 (case find_first (eq1 d) pbt of
10.240 (* val SOME (_,(_,id)) = find_first (eq1 d) pbt;
10.241 *)
10.242 - SOME (_,(_,id)) => raise error "chk_: ((i,vats,b,f,Cor ((d,vs),\
10.243 + SOME (_,(_,id)) => error "chk_: ((i,vats,b,f,Cor ((d,vs),\
10.244 \(id, pbl_ids' d vs))):itm)"
10.245 | NONE => (i,vats,false,f,Sup (d,[vs])));
10.246
10.247 @@ -1200,7 +1200,7 @@
10.248
10.249 (*. apply a fun to a ptyps node; copied from get_py .*)
10.250 fun app_ptyp f (d:pblID) _ [] =
10.251 - raise error ("app_ptyp not found: "^(strs2str d))
10.252 + error ("app_ptyp not found: "^(strs2str d))
10.253 | app_ptyp f d (k::[]) ((p as Ptyp (k',[py],_))::pys) =
10.254 if k=k' then f p
10.255 else app_ptyp f d ([k]:pblRD) pys
10.256 @@ -1247,15 +1247,15 @@
10.257 EXCEPT theory hierarchy ... compare 'fun keref2xml'.*)
10.258 fun pblID2guh (pblID:pblID) =
10.259 (((#guh o get_pbt) pblID)
10.260 - handle _ => raise error ("pblID2guh: not for '"^strs2str' pblID ^ "'"));
10.261 + handle _ => error ("pblID2guh: not for '"^strs2str' pblID ^ "'"));
10.262 fun metID2guh (metID:metID) =
10.263 (((#guh o get_met) metID)
10.264 - handle _ => raise error ("metID2guh: no 'Met_' for '"^
10.265 + handle _ => error ("metID2guh: no 'Met_' for '"^
10.266 strs2str' metID ^ "'"));
10.267 fun kestoreID2guh Pbl_ (kestoreID:kestoreID) = pblID2guh kestoreID
10.268 | kestoreID2guh Met_ (kestoreID:kestoreID) = metID2guh kestoreID
10.269 | kestoreID2guh ketype kestoreID =
10.270 - raise error ("kestoreID2guh: '" ^ ketype2str ketype ^ "' not for '" ^
10.271 + error ("kestoreID2guh: '" ^ ketype2str ketype ^ "' not for '" ^
10.272 strs2str' kestoreID ^ "'");
10.273
10.274 fun show_pblguhs () =
11.1 --- a/src/Tools/isac/Interpret/rewtools.sml Tue Sep 28 08:58:06 2010 +0200
11.2 +++ b/src/Tools/isac/Interpret/rewtools.sml Tue Sep 28 09:06:56 2010 +0200
11.3 @@ -109,7 +109,7 @@
11.4 (case goal of
11.5 NONE => rts
11.6 | SOME g =>
11.7 - raise error ("make_deriv: no derivation for "^(term2str t)))
11.8 + error ("make_deriv: no derivation for "^(term2str t)))
11.9 | rew_once lim rts t Appl [] =
11.10 (*(case rs of Rls _ =>*) rew_once lim rts t Noap rs
11.11 (*| Seq _ => rts) FIXXXXXME 14.3.03*)
11.12 @@ -147,7 +147,7 @@
11.13 val r' = Thm (thmid, tm)
11.14 in rew_once (lim-1) (rts@[(t,r',(t',a'))]) t' Appl rrs'
11.15 end)
11.16 - handle _ => raise error "derive_norm, Calc: no rewrite"
11.17 + handle _ => error "derive_norm, Calc: no rewrite"
11.18 end
11.19 (* TODO.WN080222: see rewrite__set_
11.20 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
11.21 @@ -163,7 +163,7 @@
11.22 rewrite__ thy (i+1) bdv ((snd o #rew_ord o rep_rls) rls)
11.23 ((#erls o rep_rls) rls) put_asm thm' ct;
11.24 val _ = if pairopt <> NONE then ()
11.25 - else raise error("rewrite_set_, rewrite_ \""^
11.26 + else error("rewrite_set_, rewrite_ \""^
11.27 (string_of_thmI thm')^"\" "^(term2str ct)^" = NONE")
11.28 val _ = if ! trace_rewrite andalso i < ! depth
11.29 then tracing((idt"="(i+1))^" cal1. to: "^
11.30 @@ -229,7 +229,7 @@
11.31
11.32 fun sym_Thm (Thm (thmID, thm)) = Thm (sym_thmID thmID, sym_thm thm)
11.33 | sym_Thm (Rls_ rls) = Rls_ (*WN060825?!?*) (sym_rls rls)
11.34 - | sym_Thm r = raise error ("sym_Thm: not for "^(rule2str r));
11.35 + | sym_Thm r = error ("sym_Thm: not for "^(rule2str r));
11.36 (*
11.37 val th = Thm ("real_one_collect",num_str @{thm real_one_collect});
11.38 sym_Thm th;
11.39 @@ -255,7 +255,7 @@
11.40 | eq_Thm (Thm (id1,_), _) = false
11.41 | eq_Thm (Rls_ r1, Rls_ r2) = id_rls r1 = id_rls r2
11.42 | eq_Thm (Rls_ r1, _) = false
11.43 - | eq_Thm (r1, r2) = raise error ("eq_Thm: called with '"^
11.44 + | eq_Thm (r1, r2) = error ("eq_Thm: called with '"^
11.45 (rule2str r1)^"' '"^(rule2str r2)^"'");
11.46 fun distinct_Thm r = gen_distinct eq_Thm r;
11.47
11.48 @@ -271,8 +271,8 @@
11.49 "Isabelle" => "thy_isab_" ^ str ^ "-part" : guh
11.50 | "IsacScripts" => "thy_scri_" ^ str ^ "-part"
11.51 | "IsacKnowledge" => "thy_isac_" ^ str ^ "-part"
11.52 - | str => raise error ("thy2guh: called with '"^str^"'"))
11.53 - | part2guh theID = raise error ("part2guh called with theID = "
11.54 + | str => error ("thy2guh: called with '"^str^"'"))
11.55 + | part2guh theID = error ("part2guh called with theID = "
11.56 ^ theID2str theID);
11.57 fun part2filename str = part2guh str ^ ".xml" : filename;
11.58
11.59 @@ -282,15 +282,15 @@
11.60 "Isabelle" => "thy_isab_" ^ thyID : guh
11.61 | "IsacScripts" => "thy_scri_" ^ thyID
11.62 | "IsacKnowledge" => "thy_isac_" ^ thyID
11.63 - | str => raise error ("thy2guh: called with '"^str^"'"))
11.64 - | thy2guh theID = raise error ("thy2guh called with '"^strs2str' theID^"'");
11.65 + | str => error ("thy2guh: called with '"^str^"'"))
11.66 + | thy2guh theID = error ("thy2guh called with '"^strs2str' theID^"'");
11.67 fun thy2filename thy' = thy2guh thy' ^ ".xml" : filename;
11.68 fun thypart2guh ([part, thyID, thypart]:theID) =
11.69 case part of
11.70 "Isabelle" => "thy_isab_" ^ thyID ^ "-" ^ thypart : guh
11.71 | "IsacScripts" => "thy_scri_" ^ thyID ^ "-" ^ thypart
11.72 | "IsacKnowledge" => "thy_isac_" ^ thyID ^ "-" ^ thypart
11.73 - | str => raise error ("thypart2guh: called with '"^str^"'");
11.74 + | str => error ("thypart2guh: called with '"^str^"'");
11.75 fun thypart2filename thy' = thypart2guh thy' ^ ".xml" : filename;
11.76
11.77 (*.convert the data got via contextToThy to a globally unique handle
11.78 @@ -303,7 +303,7 @@
11.79 "thy_isac_" ^ theory'2thyID thyID ^ "-thm-" ^ strip_thy thmID
11.80 | "IsacScripts" =>
11.81 "thy_scri_" ^ theory'2thyID thyID ^ "-thm-" ^ strip_thy thmID
11.82 - | str => raise error ("thm2guh called with isa = '"^isa^
11.83 + | str => error ("thm2guh called with isa = '"^isa^
11.84 "' for thm = "^thmID^"'");
11.85 fun thm2filename (isa_thyID: string * thyID) thmID =
11.86 (thm2guh isa_thyID thmID) ^ ".xml" : filename;
11.87 @@ -316,7 +316,7 @@
11.88 "thy_isac_" ^ theory'2thyID thyID ^ "-rls-" ^ rls'
11.89 | "IsacScripts" =>
11.90 "thy_scri_" ^ theory'2thyID thyID ^ "-rls-" ^ rls'
11.91 - | str => raise error ("rls2guh called with isa = '"^isa^
11.92 + | str => error ("rls2guh called with isa = '"^isa^
11.93 "' for rls = '"^rls'^"'");
11.94 fun rls2filename (isa, thyID) rls' =
11.95 rls2guh (isa, thyID) rls' ^ ".xml" : filename;
11.96 @@ -329,7 +329,7 @@
11.97 "thy_isac_" ^ theory'2thyID thyID ^ "-cal-" ^ calID
11.98 | "IsacScripts" =>
11.99 "thy_scri_" ^ theory'2thyID thyID ^ "-cal-" ^ calID
11.100 - | str => raise error ("cal2guh called with isa = '"^isa^
11.101 + | str => error ("cal2guh called with isa = '"^isa^
11.102 "' for cal = '"^calID^"'");
11.103 fun cal2filename (isa, thyID:thyID) calID =
11.104 cal2guh (isa, thyID:thyID) calID ^ ".xml" : filename;
11.105 @@ -342,7 +342,7 @@
11.106 "thy_isac_" ^ theory'2thyID thyID ^ "-ord-" ^ rew_ord'
11.107 | "IsacScripts" =>
11.108 "thy_scri_" ^ theory'2thyID thyID ^ "-ord-" ^ rew_ord'
11.109 - | str => raise error ("ord2guh called with isa = '"^isa^
11.110 + | str => error ("ord2guh called with isa = '"^isa^
11.111 "' for ord = '"^rew_ord'^"'");
11.112 fun ord2filename (isa, thyID:thyID) (rew_ord':rew_ord') =
11.113 ord2guh (isa, thyID:thyID) (rew_ord':rew_ord') ^ ".xml" : filename;
11.114 @@ -421,7 +421,7 @@
11.115 | NONE => (case assoc (!isab_thm_thy (*see Isac.ML*), str) of
11.116 SOME (thyID,_) => ("Isabelle", thyID)
11.117 | NONE =>
11.118 - raise error ("thy_containing_thm: theorem '"^str^
11.119 + error ("thy_containing_thm: theorem '"^str^
11.120 "' not in !theory' above thy '"^thy'^"'"))
11.121 end;
11.122
11.123 @@ -450,7 +450,7 @@
11.124 (rev (!ruleset'))
11.125 in case assoc (startsearch, rls') of
11.126 SOME (thy', _) => ("IsacKnowledge", thyID2theory' thy')
11.127 - | _ => raise error ("thy_containing_rls : rls '"^rls'^
11.128 + | _ => error ("thy_containing_rls : rls '"^rls'^
11.129 "' not in !rulset' above thy '"^thy'^"'")
11.130 end;
11.131 (* val (thy', termop) = (thyID, termop);
11.132 @@ -466,7 +466,7 @@
11.133 (#1 : calc -> string)) (rev (!calclist'))
11.134 in case assoc (startsearch, strip_thy termop) of
11.135 SOME (th_termop, _) => ("IsacKnowledge", strip_thy th_termop)
11.136 - | _ => raise error ("thy_containing_rls : rls '"^termop^
11.137 + | _ => error ("thy_containing_rls : rls '"^termop^
11.138 "' not in !calclist' above thy '"^thy'^"'")
11.139 end
11.140 end;
11.141 @@ -741,7 +741,7 @@
11.142 (*.not only for thydata, but also for thy's etc.*)
11.143 fun theID2guh (theID:theID) =
11.144 case length theID of
11.145 - 0 => raise error ("theID2guh: called with theID = "^strs2str' theID)
11.146 + 0 => error ("theID2guh: called with theID = "^strs2str' theID)
11.147 | 1 => part2guh theID
11.148 | 2 => thy2guh theID
11.149 | 3 => thypart2guh theID
11.150 @@ -752,10 +752,10 @@
11.151 | "Calculations" => cal2guh (isa, thyID) elemID
11.152 | "Orders" => ord2guh (isa, thyID) elemID
11.153 | "Theorems" => thy2guh [isa, thyID]
11.154 - | str => raise error ("theID2guh: called with theID = "^
11.155 + | str => error ("theID2guh: called with theID = "^
11.156 strs2str' theID)
11.157 end
11.158 - | n => raise error ("theID2guh called with theID = "^strs2str' theID);
11.159 + | n => error ("theID2guh called with theID = "^strs2str' theID);
11.160 (*.filenames not only for thydata, but also for thy's etc.*)
11.161 fun theID2filename (theID:theID) = theID2guh theID ^ ".xml" : filename;
11.162
11.163 @@ -764,14 +764,14 @@
11.164 val part = implode (take_fromto 1 4 guh')
11.165 val isa = implode (take_fromto 5 9 guh')
11.166 in if not (member op = ["exp_", "thy_", "pbl_", "met_"] part)
11.167 - then raise error ("guh '"^guh^"' does not begin with \
11.168 + then error ("guh '"^guh^"' does not begin with \
11.169 \exp_ | thy_ | pbl_ | met_")
11.170 else let val chap = case isa of
11.171 "isab_" => "Isabelle"
11.172 | "scri_" => "IsacScripts"
11.173 | "isac_" => "IsacKnowledge"
11.174 | _ =>
11.175 - raise error ("guh2theID: '"^guh^
11.176 + error ("guh2theID: '"^guh^
11.177 "' does not have isab_ | scri_ | \
11.178 \isac_ at position 5..9")
11.179 val rest = takerest (9, guh')
11.180 @@ -793,7 +793,7 @@
11.181 | "-cal-" => "Operations"
11.182 | "-ord-" => "Orders"
11.183 | str =>
11.184 - raise error ("guh2theID: '"^guh^"' has '"^sect^
11.185 + error ("guh2theID: '"^guh^"' has '"^sect^
11.186 "' instead -thm- | -rls- | \
11.187 \-cal- | -ord-")
11.188 in [chap, implode thyID, sect', implode
11.189 @@ -815,14 +815,14 @@
11.190 in case sect of
11.191 "Theorems" => Rewrite (xstr, "")
11.192 | "Rulesets" => Rewrite_Set xstr
11.193 - | str => raise error ("guh2rewtac: not impl. for '"^xstr^"'")
11.194 + | str => error ("guh2rewtac: not impl. for '"^xstr^"'")
11.195 end
11.196 | guh2rewtac (guh:guh) subs =
11.197 let val [isa, thy, sect, xstr] = guh2theID guh
11.198 in case sect of
11.199 "Theorems" => Rewrite_Inst (subs, (xstr, ""))
11.200 | "Rulesets" => Rewrite_Set_Inst (subs, xstr)
11.201 - | str => raise error ("guh2rewtac: not impl. for '"^xstr^"'")
11.202 + | str => error ("guh2rewtac: not impl. for '"^xstr^"'")
11.203 end;
11.204 (*> guh2rewtac "thy_isac_Test-thm-constant_mult_square" [];
11.205 val it = Rewrite ("constant_mult_square", "") : tac
12.1 --- a/src/Tools/isac/Interpret/script.sml Tue Sep 28 08:58:06 2010 +0200
12.2 +++ b/src/Tools/isac/Interpret/script.sml Tue Sep 28 09:06:56 2010 +0200
12.3 @@ -58,9 +58,9 @@
12.4 val e_step = (Empty_Tac_, EmptyMout, EmptyPtree, e_pos',[]:pos' list):step;
12.5
12.6 fun rule2thm' (Thm (id, thm)) = (id, string_of_thmI thm):thm'
12.7 - | rule2thm' r = raise error ("rule2thm': not defined for "^(rule2str r));
12.8 + | rule2thm' r = error ("rule2thm': not defined for "^(rule2str r));
12.9 fun rule2rls' (Rls_ rls) = id_rls rls
12.10 - | rule2rls' r = raise error ("rule2rls': not defined for "^(rule2str r));
12.11 + | rule2rls' r = error ("rule2rls': not defined for "^(rule2str r));
12.12
12.13 (*.makes a (rule,term) list to a Step (m, mout, pt', p', cid) for solve;
12.14 complicated with current t in rrlsstate.*)
12.15 @@ -110,7 +110,7 @@
12.16 | go (D::p) (Abs(s,ty,t0)) = go (p:loc_) t0
12.17 | go (L::p) (t1 $ t2) = go p t1
12.18 | go (R::p) (t1 $ t2) = go p t2
12.19 - | go l _ = raise error ("go: no "^(loc_2str l));
12.20 + | go l _ = error ("go: no "^(loc_2str l));
12.21 (*
12.22 > val t = (term_of o the o (parse thy)) "a+b";
12.23 val it = Const (#,#) $ Free (#,#) $ Free ("b","RealDef.real") : term
12.24 @@ -217,10 +217,10 @@
12.25 *)
12.26 fun init_form thy (Script sc) env =
12.27 (case get_stac thy sc of
12.28 - NONE => NONE (*raise error ("init_form: no 1st stac in "^
12.29 + NONE => NONE (*error ("init_form: no 1st stac in "^
12.30 (Syntax.string_of_term (thy2ctxt thy) sc))*)
12.31 | SOME stac => SOME (subst_atomic env stac))
12.32 - | init_form _ _ _ = raise error "init_form: no match";
12.33 + | init_form _ _ _ = error "init_form: no match";
12.34
12.35 (* use"ME/script.sml";
12.36 use"script.sml";
12.37 @@ -238,7 +238,7 @@
12.38 | itr_arg _ (Const ("Script.Or'_to'_List",_) $ _) = e_term
12.39 | itr_arg _ (Const ("Script.Tac",_) $ _) = e_term
12.40 | itr_arg _ (Const ("Script.SubProblem",_) $ _ $ _) = e_term
12.41 - | itr_arg thy t = raise error
12.42 + | itr_arg thy t = error
12.43 ("itr_arg not impl. for "^
12.44 (Syntax.string_of_term (thy2ctxt (assoc_thy thy)) t));
12.45 (* val t = (term_of o the o (parse thy))"Rewrite rroot_square_inv False e_";
12.46 @@ -294,7 +294,7 @@
12.47 (*.from penv in itm_ make args for script depending on type of description.*)
12.48 (*6.5.03 TODO: push penv into script -- and drop mk_arg here || drop penv
12.49 9.5.03 penv postponed: penv = env for script at the moment, (*mk_arg*)*)
12.50 -fun mk_arg thy d [] = raise error ("mk_arg: no data for "^
12.51 +fun mk_arg thy d [] = error ("mk_arg: no data for "^
12.52 (Syntax.string_of_term (thy2ctxt thy) d))
12.53 | mk_arg thy d [t] =
12.54 (case dsc_valT d of
12.55 @@ -302,10 +302,10 @@
12.56 | "nam" =>
12.57 [case t of
12.58 r as (Const ("op =",_) $ _ $ _) => r
12.59 - | _ => raise error
12.60 + | _ => error
12.61 ("mk_arg: dsc-typ 'nam' applied to non-equality "^
12.62 (Syntax.string_of_term (thy2ctxt thy) t))]
12.63 - | s => raise error ("mk_arg: not impl. for "^s))
12.64 + | s => error ("mk_arg: not impl. for "^s))
12.65
12.66 | mk_arg thy d (t::ts) = (mk_arg thy d [t]) @ (mk_arg thy d ts);
12.67 (*
12.68 @@ -332,7 +332,7 @@
12.69 fun itm2arg itms (_,(d,_)) =
12.70 case find_first (test_dsc d) itms of
12.71 NONE =>
12.72 - raise error ("itms2args: '"^term2str d^"' not in itms")
12.73 + error ("itms2args: '"^term2str d^"' not in itms")
12.74 (*| SOME (_,_,_,_,itm_) => mk_arg thy (d_in itm_) (ts_in itm_);
12.75 penv postponed; presently penv holds already env for script*)
12.76 | SOME (_,_,_,_,itm_) => penvval_in itm_
12.77 @@ -354,7 +354,7 @@
12.78 fun oris2fmz_vals oris =
12.79 let fun ori2fmz_vals ((_,_,_,dsc,ts):ori) =
12.80 ((term2str o comp_dts') (dsc, ts), last_elem ts)
12.81 - handle _ => raise error ("ori2fmz_env called with "^terms2str ts)
12.82 + handle _ => error ("ori2fmz_env called with "^terms2str ts)
12.83 in (split_list o (map ori2fmz_vals)) oris end;
12.84
12.85 (*detour necessary, because generate1 delivers a string-result*)
12.86 @@ -469,7 +469,7 @@
12.87 Subproblem' ((dI, pI, mI), pors, hdl, fmz_, f))
12.88 end
12.89
12.90 - | stac2tac_ pt thy t = raise error
12.91 + | stac2tac_ pt thy t = error
12.92 ("stac2tac_ TODO: no match for "^
12.93 (Syntax.string_of_term (thy2ctxt thy) t));
12.94 (*
12.95 @@ -536,7 +536,7 @@
12.96 else (mk_and o (map fst)) (get_assumptions_ pt (p,Res))
12.97 in (bdv, pred) end
12.98 | rep_set thy _ _ set =
12.99 - raise error ("check_elementwise: no set "^ (*from script*)
12.100 + error ("check_elementwise: no set "^ (*from script*)
12.101 (Syntax.string_of_term (thy2ctxt thy) set));
12.102 (*> val set = (term_of o the o (parse thy)) "{(x::real). Assumptions}";
12.103 > val p = [];
12.104 @@ -794,7 +794,7 @@
12.105 | tac_2tac Empty_Tac_ = Empty_Tac
12.106
12.107 | tac_2tac m =
12.108 - raise error ("tac_2tac: not impl. for "^(tac_2str m));
12.109 + error ("tac_2tac: not impl. for "^(tac_2str m));
12.110
12.111
12.112
12.113 @@ -952,7 +952,7 @@
12.114 | rep_tac_ (Take' (t')) = (Erule, (e_term, t'))
12.115 | rep_tac_ (Substitute' (subst,t,t')) = (Erule, (t, t'))
12.116 | rep_tac_ (Or_to_List' (t, t')) = (Erule, (t, t'))
12.117 - | rep_tac_ m = raise error ("rep_tac_: not impl.for "^
12.118 + | rep_tac_ m = error ("rep_tac_: not impl.for "^
12.119 (tac_2str m));
12.120
12.121 (*"N.3.6.03------
12.122 @@ -1118,7 +1118,7 @@
12.123 assy (y, AssGen) ((E, (l@[L,R]), SOME a,v,S,b),ss) e2
12.124 | ay => ay)
12.125 | ay =>(ay))
12.126 - | NasApp _ => raise error ("assy: FIXXXME ///must not return NasApp///")
12.127 + | NasApp _ => error ("assy: FIXXXME ///must not return NasApp///")
12.128 | ay => (ay))
12.129
12.130 | assy ya ((E,l,a,v,S,b),ss) (Const ("Script.Or",_) $e1 $ e2) =
12.131 @@ -1154,7 +1154,7 @@
12.132 | (a', STac stac) =>
12.133 let (*val _=tracing("### assy, stac = "^term2str stac);*)
12.134 val p' = case p_ of Frm => p | Res => lev_on p
12.135 - | _ => raise error ("assy: call by "^
12.136 + | _ => error ("assy: call by "^
12.137 (pos'2str (p,p_)));
12.138 in case assod pt d m stac of
12.139 Ass (m,v') =>
12.140 @@ -1307,7 +1307,7 @@
12.141 astep_up y ((E, (drop_last l), a,v,S,b),ss)
12.142
12.143 | ass_up y iss t =
12.144 - raise error ("ass_up not impl for t= "^(term2str t))
12.145 + error ("ass_up not impl for t= "^(term2str t))
12.146 (* 9.6.03
12.147 val (ys as (_,_,Script sc,_), ss) =
12.148 ((thy',srls,scr,d), [(m,EmptyMout,pt,p,[])]:step list);
12.149 @@ -1448,7 +1448,7 @@
12.150 else Steps (ScrState is, ss))
12.151
12.152 | NasApp _ (*[((E,l,a,v,S,bb),(m',f',pt',p',c'))] =>
12.153 - raise error ("locate_gen: should not have got NasApp, ets =")*)
12.154 + error ("locate_gen: should not have got NasApp, ets =")*)
12.155 => NotLocatable
12.156 | NasNap (_,_) =>
12.157 if l=[] then NotLocatable
12.158 @@ -1468,7 +1468,7 @@
12.159 NotLocatable))
12.160 end
12.161 | locate_gen _ m _ (sc,_) is =
12.162 - raise error ("locate_gen: wrong arguments,\n tac= "^(tac_2str m)^
12.163 + error ("locate_gen: wrong arguments,\n tac= "^(tac_2str m)^
12.164 ",\n scr= "^(scr2str sc)^",\n istate= "^(istate2str is));
12.165
12.166
12.167 @@ -1800,7 +1800,7 @@
12.168 | Skip (v,E) => nstep_up thy ptp scr E up Skip_ a v end
12.169
12.170 | nxt_up (thy,_) ptp scr E l ay t a v =
12.171 - raise error ("nxt_up not impl for "^
12.172 + error ("nxt_up not impl for "^
12.173 (Syntax.string_of_term (thy2ctxt (assoc_thy thy)) t))
12.174
12.175 (* val (thy, ptp, (Script sc), E, l, ay, a, v)=
12.176 @@ -1871,7 +1871,7 @@
12.177 | Appy (m', scrst as (_,_,_,v,_,_)) => (m', ScrState scrst,
12.178 (v, Sundef))) (*next stac*)
12.179
12.180 - | next_tac _ _ _ is = raise error ("next_tac: not impl for "^
12.181 + | next_tac _ _ _ is = error ("next_tac: not impl for "^
12.182 (istate2str is));
12.183
12.184
12.185 @@ -1888,7 +1888,7 @@
12.186 and (formal) args in met*)
12.187 fun relate_args env [] [] = env
12.188 | relate_args env _ [] =
12.189 - raise error ("ERROR in creating the environment for '"
12.190 + error ("ERROR in creating the environment for '"
12.191 ^id_of_scr sc^"' from \nthe items of the guard of "
12.192 ^metID2str metID^",\n\
12.193 \formal arg(s), from the script,\
12.194 @@ -1901,7 +1901,7 @@
12.195 | relate_args env (a::aa) (f::ff) =
12.196 if type_of a = type_of f
12.197 then relate_args (env @ [(a, f)]) aa ff else
12.198 - raise error ("ERROR in creating the environment for '"
12.199 + error ("ERROR in creating the environment for '"
12.200 ^id_of_scr sc^"' from \nthe items of the guard of "
12.201 ^metID2str metID^",\n\
12.202 \different types of formal arg, from the script,\
12.203 @@ -1923,7 +1923,7 @@
12.204 fun from_pblobj_or_detail' thy' (p,p_) pt =
12.205 if member op = [Pbl,Met] p_
12.206 then case get_obj g_env pt p of
12.207 - NONE => raise error "from_pblobj_or_detail': no istate"
12.208 + NONE => error "from_pblobj_or_detail': no istate"
12.209 | SOME is =>
12.210 let val metID = get_obj g_metID pt p
12.211 val {srls,...} = get_met metID
13.1 --- a/src/Tools/isac/Interpret/solve.sml Tue Sep 28 08:58:06 2010 +0200
13.2 +++ b/src/Tools/isac/Interpret/solve.sml Tue Sep 28 09:06:56 2010 +0200
13.3 @@ -109,7 +109,7 @@
13.4 *}
13.5 fun op_intern op_ =
13.6 case assoc (ops, op_) of
13.7 - SOME op' => op' | NONE => raise error ("op_intern: no op= "^op_);
13.8 + SOME op' => op' | NONE => error ("op_intern: no op= "^op_);
13.9 -----------------------*)
13.10
13.11
14.1 --- a/src/Tools/isac/Knowledge/Atools.thy Tue Sep 28 08:58:06 2010 +0200
14.2 +++ b/src/Tools/isac/Knowledge/Atools.thy Tue Sep 28 09:06:56 2010 +0200
14.3 @@ -504,7 +504,7 @@
14.4 as the fst argument;
14.5 this is, because Isabelles filter takes more than 1 sec.*)
14.6 fun same_funid f1 (Const ("op =", _) $ (f2 $ _) $ _) = f1 = f2
14.7 - | same_funid f1 t = raise error ("same_funid called with t = ("
14.8 + | same_funid f1 t = error ("same_funid called with t = ("
14.9 ^term2str f1^") ("^term2str t^")");
14.10 (*("filter_sameFunId" ,("Atools.filter'_sameFunId",
14.11 eval_filter_sameFunId "Atools.filter'_sameFunId"))*)
15.1 --- a/src/Tools/isac/Knowledge/Delete.thy Tue Sep 28 08:58:06 2010 +0200
15.2 +++ b/src/Tools/isac/Knowledge/Delete.thy Tue Sep 28 09:06:56 2010 +0200
15.3 @@ -32,7 +32,7 @@
15.4 | calc "Atools.pow" ((a, b), _) ((c, d), _) = (*FIXXXME float + prec.*)
15.5 ((power a c, 0), (0, 0))
15.6 | calc op_ ((a, b), (p11, p12)) ((c, d), (p21, p22)) =
15.7 - raise error ("calc: not impl. for Float (("^
15.8 + error ("calc: not impl. for Float (("^
15.9 (string_of_int a )^","^(string_of_int b )^"), ("^
15.10 (string_of_int p11)^","^(string_of_int p12)^")) "^op_^" (("^
15.11 (string_of_int c )^","^(string_of_int d )^"), ("^
16.1 --- a/src/Tools/isac/Knowledge/Diff.thy Tue Sep 28 08:58:06 2010 +0200
16.2 +++ b/src/Tools/isac/Knowledge/Diff.thy Tue Sep 28 09:06:56 2010 +0200
16.3 @@ -100,7 +100,7 @@
16.4
16.5 fun primed (Const (id, T)) = Const (id ^ "'", T)
16.6 | primed (Free (id, T)) = Free (id ^ "'", T)
16.7 - | primed t = raise error ("primed called with arg = '"^ term2str t ^"'");
16.8 + | primed t = error ("primed called with arg = '"^ term2str t ^"'");
16.9
16.10 (*("primed", ("Diff.primed", eval_primed "#primed"))*)
16.11 fun eval_primed _ _ (p as (Const ("Diff.primed",_) $ t)) _ =
16.12 @@ -408,7 +408,7 @@
16.13 ((term_of o the o (parse thy)) "derivative",
16.14 [(term_of o the o (parse thy)) "f_f'"])
16.15 ]
16.16 - | argl2dtss _ = raise error "Diff.ML: wrong argument for argl2dtss";
16.17 + | argl2dtss _ = error "Diff.ML: wrong argument for argl2dtss";
16.18 castab :=
16.19 overwritel (!castab,
16.20 [((term_of o the o (parse thy)) "Diff",
16.21 @@ -426,7 +426,7 @@
16.22 ((term_of o the o (parse thy)) "derivativeEq",
16.23 [(term_of o the o (parse thy)) "f_f'::bool"])
16.24 ]
16.25 - | argl2dtss _ = raise error "Diff.ML: wrong argument for argl2dtss";
16.26 + | argl2dtss _ = error "Diff.ML: wrong argument for argl2dtss";
16.27 castab :=
16.28 overwritel (!castab,
16.29 [((term_of o the o (parse thy)) "Differentiate",
17.1 --- a/src/Tools/isac/Knowledge/Equation.thy Tue Sep 28 08:58:06 2010 +0200
17.2 +++ b/src/Tools/isac/Knowledge/Equation.thy Tue Sep 28 09:06:56 2010 +0200
17.3 @@ -73,7 +73,7 @@
17.4 ((term_of o the o (parse thy)) "solutions",
17.5 [(term_of o the o (parse thy)) "L"])
17.6 ]
17.7 - | argl2dtss _ = raise error "Equation.ML: wrong argument for argl2dtss";
17.8 + | argl2dtss _ = error "Equation.ML: wrong argument for argl2dtss";
17.9
17.10 castab :=
17.11 overwritel (!castab,
18.1 --- a/src/Tools/isac/Knowledge/Poly.thy Tue Sep 28 08:58:06 2010 +0200
18.2 +++ b/src/Tools/isac/Knowledge/Poly.thy Tue Sep 28 09:06:56 2010 +0200
18.3 @@ -175,7 +175,7 @@
18.4 (* is_polyrat_in becomes true, if no bdv is in the denominator of a fraction*)
18.5 fun is_polyrat_in t v =
18.6 let fun coeff_in c v = member op = (vars c) v;
18.7 - fun finddivide (_ $ _ $ _ $ _) v = raise error("is_polyrat_in:")
18.8 + fun finddivide (_ $ _ $ _ $ _) v = error("is_polyrat_in:")
18.9 (* at the moment there is no term like this, but ....*)
18.10 | finddivide (t as (Const ("Rings.inverse_class.divide",_) $ _ $ b)) v =
18.11 not(coeff_in b v)
18.12 @@ -1141,7 +1141,7 @@
18.13 | get_basStr (Free (str, _)) = str
18.14 | get_basStr t = "|||"; (* gross gewichtet; für Brüch ect. *)
18.15 (*| get_basStr t =
18.16 - raise error("get_basStr: called with t= "^(term2str t));*)
18.17 + error("get_basStr: called with t= "^(term2str t));*)
18.18
18.19 (* liefert Hochzahl (String) einer Variablen bzw Gewichtstring (zum Sortieren) *)
18.20 fun get_potStr (Const ("Atools.pow",_) $ Free _ $ Free (str, _)) = str
18.21 @@ -1149,7 +1149,7 @@
18.22 | get_potStr (Free (str, _)) = "---" (* keine Hochzahl --> kleinst gewichtet *)
18.23 | get_potStr t = "||||||"; (* gross gewichtet; für Brüch ect. *)
18.24 (*| get_potStr t =
18.25 - raise error("get_potStr: called with t= "^(term2str t));*)
18.26 + error("get_potStr: called with t= "^(term2str t));*)
18.27
18.28 (* Umgekehrte string_ord *)
18.29 val string_ord_rev = rev_order o string_ord;
18.30 @@ -1208,7 +1208,7 @@
18.31 | (Const ("Atools.pow", _) $ Free (str_b, _) $ _ ) =>
18.32 counter (n + 1000, xs) (*FIXME.MG?!*)
18.33 | (Free (str, _)) => counter (n + 1, xs)
18.34 - (*| _ => raise error("monom_degree: called with factor: "^(term2str x)))*)
18.35 + (*| _ => error("monom_degree: called with factor: "^(term2str x)))*)
18.36 | _ => counter (n + 10000, xs)) (*FIXME.MG?! ... Brüche ect.*)
18.37 in
18.38 fun monom_degree l = counter (0, l)
18.39 @@ -1240,7 +1240,7 @@
18.40 fun tl_str str = substring (str, 1, (size str) - 1);
18.41
18.42 (* liefert nummerischen Koeffizienten eines Monoms oder NONE *)
18.43 -fun get_koeff_of_mon [] = raise error("get_koeff_of_mon: called with l = []")
18.44 +fun get_koeff_of_mon [] = error("get_koeff_of_mon: called with l = []")
18.45 | get_koeff_of_mon (l as x::xs) = if is_nums x then SOME x
18.46 else NONE;
18.47
19.1 --- a/src/Tools/isac/Knowledge/PolyEq.thy Tue Sep 28 08:58:06 2010 +0200
19.2 +++ b/src/Tools/isac/Knowledge/PolyEq.thy Tue Sep 28 09:06:56 2010 +0200
19.3 @@ -1316,12 +1316,12 @@
19.4 (case x of (*WN*)
19.5 (Free (xstr,_)) =>
19.6 (if xstr = var then 1000*(the (int_of_str pot)) else 3)
19.7 - | _ => raise error ("size_of_term' called with subst = "^
19.8 + | _ => error ("size_of_term' called with subst = "^
19.9 (term2str x)))
19.10 | size_of_term' x (Free (subst,_)) =
19.11 (case x of
19.12 (Free (xstr,_)) => (if xstr = subst then 1000 else 1)
19.13 - | _ => raise error ("size_of_term' called with subst = "^
19.14 + | _ => error ("size_of_term' called with subst = "^
19.15 (term2str x)))
19.16 | size_of_term' x (Abs (_,_,body)) = 1 + size_of_term' x body
19.17 | size_of_term' x (f$t) = size_of_term' x f + size_of_term' x t
19.18 @@ -1369,7 +1369,7 @@
19.19 in
19.20 case subst of
19.21 (_,x)::_ => (term_ord' x pr thy tu = LESS)
19.22 - | _ => raise error ("ord_make_polynomial_in called with subst = "^
19.23 + | _ => error ("ord_make_polynomial_in called with subst = "^
19.24 (subst2str subst))
19.25 end;
19.26 end;(*local*)
20.1 --- a/src/Tools/isac/Knowledge/RatEq.thy Tue Sep 28 08:58:06 2010 +0200
20.2 +++ b/src/Tools/isac/Knowledge/RatEq.thy Tue Sep 28 09:06:56 2010 +0200
20.3 @@ -50,7 +50,7 @@
20.4 fun is_rateqation_in t v =
20.5 let
20.6 fun coeff_in c v = member op = (vars c) v;
20.7 - fun finddivide (_ $ _ $ _ $ _) v = raise error("is_rateqation_in:")
20.8 + fun finddivide (_ $ _ $ _ $ _) v = error("is_rateqation_in:")
20.9 (* at the moment there is no term like this, but ....*)
20.10 | finddivide (t as (Const ("Rings.inverse_class.divide",_) $ _ $ b)) v = coeff_in b v
20.11 | finddivide (_ $ t1 $ t2) v = (finddivide t1 v)
21.1 --- a/src/Tools/isac/Knowledge/Rational-WN.sml Tue Sep 28 08:58:06 2010 +0200
21.2 +++ b/src/Tools/isac/Knowledge/Rational-WN.sml Tue Sep 28 09:06:56 2010 +0200
21.3 @@ -35,8 +35,8 @@
21.4 | ato (f$t') n = ato f n^ato t' (n+1)
21.5 in "\n-------------"^ato t 0^"\n" end;
21.6 fun free2int (t as Free (s, _)) = (((the o int_of_str) s)
21.7 - handle _ => raise error ("free2int: "^term2str t))
21.8 - | free2int t = raise error ("free2int: "^term2str t);
21.9 + handle _ => error ("free2int: "^term2str t))
21.10 + | free2int t = error ("free2int: "^term2str t);
21.11 (*diese ^^^ funktionen kommen nach src/Isa99/termC.sml -------------*)
21.12
21.13
21.14 @@ -56,12 +56,12 @@
21.15
21.16 fun mono (Const ("RatArith.pow",_) $ t1 $ t2) v g =
21.17 if t1 = v then ((replicate ((free2int t2) - g) 0) @ [1]) : poly
21.18 - else raise error ("term2poly.1 "^term2str t1)
21.19 + else error ("term2poly.1 "^term2str t1)
21.20 | mono (t as Const ("op *",_) $ t1 $
21.21 (Const ("RatArith.pow",_) $ t2 $ t3)) v g =
21.22 if t2 = v then (replicate ((free2int t3) - g) 0) @ [free2int t1]
21.23 - else raise error ("term2poly.2 "^term2str t)
21.24 - | mono t _ _ = raise error ("term2poly.3 "^term2str t);
21.25 + else error ("term2poly.2 "^term2str t)
21.26 + | mono t _ _ = error ("term2poly.3 "^term2str t);
21.27
21.28 fun poly (Const ("Groups.plus_class.plus",_) $ t1 $ t2) v g =
21.29 let val l = mono t1 v g
21.30 @@ -185,7 +185,7 @@
21.31 "***************************************************************************";
21.32 fun rewrite_set_' thy rls put_asm ruless ct =
21.33 case ruless of
21.34 - Rrls _ => raise error "rewrite_set_' not for Rrls"
21.35 + Rrls _ => error "rewrite_set_' not for Rrls"
21.36 | Rls _ =>
21.37 let
21.38 datatype switch = Appl | Noap;
21.39 @@ -208,7 +208,7 @@
21.40 rewrite_ thy ((snd o #rew_ord o rep_rls) ruless)
21.41 rls put_asm thm' ct;
21.42 val _ = if pairopt <> NONE then ()
21.43 - else raise error("rewrite_set_, rewrite_ \""^
21.44 + else error("rewrite_set_, rewrite_ \""^
21.45 (string_of_thmI thm')^"\" \""^
21.46 (Syntax.string_of_term (thy2ctxt thy) ct)^"\" = NONE")
21.47 in rew_once ruls asm ((fst o the) pairopt) Appl(rul::thms) end);
21.48 @@ -221,7 +221,7 @@
21.49 *)
21.50 fun rewrite_set_' thy rls put_asm ruless ct =
21.51 case ruless of
21.52 - Rrls _ => raise error "rewrite_set_' not for Rrls"
21.53 + Rrls _ => error "rewrite_set_' not for Rrls"
21.54 | Rls _ =>
21.55 let
21.56 datatype switch = Appl | Noap;
21.57 @@ -244,7 +244,7 @@
21.58 rewrite_ thy ((snd o #rew_ord o rep_rls) ruless)
21.59 rls put_asm thm' ct;
21.60 val _ = if pairopt <> NONE then ()
21.61 - else raise error("rewrite_set_, rewrite_ \""^
21.62 + else error("rewrite_set_, rewrite_ \""^
21.63 (string_of_thmI thm')^"\" \""^
21.64 (Syntax.string_of_term (thy2ctxt thy) ct)^"\" = NONE")
21.65 in rew_once ruls asm ((fst o the) pairopt) Appl(rul::thms) end);
22.1 --- a/src/Tools/isac/Knowledge/Rational.thy Tue Sep 28 08:58:06 2010 +0200
22.2 +++ b/src/Tools/isac/Knowledge/Rational.thy Tue Sep 28 09:06:56 2010 +0200
22.3 @@ -257,7 +257,7 @@
22.4 (* FIXME: Division von x^9+x^5+1 durch x-1000 funktioniert nicht,
22.5 integer zu klein *)
22.6 fun uv_mod_pdiv (p1:uv_poly) ([]:uv_poly) =
22.7 - raise error ("RATIONALS_UV_MOD_PDIV_EXCEPTION: division by zero")
22.8 + error ("RATIONALS_UV_MOD_PDIV_EXCEPTION: division by zero")
22.9 | uv_mod_pdiv p1 [x] =
22.10 let
22.11 val xs= Unsynchronized.ref [];
22.12 @@ -267,7 +267,7 @@
22.13 xs:=(uv_mod_rem_poly(p1,x));
22.14 while length(!xs)>0 andalso hd(!xs)=0 do xs:=tl(!xs)
22.15 )
22.16 - else raise error ("RATIONALS_UV_MOD_PDIV_EXCEPTION: division by zero");
22.17 + else error ("RATIONALS_UV_MOD_PDIV_EXCEPTION: division by zero");
22.18 ([]:uv_poly,!xs:uv_poly)
22.19 end
22.20 | uv_mod_pdiv p1 p2 =
22.21 @@ -283,7 +283,7 @@
22.22 in
22.23 (
22.24 if (!m)=0 orelse p2=[0]
22.25 - then raise error ("RATIONALS_UV_MOD_PDIV_EXCEPTION: Division by zero")
22.26 + then error ("RATIONALS_UV_MOD_PDIV_EXCEPTION: Division by zero")
22.27 else
22.28 (
22.29 if (!m)<n then
22.30 @@ -323,7 +323,7 @@
22.31 val output= Unsynchronized.ref ([],[]);
22.32 in
22.33 (
22.34 - if (!m)=0 orelse p2=[0] then raise error ("RATIONALS_UV_MOD_PDIVP_EXCEPTION: Division by zero")
22.35 + if (!m)=0 orelse p2=[0] then error ("RATIONALS_UV_MOD_PDIVP_EXCEPTION: Division by zero")
22.36 else
22.37 (
22.38 if (!m)<n then
22.39 @@ -354,12 +354,12 @@
22.40 end;
22.41
22.42 (*. calculates the remainder of p1/p2 .*)
22.43 -fun uv_mod_prest (p1:uv_poly) ([]:uv_poly) = raise error("UV_MOD_PREST_EXCEPTION: Division by zero")
22.44 +fun uv_mod_prest (p1:uv_poly) ([]:uv_poly) = error("UV_MOD_PREST_EXCEPTION: Division by zero")
22.45 | uv_mod_prest [] p2 = []:uv_poly
22.46 | uv_mod_prest p1 p2 = (#2(uv_mod_pdiv p1 p2));
22.47
22.48 (*. calculates the remainder of p1/p2 in Zp .*)
22.49 -fun uv_mod_prestp (p1:uv_poly) ([]:uv_poly) p= raise error("UV_MOD_PRESTP_EXCEPTION: Division by zero")
22.50 +fun uv_mod_prestp (p1:uv_poly) ([]:uv_poly) p= error("UV_MOD_PRESTP_EXCEPTION: Division by zero")
22.51 | uv_mod_prestp [] p2 p= []:uv_poly
22.52 | uv_mod_prestp p1 p2 p = #2(uv_mod_pdivp p1 p2 p);
22.53
22.54 @@ -368,7 +368,7 @@
22.55 | uv_mod_cont (x::p)= gcd_int x (uv_mod_cont(p));
22.56
22.57 (*. divides each coefficient of a uv polynomial by y .*)
22.58 -fun uv_mod_div_list (p:uv_poly,0) = raise error("UV_MOD_DIV_LIST_EXCEPTION: Division by zero")
22.59 +fun uv_mod_div_list (p:uv_poly,0) = error("UV_MOD_DIV_LIST_EXCEPTION: Division by zero")
22.60 | uv_mod_div_list ([],y) = []:uv_poly
22.61 | uv_mod_div_list (x::p,y) = (x div y)::uv_mod_div_list(p,y);
22.62
22.63 @@ -381,7 +381,7 @@
22.64 (
22.65 c:=uv_mod_cont(p);
22.66
22.67 - if !c=0 then raise error ("RATIONALS_UV_MOD_PP_EXCEPTION: content is 0")
22.68 + if !c=0 then error ("RATIONALS_UV_MOD_PP_EXCEPTION: content is 0")
22.69 else uv_mod_div_list(p,!c)
22.70 )
22.71 end;
22.72 @@ -517,11 +517,11 @@
22.73 end;
22.74
22.75 (*. decides if p1 is a factor of p2 in Zp .*)
22.76 -fun uv_mod_dividesp ([]:uv_poly) (p2:uv_poly) p= raise error("UV_MOD_DIVIDESP: Division by zero")
22.77 +fun uv_mod_dividesp ([]:uv_poly) (p2:uv_poly) p= error("UV_MOD_DIVIDESP: Division by zero")
22.78 | uv_mod_dividesp p1 p2 p= if uv_mod_prestp p2 p1 p = [] then true else false;
22.79
22.80 (*. decides if p1 is a factor of p2 .*)
22.81 -fun uv_mod_divides ([]:uv_poly) (p2:uv_poly) = raise error("UV_MOD_DIVIDES: Division by zero")
22.82 +fun uv_mod_divides ([]:uv_poly) (p2:uv_poly) = error("UV_MOD_DIVIDES: Division by zero")
22.83 | uv_mod_divides p1 p2 = if uv_mod_prest p2 p1 = [] then true else false;
22.84
22.85 (*. chinese remainder algorithm .*)
22.86 @@ -545,8 +545,8 @@
22.87
22.88 (*. applies the chinese remainder algorithmen to the coefficients of x1 and x2 .*)
22.89 fun uv_mod_cra_2 ([],[],m1,m2) = []
22.90 - | uv_mod_cra_2 ([],x2,m1,m2) = raise error("UV_MOD_CRA_2_EXCEPTION: invalid call x1")
22.91 - | uv_mod_cra_2 (x1,[],m1,m2) = raise error("UV_MOD_CRA_2_EXCEPTION: invalid call x2")
22.92 + | uv_mod_cra_2 ([],x2,m1,m2) = error("UV_MOD_CRA_2_EXCEPTION: invalid call x1")
22.93 + | uv_mod_cra_2 (x1,[],m1,m2) = error("UV_MOD_CRA_2_EXCEPTION: invalid call x2")
22.94 | uv_mod_cra_2 (x1::x1s,x2::x2s,m1,m2) = (uv_mod_cra2(x1,x2,m1,m2))::(uv_mod_cra_2(x1s,x2s,m1,m2));
22.95
22.96 (*. calculates the gcd of two uv polynomials p1' and p2' with the modular algorithm .*)
22.97 @@ -688,18 +688,18 @@
22.98 fun mv_monom_greater((M1x,M1l):mv_monom,(M2x,M2l):mv_monom,order)=
22.99 if order=LEX_ then
22.100 (
22.101 - if length(M1l)<>length(M2l) then raise error ("RATIONALS_MV_MONOM_GREATER_EXCEPTION: Order error")
22.102 + if length(M1l)<>length(M2l) then error ("RATIONALS_MV_MONOM_GREATER_EXCEPTION: Order error")
22.103 else if (mv_mg_hlp((map op- (M1l~~M2l)))<>GREATER) then false else true
22.104 )
22.105 else
22.106 if order=GGO_ then
22.107 (
22.108 - if length(M1l)<>length(M2l) then raise error ("RATIONALS_MV_MONOM_GREATER_EXCEPTION: Order error")
22.109 + if length(M1l)<>length(M2l) then error ("RATIONALS_MV_MONOM_GREATER_EXCEPTION: Order error")
22.110 else
22.111 if mv_addlist(M1l)=mv_addlist(M2l) then if (mv_mg_hlp((map op- (M1l~~M2l)))<>GREATER) then false else true
22.112 else if mv_addlist(M1l)>mv_addlist(M2l) then true else false
22.113 )
22.114 - else raise error ("RATIONALS_MV_MONOM_GREATER_EXCEPTION: Wrong Order");
22.115 + else error ("RATIONALS_MV_MONOM_GREATER_EXCEPTION: Wrong Order");
22.116
22.117 (*. tests if the monomial X is greater as the monomial Y and returns a order value (GREATER,EQUAL,LESS) .*)
22.118 (*. 2 orders are implemented LEX_/GGO_ (lexigraphical/greatest degree order) .*)
22.119 @@ -710,7 +710,7 @@
22.120 if order=LEX_ then
22.121 (
22.122 if length(x)<>length(y) then
22.123 - raise error ("RATIONALS_MV_GEQ_EXCEPTION: Order error")
22.124 + error ("RATIONALS_MV_GEQ_EXCEPTION: Order error")
22.125 else
22.126 (
22.127 temp:=mv_mg_hlp((map op- (x~~y)));
22.128 @@ -726,18 +726,18 @@
22.129 if order=GGO_ then
22.130 (
22.131 if length(x)<>length(y) then
22.132 - raise error ("RATIONALS_MV_GEQ_EXCEPTION: Order error")
22.133 + error ("RATIONALS_MV_GEQ_EXCEPTION: Order error")
22.134 else
22.135 if mv_addlist(x)=mv_addlist(y) then
22.136 (mv_mg_hlp((map op- (x~~y))))
22.137 else if mv_addlist(x)>mv_addlist(y) then GREATER else LESS
22.138 )
22.139 - else raise error ("RATIONALS_MV_GEQ_EXCEPTION: Wrong Order")
22.140 + else error ("RATIONALS_MV_GEQ_EXCEPTION: Wrong Order")
22.141 end;
22.142
22.143 (*. cuts the first variable from a polynomial .*)
22.144 fun mv_cut([]:mv_poly)=[]:mv_poly
22.145 - | mv_cut((x,[])::list) = raise error ("RATIONALS_MV_CUT_EXCEPTION: Invalid list ")
22.146 + | mv_cut((x,[])::list) = error ("RATIONALS_MV_CUT_EXCEPTION: Invalid list ")
22.147 | mv_cut((x,y::ys)::list)=(x,ys)::mv_cut(list);
22.148
22.149 (*. leading power product .*)
22.150 @@ -775,7 +775,7 @@
22.151 lc:=hd(mv_cut([hd(!p1o)]))::(!lc);
22.152 p1o:=tl(!p1o)
22.153 );
22.154 - if !lc=[] then raise error ("RATIONALS_MV_LC_EXCEPTION: lc is empty") else ();
22.155 + if !lc=[] then error ("RATIONALS_MV_LC_EXCEPTION: lc is empty") else ();
22.156 mv_rev_to(!lc)
22.157 )
22.158 end;
22.159 @@ -848,14 +848,14 @@
22.160
22.161 (*. division of monomials .*)
22.162 fun mv_mdiv((0,[]):mv_monom,_:mv_monom)=(0,[]):mv_monom
22.163 - | mv_mdiv(_,(0,[]))= raise error ("RATIONALS_MV_MDIV_EXCEPTION Division by 0 ")
22.164 + | mv_mdiv(_,(0,[]))= error ("RATIONALS_MV_MDIV_EXCEPTION Division by 0 ")
22.165 | mv_mdiv(p1:mv_monom,p2:mv_monom)=
22.166 let
22.167 val c= Unsynchronized.ref (#1(p2));
22.168 val pp= Unsynchronized.ref [];
22.169 in
22.170 (
22.171 - if !c=0 then raise error("MV_MDIV_EXCEPTION Dividing by zero")
22.172 + if !c=0 then error("MV_MDIV_EXCEPTION Dividing by zero")
22.173 else c:=(#1(p1) div #1(p2));
22.174 if #1(p2)<>0 then
22.175 (
22.176 @@ -863,7 +863,7 @@
22.177 if mv_is_negativ(!pp) then (0,!pp)
22.178 else (!c,!pp)
22.179 )
22.180 - else raise error("MV_MDIV_EXCEPTION Dividing by empty Polynom")
22.181 + else error("MV_MDIV_EXCEPTION Dividing by empty Polynom")
22.182 )
22.183 end;
22.184
22.185 @@ -875,7 +875,7 @@
22.186
22.187 (*. division of two multivariate polynomials .*)
22.188 fun mv_division([]:mv_poly,g:mv_poly,order)=([]:mv_poly,[]:mv_poly)
22.189 - | mv_division(f,[],order)= raise error ("RATIONALS_MV_DIVISION_EXCEPTION Division by zero")
22.190 + | mv_division(f,[],order)= error ("RATIONALS_MV_DIVISION_EXCEPTION Division by zero")
22.191 | mv_division(f,g,order)=
22.192 let
22.193 val r= Unsynchronized.ref [];
22.194 @@ -887,7 +887,7 @@
22.195 in
22.196 r := rev(sort (mv_geq order) (mv_shorten(f,order)));
22.197 g':= rev(sort (mv_geq order) (mv_shorten(g,order)));
22.198 - if #1(hd(!g'))=0 then raise error("RATIONALS_MV_DIVISION_EXCEPTION: Dividing by zero") else ();
22.199 + if #1(hd(!g'))=0 then error("RATIONALS_MV_DIVISION_EXCEPTION: Dividing by zero") else ();
22.200 if (mv_monom_greater (hd(!g'),hd(!r),order)) then ([(0,mv_null2(#2(hd(f))))],(!r))
22.201 else
22.202 (
22.203 @@ -895,7 +895,7 @@
22.204 while (if (!exit)=0 then not(mv_monom_greater (hd(!g'),hd(!r),order)) else false) do
22.205 (
22.206 if (#1(mv_lm(!g',order)))<>0 then m:=mv_mdiv(mv_lm(!r,order),mv_lm(!g',order))
22.207 - else raise error ("RATIONALS_MV_DIVISION_EXCEPTION: Dividing by zero");
22.208 + else error ("RATIONALS_MV_DIVISION_EXCEPTION: Dividing by zero");
22.209 if #1(!m)<>0 then
22.210 (
22.211 q:=(!m)::(!q);
22.212 @@ -920,8 +920,8 @@
22.213 (*. multivariate case .*)
22.214
22.215 (*. decides if x is a factor of y .*)
22.216 -fun mv_divides([]:mv_poly,[]:mv_poly)= raise error("RATIONALS_MV_DIVIDES_EXCEPTION: division by zero")
22.217 - | mv_divides(x,[]) = raise error("RATIONALS_MV_DIVIDES_EXCEPTION: division by zero")
22.218 +fun mv_divides([]:mv_poly,[]:mv_poly)= error("RATIONALS_MV_DIVIDES_EXCEPTION: division by zero")
22.219 + | mv_divides(x,[]) = error("RATIONALS_MV_DIVIDES_EXCEPTION: division by zero")
22.220 | mv_divides(x:mv_poly,y:mv_poly) = #2(mv_division(y,x,LEX_))=[];
22.221
22.222 (*. gets the maximum of a and b .*)
22.223 @@ -964,7 +964,7 @@
22.224 val help= Unsynchronized.ref ((c1,e1)::others);
22.225 val list= Unsynchronized.ref [];
22.226 in
22.227 - if length(e1)>1 then raise error ("RATIONALS_TO_LIST_EXCEPTION: not univariate")
22.228 + if length(e1)>1 then error ("RATIONALS_TO_LIST_EXCEPTION: not univariate")
22.229 else if length(e1)=0 then [c1]
22.230 else
22.231 (
22.232 @@ -1176,7 +1176,7 @@
22.233 cont:=mv_content(p1);
22.234 pp:=(#1(mv_division(p1,!cont,LEX_)));
22.235 if !pp=[]
22.236 - then raise error("RATIONALS_MV_PP_EXCEPTION: Invalid Content ")
22.237 + then error("RATIONALS_MV_PP_EXCEPTION: Invalid Content ")
22.238 else (!pp)
22.239 end
22.240
22.241 @@ -1426,7 +1426,7 @@
22.242 );
22.243 SOME [(1,rev(!vl))] handle _ => NONE
22.244 )
22.245 - else raise error ("RATIONALS_TERM2COEF_EXCEPTION 1: Invalid term")
22.246 + else error ("RATIONALS_TERM2COEF_EXCEPTION 1: Invalid term")
22.247 )
22.248 end
22.249 | term2coef' (Const ("Groups.plus_class.plus",_) $ t1 $ t2) v :mv_poly option=
22.250 @@ -1437,7 +1437,7 @@
22.251 (
22.252 SOME ((the(term2coef' t1 v)) @ mv_skalar_mul((the(term2coef' t2 v)),1)) handle _ => NONE
22.253 )
22.254 - | term2coef' (term) v = raise error ("RATIONALS_TERM2COEF_EXCEPTION 2: Invalid term");
22.255 + | term2coef' (term) v = error ("RATIONALS_TERM2COEF_EXCEPTION 2: Invalid term");
22.256
22.257 (*. checks if all coefficients of a polynomial are positiv (except the first) .*)
22.258 fun check_coeff t = (* erste Koeffizient kann <0 sein !!! *)
22.259 @@ -1541,7 +1541,7 @@
22.260 );
22.261 SOME [(1,rev(!vl))] handle _ => NONE
22.262 )
22.263 - else raise error ("RATIONALS_TERM2POLY_EXCEPTION 1: Invalid term")
22.264 + else error ("RATIONALS_TERM2POLY_EXCEPTION 1: Invalid term")
22.265 )
22.266 end
22.267 | term2poly' (Const ("Groups.plus_class.plus",_) $ t1 $ t2) v :mv_poly option =
22.268 @@ -1552,7 +1552,7 @@
22.269 (
22.270 SOME ((the(term2poly' t1 v)) @ mv_skalar_mul((the(term2poly' t2 v)),~1)) handle _ => NONE
22.271 )
22.272 - | term2poly' (term) v = raise error ("RATIONALS_TERM2POLY_EXCEPTION 2: Invalid term");
22.273 + | term2poly' (term) v = error ("RATIONALS_TERM2POLY_EXCEPTION 2: Invalid term");
22.274
22.275 (*. translates an Isabelle term into internal representation.
22.276 term2poly
22.277 @@ -1564,7 +1564,7 @@
22.278 .*)
22.279 fun term2poly (t:term) v =
22.280 if is_polynomial t then term2poly' t v
22.281 - else raise error ("term2poly: invalid = "^(term2str t));
22.282 + else error ("term2poly: invalid = "^(term2str t));
22.283
22.284 (*. same as term2poly with automatic detection of the variables .*)
22.285 fun term2polyx t = term2poly t (((map free2str) o vars) t);
22.286 @@ -1572,7 +1572,7 @@
22.287 (*. checks if the term is in expanded polynomial form and converts it into the internal representation .*)
22.288 fun expanded2poly (t:term) v =
22.289 (*if is_expanded t then*) term2poly' t v
22.290 - (*else raise error ("RATIONALS_EXPANDED2POLY_EXCEPTION: Invalid Polynomial")*);
22.291 + (*else error ("RATIONALS_EXPANDED2POLY_EXCEPTION: Invalid Polynomial")*);
22.292
22.293 (*. same as expanded2poly with automatic detection of the variables .*)
22.294 fun expanded2polyx t = expanded2poly t (((map free2str) o vars) t);
22.295 @@ -1804,7 +1804,7 @@
22.296 )
22.297 )
22.298 end
22.299 -| step_cancel _ = raise error ("RATIONALS_STEP_CANCEL_EXCEPTION: Invalid fraction");
22.300 +| step_cancel _ = error ("RATIONALS_STEP_CANCEL_EXCEPTION: Invalid fraction");
22.301
22.302
22.303 (*. same as step_cancel, this time for expanded forms (input+output) .*)
22.304 @@ -1869,7 +1869,7 @@
22.305 )
22.306 )
22.307 end
22.308 -| step_cancel_expanded _ = raise error ("RATIONALS_STEP_CANCEL_EXCEPTION: Invalid fraction");
22.309 +| step_cancel_expanded _ = error ("RATIONALS_STEP_CANCEL_EXCEPTION: Invalid fraction");
22.310
22.311 (*. calculates the greatest common divisor of numerator and denominator and divides each through it .*)
22.312 fun direct_cancel (t as Const ("Rings.inverse_class.divide",_) $ p1 $ p2) =
22.313 @@ -1954,7 +1954,7 @@
22.314 )
22.315 )
22.316 end
22.317 - | direct_cancel _ = raise error ("RATIONALS_DIRECT_CANCEL_EXCEPTION: Invalid fraction");
22.318 + | direct_cancel _ = error ("RATIONALS_DIRECT_CANCEL_EXCEPTION: Invalid fraction");
22.319
22.320 (*. same es direct_cancel, this time for expanded forms (input+output).*)
22.321 fun direct_cancel_expanded (t as Const ("Rings.inverse_class.divide",_) $ p1 $ p2) =
22.322 @@ -2039,7 +2039,7 @@
22.323 )
22.324 )
22.325 end
22.326 - | direct_cancel_expanded _ = raise error ("RATIONALS_DIRECT_CANCEL_EXCEPTION: Invalid fraction");
22.327 + | direct_cancel_expanded _ = error ("RATIONALS_DIRECT_CANCEL_EXCEPTION: Invalid fraction");
22.328
22.329
22.330 (*. adds two fractions .*)
22.331 @@ -2086,7 +2086,7 @@
22.332 )
22.333 )
22.334 end
22.335 - | add_fract (_,_) = raise error ("RATIONALS_ADD_FRACTION_EXCEPTION: Invalid add_fraction call");
22.336 + | add_fract (_,_) = error ("RATIONALS_ADD_FRACTION_EXCEPTION: Invalid add_fraction call");
22.337
22.338 (*. adds two expanded fractions .*)
22.339 fun add_fract_exp ((Const("Rings.inverse_class.divide",_) $ t11 $ t12),(Const("Rings.inverse_class.divide",_) $ t21 $ t22)) =
22.340 @@ -2120,7 +2120,7 @@
22.341 )
22.342 )
22.343 end
22.344 - | add_fract_exp (_,_) = raise error ("RATIONALS_ADD_FRACTION_EXP_EXCEPTION: Invalid add_fraction call");
22.345 + | add_fract_exp (_,_) = error ("RATIONALS_ADD_FRACTION_EXP_EXCEPTION: Invalid add_fraction call");
22.346
22.347 (*. adds a list of terms .*)
22.348 fun add_list_of_fractions []= (Free("0",HOLogic.realT),[])
22.349 @@ -2576,7 +2576,7 @@
22.350 if last=[(1,mv_null2(vars))] then make_term(factor_list,vars)
22.351 else make_term(last::factor_list,vars)
22.352 )
22.353 - else raise error ("RATIONALS_FACTORIZE_DEN_EXCEPTION: Invalid factor by division")
22.354 + else error ("RATIONALS_FACTORIZE_DEN_EXCEPTION: Invalid factor by division")
22.355 end;
22.356
22.357 (*. makes a term out of the elements of the list (expanded polynomial representation) .*)
22.358 @@ -2601,14 +2601,14 @@
22.359 if last=[(1,mv_null2(vars))] then make_exp(factor_list,vars)
22.360 else make_exp(last::factor_list,vars)
22.361 )
22.362 - else raise error ("RATIONALS_FACTORIZE_DEN_EXP_EXCEPTION: Invalid factor by division")
22.363 + else error ("RATIONALS_FACTORIZE_DEN_EXP_EXCEPTION: Invalid factor by division")
22.364 end;
22.365
22.366 (*. calculates the common denominator of all elements of the list and multiplies .*)
22.367 (*. the nominators and denominators with the correct factor .*)
22.368 (*. (polynomial representation) .*)
22.369 fun step_add_list_of_fractions []=(Free("0",HOLogic.realT),[]:term list)
22.370 - | step_add_list_of_fractions [x]= raise error ("RATIONALS_STEP_ADD_LIST_OF_FRACTIONS_EXCEPTION: Nothing to add")
22.371 + | step_add_list_of_fractions [x]= error ("RATIONALS_STEP_ADD_LIST_OF_FRACTIONS_EXCEPTION: Nothing to add")
22.372 | step_add_list_of_fractions (xs) =
22.373 let
22.374 val den_list=termlist2denominators (xs); (* list of denominators *)
22.375 @@ -2622,7 +2622,7 @@
22.376 (*. the nominators and denominators with the correct factor .*)
22.377 (*. (expanded polynomial representation) .*)
22.378 fun step_add_list_of_fractions_exp [] = (Free("0",HOLogic.realT),[]:term list)
22.379 - | step_add_list_of_fractions_exp [x] = raise error ("RATIONALS_STEP_ADD_LIST_OF_FRACTIONS_EXP_EXCEPTION: Nothing to add")
22.380 + | step_add_list_of_fractions_exp [x] = error ("RATIONALS_STEP_ADD_LIST_OF_FRACTIONS_EXP_EXCEPTION: Nothing to add")
22.381 | step_add_list_of_fractions_exp (xs)=
22.382 let
22.383 val den_list=termlist2denominators_exp (xs); (* list of denominators *)
22.384 @@ -2688,8 +2688,8 @@
22.385 ]
22.386 | term2list (Const("Groups.plus_class.plus",_) $ t1 $ t2) = term2list(t1) @ term2list(t2)
22.387 | term2list (Const("Groups.minus_class.minus",_) $ t1 $ t2) =
22.388 - raise error ("RATIONALS_TERM2LIST_EXCEPTION: - not implemented yet")
22.389 - | term2list _ = raise error ("RATIONALS_TERM2LIST_EXCEPTION: invalid term");
22.390 + error ("RATIONALS_TERM2LIST_EXCEPTION: - not implemented yet")
22.391 + | term2list _ = error ("RATIONALS_TERM2LIST_EXCEPTION: invalid term");
22.392
22.393 (*.factors out the gcd of nominator and denominator:
22.394 a/b = (a' * gcd)/(b' * gcd), a,b,gcd are poly[2].*)
22.395 @@ -2732,7 +2732,7 @@
22.396 (let val ts = term2list t
22.397 in if 1 < length ts
22.398 then SOME (add_list_of_fractions ts)
22.399 - else NONE (*raise error ("RATIONALS_ADD_EXCEPTION: nothing to add")*)
22.400 + else NONE (*error ("RATIONALS_ADD_EXCEPTION: nothing to add")*)
22.401 end) handle _ => NONE
22.402 );
22.403 (*.same as add_fraction_p_ but with normalform [3].*)
22.404 @@ -2740,12 +2740,12 @@
22.405 fun add_fraction_ (thy:theory) t =
22.406 if length(term2list(t))>1
22.407 then SOME (add_list_of_fractions_exp(term2list(t))) handle _ => NONE
22.408 - else (*raise error ("RATIONALS_ADD_FRACTION_EXCEPTION: nothing to add")*)
22.409 + else (*error ("RATIONALS_ADD_FRACTION_EXCEPTION: nothing to add")*)
22.410 NONE;
22.411 fun add_fraction_ (thy:theory) t =
22.412 (if 1 < length (term2list t)
22.413 then SOME (add_list_of_fractions_exp (term2list t))
22.414 - else (*raise error ("RATIONALS_ADD_FRACTION_EXCEPTION: nothing to add")*)
22.415 + else (*error ("RATIONALS_ADD_FRACTION_EXCEPTION: nothing to add")*)
22.416 NONE) handle _ => NONE;
22.417
22.418 (*SOME (step_add_list_of_fractions2_exp(term2list(t))); *)
22.419 @@ -2947,7 +2947,7 @@
22.420 []) end
22.421 else (tracing("### locate_rule: "^(id_of_thm r)^" not mem rrls");[])
22.422 | locate_rule _ _ _ _ _ _ =
22.423 - raise error ("locate_rule: doesnt match rev-sets in istate");
22.424 + error ("locate_rule: doesnt match rev-sets in istate");
22.425
22.426 (*.next_rule = fn : rule list -> term -> rule option
22.427 for a given term return the next rules to be done for cancelling.
22.428 @@ -2975,7 +2975,7 @@
22.429 | _ => NONE
22.430 end
22.431 | next_rule _ _ _ _ _ =
22.432 - raise error ("next_rule: doesnt match rev-sets in istate");
22.433 + error ("next_rule: doesnt match rev-sets in istate");
22.434
22.435 (*.val attach_form = f : rule list -> term -> term
22.436 -> (rule * (term * term list)) list
22.437 @@ -3054,7 +3054,7 @@
22.438 []) end
22.439 else (tracing("### locate_rule: "^(id_of_thm r)^" not mem rrls");[])
22.440 | locate_rule _ _ _ _ _ _ =
22.441 - raise error ("locate_rule: doesnt match rev-sets in istate");
22.442 + error ("locate_rule: doesnt match rev-sets in istate");
22.443
22.444 fun next_rule thy eval_rls ro [rs] t =
22.445 let val der = make_deriv thy eval_rls rs ro NONE t;
22.446 @@ -3065,7 +3065,7 @@
22.447 | _ => NONE
22.448 end
22.449 | next_rule _ _ _ _ _ =
22.450 - raise error ("next_rule: doesnt match rev-sets in istate");
22.451 + error ("next_rule: doesnt match rev-sets in istate");
22.452
22.453 fun attach_form (_:rule list list) (_:term) (_:term) = (*still missing*)
22.454 []:(rule * (term * term list)) list;
22.455 @@ -3171,7 +3171,7 @@
22.456 []) end
22.457 else (tracing("### locate_rule: "^(id_of_thm r)^" not mem rrls");[])
22.458 | locate_rule _ _ _ _ _ _ =
22.459 - raise error ("locate_rule: doesnt match rev-sets in istate");
22.460 + error ("locate_rule: doesnt match rev-sets in istate");
22.461
22.462 (*.next_rule = fn : rule list -> term -> rule option
22.463 for a given term return the next rules to be done for cancelling.
22.464 @@ -3199,7 +3199,7 @@
22.465 | _ => NONE
22.466 end
22.467 | next_rule _ _ _ _ _ =
22.468 - raise error ("next_rule: doesnt match rev-sets in istate");
22.469 + error ("next_rule: doesnt match rev-sets in istate");
22.470
22.471 (*.val attach_form = f : rule list -> term -> term
22.472 -> (rule * (term * term list)) list
22.473 @@ -3315,7 +3315,7 @@
22.474 []) end
22.475 else (tracing("### locate_rule: "^(id_of_thm r)^" not mem rrls");[])
22.476 | locate_rule _ _ _ _ _ _ =
22.477 - raise error ("locate_rule: doesnt match rev-sets in istate");
22.478 + error ("locate_rule: doesnt match rev-sets in istate");
22.479
22.480 (*.next_rule = fn : rule list -> term -> rule option
22.481 for a given term return the next rules to be done for cancelling.
22.482 @@ -3343,7 +3343,7 @@
22.483 | _ => NONE
22.484 end
22.485 | next_rule _ _ _ _ _ =
22.486 - raise error ("next_rule: doesnt match rev-sets in istate");
22.487 + error ("next_rule: doesnt match rev-sets in istate");
22.488
22.489 (*.val attach_form = f : rule list -> term -> term
22.490 -> (rule * (term * term list)) list
23.1 --- a/src/Tools/isac/Knowledge/RootEq.thy Tue Sep 28 08:58:06 2010 +0200
23.2 +++ b/src/Tools/isac/Knowledge/RootEq.thy Tue Sep 28 09:06:56 2010 +0200
23.3 @@ -125,7 +125,7 @@
23.4 fun is_rootTerm_in t v =
23.5 let
23.6 fun coeff_in c v = member op = (vars c) v;
23.7 - fun findroot (_ $ _ $ _ $ _) v = raise error("is_rootTerm_in:")
23.8 + fun findroot (_ $ _ $ _ $ _) v = error("is_rootTerm_in:")
23.9 (* at the moment there is no term like this, but ....*)
23.10 | findroot (t as (Const ("Root.nroot",_) $ _ $ t3)) v = coeff_in t3 v
23.11 | findroot (_ $ t2 $ t3) v = (findroot t2 v) orelse (findroot t3 v)
23.12 @@ -139,7 +139,7 @@
23.13 fun is_sqrtTerm_in t v =
23.14 let
23.15 fun coeff_in c v = member op = (vars c) v;
23.16 - fun findsqrt (_ $ _ $ _ $ _) v = raise error("is_sqrteqation_in:")
23.17 + fun findsqrt (_ $ _ $ _ $ _) v = error("is_sqrteqation_in:")
23.18 (* at the moment there is no term like this, but ....*)
23.19 | findsqrt (_ $ t1 $ t2) v = (findsqrt t1 v) orelse (findsqrt t2 v)
23.20 | findsqrt (t as (Const ("NthRoot.sqrt",_) $ a)) v = coeff_in a v
23.21 @@ -154,7 +154,7 @@
23.22 fun is_normSqrtTerm_in t v =
23.23 let
23.24 fun coeff_in c v = member op = (vars c) v;
23.25 - fun isnorm (_ $ _ $ _ $ _) v = raise error("is_normSqrtTerm_in:")
23.26 + fun isnorm (_ $ _ $ _ $ _) v = error("is_normSqrtTerm_in:")
23.27 (* at the moment there is no term like this, but ....*)
23.28 | isnorm (Const ("Groups.plus_class.plus",_) $ _ $ t2) v = is_sqrtTerm_in t2 v
23.29 | isnorm (Const ("op *",_) $ _ $ t2) v = is_sqrtTerm_in t2 v
24.1 --- a/src/Tools/isac/Knowledge/RootRatEq.thy Tue Sep 28 08:58:06 2010 +0200
24.2 +++ b/src/Tools/isac/Knowledge/RootRatEq.thy Tue Sep 28 09:06:56 2010 +0200
24.3 @@ -48,7 +48,7 @@
24.4 | rootadd (t as (Const ("Groups.minus_class.minus",_) $ t2 $ t3)) v =
24.5 (is_rootTerm_in t2 v) orelse (is_rootTerm_in t3 v)
24.6 | rootadd _ _ = false;
24.7 - fun findrootrat (_ $ _ $ _ $ _) v = raise error("is_rootRatAddTerm_in:")
24.8 + fun findrootrat (_ $ _ $ _ $ _) v = error("is_rootRatAddTerm_in:")
24.9 (* at the moment there is no term like this, but ....*)
24.10 | findrootrat (t as (Const ("Rings.inverse_class.divide",_) $ _ $ t3)) v =
24.11 if (is_rootTerm_in t3 v) then rootadd t3 v else false
25.1 --- a/src/Tools/isac/Knowledge/Simplify.thy Tue Sep 28 08:58:06 2010 +0200
25.2 +++ b/src/Tools/isac/Knowledge/Simplify.thy Tue Sep 28 09:06:56 2010 +0200
25.3 @@ -73,7 +73,7 @@
25.4 ((term_of o the o (parse thy)) "normalform",
25.5 [(term_of o the o (parse thy)) "N"])
25.6 ]
25.7 - | argl2dtss _ = raise error "Simplify.ML: wrong argument for argl2dtss";
25.8 + | argl2dtss _ = error "Simplify.ML: wrong argument for argl2dtss";
25.9
25.10 castab :=
25.11 overwritel (!castab,
26.1 --- a/src/Tools/isac/Knowledge/Test.thy Tue Sep 28 08:58:06 2010 +0200
26.2 +++ b/src/Tools/isac/Knowledge/Test.thy Tue Sep 28 09:06:56 2010 +0200
26.3 @@ -173,7 +173,7 @@
26.4 (*does a term contain a root ?*)
26.5 fun eval_root_free (thmid:string) _ (t as (Const(op0,t0) $ arg)) thy =
26.6 if strip_thy op0 <> "is'_root'_free"
26.7 - then raise error ("eval_root_free: wrong "^op0)
26.8 + then error ("eval_root_free: wrong "^op0)
26.9 else if const_in (strip_thy op0) arg
26.10 then SOME (mk_thmid thmid ""
26.11 ((Syntax.string_of_term (thy2ctxt thy)) arg) "",
27.1 --- a/src/Tools/isac/ProgLang/Tools.thy Tue Sep 28 08:58:06 2010 +0200
27.2 +++ b/src/Tools/isac/ProgLang/Tools.thy Tue Sep 28 09:06:56 2010 +0200
27.3 @@ -67,7 +67,7 @@
27.4 Const ("op |",_) $ _ $ _ => get (ls @ [o1]) o2
27.5 | _ => ls @ [o1, o2]
27.6 in (((list2isalist bool) o (get [])) ors)
27.7 - handle _ => raise error ("or2list: no ORs= "^(term2str ors)) end
27.8 + handle _ => error ("or2list: no ORs= "^(term2str ors)) end
27.9 );
27.10 (*>val t = HOLogic.true_const;
27.11 > val t' = or2list t;
28.1 --- a/src/Tools/isac/ProgLang/rewrite.sml Tue Sep 28 08:58:06 2010 +0200
28.2 +++ b/src/Tools/isac/ProgLang/rewrite.sml Tue Sep 28 09:06:56 2010 +0200
28.3 @@ -95,7 +95,7 @@
28.4 in chk [] asms end
28.5 (* rewrite with a rule set, which must not be the empty Erls *)
28.6 and rewrite__set_ _ _ __ Erls t =
28.7 - raise error("rewrite__set_ called with 'Erls' for '"^term2str t^"'")
28.8 + error("rewrite__set_ called with 'Erls' for '"^term2str t^"'")
28.9 (* rewrite with a 'reverse rule set' based on ML code *)
28.10 | rewrite__set_ thy i _ _ (rrls as Rrls _) t =
28.11 let val _= if ! trace_rewrite andalso i < ! depth
28.12 @@ -141,7 +141,7 @@
28.13 rewrite__ thy (i+1) bdv ((snd o #rew_ord o rep_rls) rls)
28.14 ((#erls o rep_rls) rls) put_asm thm' ct;
28.15 val _ = if pairopt <> NONE then ()
28.16 - else raise error("rewrite_set_, rewrite_ \""^
28.17 + else error("rewrite_set_, rewrite_ \""^
28.18 (string_of_thmI thm')^"\" "^(term2str ct)^" = NONE")
28.19 val _ = if ! trace_rewrite andalso i < ! depth
28.20 then tracing((idt"="(i+1))^" calc. to: "^
28.21 @@ -161,7 +161,7 @@
28.22 rewrite__ thy (i+1) bdv ((snd o #rew_ord o rep_rls) rls)
28.23 ((#erls o rep_rls) rls) put_asm thm' ct;
28.24 val _ = if pairopt <> NONE then ()
28.25 - else raise error("rewrite_set_, rewrite_ \""^
28.26 + else error("rewrite_set_, rewrite_ \""^
28.27 (string_of_thmI thm')^"\" "^(term2str ct)^" = NONE")
28.28 val _ = if ! trace_rewrite andalso i < ! depth
28.29 then tracing((idt"="(i+1))^" cal1. to: "^
28.30 @@ -333,7 +333,7 @@
28.31
28.32
28.33 fun get_rls_scr rs' = ((#scr o rep_rls o #2 o the o assoc') (!ruleset',rs'))
28.34 - handle _ => raise error ("get_rls_scr: no script for "^rs');
28.35 + handle _ => error ("get_rls_scr: no script for "^rs');
28.36
28.37
28.38 (*make_thm added to Pure/thm.ML*)
28.39 @@ -415,7 +415,7 @@
28.40 then mk_thm thy ct'
28.41 else (num_str o (PureThy.get_thm thy)) thmid
28.42 ) handle _ =>
28.43 - raise error ("assoc_thm': '"^thmid^"' not in '"^
28.44 + error ("assoc_thm': '"^thmid^"' not in '"^
28.45 (theory2domID thy)^"' (and parents)");
28.46 (*> assoc_thm' Isac.thy ("sym_#mult_2_3","6 = 2 * 3");
28.47 val it = "6 = 2 * 3" : thm
29.1 --- a/src/Tools/isac/ProgLang/scrtools.sml Tue Sep 28 08:58:06 2010 +0200
29.2 +++ b/src/Tools/isac/ProgLang/scrtools.sml Tue Sep 28 09:06:56 2010 +0200
29.3 @@ -145,9 +145,9 @@
29.4 (**.construct scr-env from scr(created automatically) and Rewrite_Set.**)
29.5
29.6 fun one_scr_arg (Const _ $ arg $ _) = arg
29.7 - | one_scr_arg t = raise error ("one_scr_arg: called by "^(term2str t));
29.8 + | one_scr_arg t = error ("one_scr_arg: called by "^(term2str t));
29.9 fun two_scr_arg (Const _ $ a1 $ a2 $ _) = (a1, a2)
29.10 - | two_scr_arg t = raise error ("two_scr_arg: called by "^(term2str t));
29.11 + | two_scr_arg t = error ("two_scr_arg: called by "^(term2str t));
29.12
29.13
29.14 (**.generate calc from a script.**)
29.15 @@ -167,7 +167,7 @@
29.16 datatype stacexpr = STac of term | Expr of term
29.17 fun rep_stacexpr (STac t ) = t
29.18 | rep_stacexpr (Expr t) =
29.19 - raise error ("rep_stacexpr called with t= "^(term2str t));
29.20 + error ("rep_stacexpr called with t= "^(term2str t));
29.21
29.22 type env = (term * term) list;
29.23
29.24 @@ -300,7 +300,7 @@
29.25 | is_calc _ = false;
29.26 fun op_of_calc (Const ("Script.Calculate",_) $ Free (op_,_)) = op_
29.27 | op_of_calc (Const ("Script.Calculate",_) $ Free (op_,_) $ _) = op_
29.28 - | op_of_calc t = raise error ("op_of_calc called with"^term2str t);
29.29 + | op_of_calc t = error ("op_of_calc called with"^term2str t);
29.30 (*
29.31 val Script sc = (#scr o rep_rls) Test_simplify;
29.32 val stacs = stacpbls sc;
29.33 @@ -440,7 +440,7 @@
29.34 | contain_bdv (Rls_ rls ::rs) =
29.35 contain_bdv (get_rules rls) orelse contain_bdv rs
29.36 | contain_bdv (r::_) =
29.37 - raise error ("contain_bdv called with ["^(id_rule r)^",...]");
29.38 + error ("contain_bdv called with ["^(id_rule r)^",...]");
29.39
29.40 fun rules2scr_Rls calc rules = (*WN100816 t_ -> t_t like "Script Stepwise..*)
29.41 if contain_bdv rules
29.42 @@ -461,7 +461,7 @@
29.43 # generate a script for stepwise execution of the rls
29.44 # filter the operators for Calc out of the script
29.45 !!!use this function in ruleset' := !!! .*)
29.46 -fun prep_rls Erls = raise error "prep_rls not impl. for Erls"
29.47 +fun prep_rls Erls = error "prep_rls not impl. for Erls"
29.48 | prep_rls (Rls {id,preconds,rew_ord,erls,srls,calc,rules,...}) =
29.49 let val sc = (rules2scr_Rls (!calclist') rules)
29.50 in Rls {id=id,preconds=preconds,rew_ord=rew_ord,erls=erls,
29.51 @@ -482,7 +482,7 @@
29.52 rules=rules,
29.53 scr = Script sc} end
29.54 | prep_rls (Rrls {id,...}) =
29.55 - raise error ("prep_rls not required for Rrls \""^id^"\"");
29.56 + error ("prep_rls not required for Rrls \""^id^"\"");
29.57 (*
29.58 val Script sc = (#scr o rep_rls o prep_rls) isolate_root;
29.59 (tracing o term2str) sc;
30.1 --- a/src/Tools/isac/ProgLang/termC.sml Tue Sep 28 08:58:06 2010 +0200
30.2 +++ b/src/Tools/isac/ProgLang/termC.sml Tue Sep 28 09:06:56 2010 +0200
30.3 @@ -34,8 +34,7 @@
30.4 and atol n [] =
30.5 ("\n*** "^indent n^"]")
30.6 | atol n (T::Ts) = (ato n T ^ atol n Ts)
30.7 -(*in print (ato 0 t ^ "\n") end; TODO TUM10*)
30.8 -in tracing (ato 0 t) end;
30.9 +in writeln (ato 0 t ^ "\n") end;
30.10 (*
30.11 > val T = (type_of o term_of o the o (parse thy)) "a::[real,int] => nat";
30.12 > atomtyp T;
30.13 @@ -86,7 +85,7 @@
30.14 | ato (Abs (a, _, body)) n =
30.15 "\n*** " ^ indent n ^ "Abs(" ^ a ^ ", _" ^ ato body (n+1)
30.16 | ato (f $ t) n = (ato f n ^ ato t (n + 1))
30.17 - in tracing ("\n*** -------------" ^ ato t 0 ^ "\n***") end;
30.18 + in writeln ("\n*** -------------" ^ ato t 0 ^ "\n***") end;
30.19
30.20 fun term_detail2str t =
30.21 let fun ato (Const (a, T)) n =
30.22 @@ -103,14 +102,14 @@
30.23 ^ ato body (n + 1)
30.24 | ato (f $ t) n = ato f n ^ ato t (n + 1)
30.25 in "\n*** " ^ ato t 0 ^ "\n***" end;
30.26 -fun atomty t = (tracing o term_detail2str) t; (*WN100907 broken*)
30.27 +fun atomty t = (writeln o term_detail2str) t; (*WN100907 broken*)
30.28
30.29 fun term_str thy (Const(s,_)) = s
30.30 | term_str thy (Free(s,_)) = s
30.31 | term_str thy (Var((s,i),_)) = s^(string_of_int i)
30.32 | term_str thy (Bound i) = "B."^(string_of_int i)
30.33 | term_str thy (Abs(s,_,_)) = s
30.34 - | term_str thy t = raise error("term_str not for "^term2str t);
30.35 + | term_str thy t = error("term_str not for "^term2str t);
30.36
30.37 (*.contains the fst argument the second argument (a leave! of term).*)
30.38 fun contains_term (Abs(_,_,body)) t = contains_term body t
30.39 @@ -172,11 +171,11 @@
30.40 (*fun int_of_Free (Free (intstr, _)) =
30.41 (case BasisLibrary.Int.fromString intstr of
30.42 SOME i => i
30.43 - | NONE => raise error ("int_of_Free ( "^ intstr ^", _)"))
30.44 - | int_of_Free t = raise error ("int_of_Free ( "^ term2str t ^" )");*)
30.45 + | NONE => error ("int_of_Free ( "^ intstr ^", _)"))
30.46 + | int_of_Free t = error ("int_of_Free ( "^ term2str t ^" )");*)
30.47 fun int_of_Free (Free (intstr, _)) = (Thy_Output.integer intstr
30.48 - handle _ => raise error ("int_of_Free ( "^ intstr ^", _)"))
30.49 - | int_of_Free t = raise error ("int_of_Free ( "^ term2str t ^" )");
30.50 + handle _ => error ("int_of_Free ( "^ intstr ^", _)"))
30.51 + | int_of_Free t = error ("int_of_Free ( "^ term2str t ^" )");
30.52
30.53 fun vars t =
30.54 let
30.55 @@ -225,10 +224,10 @@
30.56 | is_bdv_ _ = false;
30.57
30.58 fun free2str (Free (s,_)) = s
30.59 - | free2str t = raise error ("free2str not for "^ term2str t);
30.60 + | free2str t = error ("free2str not for "^ term2str t);
30.61 fun free2int (t as Free (s, _)) = ((str2int s)
30.62 - handle _ => raise error ("free2int: "^term_detail2str t))
30.63 - | free2int t = raise error ("free2int: "^term_detail2str t);
30.64 + handle _ => error ("free2int: "^term_detail2str t))
30.65 + | free2int t = error ("free2int: "^term_detail2str t);
30.66
30.67 (*27.8.01: unused*)
30.68 fun var2free (t as Const(s,T)) = t
30.69 @@ -263,7 +262,7 @@
30.70
30.71 fun isapair2pair (Const ("Pair",_) $ a $ b) = (a,b)
30.72 | isapair2pair t =
30.73 - raise error ("isapair2pair called with "^term2str t);
30.74 + error ("isapair2pair called with "^term2str t);
30.75
30.76 val listType = Type ("List.list",[Type ("bool",[])]);
30.77 fun isalist2list ls =
30.78 @@ -271,7 +270,7 @@
30.79 fun get es (Const("List.list.Cons",_) $ t $ ls) = get (t::es) ls
30.80 | get es (Const("List.list.Nil",_)) = es
30.81 | get _ t =
30.82 - raise error ("isalist2list applied to NON-list '"^term2str t^"'")
30.83 + error ("isalist2list applied to NON-list '"^term2str t^"'")
30.84 in (rev o (get [])) ls end;
30.85 (*
30.86 > val il = str2term "[a=b,c=d,e=f]";
30.87 @@ -477,7 +476,7 @@
30.88 fun power b 0 = 1
30.89 | power b n =
30.90 if n>0 then b*(power b (n-1))
30.91 - else raise error ("power "^(str_of_int b)^" "^(str_of_int n));
30.92 + else error ("power "^(str_of_int b)^" "^(str_of_int n));
30.93 (*
30.94 > power 2 3;
30.95 val it = 8 : int
30.96 @@ -536,7 +535,7 @@
30.97 fun dest_type (Type(T,[])) = T
30.98 | dest_type T =
30.99 (atomtyp T;
30.100 - raise error ("... dest_type: not impl. for this type"));
30.101 + error ("... dest_type: not impl. for this type"));
30.102
30.103 fun term_of_num ntyp n = Free (str_of_int n, ntyp);
30.104
30.105 @@ -562,8 +561,8 @@
30.106 fun num_of_term (t as Free (s,_)) =
30.107 (case int_of_str s of
30.108 SOME s' => s'
30.109 - | NONE => raise error ("num_of_term not for "^ term2str t))
30.110 - | num_of_term t = raise error ("num_of_term not for "^term2str t);
30.111 + | NONE => error ("num_of_term not for "^ term2str t))
30.112 + | num_of_term t = error ("num_of_term not for "^term2str t);
30.113
30.114 fun mk_factroot op_(*=thy.sqrt*) T fact root =
30.115 Const ("op *", [T, T] ---> T) $ (term_of_num T fact) $
30.116 @@ -612,11 +611,11 @@
30.117 | calc "op *" (n1, n2) = n1*n2
30.118 | calc "Rings.inverse_class.divide"(n1, n2) = n1 div n2
30.119 | calc "Atools.pow"(n1, n2) = power n1 n2
30.120 - | calc op_ _ = raise error ("calc: operator = "^op_^" not defined");-----*)
30.121 + | calc op_ _ = error ("calc: operator = "^op_^" not defined");-----*)
30.122 fun calc_equ "op <" (n1, n2) = n1 < n2
30.123 | calc_equ "op <=" (n1, n2) = n1 <= n2
30.124 | calc_equ op_ _ =
30.125 - raise error ("calc_equ: operator = "^op_^" not defined");
30.126 + error ("calc_equ: operator = "^op_^" not defined");
30.127 fun sqrt (n:int) = if n < 0 then 0
30.128 (*FIXME ~~~*) else (trunc o Math.sqrt o Real.fromInt) n;
30.129
30.130 @@ -625,7 +624,7 @@
30.131
30.132 fun dest_binop_typ (Type("fun",[range,Type("fun",[arg2,arg1])])) =
30.133 (arg1,arg2,range)
30.134 - | dest_binop_typ _ = raise error "dest_binop_typ: not binary";
30.135 + | dest_binop_typ _ = error "dest_binop_typ: not binary";
30.136 (* -----
30.137 > val t = (term_of o the o (parse thy)) "#3^#4";
30.138 > val hT = type_of (head_of t);
31.1 --- a/src/Tools/isac/calcelems.sml Tue Sep 28 08:58:06 2010 +0200
31.2 +++ b/src/Tools/isac/calcelems.sml Tue Sep 28 09:06:56 2010 +0200
31.3 @@ -144,9 +144,9 @@
31.4 val e_rule =
31.5 Thm ("refl", ProofContext.get_thm (thy2ctxt' "Complex_Main") "refl" );
31.6 fun id_of_thm (Thm (id, _)) = id
31.7 - | id_of_thm _ = raise error "id_of_thm";
31.8 + | id_of_thm _ = error "id_of_thm";
31.9 fun thm_of_thm (Thm (_, thm)) = thm
31.10 - | thm_of_thm _ = raise error "thm_of_thm";
31.11 + | thm_of_thm _ = error "thm_of_thm";
31.12 fun rep_thm_G' (Thm (thmid, thm)) = (thmid, thm);
31.13 fun eq_thmI ((thmid1 : thmID, _ : thm), (thmid2 : thmID, _ : thm)) =
31.14 (strip_thy thmid1) = (strip_thy thmid2);
31.15 @@ -307,7 +307,7 @@
31.16 (*theID eg. is ["IsacKnowledge", "Test", "Rulesets", "ac_plus_times"]*)
31.17 fun theID2thyID (theID:theID) =
31.18 if length theID >= 3 then (last_elem o (drop_last_n 2)) theID : thyID
31.19 - else raise error ("theID2thyID called with "^ theID2str theID);
31.20 + else error ("theID2thyID called with "^ theID2str theID);
31.21
31.22 (*the key into the hierarchy ob problems*)
31.23 type pblID = string list; (* domID::...*)
31.24 @@ -451,9 +451,9 @@
31.25 (*asm_thm=asm_thm,*)rules=rules,scr=scr}
31.26 | rep_rls Erls = rep_rls e_rls
31.27 | rep_rls (Rrls {id,...}) = rep_rls e_rls
31.28 - (*raise error("rep_rls doesn't take apart reverse-rewrite-rule-sets: "^id)*);
31.29 + (*error("rep_rls doesn't take apart reverse-rewrite-rule-sets: "^id)*);
31.30 (*| rep_rls (Seq {id,...}) =
31.31 - raise error("rep_rls doesn't take apart reverse-rewrite-rule-sets: "^id);
31.32 + error("rep_rls doesn't take apart reverse-rewrite-rule-sets: "^id);
31.33 --1.7.03*)
31.34 fun rep_rrls
31.35 (Rrls {id,(*asm_thm,*) calc, erls, prepat, rew_ord,
31.36 @@ -464,9 +464,9 @@
31.37 rew_ord=rew_ord, attach_form=attach_form, init_state=init_state,
31.38 locate_rule=locate_rule, next_rule=next_rule, normal_form=normal_form}
31.39 | rep_rrls (Rls {id,...}) =
31.40 - raise error ("rep_rrls doesn't take apart (normal) rule-sets: "^id)
31.41 + error ("rep_rrls doesn't take apart (normal) rule-sets: "^id)
31.42 | rep_rrls (Seq {id,...}) =
31.43 - raise error ("rep_rrls doesn't take apart (normal) rule-sets: "^id);
31.44 + error ("rep_rrls doesn't take apart (normal) rule-sets: "^id);
31.45
31.46 fun append_rls id (Rls {id=_,preconds=pc,rew_ord=ro,erls=er,srls=sr,calc=ca,
31.47 rules =rs,scr=sc}) r =
31.48 @@ -477,7 +477,7 @@
31.49 (Seq{id=id,preconds=pc,rew_ord=ro,erls=er,srls=sr,calc=ca,
31.50 rules = rs @ r,scr=sc}:rls)
31.51 | append_rls id (Rrls _) _ =
31.52 - raise error ("append_rls: not for reverse-rewrite-rule-set "^id);
31.53 + error ("append_rls: not for reverse-rewrite-rule-set "^id);
31.54
31.55 (*. are _atomic_ rules equal ?.*)
31.56 (*WN080102 compare eqrule ?!?*)
31.57 @@ -516,7 +516,7 @@
31.58 rules = gen_union eq_rule rule2str (rs1, (#rules o rep_rls) r2),
31.59 scr=sc1}:rls)
31.60 | merge_rls _ _ _ =
31.61 - raise error "merge_rls: not for reverse-rewrite-rule-sets\
31.62 + error "merge_rls: not for reverse-rewrite-rule-sets\
31.63 \and not for mixed Rls -- Seq";
31.64 fun remove_rls id (Rls {id=_,preconds=pc,rew_ord=ro,erls=er,srls=sr,calc=ca,
31.65 (*asm_thm=at,*)rules =rs,scr=sc}) r =
31.66 @@ -528,7 +528,7 @@
31.67 (Seq{id=id,preconds=pc,rew_ord=ro,erls=er,srls=sr,calc=ca,
31.68 (*asm_thm=at,*)rules = gen_rems eq_rule (rs, r),
31.69 scr=sc}:rls)
31.70 - | remove_rls id (Rrls _) _ = raise error
31.71 + | remove_rls id (Rrls _) _ = error
31.72 ("remove_rls: not for reverse-rewrite-rule-set "^id);
31.73
31.74 (*!!!> gen_rems (op=) ([1,2,3,4], [3,4,5]);
31.75 @@ -540,29 +540,29 @@
31.76 SOME _ => true | NONE => false;*)
31.77 fun memrls r (Rls {rules,...}) = gen_mem eqrule (r, rules)
31.78 | memrls r (Seq {rules,...}) = gen_mem eqrule (r, rules)
31.79 - | memrls r _ = raise error ("memrls: incomplete impl. r= "^(rule2str r));
31.80 + | memrls r _ = error ("memrls: incomplete impl. r= "^(rule2str r));
31.81 fun rls_get_thm rls (id: xstring) =
31.82 case find_first (curry eq_rule e_rule)
31.83 ((#rules o rep_rls) rls) of
31.84 SOME thm => SOME thm | NONE => NONE;
31.85
31.86 -fun assoc' ([], key) = raise error ("ME_Isa: '"^key^"' not known")
31.87 +fun assoc' ([], key) = error ("ME_Isa: '"^key^"' not known")
31.88 | assoc' ((keyi, xi) :: pairs, key) =
31.89 if key = keyi then SOME xi else assoc' (pairs, key);
31.90
31.91 (*100818 fun assoc_thy (thy:theory') = ((the o assoc')(!theory',thy))
31.92 - handle _ => raise error ("ME_Isa: thy '"^thy^"' not in system");*)
31.93 + handle _ => error ("ME_Isa: thy '"^thy^"' not in system");*)
31.94 fun assoc_thy (thy:theory') = (*FIXME100818 abolish*)
31.95 (theory ((implode o (curry takelast 4) o explode) thy))
31.96 - handle _ => raise error ("ME_Isa: thy '" ^ thy ^ "' not in system");
31.97 + handle _ => error ("ME_Isa: thy '" ^ thy ^ "' not in system");
31.98
31.99 (*.associate an rls-identifier with an rls; related to 'fun assoc_rls';
31.100 these are NOT compatible to "fun assoc_thm'" in that they do NOT handle
31.101 overlays by re-using an identifier in different thys.*)
31.102 fun assoc_rls (rls:rls') = ((#2 o the o assoc')(!ruleset',rls))
31.103 - handle _ => raise error ("ME_Isa: '"^rls^"' not in system");
31.104 + handle _ => error ("ME_Isa: '"^rls^"' not in system");
31.105 (*fun assoc_rls (rls:rls') = ((the o assoc')(!ruleset',rls))
31.106 - handle _ => raise error ("ME_Isa: '"^rls^"' not in system");*)
31.107 + handle _ => error ("ME_Isa: '"^rls^"' not in system");*)
31.108
31.109 (*.overwrite an element in an association list and pair it with a thyID
31.110 in order to create the thy_hierarchy;
31.111 @@ -579,20 +579,20 @@
31.112 in overwritel (al, bl') end;
31.113
31.114 fun assoc_rew_ord ro = ((the o assoc') (!rew_ord',ro))
31.115 - handle _ => raise error ("ME_Isa: rew_ord '"^ro^"' not in system");
31.116 + handle _ => error ("ME_Isa: rew_ord '"^ro^"' not in system");
31.117 (*get the string for stac from rule*)
31.118 -fun assoc_calc ([], key) = raise error ("assoc_calc: '"^ key ^"' not found")
31.119 +fun assoc_calc ([], key) = error ("assoc_calc: '"^ key ^"' not found")
31.120 | assoc_calc ((calc, (keyi, xi)) :: pairs, key) =
31.121 if key = keyi then calc else assoc_calc (pairs, key);
31.122 (*only used for !calclist'...*)
31.123 -fun assoc1 ([], key) = raise error ("assoc1 (for met.calc=): '"^ key
31.124 +fun assoc1 ([], key) = error ("assoc1 (for met.calc=): '"^ key
31.125 ^"' not found")
31.126 | assoc1 ((all as (keyi, _)) :: pairs, key) =
31.127 if key = keyi then all else assoc1 (pairs, key);
31.128
31.129 (*TODO.WN080102 clarify usage of type cal and type calc..*)
31.130 fun calID2calcID (calID : calID) =
31.131 - let fun ass [] = raise error ("calID2calcID: "^calID^"not in calclist'")
31.132 + let fun ass [] = error ("calID2calcID: "^calID^"not in calclist'")
31.133 | ass ((calci, (cali, eval_fn))::ids) =
31.134 if calID = cali then calci
31.135 else ass ids
32.1 --- a/src/Tools/isac/library.sml Tue Sep 28 08:58:06 2010 +0200
32.2 +++ b/src/Tools/isac/library.sml Tue Sep 28 09:06:56 2010 +0200
32.3 @@ -33,7 +33,7 @@
32.4 if n > 0 then drop (n - 1, xs) else x :: xs;
32.5
32.6 (*exn LIST has disappeared in 2009 ... replaced by error...*)
32.7 -fun last_elem [] = raise error "last_elem" (*FIXME.2009*)
32.8 +fun last_elem [] = error "last_elem" (*FIXME.2009*)
32.9 | last_elem [x] = x
32.10 | last_elem (_ :: xs) = last_elem xs;
32.11
32.12 @@ -100,7 +100,7 @@
32.13
32.14 fun cons2 (f,g) x = (f x, g x); (*PL softwareparadigmen*)
32.15
32.16 -fun nth _ [] = raise error "nth _ []"
32.17 +fun nth _ [] = error "nth _ []"
32.18 | nth 1 (x::_) = x
32.19 | nth n (_::xs) = nth (n-1) xs;
32.20 (*WN050106 quick for test: doesn't check for exns*)
32.21 @@ -268,15 +268,15 @@
32.22 fun intsto1 0 = []
32.23 | intsto1 n = (intsto1 (n-1)) @ [n]
32.24 in
32.25 -fun intsto n = if n < 0 then (raise error "intsto < 0") else intsto1 n
32.26 +fun intsto n = if n < 0 then (error "intsto < 0") else intsto1 n
32.27 end;
32.28
32.29
32.30 type 'a stack = 'a list;
32.31 fun top ((x::xs):'a stack) = x
32.32 - | top _ = raise error "top called for empty list";
32.33 + | top _ = error "top called for empty list";
32.34 fun pop ((x::xs):'a stack) = xs:'a stack
32.35 - | pop _ = raise error "pop called for empty list";
32.36 + | pop _ = error "pop called for empty list";
32.37 fun push x (xs:'a stack) = x::xs:'a stack;
32.38
32.39
32.40 @@ -295,7 +295,7 @@
32.41
32.42 (*.take elements from b to e including both.*)
32.43 fun take_fromto from to l =
32.44 - if from > to then raise error ("take_fromto from="^string_of_int from^
32.45 + if from > to then error ("take_fromto from="^string_of_int from^
32.46 " > to="^string_of_int to)
32.47 else drop (from - 1, take (to, l));
32.48 (*> take_fromto 3 5 [1,2,3,4,5,6,7];
33.1 --- a/src/Tools/isac/xmlsrc/datatypes.sml Tue Sep 28 08:58:06 2010 +0200
33.2 +++ b/src/Tools/isac/xmlsrc/datatypes.sml Tue Sep 28 09:06:56 2010 +0200
33.3 @@ -80,8 +80,8 @@
33.4 autx (j + i) auts ^
33.5 indt j ^ "</"^str^">\n" : xml
33.6 end;
33.7 -(* tracing(authors2xml 2 "MATHAUTHORS" []);
33.8 - tracing(authors2xml 2 "MATHAUTHORS"
33.9 +(* writeln(authors2xml 2 "MATHAUTHORS" []);
33.10 + writeln(authors2xml 2 "MATHAUTHORS"
33.11 ["isac-team 2001", "Richard Lang 2003"]);
33.12 *)
33.13
33.14 @@ -92,7 +92,7 @@
33.15 in (indt j) ^ "<STRINGLIST>\n" ^
33.16 (id2x (j + indentation) ids) ^
33.17 (indt j) ^ "</STRINGLIST>\n" end;
33.18 -(* tracing(id2xml 8 ["linear","univariate","equation"]);
33.19 +(* writeln(id2xml 8 ["linear","univariate","equation"]);
33.20 <STRINGLIST>
33.21 <STRING>linear</STRING>
33.22 <STRING>univariate</STRING>
33.23 @@ -106,7 +106,7 @@
33.24 in (indt j) ^ "<INTLIST>\n" ^
33.25 (int2x (j + i) ids) ^
33.26 (indt j) ^ "</INTLIST>\n" end;
33.27 -(* tracing(ints2xml 3 [1,2,3]);
33.28 +(* writeln(ints2xml 3 [1,2,3]);
33.29 *)
33.30
33.31
33.32 @@ -122,18 +122,18 @@
33.33 ints2xml (j+i) pos ^
33.34 pos_2xml (j+i) pos_ ^
33.35 indt (j) ^ "</" ^ tag ^ ">\n";
33.36 -(* tracing(pos'2xml 3 ("POSITION", ([1,2,3], Pbl)));
33.37 +(* writeln(pos'2xml 3 ("POSITION", ([1,2,3], Pbl)));
33.38 *)
33.39
33.40 fun formula2xml j term = (*TODO.WN050211: use for _all_ <FORMULA>*)
33.41 indt j ^ "<FORMULA>\n"^
33.42 term2xml j term ^"\n"^
33.43 indt j ^ "</FORMULA>\n" : xml;
33.44 -(* tracing(formula2xml 6 (str2term "1+1=2"));
33.45 +(* writeln(formula2xml 6 (str2term "1+1=2"));
33.46 *)
33.47 fun formulae2xml j [] = ("":xml)
33.48 | formulae2xml j (r::rs) = formula2xml j r ^ formulae2xml j rs;
33.49 -(* tracing(formulae2xml 6 [str2term "1+1=2", str2term "1+1+1=3"]);
33.50 +(* writeln(formulae2xml 6 [str2term "1+1=2", str2term "1+1+1=3"]);
33.51 *)
33.52
33.53 (*WN0502 @see ME/ctree: type asms: illdesigned, thus not used*)
33.54 @@ -144,11 +144,11 @@
33.55 term2xml (j+i) term ^"\n"^
33.56 indt (j+i) ^ "</FORMULA>\n"^
33.57 indt j ^ "</POSFORM>\n" : xml;
33.58 -(* tracing(posform2xml 6 (([1,2],Frm), str2term "1+1=2"));
33.59 +(* writeln(posform2xml 6 (([1,2],Frm), str2term "1+1=2"));
33.60 *)
33.61 fun posforms2xml j [] = ("":xml)
33.62 | posforms2xml j (r::rs) = posform2xml j r ^ posforms2xml j rs;
33.63 -(* tracing(posforms2xml 6 [(([1],Res), str2term "1+1=2"),(([2],Res), str2term "1+1+1=3")]);
33.64 +(* writeln(posforms2xml 6 [(([1],Res), str2term "1+1=2"),(([2],Res), str2term "1+1+1=3")]);
33.65 *)
33.66
33.67 fun calcref2xml j (thyID:thyID, (scrop, (rewop, _)):calc) =
33.68 @@ -172,7 +172,7 @@
33.69 (*.for creating a href for a rule within an rls's rule list;
33.70 the guh points to the thy of definition of the rule, NOT of use in rls.*)
33.71 fun rule2xml j (thyID:thyID) Erule =
33.72 - raise error "rule2xml called with 'Erule'"
33.73 + error "rule2xml called with 'Erule'"
33.74 (* val (j, thyID, Thm (thmID, thm)) = (j+i, thyID, nth 1 rules);
33.75 val (j, thyID, Thm (thmID, thm)) = (j, thyID,r);
33.76 *)
33.77 @@ -217,7 +217,7 @@
33.78 in filt end;
33.79
33.80 (*FIXME.WN040831 model2xml <--?--> pattern2xml*)
33.81 -(*WN.25.8.03: pattern2xml different output with TextIO | tracing !!!
33.82 +(*WN.25.8.03: pattern2xml different output with TextIO | writeln !!!
33.83 the version below is for TextIO: terms2xml makes \n !*)
33.84 (* val (j, p, where_) = (i, ppc, where_);
33.85 *)
33.86 @@ -244,7 +244,7 @@
33.87 | res => (indt j) ^ "<RELATE>\n" ^ terms2xml' j res ^
33.88 (indt j) ^ "</RELATE>\n");
33.89 (*
33.90 -tracing(pattern2xml 3 ((#ppc o get_pbt)
33.91 +writeln(pattern2xml 3 ((#ppc o get_pbt)
33.92 ["squareroot","univariate","equation","test"]) []);
33.93 *)
33.94
33.95 @@ -318,7 +318,7 @@
33.96 (indt (j+i)) ^ "</RELATE>\n")^
33.97 indt j ^"</MODEL>\n"):xml
33.98 end;
33.99 -(* tracing(model2xml 3 itms []);
33.100 +(* writeln(model2xml 3 itms []);
33.101 *)
33.102
33.103 fun spec2xml j ((dI,pI,mI):spec) =
33.104 @@ -344,7 +344,7 @@
33.105 | _ => "Und")^" </BELONGSTO>\n"^
33.106 spec2xml (j+i) spec ^
33.107 indt j ^"</CALCHEAD>\n"):xml;
33.108 -(* tracing (modspec2xml 2 e_ocalhd);
33.109 +(* writeln (modspec2xml 2 e_ocalhd);
33.110 *)
33.111 fun pos'calchead2xml j (p:pos', (b, p_, head, gfr, pre, spec): ocalhd) =
33.112 (indt j ^"<CALCHEAD status = "^
33.113 @@ -376,14 +376,14 @@
33.114 indt j ^"</SUBSTITUTION>\n"):xml;
33.115 (* val subs = [(str2term "bdv", str2term "x")];
33.116 val subs = ["(bdv, x)"];
33.117 - tracing(subs2xml 0 subs);
33.118 + writeln(subs2xml 0 subs);
33.119 *)
33.120 fun subst2xml j (subst:subst) =
33.121 (indt j ^"<SUBSTITUTION>\n"^
33.122 foldl op^ ("", map (sub2xml (j+i)) subst) ^
33.123 indt j ^"</SUBSTITUTION>\n"):xml;
33.124 (* val subst = [(str2term "bdv", str2term "x")];
33.125 - tracing(subst2xml 0 subst);
33.126 + writeln(subst2xml 0 subst);
33.127 *)
33.128
33.129 (* val (j, str) = ((j+i), form);
33.130 @@ -568,7 +568,7 @@
33.131 (indt j ^"<REWRITETACTIC name=\"Rewrite\">\n"^
33.132 thm'2xml (j+i) thm'^
33.133 indt j ^"</REWRITETACTIC>\n"):xml
33.134 -(* tracing (tac2xml 2 (Rewrite ("all_left",
33.135 +(* writeln (tac2xml 2 (Rewrite ("all_left",
33.136 "~ ?b =!= 0 ==> (?a = ?b) = (?a - ?b = 0)")));
33.137 val (j, (Rewrite_Inst (subs, thm'))) = (i, tac);
33.138 *)
33.139 @@ -577,7 +577,7 @@
33.140 subs2xml (j+i) subs^
33.141 thm'2xml (j+i) thm'^
33.142 indt j ^"</REWRITEINSTTACTIC>\n"):xml
33.143 -(* tracing (tac2xml 2 (Rewrite_Inst
33.144 +(* writeln (tac2xml 2 (Rewrite_Inst
33.145 (["(bdv,x)"],
33.146 ("all_left",
33.147 "~ ?b =!= 0 ==> (?a = ?b) = (?a - ?b = 0)"))));
33.148 @@ -609,7 +609,7 @@
33.149 id2xml (j+i) pI^
33.150 indt j ^"</STRINGLISTTACTIC>\n"):xml
33.151
33.152 - | tac2xml j tac = raise error ("tac2xml: not impl. for "^tac2str tac);
33.153 + | tac2xml j tac = error ("tac2xml: not impl. for "^tac2str tac);
33.154
33.155 fun tacs2xml j [] = "":xml
33.156 | tacs2xml j (t::ts) = tac2xml j t ^ tacs2xml j ts;
33.157 @@ -698,10 +698,10 @@
33.158 (* val (ContThmInst{thyID, thm, bdvs, thminst, applto, applat, reword,
33.159 asms, lhs, rhs, result, resasms, asmrls}) =
33.160 (context_thy (pt,pos) tac);
33.161 -tracing (contthy2xml 2 (context_thy (pt,pos) tac));
33.162 +writeln (contthy2xml 2 (context_thy (pt,pos) tac));
33.163 *)
33.164 fun contthy2xml j EContThy =
33.165 - raise error "contthy2xml called with EContThy"
33.166 + error "contthy2xml called with EContThy"
33.167 | contthy2xml j (ContThm {thyID, thm, applto, applat, reword,
33.168 asms,lhs, rhs, result, resasms, asmrls}) =
33.169 indt j ^ "<GUH> " ^ thm ^ " </GUH>\n" ^
34.1 --- a/src/Tools/isac/xmlsrc/interface-xml.sml Tue Sep 28 08:58:06 2010 +0200
34.2 +++ b/src/Tools/isac/xmlsrc/interface-xml.sml Tue Sep 28 09:06:56 2010 +0200
34.3 @@ -25,14 +25,14 @@
34.4 (** add and delete users -----------------------------------------------
34.5 FIXXME.8.03 addUser: clear code, because only CalcTrees distinguished**)
34.6 fun adduserOK2xml (cI:calcID) (uI:iterID) =
34.7 - tracing ("@@@@@begin@@@@@\n "^string_of_int uI^" \n" ^
34.8 + writeln ("@@@@@begin@@@@@\n "^string_of_int uI^" \n" ^
34.9 "<ADDUSER>\n" ^
34.10 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.11 " <USERID> "^string_of_int uI^" </USERID>\n" ^
34.12 "</ADDUSER>\n" ^
34.13 "@@@@@end@@@@@");
34.14 fun deluserOK2xml (cI:calcID) (uI:iterID) =
34.15 - tracing ("@@@@@begin@@@@@\n "^string_of_int uI^" \n" ^
34.16 + writeln ("@@@@@begin@@@@@\n "^string_of_int uI^" \n" ^
34.17 "<DELUSER>\n" ^
34.18 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.19 " <USERID> "^string_of_int uI^" </USERID>\n" ^
34.20 @@ -41,27 +41,27 @@
34.21 (*---------------------------------------------------------------------*)
34.22
34.23 fun calctreeOK2xml (*uI:iterID*) (cI:calcID) =
34.24 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.25 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.26 "<CALCTREE>\n" ^
34.27 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.28 "</CALCTREE>\n" ^
34.29 "@@@@@end@@@@@");
34.30 fun deconstructcalctreeOK2xml (*uI:userID*) (cI:calcID) =
34.31 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.32 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.33 "<DELCALC>\n" ^
34.34 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.35 "</DELCALC>\n" ^
34.36 "@@@@@end@@@@@");
34.37
34.38 fun iteratorOK2xml (cI:calcID) (p:pos')=
34.39 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.40 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.41 "<CALCITERATOR>\n" ^
34.42 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.43 pos'2xml i ("POSITION", p) ^
34.44 "</CALCITERATOR>\n" ^
34.45 "@@@@@end@@@@@");
34.46 fun iteratorERROR2xml (cI:calcID) =
34.47 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.48 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.49 "<CALCITERATOR>\n" ^
34.50 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.51 " <ERROR> pos does not exist </ERROR>\n" ^
34.52 @@ -69,14 +69,14 @@
34.53 "@@@@@end@@@@@");
34.54
34.55 fun sysERROR2xml (cI:calcID) "" =
34.56 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.57 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.58 "<SYSERROR>\n" ^
34.59 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.60 " <ERROR> in kernel </ERROR>\n" ^
34.61 "</SYSERROR>\n" ^
34.62 "@@@@@end@@@@@")
34.63 | sysERROR2xml (cI:calcID) str =
34.64 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.65 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.66 "<SYSERROR>\n" ^
34.67 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.68 " <ERROR> "^str^" </ERROR>\n" ^
34.69 @@ -84,7 +84,7 @@
34.70 "@@@@@end@@@@@");
34.71
34.72 fun refformulaOK2xml (cI:calcID) p (Form t) =
34.73 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.74 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.75 "<REFFORMULA>\n" ^
34.76 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.77 " <CALCFORMULA>\n"^
34.78 @@ -96,7 +96,7 @@
34.79 "</REFFORMULA>\n" ^
34.80 "@@@@@end@@@@@")
34.81 | refformulaOK2xml (cI:calcID) p (ModSpec modspec) =
34.82 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.83 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.84 "<REFFORMULA>\n" ^
34.85 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.86 pos'calchead2xml i (p, modspec)^
34.87 @@ -104,7 +104,7 @@
34.88 "@@@@@end@@@@@");
34.89
34.90 fun refformulaERROR2xml (cI:calcID) = (*FIXME.WN.29.8.03 unused*)
34.91 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.92 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.93 "<REFFORMULA>\n" ^
34.94 " <ERROR> object is not a formula </ERROR>\n" ^
34.95 "</REFFORMULA>\n" ^
34.96 @@ -113,14 +113,14 @@
34.97 (* val (cI, tac) = (cI, ta);
34.98 *)
34.99 fun gettacticOK2xml (cI:calcID) tac =
34.100 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.101 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.102 "<GETTACTIC>\n" ^
34.103 " <CALCID> "^string_of_int cI^" </CALCID>\n"^
34.104 tac2xml i tac^
34.105 "</GETTACTIC>\n" ^
34.106 "@@@@@end@@@@@");
34.107 fun gettacticERROR2xml (cI:calcID) str =
34.108 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.109 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.110 "<GETTACTIC>\n" ^
34.111 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.112 " <ERROR> "^str^" </ERROR>\n" ^
34.113 @@ -128,7 +128,7 @@
34.114 "@@@@@end@@@@@");
34.115
34.116 fun applicabletacticsOK cI tacs =
34.117 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.118 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.119 "<APPLICABLETACTICS>\n" ^
34.120 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.121 " <TACLIST>\n"^
34.122 @@ -138,7 +138,7 @@
34.123 "@@@@@end@@@@@");
34.124
34.125 fun getasmsOK2xml (cI:calcID) terms =
34.126 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.127 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.128 "<GETASSUMPTIONS>\n" ^
34.129 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.130 " <ASMLIST>\n"^
34.131 @@ -151,7 +151,7 @@
34.132
34.133 (*WN0502 @see ME/ctree: type asms: illdesigned, thus not used*)
34.134 fun getaccuasmsOK2xml cI asms =
34.135 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.136 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.137 "<GETACCUMULATEDASMS>\n" ^
34.138 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.139 " <ASMLIST>\n"^
34.140 @@ -165,7 +165,7 @@
34.141 *)
34.142
34.143 fun getintervalOK (cI:calcID) fs =
34.144 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.145 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.146 "<GETELEMENTSFROMTO>\n" ^
34.147 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.148 " <FORMHEADS>\n"^
34.149 @@ -176,7 +176,7 @@
34.150
34.151
34.152 fun matchpbl2xml (cI:calcID) (model_ok, pI, hdl, pbl, pre) =
34.153 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.154 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.155 "<CONTEXTPBL>\n" ^
34.156 " <GUH> " ^ pblID2guh pI ^ " </GUH>\n" ^
34.157 " <STATUS> " ^ (if model_ok
34.158 @@ -190,7 +190,7 @@
34.159 "@@@@@end@@@@@");
34.160
34.161 fun matchmet2xml (cI:calcID) (model_ok, pI, scr, pbl, pre) =
34.162 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.163 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.164 "<CONTEXTMET>\n" ^
34.165 " <GUH> " ^ metID2guh pI ^ " </GUH>\n" ^
34.166 " <STATUS> " ^ (if model_ok
34.167 @@ -203,7 +203,7 @@
34.168
34.169
34.170 fun tryrefineOK2xml (cI:calcID) (ModSpec modspec) =
34.171 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.172 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.173 "<TRYREFINE>\n" ^
34.174 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.175 modspec2xml i modspec ^
34.176 @@ -211,7 +211,7 @@
34.177 "@@@@@end@@@@@");
34.178
34.179 fun appendformulaOK2xml (cI:calcID) (old:pos') (del:pos') (new:pos') =
34.180 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.181 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.182 "<APPENDFORMULA>\n" ^
34.183 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.184 " <CALCCHANGED>\n" ^
34.185 @@ -224,12 +224,12 @@
34.186 (* appendformulaOK2xml 1 ([2],Frm) ([3],Pbl) ([4],Res);
34.187 *)
34.188 fun appendformulaERROR2xml (cI:calcID) msg =
34.189 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.190 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.191 "<CALCMESSAGE> "^ msg ^" </CALCMESSAGE>\n" ^
34.192 "@@@@@end@@@@@");
34.193
34.194 fun replaceformulaOK2xml (cI:calcID) (old:pos') (del:pos') (new:pos') =
34.195 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.196 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.197 "<REPLACEFORMULA>\n" ^
34.198 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.199 " <CALCCHANGED>\n" ^
34.200 @@ -240,12 +240,12 @@
34.201 "</REPLACEFORMULA>\n" ^
34.202 "@@@@@end@@@@@");
34.203 fun replaceformulaERROR2xml (cI:calcID) msg =
34.204 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.205 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.206 "<CALCMESSAGE> "^ msg ^" </CALCMESSAGE>\n" ^
34.207 "@@@@@end@@@@@");
34.208
34.209 fun message2xml (cI:calcID) e =
34.210 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.211 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.212 "<MESSAGE>\n" ^
34.213 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.214 " <STRING> "^e^" </STRING>\n" ^
34.215 @@ -253,7 +253,7 @@
34.216 "@@@@@end@@@@@");
34.217
34.218 fun setnexttactic2xml (*uI:iterID*) (cI:calcID) e =
34.219 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.220 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.221 "<SETNEXTTACTIC>\n" ^
34.222 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.223 " <MESSAGE> "^e^" </MESSAGE>\n" ^
34.224 @@ -261,7 +261,7 @@
34.225 "@@@@@end@@@@@");
34.226
34.227 fun fetchproposedtacticOK2xml (*uI:userID*) (cI:calcID) tac =
34.228 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.229 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.230 "<NEXTTAC>\n" ^
34.231 " <CALCID> "^string_of_int cI^" </CALCID>\n"^
34.232 tac2xml i tac^
34.233 @@ -271,7 +271,7 @@
34.234 (* fetchproposedtactic2xml 11 22 (Rewrite ("rmult_commute","?m *?n =?n *?m"));
34.235 *)
34.236 fun fetchproposedtacticERROR2xml (*uI:userID*) (cI:calcID) e =
34.237 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.238 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.239 "<NEXTTAC>\n" ^
34.240 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.241 " <ERROR> "^ e ^" </ERROR>\n" ^
34.242 @@ -283,7 +283,7 @@
34.243 GENERATED: the pos' of the new active formula
34.244 .*)
34.245 fun autocalculateOK2xml (cI:calcID) (old:pos') (del:pos') (new:pos') =
34.246 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.247 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.248 "<AUTOCALC>\n" ^
34.249 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.250 " <CALCCHANGED>\n" ^
34.251 @@ -296,12 +296,12 @@
34.252 (* autocalculate2xml 11 22 (Rewrite ("rmult_commute","?m *?n =?n *?m"));
34.253 *)
34.254 fun autocalculateERROR2xml (cI:calcID) e =
34.255 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.256 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.257 "<CALCMESSAGE> "^ e ^" </CALCMESSAGE>\n" ^
34.258 "@@@@@end@@@@@");
34.259
34.260 fun interStepsOK (cI:calcID) (*pos'forms*) (old:pos') (del:pos') (new:pos') =
34.261 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.262 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.263 "<INTERSTEPS>\n" ^
34.264 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.265 " <CALCCHANGED>\n" ^
34.266 @@ -312,12 +312,12 @@
34.267 "</INTERSTEPS>\n" ^
34.268 "@@@@@end@@@@@");
34.269 fun interStepsERROR (cI:calcID) e =
34.270 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.271 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.272 " <CALCMESSAGE> "^ e ^" </CALCMESSAGE>\n" ^
34.273 "@@@@@end@@@@@");
34.274
34.275 fun modifycalcheadOK2xml (cI:calcID) (chd as (complete,p_,_,_,_,_):ocalhd) =
34.276 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.277 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.278 "<MODIFYCALCHEAD>\n" ^
34.279 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.280 " <STATUS> "^(if complete then "complete"
34.281 @@ -329,7 +329,7 @@
34.282 (* val (cI, contthy) = (cI, (context_thy (pt,pos) tac));
34.283 *)
34.284 fun contextthyOK2xml cI contthy =
34.285 - tracing ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.286 + writeln ("@@@@@begin@@@@@\n "^string_of_int cI^" \n" ^
34.287 "<CONTEXTTHY>\n" ^
34.288 " <CALCID> "^string_of_int cI^" </CALCID>\n" ^
34.289 contthy2xml i contthy ^
34.290 @@ -338,5 +338,5 @@
34.291
34.292 (*
34.293 fun contextthyNO2xml guh =
34.294 - tracing (datatypes.contextthyNO2xml 0 guh);
34.295 + writeln (datatypes.contextthyNO2xml 0 guh);
34.296 *)
35.1 --- a/src/Tools/isac/xmlsrc/mathml.sml Tue Sep 28 08:58:06 2010 +0200
35.2 +++ b/src/Tools/isac/xmlsrc/mathml.sml Tue Sep 28 09:06:56 2010 +0200
35.3 @@ -28,7 +28,7 @@
35.4
35.5
35.6 fun strs2xml strs = foldl (op ^) ("", strs);
35.7 -(* tracing (strs2xml ["<XXX> xxx </XXX>\n","<YYY> yyy </YYY>\n"]);
35.8 +(* writeln (strs2xml ["<XXX> xxx </XXX>\n","<YYY> yyy </YYY>\n"]);
35.9 <XXX> xxx </XXX>
35.10 <YYY> yyy </YYY>*)
35.11
35.12 @@ -41,7 +41,7 @@
35.13 indt (j+2*i) ^ "<ISA> " ^ (decode o term2str) t ^ " </ISA>\n" ^
35.14 indt (j+i) ^ "</MATHML>";
35.15 (*val t = str2term "equality e_";
35.16 - tracing (term2xml 8 t);
35.17 + writeln (term2xml 8 t);
35.18 <MATHML>
35.19 <ISA> equality e_ </ISA>
35.20 <MATHML> *)
35.21 @@ -49,7 +49,7 @@
35.22 (*version for TextIO*)
35.23 fun terms2xml j [] = ""
35.24 | terms2xml j (t::ts) = term2xml j t ^ terms2xml j ts;
35.25 -(*version for tracing: extra \n*)
35.26 +(*version for writeln: extra \n*)
35.27 fun terms2xml' j [] = ""
35.28 | terms2xml' j [t] = term2xml j t
35.29 | terms2xml' j (t::ts) = term2xml j t ^"\n"^ terms2xml' j ts;
35.30 @@ -62,11 +62,11 @@
35.31 (*version for TextIO*)
35.32 fun cterms2xml j [] = ""
35.33 | cterms2xml j (t::ts) = cterm2xml j t ^ cterms2xml j ts;
35.34 -(*version for tracing: extra \n*)
35.35 +(*version for writeln: extra \n*)
35.36 fun cterms2xml' j [] = ""
35.37 | cterms2xml' j (t::ts) = cterm2xml j t ^"\n"^ cterms2xml j ts;
35.38
35.39 -(* tracing(cterms2xml 5 ["cterm1", "cterm2"]);
35.40 +(* writeln(cterms2xml 5 ["cterm1", "cterm2"]);
35.41 <MATHML>
35.42 <ISA> cterm1 </ISA>
35.43 </MATHML>
36.1 --- a/src/Tools/isac/xmlsrc/pbl-met-hierarchy.sml Tue Sep 28 08:58:06 2010 +0200
36.2 +++ b/src/Tools/isac/xmlsrc/pbl-met-hierarchy.sml Tue Sep 28 09:06:56 2010 +0200
36.3 @@ -11,13 +11,13 @@
36.4 in (TextIO.output (file, str);
36.5 TextIO.flushOut file;
36.6 TextIO.closeOut file) end;
36.7 -fun pos2filename [] = raise error "pos2filename called with []"
36.8 +fun pos2filename [] = error "pos2filename called with []"
36.9 | pos2filename [i] = "_" ^ string_of_int i ^ ".xml"
36.10 | pos2filename (i::is) = "_" ^ string_of_int i ^ pos2filename is;
36.11 (* pos2filename [1,22,3];
36.12 val it = "_1_22_3.xml" : string
36.13 *)
36.14 -fun id2filename [] = raise error "id2filename called with []"
36.15 +fun id2filename [] = error "id2filename called with []"
36.16 | id2filename [s] = s ^ ".xml"
36.17 | id2filename (s::ss) = s ^ "_" ^ id2filename ss;
36.18 (* id2filename ["linear","univariate","equation"];
36.19 @@ -77,7 +77,7 @@
36.20 and nds _ _ [] = ""
36.21 | nds i p (n::ns) = (nd i p n) ^ (nds i (lev_on p) ns);
36.22 in nds j [0] h : xml end;
36.23 -(* (tracing o hierarchy_pbl) (!ptyps);
36.24 +(* (writeln o hierarchy_pbl) (!ptyps);
36.25 *)
36.26
36.27 fun pbl_hierarchy2file (path:path) =
36.28 @@ -192,7 +192,7 @@
36.29 (*
36.30 val pblID = ["linear","univariate","equation"];
36.31 val pblID = ["degree_4","polynomial","univariate","equation"];
36.32 -tracing (pbl2xml pblID (get_pbt pblID));
36.33 +writeln (pbl2xml pblID (get_pbt pblID));
36.34 *)
36.35
36.36 (*replace by 'fun calc2xml' as developed for thy in 0607*)
36.37 @@ -270,7 +270,7 @@
36.38 authors2xml i "COURSEDESIGNS" ["isac team 2006"] ^
36.39 "</NODECONTENT>" : xml;
36.40
36.41 -(* tracing (met2xml ["Test", "solve_linear"]
36.42 +(* writeln (met2xml ["Test", "solve_linear"]
36.43 (get_met ["Test", "solve_linear"]));
36.44 *)
36.45
36.46 @@ -278,14 +278,14 @@
36.47
36.48 (*.write the files using an int-key (pos') as filename.*)
36.49 fun pbl2file (path:path) (pos:pos) (id:metID) (pbl as {guh,...}) =
36.50 - (tracing ("### pbl2file: id = " ^ strs2str id);
36.51 + (writeln ("### pbl2file: id = " ^ strs2str id);
36.52 ((str2file (path ^ pos2filename pos)) o (pbl2xml id)) pbl
36.53 );
36.54
36.55 (*.write the files using the guh as filename.*)
36.56 (* *)
36.57 fun pbl2file (path:path) (pos:pos) (id:metID) (pbl as {guh,...}) =
36.58 - (tracing ("### pbl2file: id = " ^ strs2str id ^ ", pos = " ^ pos2str pos);
36.59 + (writeln ("### pbl2file: id = " ^ strs2str id ^ ", pos = " ^ pos2str pos);
36.60 ((str2file (path ^ guh2filename guh)) o (pbl2xml id)) pbl
36.61 );
36.62
36.63 @@ -293,12 +293,12 @@
36.64
36.65 (*.write the files using an int-key (pos') as filename.*)
36.66 fun met2file (path:path) (pos:pos) (id:metID) met =
36.67 - (tracing ("### met2file: id = " ^ strs2str id);
36.68 + (writeln ("### met2file: id = " ^ strs2str id);
36.69 ((str2file (path ^ "met" ^ pos2filename pos)) o (met2xml id)) met);
36.70
36.71 (*.write the files using the guh as filename.*)
36.72 fun met2file (path:path) (pos:pos) (id:metID) (met as {guh,...}) =
36.73 - (tracing ("### met2file: id = " ^ strs2str id);
36.74 + (writeln ("### met2file: id = " ^ strs2str id);
36.75 ((str2file (path ^ guh2filename guh)) o (met2xml id)) met);
36.76
36.77
37.1 --- a/src/Tools/isac/xmlsrc/thy-hierarchy.sml Tue Sep 28 08:58:06 2010 +0200
37.2 +++ b/src/Tools/isac/xmlsrc/thy-hierarchy.sml Tue Sep 28 09:06:56 2010 +0200
37.3 @@ -103,7 +103,7 @@
37.4 : (theID * thydata) list
37.5 end;
37.6
37.7 -fun show_thes () = (tracing o format_pblIDl o (scan [])) (!thehier);
37.8 +fun show_thes () = (writeln o format_pblIDl o (scan [])) (!thehier);
37.9
37.10
37.11
37.12 @@ -132,7 +132,7 @@
37.13 until insertion into the hierarchy of theory elements 'th' is possible
37.14 (the hierarchy requires the parentnode to exist for insertion).*)
37.15 fun cut_theID th ([]:theID) =
37.16 - raise error "could not insert into thy-hierarchy"
37.17 + error "could not insert into thy-hierarchy"
37.18 | cut_theID th theID =
37.19 if can_insert theID th
37.20 then theID else cut_theID th (drop_last theID);
37.21 @@ -164,7 +164,7 @@
37.22 | the_hier th ((theID, thydata)::ths) =
37.23 if can_insert theID th
37.24 then let val th' = if exist_the theID th
37.25 - then (tracing ("*** insert: preserved "^strs2str theID);
37.26 + then (writeln ("*** insert: preserved "^strs2str theID);
37.27 th)
37.28 else insrt theID thydata theID th
37.29 in the_hier th' ths end
37.30 @@ -261,11 +261,11 @@
37.31 authors2xml i "COURSEDESIGNS" coursedesign ^
37.32 "</RULESETDATA>\n"
37.33 | thydata2xml (theID, _) =
37.34 - raise error ("thydata2xml: not implemented for "^ strs2str' theID);
37.35 + error ("thydata2xml: not implemented for "^ strs2str' theID);
37.36
37.37 (*.analoguous to 'fun met2file'.*)
37.38 fun thydata2file (xmldata:path) (pos:pos) (theID:theID) thydata =
37.39 - (tracing ("### thes2file: id = " ^ strs2str theID);
37.40 + (writeln ("### thes2file: id = " ^ strs2str theID);
37.41 str2file (xmldata ^ theID2filename theID)
37.42 (thydata2xml (theID:theID, thydata)));
37.43
38.1 --- a/test/Tools/isac/Frontend/interface.sml Tue Sep 28 08:58:06 2010 +0200
38.2 +++ b/test/Tools/isac/Frontend/interface.sml Tue Sep 28 09:06:56 2010 +0200
38.3 @@ -60,10 +60,10 @@
38.4 "--------- encode ^ -> ^^^ ---------------------------------------";
38.5 "--------- encode ^ -> ^^^ ---------------------------------------";
38.6 if encode "a^2+b^2=c^2" = "a^^^2+b^^^2=c^^^2" then ()
38.7 -else raise error "interface.sml: diff.behav. in encode ^ -> ^^^ ";
38.8 +else error "interface.sml: diff.behav. in encode ^ -> ^^^ ";
38.9
38.10 if (decode o encode) "a^2+b^2=c^2" = "a^2+b^2=c^2" then ()
38.11 -else raise error "interface.sml: diff.behav. in de/encode ^ <-> ^^^ ";
38.12 +else error "interface.sml: diff.behav. in de/encode ^ <-> ^^^ ";
38.13
38.14 ==================================================================*)
38.15 "exported from struct --------------------------------------------";
38.16 @@ -167,7 +167,7 @@
38.17 val (Form f, tac, asms) = pt_extract (pt, ip);
38.18 (*exception just above means: 'ModSpec' has been returned: error anyway*)
38.19 if term2str f = "[x = 1]" then () else
38.20 - raise error "FE-Kernel-interface.sml: diff.behav. in solve_linear as rootpbl";
38.21 + error "FE-Kernel-interface.sml: diff.behav. in solve_linear as rootpbl";
38.22
38.23
38.24
38.25 @@ -188,10 +188,10 @@
38.26 moveActiveDown 1;
38.27 moveActiveDown 1;
38.28 if get_pos 1 1 = ([2], Res) then () else
38.29 - raise error "FE-interface.sml: diff.behav. in a inspect 1 with Iterator 2";
38.30 + error "FE-interface.sml: diff.behav. in a inspect 1 with Iterator 2";
38.31 moveActiveDown 1; refFormula 1 ([], Res);
38.32 if get_pos 1 1 = ([], Res) then () else
38.33 - raise error "FE-interface.sml: diff.behav. in b inspect 1 with Iterator 2";
38.34 + error "FE-interface.sml: diff.behav. in b inspect 1 with Iterator 2";
38.35 moveActiveCalcHead 1; refFormula 1 ([],Pbl);
38.36
38.37
38.38 @@ -317,7 +317,7 @@
38.39 val (Form f, tac, asms) = pt_extract (pt, ip);
38.40 (*exception just above means: 'ModSpec' has been returned: error anyway*)
38.41 if term2str f = "[x = 1]" then () else
38.42 - raise error "FE-interface.sml: diff.behav. in miniscript with mini-subpb";
38.43 + error "FE-interface.sml: diff.behav. in miniscript with mini-subpb";
38.44
38.45 DEconstrCalcTree 1;
38.46
38.47 @@ -372,7 +372,7 @@
38.48 val p = get_pos 1 1;
38.49 val (Form f, tac, asms) = pt_extract (pt, p);
38.50 if term2str f = "[x = 1]" andalso p = ([], Res) then () else
38.51 - raise error "FE-interface.sml: diff.behav. in miniscript with mini-subpb";
38.52 + error "FE-interface.sml: diff.behav. in miniscript with mini-subpb";
38.53
38.54 DEconstrCalcTree 1;
38.55
38.56 @@ -397,7 +397,7 @@
38.57 val p = get_pos 1 1;
38.58 val (Form f, tac, asms) = pt_extract (pt, p);
38.59 if term2str f = "[x = 1]" andalso p = ([], Res) then () else
38.60 - raise error "FE-interface.sml: diff.behav. in solve_linear/rt AUTOCALCULATE ";
38.61 + error "FE-interface.sml: diff.behav. in solve_linear/rt AUTOCALCULATE ";
38.62
38.63
38.64 "--------- solve_linear as rootpbl AUTOCALC CompleteHead/Calc ----";
38.65 @@ -420,7 +420,7 @@
38.66 autoCalculate 1 CompleteCalc;
38.67 val ((pt,p),_) = get_calc 1;
38.68 if p=([], Res) then () else
38.69 - raise error "FE-interface.sml: diff.behav. in solve_linear AUTOC Head/Calc ";
38.70 + error "FE-interface.sml: diff.behav. in solve_linear AUTOC Head/Calc ";
38.71
38.72
38.73 "--------- miniscript with mini-subpbl AUTOCALCULATE CompleteCalc-";
38.74 @@ -452,7 +452,7 @@
38.75 val p = get_pos 1 1;
38.76 val (Form f, tac, asms) = pt_extract (pt, p);
38.77 if term2str f = "[x = 1]" andalso p = ([], Res) then () else
38.78 - raise error "FE-interface.sml: diff.behav. in mini-subpbl AUTOCALCULATE 6";
38.79 + error "FE-interface.sml: diff.behav. in mini-subpbl AUTOCALCULATE 6";
38.80
38.81
38.82 "--------- miniscript with mini-subpbl AUTO CompleteCalcHead------";
38.83 @@ -495,7 +495,7 @@
38.84 if get_obj g_spec pt [] = ("e_domID",
38.85 ["linear", "univariate","equation","test"],
38.86 ["Test","solve_linear"]) then ()
38.87 - else raise error "FE-interface.sml: diff.behav. in setProblem, setMethod";
38.88 + else error "FE-interface.sml: diff.behav. in setProblem, setMethod";
38.89
38.90 autoCalculate 1 CompleteCalcHead;
38.91 refFormula 1 (get_pos 1 1);
38.92 @@ -508,7 +508,7 @@
38.93 val p = get_pos 1 1;
38.94 val (Form f, tac, asms) = pt_extract (pt, p);
38.95 if term2str f = "[x = 1]" andalso p = ([], Res) then () else
38.96 - raise error "FE-interface.sml: diff.behav. in mini-subpbl AUTOCALCULATE 6";
38.97 + error "FE-interface.sml: diff.behav. in mini-subpbl AUTOCALCULATE 6";
38.98
38.99
38.100 "--------- setContext..Thy ---------------------------------------";
38.101 @@ -558,7 +558,7 @@
38.102 writeln str;
38.103 if str = ". ----- pblobj -----\n1. x + 1 = 2\n2. x + 1 + -1 * 2 = 0\n"
38.104 then () else
38.105 - raise error "FE-interface.sml: diff.behav. in mini-subpbl CompleteToSubpbl-1";
38.106 + error "FE-interface.sml: diff.behav. in mini-subpbl CompleteToSubpbl-1";
38.107
38.108 autoCalculate 1 (Step 1); (*proceeds only, of NOT 1 step before subplb*)
38.109 autoCalculate 1 CompleteToSubpbl;
38.110 @@ -570,7 +570,7 @@
38.111 val p = get_pos 1 1;
38.112 val (Form f, tac, asms) = pt_extract (pt, p);
38.113 if term2str f = "[x = 1]" andalso p = ([], Res) then () else
38.114 - raise error "FE-interface.sml: diff.behav. in mini-subpbl CompleteToSubpbl 1";
38.115 + error "FE-interface.sml: diff.behav. in mini-subpbl CompleteToSubpbl 1";
38.116
38.117
38.118
38.119 @@ -777,7 +777,7 @@
38.120 val p = get_pos 1 1;
38.121 val (Form f, tac, asms) = pt_extract (pt, p);
38.122 if term2str f = "[x = -1, x = -3]" andalso p = ([], Res) then () else
38.123 - raise error "FE-interface.sml: diff.behav. in tryMatchProblem, tryRefine";
38.124 + error "FE-interface.sml: diff.behav. in tryMatchProblem, tryRefine";
38.125
38.126 (*------------^^^-inserted-----------------------------------------------*)
38.127 (*WN050904 the fetchProposedTactic's below may not have worked like that
38.128 @@ -800,7 +800,7 @@
38.129 val p = get_pos 1 1;
38.130 val (Form f, tac, asms) = pt_extract (pt, p);
38.131 if term2str f = "[x = -1, x = -3]" andalso p = ([], Res) then () else
38.132 - raise error "FE-interface.sml: diff.behav. in tryMatchProblem, tryRefine";
38.133 + error "FE-interface.sml: diff.behav. in tryMatchProblem, tryRefine";
38.134
38.135
38.136 "--------- modifyCalcHead, resetCalcHead, modelProblem ------------";
38.137 @@ -939,7 +939,7 @@
38.138 val p = get_pos 1 1;
38.139 val (Form f, tac, asms) = pt_extract (pt, p);
38.140 if term2str f = "[x = 1]" andalso p = ([], Res) then () else
38.141 - raise error "FE-interface.sml: diff.behav. in from pbl-hierarchy";
38.142 + error "FE-interface.sml: diff.behav. in from pbl-hierarchy";
38.143
38.144
38.145
38.146 @@ -957,7 +957,7 @@
38.147 val p = get_pos 1 1;
38.148 val (Form f, tac, asms) = pt_extract (pt, p);
38.149 if term2str f = "[x = 1]" andalso p = ([], Res) then () else
38.150 - raise error "FE-interface.sml: diff.behav. in algebra system";
38.151 + error "FE-interface.sml: diff.behav. in algebra system";
38.152
38.153
38.154
38.155 @@ -1098,7 +1098,7 @@
38.156 val p = get_pos 1 1;
38.157 val (Form f, tac, asms) = pt_extract (pt, p);
38.158 if term2str f = "[x = 1]" andalso p = ([], Res) then () else
38.159 - raise error "FE-interface.sml: diff.behav. in combinations of steps";
38.160 + error "FE-interface.sml: diff.behav. in combinations of steps";
38.161
38.162
38.163 "--------- appendFormula label{SOLVE:MANUAL:FORMULA:enter} right--";
38.164 @@ -1124,7 +1124,7 @@
38.165 val p = get_pos 1 1;
38.166 val (Form f, tac, asms) = pt_extract (pt, p);
38.167 if term2str f = "-1 + x = 0" andalso p = ([2], Res) then () else
38.168 - raise error "FE-interface.sml: diff.behav. in FORMULA:enter} right";
38.169 + error "FE-interface.sml: diff.behav. in FORMULA:enter} right";
38.170
38.171 "--------- appendFormula label{SOLVE:MANUAL:FORMULA:enter} other--";
38.172 "--------- appendFormula label{SOLVE:MANUAL:FORMULA:enter} other--";
38.173 @@ -1149,7 +1149,7 @@
38.174 val p = get_pos 1 1;
38.175 val (Form f, tac, asms) = pt_extract (pt, p);
38.176 if term2str f = "x - 1 = 0" andalso p = ([2], Res) then () else
38.177 - raise error "FE-interface.sml: diff.behav. in FORMULA:enter} other";
38.178 + error "FE-interface.sml: diff.behav. in FORMULA:enter} other";
38.179
38.180 "--------- appendFormula label{SOLVE:MANUAL:FORMULA:enter} oth 2--";
38.181 "--------- appendFormula label{SOLVE:MANUAL:FORMULA:enter} oth 2--";
38.182 @@ -1175,7 +1175,7 @@
38.183 val p = get_pos 1 1;
38.184 val (Form f, tac, asms) = pt_extract (pt, p);
38.185 if term2str f = "x = 1" andalso p = ([3,2], Res) then () else
38.186 - raise error "FE-interface.sml: diff.behav. in FORMULA:enter} oth 2";
38.187 + error "FE-interface.sml: diff.behav. in FORMULA:enter} oth 2";
38.188
38.189
38.190 "--------- appendFormula label{SOLVE:MANUAL:FORMULA:enter} NOTok--";
38.191 @@ -1199,7 +1199,7 @@
38.192 val p = get_pos 1 1;
38.193 val (Form f, tac, asms) = pt_extract (pt, p);
38.194 if term2str f = "x + 1 + -1 * 2 = 0" andalso p = ([1], Res) then () else
38.195 - raise error "FE-interface.sml: diff.behav. in FORMULA:enter} NOTok";
38.196 + error "FE-interface.sml: diff.behav. in FORMULA:enter} NOTok";
38.197
38.198
38.199 "--------- replaceFormula {SOLVE:MANUAL:FORMULA:replace} right----";
38.200 @@ -1222,11 +1222,11 @@
38.201 val p = get_pos 1 1;
38.202 val (Form f, tac, asms) = pt_extract (pt, p);
38.203 if term2str f = "-1 + x = 0" andalso p = ([2], Res) then () else
38.204 - raise error "FE-interface.sml: diff.behav. in FORMULA:replace} right 1";
38.205 + error "FE-interface.sml: diff.behav. in FORMULA:replace} right 1";
38.206 if map fst (get_interval ([2],Res) ([],Res) 9999 pt) =
38.207 [([2], Res), ([3], Pbl), ([3, 1], Frm), ([3, 1], Res), ([3, 2], Res),
38.208 ([3], Res), ([4], Res), ([], Res)] then () (*nothing deleted!*) else
38.209 - raise error "FE-interface.sml: diff.behav. in FORMULA:replace} right 2";
38.210 + error "FE-interface.sml: diff.behav. in FORMULA:replace} right 2";
38.211
38.212 (*WN050211 replaceFormula didn't work on second ctree: thus now tested...*)
38.213 CalcTree
38.214 @@ -1245,11 +1245,11 @@
38.215 val p = get_pos 2 1;
38.216 val (Form f, tac, asms) = pt_extract (pt, p);
38.217 if term2str f = "-1 + x = 0" andalso p = ([2], Res) then () else
38.218 - raise error "FE-interface.sml: diff.behav. in FORMULA:replace} right 1";
38.219 + error "FE-interface.sml: diff.behav. in FORMULA:replace} right 1";
38.220 if map fst (get_interval ([2],Res) ([],Res) 9999 pt) =
38.221 [([2], Res), ([3], Pbl), ([3, 1], Frm), ([3, 1], Res), ([3, 2], Res),
38.222 ([3], Res), ([4], Res), ([], Res)] then () (*nothing deleted!*) else
38.223 - raise error "FE-interface.sml: diff.behav. in FORMULA:replace} right 2b";
38.224 + error "FE-interface.sml: diff.behav. in FORMULA:replace} right 2b";
38.225
38.226 "--------- replaceFormula {SOLVE:MANUAL:FORMULA:replace} other----";
38.227 "--------- replaceFormula {SOLVE:MANUAL:FORMULA:replace} other----";
38.228 @@ -1274,7 +1274,7 @@
38.229 val p = get_pos 1 1;
38.230 val (Form f, tac, asms) = pt_extract (pt, p);
38.231 if term2str f = "x - 1 = 0" andalso p = ([2], Res) then () else
38.232 - raise error "FE-interface.sml: diff.behav. in FORMULA:replace} other 1";
38.233 + error "FE-interface.sml: diff.behav. in FORMULA:replace} other 1";
38.234 (* for getting the list in whole length ...
38.235 print_depth 99;map fst (get_interval ([1],Res) ([],Res) 9999 pt);print_depth 3;
38.236 *)
38.237 @@ -1284,7 +1284,7 @@
38.238 ([2, 8], Res), ([2, 9], Res), ([2], Res)
38.239 (*WN060727 {cutlevup->test_trans} removed: ,
38.240 ([], Res)(*dropped, if test_trans doesnt stop at PblNd*)*)] then () else
38.241 - raise error "FE-interface.sml: diff.behav. in FORMULA:replace} other 2";
38.242 + error "FE-interface.sml: diff.behav. in FORMULA:replace} other 2";
38.243
38.244
38.245
38.246 @@ -1314,12 +1314,12 @@
38.247 [([1], Res), ([2], Res), ([3], Pbl), ([3, 1], Frm), ([3, 1], Res),
38.248 ([3, 2, 1], Frm), ([3, 2, 1], Res), ([3, 2, 2], Res),
38.249 ([3,2],Res)] then () else
38.250 - raise error "FE-interface.sml: diff.behav. in FORMULA:replace} oth2 1";
38.251 + error "FE-interface.sml: diff.behav. in FORMULA:replace} oth2 1";
38.252
38.253 val p = get_pos 1 1;
38.254 val (Form f, tac, asms) = pt_extract (pt, p);
38.255 if term2str f = "x = 1" andalso p = ([3,2], Res) then () else
38.256 - raise error "FE-interface.sml: diff.behav. in FORMULA:replace} oth2 2";
38.257 + error "FE-interface.sml: diff.behav. in FORMULA:replace} oth2 2";
38.258
38.259
38.260
38.261 @@ -1344,6 +1344,6 @@
38.262 val p = get_pos 1 1;
38.263 val (Form f, tac, asms) = pt_extract (pt, p);
38.264 if term2str f = "-1 + x = 0" andalso p = ([2], Res) then () else
38.265 - raise error "FE-interface.sml: diff.behav. in FORMULA:replace} NOTok";
38.266 + error "FE-interface.sml: diff.behav. in FORMULA:replace} NOTok";
38.267
38.268
39.1 --- a/test/Tools/isac/Interpret/calchead.sml Tue Sep 28 08:58:06 2010 +0200
39.2 +++ b/test/Tools/isac/Interpret/calchead.sml Tue Sep 28 09:06:56 2010 +0200
39.3 @@ -45,13 +45,13 @@
39.4 [([], Pbl), ([1], Frm),([1], Res), ([2], Res), ([3], Pbl), ([3, 1], Frm),
39.5 ([3, 1], Res), ([3, 2, 1], Frm), ([3, 2, 1], Res), ([3, 2, 2], Res),
39.6 ([3, 2], Res)] then () else
39.7 -raise error "calchead.sml: diff.behav. get_interval after replace} other 2 a";
39.8 +error "calchead.sml: diff.behav. get_interval after replace} other 2 a";
39.9
39.10 print_depth 99;map fst (get_interval ([3, 2, 1], Res) ([],Res) 9999 pt);
39.11 print_depth 3;
39.12 if map fst (get_interval ([3, 2, 1], Res) ([],Res) 9999 pt) =
39.13 [([3, 2, 1], Res), ([3, 2, 2], Res), ([3, 2], Res)] then () else
39.14 -raise error "modspec.sml: diff.behav. get_interval after replace} other 2 b";
39.15 +error "modspec.sml: diff.behav. get_interval after replace} other 2 b";
39.16
39.17
39.18
39.19 @@ -98,7 +98,7 @@
39.20 {Find=[Incompl "maximum",Incompl "valuesFor [a]"],
39.21 Given=[Correct "fixedValues [r = Arbfix]"],
39.22 Relate=[Incompl "relations []"], Where=[],With=[]})
39.23 -then raise error "test-maximum.sml: model stepwise - different behaviour"
39.24 +then error "test-maximum.sml: model stepwise - different behaviour"
39.25 else (); (*different with show_types !!!*)
39.26 6.5.03---*)
39.27
39.28 @@ -119,14 +119,14 @@
39.29 {Find=[Incompl "maximum",Incompl "valuesFor"],
39.30 Given=[Correct "fixedValues [r = Arbfix]"],
39.31 Relate=[Incompl "relations []"], Where=[],With=[]})
39.32 -then raise error "diffappl.sml: Specify_Problem different behaviour"
39.33 +then error "diffappl.sml: Specify_Problem different behaviour"
39.34 else ();
39.35 (* WN.3.9.03 (#391) Model_Specify did init_pbl newly
39.36 if ppc<>(Problem ["maximum_of","function"],
39.37 {Find=[Missing "maximum m_",Missing "valuesFor vs_"],
39.38 Given=[Correct "fixedValues [r = Arbfix]"],
39.39 Relate=[Missing "relations rs_"],Where=[],With=[]})
39.40 -then raise error "diffappl.sml: Specify_Problem different behaviour"
39.41 +then error "diffappl.sml: Specify_Problem different behaviour"
39.42 else ();*)
39.43
39.44 val nxt = tac2tac_ pt p(Specify_Method ["DiffApp","max_by_calculus"]);
39.45 @@ -138,7 +138,7 @@
39.46 Given=[Correct "fixedValues [r = Arbfix]",Missing "boundVariable v_v",
39.47 Missing "interval itv_",Missing "errorBound err_"],
39.48 Relate=[Incompl "relations []"],Where=[],With=[]})
39.49 -then raise error "diffappl.sml: Specify_Method different behaviour"
39.50 +then error "diffappl.sml: Specify_Method different behaviour"
39.51 else ();
39.52 (* WN.3.9.03 (#391) Model_Specify did init_pbl newly
39.53 if ppc<>(Method ["DiffApp","max_by_calculus"],
39.54 @@ -146,7 +146,7 @@
39.55 Given=[Correct "fixedValues [r = Arbfix]",Missing "boundVariable v_v",
39.56 Missing "interval itv_",Missing "errorBound err_"],
39.57 Relate=[Missing "relations rs_"],Where=[],With=[]})
39.58 -then raise error "diffappl.sml: Specify_Method different behaviour"
39.59 +then error "diffappl.sml: Specify_Method different behaviour"
39.60 else ();*)
39.61
39.62
39.63 @@ -204,7 +204,7 @@
39.64
39.65 if nxt<>(Add_Relation
39.66 "relations [(a / 2) ^^^ 2 + (b / 2) ^^^ 2 = r ^^^ 2]")
39.67 -then raise error "test specify, fmz <> []: nxt <> Add_Relation (a/2)^2.." else (); (*different with show_types !!!*)
39.68 +then error "test specify, fmz <> []: nxt <> Add_Relation (a/2)^2.." else (); (*different with show_types !!!*)
39.69
39.70 val nxt = tac2tac_ pt p nxt;
39.71 val(p,_,Form'(PpcKF(_,_,_,_,ppc)),nxt,_,pt) = specify nxt p [] pt;
39.72 @@ -238,7 +238,7 @@
39.73 val(p,_,Form'(PpcKF(_,_,_,_,ppc)),nxt,_,pt) = specify nxt p [] pt;
39.74 (*val nxt = Apply_Method ("DiffApp.thy","max_by_calculus") *)
39.75 if nxt<>(Apply_Method ["DiffApp","max_by_calculus"])
39.76 -then raise error "test specify, fmz <> []: nxt <> Apply_Method max_by_calculus" else ();
39.77 +then error "test specify, fmz <> []: nxt <> Apply_Method max_by_calculus" else ();
39.78
39.79
39.80 "--------- maximum example with 'specify', fmz = [] --------------";
39.81 @@ -286,7 +286,7 @@
39.82
39.83 (*30.8.01 ... funktioniert nicht mehr nach Einfuehrung env ....
39.84 if nxt<>(Add_Relation "relations []")
39.85 -then raise error "test specify, fmz <> []: nxt <> Add_Relation.."
39.86 +then error "test specify, fmz <> []: nxt <> Add_Relation.."
39.87 else (); (*different with show_types !!!*)
39.88 *)
39.89
39.90 @@ -316,7 +316,7 @@
39.91 (*val nxt = Apply_Method ("DiffApp","max_by_calculus") *)
39.92 (*30.8.01 ... funktioniert nicht mehr nach Einfuehrung env ....
39.93 if nxt<>(Apply_Method ("DiffApp.thy","max_by_calculus"))
39.94 -then raise error "test specify, fmz <> []: nxt <> Add_Relation.."
39.95 +then error "test specify, fmz <> []: nxt <> Add_Relation.."
39.96 else ();
39.97 *)
39.98
39.99 @@ -352,7 +352,7 @@
39.100 [ _ $ Free ("c", _) $ _, _ $ Free ("c_2", _) $ _]),
39.101 (3, [1], "#Find", Const ("EqSystem.solution", _), [Free ("ss'''", _)])]
39.102 =>()
39.103 - | _ => raise error "calchead.sml match_ags 2 args Nok ----------------";
39.104 + | _ => error "calchead.sml match_ags 2 args Nok ----------------";
39.105
39.106
39.107 "-b------------------------------------------------------";
39.108 @@ -379,7 +379,7 @@
39.109 (3, [1], "#Find", Const ("EqSystem.solution", _), [Free ("ss'''", _)])]
39.110 (* type of Find: [Free ("ss'''", "bool List.list")]*)
39.111 =>()
39.112 - | _ => raise error "calchead.sml match_ags copy-named dropped --------";
39.113 + | _ => error "calchead.sml match_ags copy-named dropped --------";
39.114
39.115
39.116 "-c---ERROR case: stac is missing #Given equalities e_s--";
39.117 @@ -425,7 +425,7 @@
39.118 case ((match_ags (theory "EqSystem") pats ags)
39.119 handle ERROR _ => []) of (*why not TYPE ?WN100920*)
39.120 [] => match_ags_msg pI stac ags
39.121 - | _ => raise error "calchead.sml match_ags 1st arg missing --------";
39.122 + | _ => error "calchead.sml match_ags 1st arg missing --------";
39.123
39.124
39.125 "-d------------------------------------------------------";
39.126 @@ -516,24 +516,24 @@
39.127 (2, [1], "#Given", Const ("Descript.solveFor", _), [Free ("x", _)]),
39.128 (3, [1], "#Find", Const ("Descript.solutions", _), [Free ("x_i", _)])]
39.129 => ()
39.130 - | _ => raise error "calchead.sml match_ags [univariate,equation,test]--";
39.131 + | _ => error "calchead.sml match_ags [univariate,equation,test]--";
39.132
39.133
39.134 "--------- regression test fun is_copy_named ------------";
39.135 "--------- regression test fun is_copy_named ------------";
39.136 "--------- regression test fun is_copy_named ------------";
39.137 val trm = (1, (2, @{term "v'i'"}));
39.138 -if is_copy_named trm then () else raise error "regr. is_copy_named 1";
39.139 +if is_copy_named trm then () else error "regr. is_copy_named 1";
39.140 val trm = (1, (2, @{term "e_e"}));
39.141 -if is_copy_named trm then raise error "regr. is_copy_named 2" else ();
39.142 +if is_copy_named trm then error "regr. is_copy_named 2" else ();
39.143 val trm = (1, (2, @{term "L'''"}));
39.144 -if is_copy_named trm then () else raise error "regr. is_copy_named 3";
39.145 +if is_copy_named trm then () else error "regr. is_copy_named 3";
39.146
39.147 (* out-comment 'structure CalcHead'...
39.148 val trm = (1, (2, @{term "v'i'"}));
39.149 -if is_copy_named_generating trm then () else raise error "regr. is_copy_named";
39.150 +if is_copy_named_generating trm then () else error "regr. is_copy_named";
39.151 val trm = (1, (2, @{term "L'''"}));
39.152 -if is_copy_named_generating trm then raise error "regr. is_copy_named" else ();
39.153 +if is_copy_named_generating trm then error "regr. is_copy_named" else ();
39.154 *)
39.155
39.156 "--------- regr.test fun cpy_nam ------------------------";
39.157 @@ -551,7 +551,7 @@
39.158
39.159 case cpy_nam pbt oris (hd cy) of
39.160 ([1], "#Find", Const ("Descript.solutions", _), [Free ("x_i", _)]) => ()
39.161 - | _ => raise error "calchead.sml regr.test cpy_nam-1-";
39.162 + | _ => error "calchead.sml regr.test cpy_nam-1-";
39.163
39.164 (*new data: cpy_nam without changing the name*)
39.165 @{term "equalities"}; type_of @{term "[x_1+1=2,x_2=0]"};
39.166 @@ -568,4 +568,4 @@
39.167
39.168 case cpy_nam pbt oris (hd cy) of
39.169 ([1], "#Find", Const ("EqSystem.solution", _), [Free ("ss'''", _)]) => ()
39.170 - | _ => raise error "calchead.sml regr.test cpy_nam-2-";
39.171 + | _ => error "calchead.sml regr.test cpy_nam-2-";
40.1 --- a/test/Tools/isac/Interpret/ctree.sml Tue Sep 28 08:58:06 2010 +0200
40.2 +++ b/test/Tools/isac/Interpret/ctree.sml Tue Sep 28 09:06:56 2010 +0200
40.3 @@ -116,7 +116,7 @@
40.4 val (p,_,f,nxt,_,pt) = me nxt p [1] pt(*.append_result: pos =[]*);
40.5 val Form' (FormKF (~1,EdUndef,0,Nundef,res)) = f;
40.6 if (snd nxt)=End_Proof' andalso res="[x = 1]" then ()
40.7 -else raise error "new behaviour in test: miniscript with mini-subpbl";
40.8 +else error "new behaviour in test: miniscript with mini-subpbl";
40.9
40.10 show_pt pt;
40.11
40.12 @@ -136,7 +136,7 @@
40.13 ([3], Res),
40.14 ([4], Res),
40.15 ([], Res)]
40.16 -then () else raise error "ctree.sml: diff:behav. in get_allpos' 1";
40.17 +then () else error "ctree.sml: diff:behav. in get_allpos' 1";
40.18
40.19 if get_allpos's ([], 1) (children pt) =
40.20 [([1], Frm),
40.21 @@ -148,7 +148,7 @@
40.22 ([3, 2], Res),
40.23 ([3], Res),
40.24 ([4], Res)]
40.25 -then () else raise error "ctree.sml: diff:behav. in get_allpos' 2";
40.26 +then () else error "ctree.sml: diff:behav. in get_allpos' 2";
40.27
40.28 if get_allpos's ([], 2) (takerest (1, children pt)) =
40.29 [([2], Res),
40.30 @@ -158,7 +158,7 @@
40.31 ([3, 2], Res),
40.32 ([3], Res),
40.33 ([4], Res)]
40.34 -then () else raise error "ctree.sml: diff:behav. in get_allpos' 3";
40.35 +then () else error "ctree.sml: diff:behav. in get_allpos' 3";
40.36
40.37 if get_allpos's ([], 3) (takerest (2, children pt)) =
40.38 [([3], Frm),
40.39 @@ -167,13 +167,13 @@
40.40 ([3, 2], Res),
40.41 ([3], Res),
40.42 ([4], Res)]
40.43 -then () else raise error "ctree.sml: diff:behav. in get_allpos' 4";
40.44 +then () else error "ctree.sml: diff:behav. in get_allpos' 4";
40.45
40.46 if get_allpos's ([3], 1) (children (nth 3 (children pt))) =
40.47 [([3, 1], Frm),
40.48 ([3, 1], Res),
40.49 ([3, 2], Res)]
40.50 -then () else raise error "ctree.sml: diff:behav. in get_allpos' 5";
40.51 +then () else error "ctree.sml: diff:behav. in get_allpos' 5";
40.52
40.53 if get_allpos' ([3], 1) (nth 3 (children pt)) =
40.54 [([3], Frm),
40.55 @@ -181,7 +181,7 @@
40.56 ([3, 1], Res),
40.57 ([3, 2], Res),
40.58 ([3], Res)]
40.59 -then () else raise error "ctree.sml: diff:behav. in get_allpos' 6";
40.60 +then () else error "ctree.sml: diff:behav. in get_allpos' 6";
40.61
40.62
40.63 (**##############################################################(**)
40.64 @@ -200,23 +200,23 @@
40.65 ([3, 2], Res),
40.66 ([3], Res),
40.67 ([4], Res)]
40.68 -then () else raise error "ctree.sml: diff:behav. in cut_level 1a";
40.69 +then () else error "ctree.sml: diff:behav. in cut_level 1a";
40.70 val (res,asm) = get_obj g_result pt' [2];
40.71 if res = e_term andalso asm = [] then () else
40.72 -raise error "ctree.sml: diff:behav. in cut_level 1aa" WN050219*);
40.73 +error "ctree.sml: diff:behav. in cut_level 1aa" WN050219*);
40.74 if not (existpt [2] pt') then () else
40.75 -raise error "ctree.sml: diff:behav. in cut_level 1aa2" (*WN050220*);
40.76 +error "ctree.sml: diff:behav. in cut_level 1aa2" (*WN050220*);
40.77
40.78 val (res,asm) = get_obj g_result pt' [];
40.79 if term2str res = "[x = 1]" (*WN050219 e_term in cut_tree!!!*) then () else
40.80 -raise error "ctree.sml: diff:behav. in cut_level 1ab";
40.81 +error "ctree.sml: diff:behav. in cut_level 1ab";
40.82 if map fst (get_interval ([],Frm) ([],Res) 9999 pt') =
40.83 [([], Frm),
40.84 ([1], Frm),
40.85 ([1], Res),
40.86 ([2], Res),(*, e_term in cut_tree!!!*)
40.87 ([], Res)] then () else
40.88 -raise error "ctree.sml: diff:behav. in cut_level 1b";
40.89 +error "ctree.sml: diff:behav. in cut_level 1b";
40.90
40.91
40.92 val (pt',cuts) = cut_level [] [] pt ([2],Res);
40.93 @@ -226,22 +226,22 @@
40.94 ([3, 2], Res),
40.95 ([3], Res),
40.96 ([4], Res)]
40.97 -then () else raise error "ctree.sml: diff:behav. in cut_level 2a";
40.98 +then () else error "ctree.sml: diff:behav. in cut_level 2a";
40.99
40.100 if pr_ptree pr_short pt' = ". ----- pblobj -----\n1. x + 1 = 2\n2. x + 1 + -1 * 2 = 0\n"
40.101 -then () else raise error "ctree.sml: diff:behav. in cut_level 2b";
40.102 +then () else error "ctree.sml: diff:behav. in cut_level 2b";
40.103
40.104 val (pt',cuts) = cut_level [] [3] pt ([3,1],Frm);
40.105 if cuts = [([3, 1], Res), ([3, 2], Res)]
40.106 -then () else raise error "ctree.sml: diff:behav. in cut_level 3a";
40.107 +then () else error "ctree.sml: diff:behav. in cut_level 3a";
40.108 if pr_ptree pr_short pt' = ". ----- pblobj -----\n1. x + 1 = 2\n2. x + 1 + -1 * 2 = 0\n3. ----- pblobj -----\n3.1. -1 + x = 0\n4. [x = 1]\n"
40.109 -then () else raise error "ctree.sml: diff:behav. in cut_level 3b";
40.110 +then () else error "ctree.sml: diff:behav. in cut_level 3b";
40.111
40.112 val (pt',cuts) = cut_level [] [3] pt ([3,1],Res);
40.113 if cuts = [([3, 2], Res)]
40.114 -then () else raise error "ctree.sml: diff:behav. in cut_level 4a";
40.115 +then () else error "ctree.sml: diff:behav. in cut_level 4a";
40.116 if pr_ptree pr_short pt' = ". ----- pblobj -----\n1. x + 1 = 2\n2. x + 1 + -1 * 2 = 0\n3. ----- pblobj -----\n3.1. -1 + x = 0\n4. [x = 1]\n"
40.117 -then () else raise error "ctree.sml: diff:behav. in cut_level 4b";
40.118 +then () else error "ctree.sml: diff:behav. in cut_level 4b";
40.119
40.120
40.121 "-------------- cut_tree (from ptree above)-----------------------";
40.122 @@ -256,25 +256,25 @@
40.123 ([3], Res),
40.124 ([4], Res),
40.125 ([], Res)]
40.126 -then () else raise error "ctree.sml: diff:behav. in cut_tree 1a";
40.127 +then () else error "ctree.sml: diff:behav. in cut_tree 1a";
40.128
40.129 val (res,asm) = get_obj g_result pt' [2];
40.130 if res = e_term (*WN050219 done by cut_level*) then () else
40.131 -raise error "ctree.sml: diff:behav. in cut_tree 1aa";
40.132 +error "ctree.sml: diff:behav. in cut_tree 1aa";
40.133
40.134 val form = get_obj g_form pt' [2];
40.135 if term2str form = "x + 1 + -1 * 2 = 0" (*remained !!!*) then () else
40.136 -raise error "ctree.sml: diff:behav. in cut_tree 1ab";
40.137 +error "ctree.sml: diff:behav. in cut_tree 1ab";
40.138
40.139 val (res,asm) = get_obj g_result pt' [];
40.140 if res = e_term (*WN050219 done by cut_tree*) then () else
40.141 -raise error "ctree.sml: diff:behav. in cut_tree 1ac";
40.142 +error "ctree.sml: diff:behav. in cut_tree 1ac";
40.143
40.144 if map fst (get_interval ([],Frm) ([],Res) 9999 pt') =
40.145 [([], Frm),
40.146 ([1], Frm),
40.147 ([1], Res)] then () else
40.148 -raise error "ctree.sml: diff:behav. in cut_tree 1ad";
40.149 +error "ctree.sml: diff:behav. in cut_tree 1ad";
40.150
40.151 val (pt', cuts) = cut_tree pt ([2],Res);
40.152 if cuts = [([3], Frm),
40.153 @@ -284,7 +284,7 @@
40.154 ([3], Res),
40.155 ([4], Res),
40.156 ([], Res)]
40.157 -then () else raise error "ctree.sml: diff:behav. in cut_tree 2";
40.158 +then () else error "ctree.sml: diff:behav. in cut_tree 2";
40.159
40.160 val (pt', cuts) = cut_tree pt ([3,1],Frm);
40.161 if cuts = [([3, 1], Res),
40.162 @@ -292,14 +292,14 @@
40.163 ([3], Res),
40.164 ([4], Res),
40.165 ([], Res)]
40.166 -then () else raise error "ctree.sml: diff:behav. in cut_tree 3";
40.167 +then () else error "ctree.sml: diff:behav. in cut_tree 3";
40.168
40.169 val (pt', cuts) = cut_tree pt ([3,1],Res);
40.170 if cuts = [([3, 2], Res),
40.171 ([3], Res),
40.172 ([4], Res),
40.173 ([], Res)]
40.174 -then () else raise error "ctree.sml: diff:behav. in cut_tree 4";
40.175 +then () else error "ctree.sml: diff:behav. in cut_tree 4";
40.176
40.177
40.178 "=====new ptree 1a miniscript with mini-subpbl ===================";
40.179 @@ -327,11 +327,11 @@
40.180
40.181 val (pt',cuts) = cut_level [] [3] pt ([1],Frm);(*([1],Frm) is stored*)
40.182 if cuts = [](*([1],Res) is not yet stored (Nd.ostate=Incomplete)*)
40.183 -then () else raise error "ctree.sml: diff:behav. in cut_tree 4a";
40.184 +then () else error "ctree.sml: diff:behav. in cut_tree 4a";
40.185
40.186 val (pt', cuts) = cut_tree pt ([1],Frm);
40.187 if cuts = []
40.188 -then () else raise error "ctree.sml: diff:behav. in cut_tree 4a";
40.189 +then () else error "ctree.sml: diff:behav. in cut_tree 4a";
40.190
40.191 (*WN050219
40.192 val pos as ([p],_) = ([1],Frm);
40.193 @@ -371,14 +371,14 @@
40.194 ([3, 2], Res),
40.195 ([3], Res),
40.196 ([4], Res)]
40.197 - then () else raise error "ctree.sml: diff:behav. in cut_tree 3rd level 1";
40.198 + then () else error "ctree.sml: diff:behav. in cut_tree 3rd level 1";
40.199
40.200 val (pt', cuts) = cut_tree pt ([3,2,1],Res);
40.201 if cuts = [([3, 2, 2], Res),
40.202 ([3, 2], Res),
40.203 ([3], Res),
40.204 ([4], Res)]
40.205 - then () else raise error "ctree.sml: diff:behav. in cut_tree 3rd level 2";
40.206 + then () else error "ctree.sml: diff:behav. in cut_tree 3rd level 2";
40.207
40.208
40.209 "-------------- cappend (from ptree above)------------------------";
40.210 @@ -391,11 +391,11 @@
40.211 ([3], Res),
40.212 ([4], Res),
40.213 ([], Res)]
40.214 -then () else raise error "ctree.sml: diff:behav. in cappend_form";
40.215 +then () else error "ctree.sml: diff:behav. in cappend_form";
40.216 if term2str (get_obj g_form pt' [3,2,1]) = "newnew" andalso
40.217 get_obj g_tac pt' [3,2,1] = Empty_Tac andalso
40.218 term2str (fst (get_obj g_result pt' [3,2,1])) = "??.empty"
40.219 - then () else raise error "ctree.sml: diff:behav. in cappend 1";
40.220 + then () else error "ctree.sml: diff:behav. in cappend 1";
40.221
40.222 val (pt',cuts) = cappend_atomic pt [3,2,1] e_istate (str2term "newform")
40.223 (Tac "test") (str2term "newresult",[]) Complete;
40.224 @@ -405,7 +405,7 @@
40.225 ([3], Res),
40.226 ([4], Res),
40.227 ([], Res)]
40.228 -then () else raise error "ctree.sml: diff:behav. in cappend_atomic";
40.229 +then () else error "ctree.sml: diff:behav. in cappend_atomic";
40.230
40.231
40.232
40.233 @@ -441,9 +441,9 @@
40.234 val form = get_obj g_form pt (fst p);
40.235 val (res,_) = get_obj g_result pt (fst p);
40.236 if term2str form = "x + 1 = 2" andalso res = e_term then () else
40.237 -raise error "ctree.sml, diff.behav. cappend minisubpbl ([1],Frm)";
40.238 +error "ctree.sml, diff.behav. cappend minisubpbl ([1],Frm)";
40.239 if not (existpt ((lev_on o fst) p) pt) then () else
40.240 -raise error "ctree.sml, diff.behav. cappend minisubpbl ([1],Frm) nxt";
40.241 +error "ctree.sml, diff.behav. cappend minisubpbl ([1],Frm) nxt";
40.242
40.243 (*val (p,_,f,nxt,_,pt) = me nxt p [1] pt(**)cappend_atomic: pos =[1]*);
40.244 val p = ([1], Res);
40.245 @@ -453,9 +453,9 @@
40.246 val form = get_obj g_form pt (fst p);
40.247 val (res,_) = get_obj g_result pt (fst p);
40.248 if term2str form = "x + 1 = 2" andalso term2str res = "x + 1 + -1 * 2 = 0"
40.249 -then () else raise error "ctree.sml, diff.behav. cappend minisubpbl ([1],Res)";
40.250 +then () else error "ctree.sml, diff.behav. cappend minisubpbl ([1],Res)";
40.251 if not (existpt ((lev_on o fst) p) pt) then () else
40.252 -raise error "ctree.sml, diff.behav. cappend minisubpbl ([1],Res) nxt";
40.253 +error "ctree.sml, diff.behav. cappend minisubpbl ([1],Res) nxt";
40.254
40.255 (*val (p,_,f,nxt,_,pt) = me nxt p [1] pt(**)cappend_atomic: pos =[2]*);
40.256 val p = ([2], Res);
40.257 @@ -465,18 +465,18 @@
40.258 val form = get_obj g_form pt (fst p);
40.259 val (res,_) = get_obj g_result pt (fst p);
40.260 if term2str form = "x + 1 + -1 * 2 = 0" andalso term2str res = "-1 + x = 0"
40.261 -then () else raise error "ctree.sml, diff.behav. cappend minisubpbl ([2],Res)";
40.262 +then () else error "ctree.sml, diff.behav. cappend minisubpbl ([2],Res)";
40.263 if not (existpt ((lev_on o fst) p) pt) then () else
40.264 -raise error "ctree.sml, diff.behav. cappend minisubpbl ([2],Res) nxt";
40.265 +error "ctree.sml, diff.behav. cappend minisubpbl ([2],Res) nxt";
40.266
40.267
40.268 (*val (p,_,f,nxt,_,pt) = me nxt p [1] pt;(**)cappend_problem: pos =[3]*)
40.269 val p = ([3], Pbl);
40.270 val (pt,cuts) = cappend_problem pt (fst p) e_istate e_fmz ([],e_spec,e_term);
40.271 if is_pblobj (get_obj I pt (fst p)) then () else
40.272 -raise error "ctree.sml, diff.behav. cappend minisubpbl ([3],Pbl)";
40.273 +error "ctree.sml, diff.behav. cappend minisubpbl ([3],Pbl)";
40.274 if not (existpt ((lev_on o fst) p) pt) then () else
40.275 -raise error "ctree.sml, diff.behav. cappend minisubpbl ([3],Pbl) nxt";
40.276 +error "ctree.sml, diff.behav. cappend minisubpbl ([3],Pbl) nxt";
40.277
40.278 (* ...complete calchead skipped...*)
40.279
40.280 @@ -486,9 +486,9 @@
40.281 val form = get_obj g_form pt (fst p);
40.282 val (res,_) = get_obj g_result pt (fst p);
40.283 if term2str form = "-1 + x = 0" andalso res = e_term then () else
40.284 -raise error "ctree.sml, diff.behav. cappend minisubpbl ([3,1],Frm)";
40.285 +error "ctree.sml, diff.behav. cappend minisubpbl ([3,1],Frm)";
40.286 if not (existpt ((lev_on o fst) p) pt) then () else
40.287 -raise error "ctree.sml, diff.behav. cappend minisubpbl ([3,1],Frm) nxt";
40.288 +error "ctree.sml, diff.behav. cappend minisubpbl ([3,1],Frm) nxt";
40.289
40.290 (*val (p,_,f,nxt,_,pt) = me nxt p [1] pt;(**)cappend_atomic: pos =[3,1]*)
40.291 val p = ([3, 1], Res);
40.292 @@ -498,9 +498,9 @@
40.293 val form = get_obj g_form pt (fst p);
40.294 val (res,_) = get_obj g_result pt (fst p);
40.295 if term2str form = "-1 + x = 0" andalso term2str res = "x = 0 + -1 * -1" then()
40.296 -else raise error "ctree.sml, diff.behav. cappend minisubpbl ([3,1],Res)";
40.297 +else error "ctree.sml, diff.behav. cappend minisubpbl ([3,1],Res)";
40.298 if not (existpt ((lev_on o fst) p) pt) then () else
40.299 -raise error "ctree.sml, diff.behav. cappend minisubpbl ([3,1],Res) nxt";
40.300 +error "ctree.sml, diff.behav. cappend minisubpbl ([3,1],Res) nxt";
40.301
40.302 (*val (p,_,f,nxt,_,pt) = me nxt p [1] pt(**)cappend_form: pos =[3,1]*);
40.303 (*val (p,_,f,nxt,_,pt) = me nxt p [1] pt(**)cappend_atomic: pos =[3,1]*);
40.304 @@ -545,7 +545,7 @@
40.305 (*
40.306 val p = (move_dn [] pt p) handle e => print_exn_G e;
40.307 Exception PTREE end of calculation*)
40.308 -if p=([],Res) then () else raise error "ctree.sml: diff:behav. in move_dn";
40.309 +if p=([],Res) then () else error "ctree.sml: diff:behav. in move_dn";
40.310
40.311
40.312 "-------------- move_dn: Frm -> Res ------------------------------";
40.313 @@ -565,7 +565,7 @@
40.314 moveActiveRoot 1;
40.315 moveActiveDown 1;
40.316 if get_pos 1 1 = ([1], Frm) then ()
40.317 - else raise error "ctree.sml: diff.behav. in move_dn: Frm -> Res (1)";
40.318 + else error "ctree.sml: diff.behav. in move_dn: Frm -> Res (1)";
40.319 moveActiveDown 1; (*<ERROR> pos does not exist </ERROR>*)
40.320
40.321 autoCalculate 1 (Step 1);
40.322 @@ -573,7 +573,7 @@
40.323
40.324 moveActiveDown 1; (*<ERROR> pos does not exist </ERROR>*)
40.325 if get_pos 1 1 = ([1], Res) then ()
40.326 - else raise error "ctree.sml: diff.behav. in move_dn: Frm -> Res (1)";
40.327 + else error "ctree.sml: diff.behav. in move_dn: Frm -> Res (1)";
40.328 moveActiveDown 1; (*<ERROR> pos does not exist </ERROR>*)
40.329
40.330
40.331 @@ -592,7 +592,7 @@
40.332 val p = move_up [] pt p; (*-> ([],Pbl)*)
40.333 (*val p = (move_up [] pt p) handle e => print_exn_G e;
40.334 Exception PTREE begin of calculation*)
40.335 -if p=([],Pbl) then () else raise error "ctree.sml: diff.behav. in move_up";
40.336 +if p=([],Pbl) then () else error "ctree.sml: diff.behav. in move_up";
40.337
40.338
40.339 "------ move into detail -----------------------------------------";
40.340 @@ -627,7 +627,7 @@
40.341 val p = move_dn [] pt p; (*([2, 5], Res)*);
40.342 val p = move_dn [] pt p; (*([2, 6], Res)*);
40.343 if p = ([2, 6], Res) then()
40.344 - else raise error "ctree.sml: diff.behav. in move into detail";
40.345 + else error "ctree.sml: diff.behav. in move into detail";
40.346
40.347 "=====new ptree 3a ===============================================";
40.348 "=====new ptree 3a ===============================================";
40.349 @@ -800,29 +800,29 @@
40.350 writeln(pr_ptree pr_short pt);
40.351 case get_trace pt [1,3] [4,1,1] of
40.352 [[1,3],[1,4],[2],[3],[4],[4,1],[4,1,1]] => ()
40.353 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1a";
40.354 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1a";
40.355 case get_trace pt [2] [4,3,2] of
40.356 [[2],[3],[4],[4,1],[4,1,1],[4,2],[4,3],[4,3,1],[4,3,2]] => ()
40.357 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1b";
40.358 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1b";
40.359 case get_trace pt [1,4] [4,3,1] of
40.360 [[1,4],[2],[3],[4],[4,1],[4,1,1],[4,2],[4,3],[4,3,1]] => ()
40.361 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1c";
40.362 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1c";
40.363 case get_trace pt [4,2] [5] of
40.364 (*[([4,2],_),([4,3],_),([4,4],_),([4,4,1],_),([4,4,2],_),([4,4,3],_),
40.365 ([4,4,4],_),([4,4,5],_),([5],_)] => () ..with pt_form*)
40.366 [[4,2],[4,3],[4,3,1],[4,3,2],[4,3,3],[4,3,4],[4,3,5],[5]]=>()
40.367 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1d";
40.368 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1d";
40.369 case get_trace pt [] [4,4,2] of
40.370 [[1],[1,1],[1,2],[1,3],[1,4],[2],[3],[4],[4,1],[4,1,1],[4,2],
40.371 [4,3],[4,3,1],[4,3,2]] => ()
40.372 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1e";
40.373 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1e";
40.374 case get_trace pt [] [] of
40.375 [[1],[1,1],[1,2],[1,3],[1,4],[2],[3],[4],[4,1],[4,1,1],[4,2],
40.376 [4,3],[4,3,1],[4,3,2],[4,3,3],[4,3,4],[4,3,5],[5]] => ()
40.377 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1f";
40.378 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1f";
40.379 case get_trace pt [4,3] [4,3] of
40.380 [[4,3],[4,3,1],[4,3,2],[4,3,3],[4,3,4],[4,3,5]] => ()
40.381 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1g";
40.382 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1g";
40.383
40.384 "--- level 2: get pos' from start b to end p ---------------------";
40.385 "--- level 2: get pos' from start b to end p ---------------------";
40.386 @@ -834,11 +834,11 @@
40.387 (*
40.388 case get_trace pt ([1,4],Res) ([4,4,1],Frm) of
40.389 [[2],[3],[4],[4,1],[4,2],[4,2,1],[4,3],[4,4],[4,4,1]] => ()
40.390 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1b";
40.391 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1b";
40.392 case get_trace pt ([],Pbl) ([],Res) of
40.393 [[1],[1,1],[1,2],[1,3],[1,4],[2],[3],[4],[4,1],[4,2],[4,2,1],[4,3],
40.394 [4,4],[4,4,1],[4,4,2],[4,4,3],[4,4,4],[4,4,5],[5]] => ()
40.395 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1e";
40.396 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1e";
40.397 *)
40.398
40.399 (******************************************************************)
40.400 @@ -870,7 +870,7 @@
40.401 ("PolyEq.thy",
40.402 ["normalize", "polynomial", "univariate", "equation"]),
40.403 ["9 * x + -6 * x ^^^ 2 + x ^^^ 3 ~= 0"]) => ()
40.404 - | _ => raise error "diff.behav.in ctree.sml: pt_extract asm<>[]";
40.405 + | _ => error "diff.behav.in ctree.sml: pt_extract asm<>[]";
40.406 (*WN060717 unintentionally changed some rls/ord while
40.407 completing knowl. for thes2file...
40.408
40.409 @@ -880,7 +880,7 @@
40.410 ("PolyEq.thy",
40.411 ["normalize", "polynomial", "univariate", "equation"]),
40.412 ["9 * x + (x ^^^ 3 + -6 * x ^^^ 2) ~= 0"]) => ()
40.413 - | _ => raise error "diff.behav.in ctree.sml: pt_extract asm<>[]";
40.414 + | _ => error "diff.behav.in ctree.sml: pt_extract asm<>[]";
40.415
40.416 .... but it became even better*)
40.417
40.418 @@ -908,62 +908,62 @@
40.419 ("solve (x + 1 = 2, x)",
40.420 Apply_Method ["Test", "squ-equ-test-subpbl1"],
40.421 []) => ()
40.422 - | _ => raise error "diff.behav.in ctree.sml: pt_extract ([], Pbl)";
40.423 + | _ => error "diff.behav.in ctree.sml: pt_extract ([], Pbl)";
40.424
40.425 val (Form form, SOME tac, asm) = pt_extract (pt, ([1], Frm));
40.426 case (term2str form, tac, terms2strs asm) of
40.427 ("x + 1 = 2", Rewrite_Set "norm_equation", []) => ()
40.428 - | _ => raise error "diff.behav.in ctree.sml: pt_extract ([1], Frm)";
40.429 + | _ => error "diff.behav.in ctree.sml: pt_extract ([1], Frm)";
40.430
40.431 val (Form form, SOME tac, asm) = pt_extract (pt, ([1], Res));
40.432 case (term2str form, tac, terms2strs asm) of
40.433 ("x + 1 + -1 * 2 = 0", Rewrite_Set "Test_simplify", []) => ()
40.434 - | _ => raise error "diff.behav.in ctree.sml: pt_extract ([1], Res)";
40.435 + | _ => error "diff.behav.in ctree.sml: pt_extract ([1], Res)";
40.436
40.437 val (Form form, SOME tac, asm) = pt_extract (pt, ([2], Res));
40.438 case (term2str form, tac, terms2strs asm) of
40.439 ("-1 + x = 0",
40.440 Subproblem ("Test.thy", ["linear", "univariate", "equation", "test"]),
40.441 []) => ()
40.442 - | _ => raise error "diff.behav.in ctree.sml: pt_extract ([2], Res)";
40.443 + | _ => error "diff.behav.in ctree.sml: pt_extract ([2], Res)";
40.444
40.445 val (ModSpec (_,_,form,_,_,_), SOME tac, asm) = pt_extract (pt, ([3], Pbl));
40.446 case (term2str form, tac, terms2strs asm) of
40.447 ("solve (-1 + x = 0, x)", Apply_Method ["Test", "solve_linear"], []) => ()
40.448 - | _ => raise error "diff.behav.in ctree.sml: pt_extract ([3], Pbl)";
40.449 + | _ => error "diff.behav.in ctree.sml: pt_extract ([3], Pbl)";
40.450
40.451 val (Form form, SOME tac, asm) = pt_extract (pt, ([3,1], Frm));
40.452 case (term2str form, tac, terms2strs asm) of
40.453 ("-1 + x = 0", Rewrite_Set_Inst (["(bdv, x)"], "isolate_bdv"), []) => ()
40.454 - | _ => raise error "diff.behav.in ctree.sml: pt_extract ([3,1], Frm)";
40.455 + | _ => error "diff.behav.in ctree.sml: pt_extract ([3,1], Frm)";
40.456
40.457 val (Form form, SOME tac, asm) = pt_extract (pt, ([3,1], Res));
40.458 case (term2str form, tac, terms2strs asm) of
40.459 ("x = 0 + -1 * -1", Rewrite_Set "Test_simplify", []) => ()
40.460 - | _ => raise error "diff.behav.in ctree.sml: pt_extract ([3,1], Res)";
40.461 + | _ => error "diff.behav.in ctree.sml: pt_extract ([3,1], Res)";
40.462
40.463 val (Form form, SOME tac, asm) = pt_extract (pt, ([3,2], Res));
40.464 case (term2str form, tac, terms2strs asm) of
40.465 ("x = 1", Check_Postcond ["linear", "univariate", "equation", "test"],
40.466 []) => ()
40.467 - | _ => raise error "diff.behav.in ctree.sml: pt_extract ([3,2], Res)";
40.468 + | _ => error "diff.behav.in ctree.sml: pt_extract ([3,2], Res)";
40.469
40.470 val (Form form, SOME tac, asm) = pt_extract (pt, ([3], Res));
40.471 case (term2str form, tac, terms2strs asm) of
40.472 ("[x = 1]", Check_elementwise "Assumptions", []) => ()
40.473 - | _ => raise error "diff.behav.in ctree.sml: pt_extract ([3], Res)";
40.474 + | _ => error "diff.behav.in ctree.sml: pt_extract ([3], Res)";
40.475
40.476 val (Form form, SOME tac, asm) = pt_extract (pt, ([4], Res));
40.477 case (term2str form, tac, terms2strs asm) of
40.478 ("[x = 1]",
40.479 Check_Postcond ["sqroot-test", "univariate", "equation", "test"],
40.480 []) => ()
40.481 - | _ => raise error "diff.behav.in ctree.sml: pt_extract ([4], Res)";
40.482 + | _ => error "diff.behav.in ctree.sml: pt_extract ([4], Res)";
40.483
40.484 val (Form form, tac, asm) = pt_extract (pt, ([], Res));
40.485 case (term2str form, tac, terms2strs asm) of
40.486 ("[x = 1]", NONE, []) => ()
40.487 - | _ => raise error "diff.behav.in ctree.sml: pt_extract ([], Res)";
40.488 + | _ => error "diff.behav.in ctree.sml: pt_extract ([], Res)";
40.489
40.490 "=====new ptree 6 minisubpbl intersteps ==========================";
40.491 "=====new ptree 6 minisubpbl intersteps ==========================";
40.492 @@ -1003,13 +1003,13 @@
40.493 ([3], Res),
40.494 ([4], Res),
40.495 ([], Res)] then () else
40.496 -raise error "ctree.sml diff.behav. get_allp new []";
40.497 +error "ctree.sml diff.behav. get_allp new []";
40.498
40.499 print_depth 99;
40.500 val cuts2 = get_allps [] [1] (children pt);
40.501 print_depth 3;
40.502 if cuts = cuts2 @ [([], Res)] then () else
40.503 -raise error "ctree.sml diff.behav. get_allps new []";
40.504 +error "ctree.sml diff.behav. get_allps new []";
40.505
40.506 "---(3) on S(606)..S(608)--------";
40.507 "--- nd [2] with 6 children---------------------------------";
40.508 @@ -1018,11 +1018,11 @@
40.509 [([2, 1], Frm), ([2, 1], Res), ([2, 2], Res), ([2, 3], Res),
40.510 ([2, 4], Res), ([2, 5], Res), ([2, 6], Res),
40.511 ([2], Res)] then () else
40.512 -raise error "ctree.sml diff.behav. get_allp new [2]";
40.513 +error "ctree.sml diff.behav. get_allp new [2]";
40.514
40.515 val cuts2 = get_allps [] [2,1] (children (get_nd pt [2]));
40.516 if cuts = cuts2 @ [([2], Res)] then () else
40.517 -raise error "ctree.sml diff.behav. get_allps new [2]";
40.518 +error "ctree.sml diff.behav. get_allps new [2]";
40.519
40.520
40.521 "---(4) on S(606)..S(608)--------";
40.522 @@ -1034,33 +1034,33 @@
40.523 ([3, 2, 1], Frm), ([3, 2, 1], Res), ([3, 2, 2], Res),
40.524 ([3, 2], Res),
40.525 ([3], Res)] then () else
40.526 -raise error "ctree.sml diff.behav. get_allp new [3]";
40.527 +error "ctree.sml diff.behav. get_allp new [3]";
40.528
40.529 val cuts2 = get_allps [] [3,1] (children (get_nd pt [3]));
40.530 if cuts = cuts2 @ [([3], Res)] then () else
40.531 -raise error "ctree.sml diff.behav. get_allps new [3]";
40.532 +error "ctree.sml diff.behav. get_allps new [3]";
40.533
40.534 "--- nd [3,2] with 2 children--------------------------------";
40.535 val cuts = get_allp [] ([3,2], ([],Frm)) (get_nd pt [3,2]);
40.536 if cuts =
40.537 [([3, 2, 1], Frm), ([3, 2, 1], Res), ([3, 2, 2], Res),
40.538 ([3, 2], Res)] then () else
40.539 -raise error "ctree.sml diff.behav. get_allp new [3,2]";
40.540 +error "ctree.sml diff.behav. get_allp new [3,2]";
40.541
40.542 val cuts2 = get_allps [] [3,2,1] (children (get_nd pt [3,2]));
40.543 if cuts = cuts2 @ [([3, 2], Res)] then () else
40.544 -raise error "ctree.sml diff.behav. get_allps new [3,2]";
40.545 +error "ctree.sml diff.behav. get_allps new [3,2]";
40.546
40.547 "---(5a) on S(606)..S(608)--------";
40.548 "--- nd [3,2,1] with 0 children------------------------------";
40.549 val cuts = get_allp [] ([3,2,1], ([],Frm)) (get_nd pt [3,2,1]);
40.550 if cuts =
40.551 [] then () else
40.552 -raise error "ctree.sml diff.behav. get_allp new [3,2,1]";
40.553 +error "ctree.sml diff.behav. get_allp new [3,2,1]";
40.554
40.555 val cuts2 = get_allps [] [3,2,1,1] (children (get_nd pt [3,2,1]));
40.556 if cuts = cuts2 @ [] then () else
40.557 -raise error "ctree.sml diff.behav. get_allps new [3,2,1]";
40.558 +error "ctree.sml diff.behav. get_allps new [3,2,1]";
40.559
40.560
40.561 (**#################################################################**)
40.562 @@ -1070,10 +1070,10 @@
40.563 show_pt pt;
40.564 val b = get_obj g_branch pt [];
40.565 if b = TransitiveB then () else
40.566 -raise error ("ctree.sml diff.behav. in [] branch="^branch2str b);
40.567 +error ("ctree.sml diff.behav. in [] branch="^branch2str b);
40.568 val b = get_obj g_branch pt [3];
40.569 if b = TransitiveB then () else
40.570 -raise error ("ctree.sml diff.behav. in [3] branch="^branch2str b);
40.571 +error ("ctree.sml diff.behav. in [3] branch="^branch2str b);
40.572
40.573 "---(2) on S(606)..S(608)--------";
40.574 val (pt', cuts) = cut_tree pt ([1],Res);
40.575 @@ -1085,7 +1085,7 @@
40.576 ([3, 1], Frm), ([3, 1], Res), ([3, 2, 1], Frm), ([3, 2, 1], Res),
40.577 ([3, 2, 2], Res), ([3, 2], Res), ([3], Res), ([4], Res),
40.578 (*WN060727 after replacing cutlevup by test_trans:*)([], Res)] then () else
40.579 -raise error "ctree.sml: diff.behav. cut_tree ([1],Res)";
40.580 +error "ctree.sml: diff.behav. cut_tree ([1],Res)";
40.581
40.582
40.583 "---(3) on S(606)..S(608)--------";
40.584 @@ -1105,7 +1105,7 @@
40.585 ([3], Res),
40.586 ([4], Res),
40.587 (*WN060727 added after replacing cutlevup by test_trans:*)([],Res)] then ()
40.588 -else raise error "ctree.sml: diff.behav. cut_tree ([2],Res)";
40.589 +else error "ctree.sml: diff.behav. cut_tree ([2],Res)";
40.590
40.591 "---(4) on S(606)..S(608)--------";
40.592 val (pt', cuts) = cut_tree pt ([3],Pbl);
40.593 @@ -1119,7 +1119,7 @@
40.594 ([3], Res),
40.595 ([4], Res),
40.596 (*WN060727 added after replacing cutlevup by test_trans:*)([], Res)]
40.597 -then () else raise error "ctree.sml: diff.behav. cut_tree ([3],Pbl)";
40.598 +then () else error "ctree.sml: diff.behav. cut_tree ([3],Pbl)";
40.599
40.600 "---(5a) on S(606)..S(608) cut_tree --------";
40.601 val (pt', cuts) = cut_tree pt ([3,2,1],Res);
40.602 @@ -1129,7 +1129,7 @@
40.603 if cuts = [([3, 2, 2], Res), ([3, 2], Res),
40.604 (*WN060727 added after replacing cutlevup by test_trans:*)
40.605 ([3], Res), ([4], Res),([],Res)] then ()
40.606 -else raise error "ctree.sml: diff.behav. cut_tree ([3,2,1],Res)";
40.607 +else error "ctree.sml: diff.behav. cut_tree ([3,2,1],Res)";
40.608 show_pt pt';
40.609
40.610
40.611 @@ -1149,14 +1149,14 @@
40.612 ([3, 1], Frm), ([3, 1], Res), ([3, 2, 1], Frm), ([3, 2, 1], Res),
40.613 ([3, 2, 2], Res), ([3, 2], Res), ([3], Res), ([4], Res),
40.614 (*WN060727 added after replacing cutlevup by test_trans:*) ([], Res)] then ()
40.615 -else raise error "ctree.sml: diff:behav. in complete pt:append_atomic[1] cuts";
40.616 +else error "ctree.sml: diff:behav. in complete pt:append_atomic[1] cuts";
40.617 val afterins = get_allp [] ([], ([],Frm)) pt';
40.618 print_depth 99;
40.619 afterins;
40.620 print_depth 3;
40.621 if afterins = [([1], Frm), ([1], Res)
40.622 (*, WN060727 removed after replacing cutlevup by test_trans:([], Res)*)] then()
40.623 -else raise error "ctree.sml: diff:behav. in complete pt: append_atomic[1] afterins";
40.624 +else error "ctree.sml: diff:behav. in complete pt: append_atomic[1] afterins";
40.625 show_pt pt';
40.626
40.627 "---(3) on S(606)..S(608)--------";
40.628 @@ -1171,7 +1171,7 @@
40.629 ([3, 1], Frm),([3, 1], Res), ([3, 2, 1], Frm), ([3, 2, 1], Res),
40.630 ([3, 2, 2], Res), ([3, 2], Res), ([3], Res), ([4], Res),
40.631 (*WN060727 added after replacing cutlevup by test_trans:*) ([], Res)] then ()
40.632 -else raise error "ctree.sml: diff:behav.in complete pt: append_atomic[2] cuts";
40.633 +else error "ctree.sml: diff:behav.in complete pt: append_atomic[2] cuts";
40.634 val afterins = get_allp [] ([], ([],Frm)) pt';
40.635 print_depth 99;
40.636 afterins;
40.637 @@ -1179,7 +1179,7 @@
40.638 if afterins = [([1], Frm), ([1], Res), ([2], Frm), ([2], Res)
40.639 (*, WN060727 removed after replacing cutlevup by test_trans:([], Res)*)]
40.640 then () else
40.641 -raise error "ctree.sml: diff:behav. in complete pt: append_atomic[2] afterins";
40.642 +error "ctree.sml: diff:behav. in complete pt: append_atomic[2] afterins";
40.643 show_pt pt';
40.644 (*
40.645 val p = move_dn [] pt' ([],Pbl) (*-> ([1],Frm)*);
40.646 @@ -1204,7 +1204,7 @@
40.647 ([3, 2], Res),
40.648 ([3], Res), ([4], Res),
40.649 (*WN060727 added after replacing cutlevup by test_trans*)([], Res)] then ()else
40.650 -raise error "ctree.sml: diff:behav. in ccomplete pt: append_problem[3] cuts";
40.651 +error "ctree.sml: diff:behav. in ccomplete pt: append_problem[3] cuts";
40.652 val afterins = get_allp [] ([], ([],Frm)) pt';
40.653 print_depth 99;
40.654 afterins;
40.655 @@ -1213,7 +1213,7 @@
40.656 [([1], Frm), ([1], Res),([2, 1], Frm), ([2, 1], Res), ([2, 2], Res),
40.657 ([2, 3], Res), ([2, 4], Res), ([2, 5], Res), ([2, 6], Res), ([2], Res),
40.658 ([3], Pbl)] then () else
40.659 -raise error "ctree.sml: diff:behav.in complete pt: append_problem[3] afterins";
40.660 +error "ctree.sml: diff:behav.in complete pt: append_problem[3] afterins";
40.661 (* use"systest/ctree.sml";
40.662 use"ctree.sml";
40.663 *)
40.664 @@ -1227,7 +1227,7 @@
40.665 if cuts = [([3, 2, 1], Frm), ([3, 2, 1], Res), ([3, 2, 2], Res),
40.666 ([3, 2], Res),
40.667 (*WN060727 added*)([3], Res), ([4], Res), ([], Res)] then () else
40.668 -raise error "ctree.sml: diff:behav. in complete pt: append_atomic[3,1] cuts";
40.669 +error "ctree.sml: diff:behav. in complete pt: append_atomic[3,1] cuts";
40.670 val afterins = get_allp [] ([], ([],Frm)) pt';
40.671 print_depth 99;
40.672 afterins;
40.673 @@ -1242,7 +1242,7 @@
40.674 ([3], Res)(*cutlevup=false*),
40.675 ([4], Res),
40.676 ([], Res)(*cutlevup=false*)] then () else
40.677 -raise error "ctree.sml: diff:behav. in complete pt: append_atomic[3,1] insrtd";
40.678 +error "ctree.sml: diff:behav. in complete pt: append_atomic[3,1] insrtd";
40.679 *)
40.680 if afterins = [([1], Frm), ([1], Res),
40.681 ([2, 1], Frm), ([2, 1], Res), ([2, 2], Res),
40.682 @@ -1250,10 +1250,10 @@
40.683 ([2], Res),
40.684 ([3], Pbl),
40.685 ([3, 1], Frm), ([3, 1], Res)] then () else
40.686 -raise error "ctree.sml: diff:behav. in complete pt: append_atomic[3,1] insrtd";
40.687 +error "ctree.sml: diff:behav. in complete pt: append_atomic[3,1] insrtd";
40.688
40.689 if term2str (get_obj g_form pt' [3,1]) = "Inform [3, 1]" then () else
40.690 -raise error "ctree.sml: diff:behav. in complete pt: append_atomic[3,1] Inform";
40.691 +error "ctree.sml: diff:behav. in complete pt: append_atomic[3,1] Inform";
40.692
40.693 "---(6) on S(606)..S(608)--------";
40.694 val (pt', cuts) = cappend_atomic pt [3,2] e_istate (str2term "Inform[3,2]")
40.695 @@ -1264,7 +1264,7 @@
40.696 if cuts = [(*just after is: cutlevup=false in [3]*)
40.697 (*WN060727 after test_trans instead cutlevup added:*)
40.698 ([3], Res), ([4], Res), ([], Res)] then () else
40.699 -raise error "ctree.sml: diff:behav. in complete pt: append_atomic[3,2] cuts";
40.700 +error "ctree.sml: diff:behav. in complete pt: append_atomic[3,2] cuts";
40.701 val afterins = get_allp [] ([], ([],Frm)) pt';
40.702 print_depth 99;
40.703 afterins;
40.704 @@ -1278,7 +1278,7 @@
40.705 ([3, 1], Frm), ([3, 1], Res), ([3, 2], Frm), ([3, 2], Res),
40.706 ([3], Res),
40.707 ([4], Res), ([], Res)] then () else
40.708 -raise error "ctree.sml: diff:behav. in complete pt: append_atomic[3,2] insrtd";
40.709 +error "ctree.sml: diff:behav. in complete pt: append_atomic[3,2] insrtd";
40.710 *)
40.711 if afterins = [([1], Frm), ([1], Res),
40.712 ([2, 1], Frm), ([2, 1], Res), ([2, 2], Res),
40.713 @@ -1287,10 +1287,10 @@
40.714 ([3], Pbl),
40.715 ([3, 1], Frm), ([3, 1], Res), ([3, 2], Frm), ([3, 2], Res)]
40.716 then () else
40.717 -raise error "ctree.sml: diff:behav. in complete pt: append_atomic[3,2] insrtd";
40.718 +error "ctree.sml: diff:behav. in complete pt: append_atomic[3,2] insrtd";
40.719
40.720 if term2str (get_obj g_form pt' [3,2]) = "Inform [3, 2]" then () else
40.721 -raise error "ctree.sml: diff:behav. in complete pt: append_atomic[3,2] Inform";
40.722 +error "ctree.sml: diff:behav. in complete pt: append_atomic[3,2] Inform";
40.723
40.724 "---(6++) on S(606)..S(608)--------";
40.725 (**)
40.726 @@ -1302,7 +1302,7 @@
40.727 if cuts = [([3, 2, 2], Res), ([3, 2], Res),
40.728 (*WN060727 {cutlevup->test_trans} added:*)([3], Res), ([4], Res), ([], Res)]
40.729 then () else
40.730 -raise error "ctree.sml: diff:behav. in complete pt: append_atomic[3,2,1] cuts";
40.731 +error "ctree.sml: diff:behav. in complete pt: append_atomic[3,2,1] cuts";
40.732 val afterins = get_allp [] ([], ([],Frm)) pt';
40.733 print_depth 99;
40.734 afterins;
40.735 @@ -1314,9 +1314,9 @@
40.736 ([3], Pbl),
40.737 ([3, 1], Frm), ([3, 1], Res),
40.738 ([3, 2, 1], Frm), ([3, 2, 1], Res)] then () else
40.739 -raise error "ctree.sml: diff:behav. in complete pt: append_atom[3,2,1] insrtd";
40.740 +error "ctree.sml: diff:behav. in complete pt: append_atom[3,2,1] insrtd";
40.741 if term2str (get_obj g_form pt' [3,2,1]) = "Inform [3, 2, 1]" then () else
40.742 -raise error "ctree.sml: diff:behav. complete pt: append_atomic[3,2,1] Inform";
40.743 +error "ctree.sml: diff:behav. complete pt: append_atomic[3,2,1] Inform";
40.744 (*
40.745 show_pt pt';
40.746 show_pt pt;
41.1 --- a/test/Tools/isac/Interpret/inform.sml Tue Sep 28 08:58:06 2010 +0200
41.2 +++ b/test/Tools/isac/Interpret/inform.sml Tue Sep 28 09:06:56 2010 +0200
41.3 @@ -64,7 +64,7 @@
41.4 val str = pr_ptree pr_short pt;
41.5 writeln str;
41.6 if str = ". ----- pblobj -----\n1. x + 1 = 2\n2. x + 1 + -1 * 2 = 0\n2.1. x + 1 + -1 * 2 = 0\n2.2. -1 * 2 + (x + 1) = 0\n2.3. -1 * 2 + (1 + x) = 0\n2.4. 1 + (-1 * 2 + x) = 0\n2.5. 1 + (-2 + x) = 0\n2.6. 1 + (-2 * 1 + x) = 0\n" then ()
41.7 - else raise error "inform.sml: diff.behav.appendFormula: on Res + equ 1";
41.8 + else error "inform.sml: diff.behav.appendFormula: on Res + equ 1";
41.9
41.10 moveDown 1 ([ ],Pbl); refFormula 1 ([1],Frm); (*x + 1 = 2*)
41.11 moveDown 1 ([1],Frm); refFormula 1 ([1],Res); (*x + 1 + -1 * 2 = 0*)
41.12 @@ -79,16 +79,16 @@
41.13 moveDown 1 ([2,5],Res); refFormula 1 ([2,6],Res);
41.14 val ((pt,_),_) = get_calc 1;
41.15 if "-2 * 1 + (1 + x) = 0" = term2str (fst (get_obj g_result pt [2,6])) then()
41.16 - else raise error "inform.sml: diff.behav.appendFormula: on Res + equ 2";
41.17 + else error "inform.sml: diff.behav.appendFormula: on Res + equ 2";
41.18
41.19 fetchProposedTactic 1; (*takes Iterator 1 _1_*)
41.20 val (_,(tac,_,_)::_) = get_calc 1;
41.21 if tac = Rewrite_Set "Test_simplify" then ()
41.22 - else raise error "inform.sml: diff.behav.appendFormula: on Res + equ 3";
41.23 + else error "inform.sml: diff.behav.appendFormula: on Res + equ 3";
41.24 autoCalculate 1 CompleteCalc;
41.25 val ((pt,_),_) = get_calc 1;
41.26 if "[x = 1]" = term2str (fst (get_obj g_result pt [])) then ()
41.27 - else raise error "inform.sml: diff.behav.appendFormula: on Res + equ 4";
41.28 + else error "inform.sml: diff.behav.appendFormula: on Res + equ 4";
41.29 (* autoCalculate 1 CompleteCalc;
41.30 val ((pt,p),_) = get_calc 1;
41.31 (writeln o istates2str) (get_obj g_loc pt [ ]);
41.32 @@ -144,16 +144,16 @@
41.33 moveDown 1 ([1,5],Res); refFormula 1 ([1,6],Res);
41.34 val ((pt,_),_) = get_calc 1;
41.35 if "2 + -1 + x = 2" = term2str (fst (get_obj g_result pt [1,6])) then()
41.36 - else raise error "inform.sml: diff.behav.appendFormula: on Frm + equ 1";
41.37 + else error "inform.sml: diff.behav.appendFormula: on Frm + equ 1";
41.38
41.39 fetchProposedTactic 1; (*takes Iterator 1 _1_*)
41.40 val (_,(tac,_,_)::_) = get_calc 1;
41.41 if tac = Rewrite_Set "norm_equation" then ()
41.42 - else raise error "inform.sml: diff.behav.appendFormula: on Frm + equ 2";
41.43 + else error "inform.sml: diff.behav.appendFormula: on Frm + equ 2";
41.44 autoCalculate 1 CompleteCalc;
41.45 val ((pt,_),_) = get_calc 1;
41.46 if "[x = 1]" = term2str (fst (get_obj g_result pt [])) then ()
41.47 - else raise error "inform.sml: diff.behav.appendFormula: on Frm + equ 3";
41.48 + else error "inform.sml: diff.behav.appendFormula: on Frm + equ 3";
41.49
41.50
41.51 "--------- appendFormula: on Res + NO deriv ----------------------";
41.52 @@ -175,16 +175,16 @@
41.53 writeln str;
41.54 if str = ". ----- pblobj -----\n1. x + 1 = 2\n" andalso p = ([1], Res)
41.55 then ()
41.56 - else raise error "inform.sml: diff.behav.appendFormula: Res + NOder 1";
41.57 + else error "inform.sml: diff.behav.appendFormula: Res + NOder 1";
41.58
41.59 fetchProposedTactic 1;
41.60 val (_,(tac,_,_)::_) = get_calc 1;
41.61 if tac = Rewrite_Set "Test_simplify" then ()
41.62 - else raise error "inform.sml: diff.behav.appendFormula: Res + NOder 2";
41.63 + else error "inform.sml: diff.behav.appendFormula: Res + NOder 2";
41.64 autoCalculate 1 CompleteCalc;
41.65 val ((pt,_),_) = get_calc 1;
41.66 if "[x = 1]" = term2str (fst (get_obj g_result pt [])) then ()
41.67 - else raise error "inform.sml: diff.behav.appendFormula: on Frm + equ 3";
41.68 + else error "inform.sml: diff.behav.appendFormula: on Frm + equ 3";
41.69
41.70
41.71 "--------- appendFormula: on Res + late deriv --------------------";
41.72 @@ -206,16 +206,16 @@
41.73 writeln str;
41.74 if str = ". ----- pblobj -----\n1. x + 1 = 2\n2. x + 1 + -1 * 2 = 0\n3. ----- pblobj -----\n3.1. -1 + x = 0\n3.2. x = 0 + -1 * -1\n3.2.1. x = 0 + -1 * -1\n3.2.2. x = 0 + 1\n" andalso p = ([3,2], Res)
41.75 then () (*finds 1 step too early: ([3,2], Res) "x = 1" also by script !!!*)
41.76 - else raise error "inform.sml: diff.behav.appendFormula: Res + late d 1";
41.77 + else error "inform.sml: diff.behav.appendFormula: Res + late d 1";
41.78
41.79 fetchProposedTactic 1;
41.80 val (_,(tac,_,_)::_) = get_calc 1;
41.81 if tac = Check_Postcond ["linear", "univariate", "equation", "test"] then ()
41.82 - else raise error "inform.sml: diff.behav.appendFormula: Res + late d 2";
41.83 + else error "inform.sml: diff.behav.appendFormula: Res + late d 2";
41.84 autoCalculate 1 CompleteCalc;
41.85 val ((pt,_),_) = get_calc 1;
41.86 if "[x = 1]" = term2str (fst (get_obj g_result pt [])) then ()
41.87 - else raise error "inform.sml: diff.behav.appendFormula: Res + late d 3";
41.88 + else error "inform.sml: diff.behav.appendFormula: Res + late d 3";
41.89
41.90
41.91 "--------- appendFormula: on Res + late deriv [x = 3 + -2]---///--";
41.92 @@ -235,12 +235,12 @@
41.93 val str = pr_ptree pr_short pt;
41.94 writeln str;
41.95 if str=". ----- pblobj -----\n1. x + 1 = 2\n2. x + 1 + -1 * 2 = 0\n3. ----- pblobj -----\n3.1. -1 + x = 0\n3.2. x = 0 + -1 * -1\n4. [x = 1]\n4.1. [x = 1]\n4.2. [x = -2 + 3]\n4.3. [x = 3 + -2]\n" then ()
41.96 - else raise error "inform.sml: diff.behav.appendFormula: Res + latEE 1";
41.97 + else error "inform.sml: diff.behav.appendFormula: Res + latEE 1";
41.98 autoCalculate 1 CompleteCalc;
41.99 val ((pt,p),_) = get_calc 1;
41.100 if "[x = 3 + -2 * 1]" = term2str (fst (get_obj g_result pt [])) then ()
41.101 (* ~~~~~~~~~~ simplify as last step in any script ?!*)
41.102 - else raise error "inform.sml: diff.behav.appendFormula: Res + latEE 2";
41.103 + else error "inform.sml: diff.behav.appendFormula: Res + latEE 2";
41.104
41.105
41.106
41.107 @@ -263,11 +263,11 @@
41.108 val str = pr_ptree pr_short pt;
41.109 writeln str;
41.110 if str=". ----- pblobj -----\n1. x + 1 = 2\n2. x + 1 + -1 * 2 = 0\n2.1. x + 1 + -1 * 2 = 0\n2.2. -1 * 2 + (x + 1) = 0\n2.3. -1 * 2 + (1 + x) = 0\n2.4. 1 + (-1 * 2 + x) = 0\n2.5. 1 + (-2 + x) = 0\n2.6. 1 + (-2 * 1 + x) = 0\n" then()
41.111 - else raise error "inform.sml: diff.behav.replaceFormula: on Res += 1";
41.112 + else error "inform.sml: diff.behav.replaceFormula: on Res += 1";
41.113 autoCalculate 1 CompleteCalc;
41.114 val ((pt,pos as(p,_)),_) = get_calc 1;
41.115 if pos=([],Res)andalso"[x = 1]"=(term2str o fst)(get_obj g_result pt p)then()
41.116 - else raise error "inform.sml: diff.behav.replaceFormula: on Res + = 2";
41.117 + else error "inform.sml: diff.behav.replaceFormula: on Res + = 2";
41.118
41.119
41.120 "--------- replaceFormula: on Res + = 1st Nd ---------------------";
41.121 @@ -288,11 +288,11 @@
41.122 val str = pr_ptree pr_short pt;
41.123 writeln str;
41.124 if str=". ----- pblobj -----\n1. x + 1 = 2\n1.1. x + 1 = 2\n1.2. 1 + x = 2\n1.3. 1 + x = -2 + 4\n1.4. x + 1 = -2 + 4\n" then ()
41.125 - else raise error "inform.sml: diff.behav.replaceFormula: on Res 1 + = 1";
41.126 + else error "inform.sml: diff.behav.replaceFormula: on Res 1 + = 1";
41.127 autoCalculate 1 CompleteCalc;
41.128 val ((pt,pos as(p,_)),_) = get_calc 1;
41.129 if pos=([],Res)andalso"[x = 1]"=(term2str o fst)(get_obj g_result pt p)then()
41.130 - else raise error "inform.sml: diff.behav.replaceFormula: on Res + = 2";
41.131 + else error "inform.sml: diff.behav.replaceFormula: on Res + = 2";
41.132
41.133
41.134 "--------- replaceFormula: on Frm + = 1st Nd ---------------------";
41.135 @@ -312,11 +312,11 @@
41.136 val str = pr_ptree pr_short pt;
41.137 writeln str;
41.138 if str=". ----- pblobj -----\n1. x + 1 = 2\n1.1. x + 1 = 2\n1.2. 1 + x = 2\n1.3. 1 + x = -2 + 4\n1.4. x + 1 = -2 + 4\n" then ()
41.139 - else raise error "inform.sml: diff.behav.replaceFormula: on Frm 1 + = 1";
41.140 + else error "inform.sml: diff.behav.replaceFormula: on Frm 1 + = 1";
41.141 autoCalculate 1 CompleteCalc;
41.142 val ((pt,pos as(p,_)),_) = get_calc 1;
41.143 if pos=([],Res)andalso"[x = 1]"=(term2str o fst)(get_obj g_result pt p)then()
41.144 - else raise error "inform.sml: diff.behav.replaceFormula: on Frm 1 + = 2";
41.145 + else error "inform.sml: diff.behav.replaceFormula: on Frm 1 + = 2";
41.146
41.147
41.148 "--------- replaceFormula: cut calculation -----------------------";
41.149 @@ -331,14 +331,14 @@
41.150 autoCalculate 1 CompleteCalc;
41.151 moveActiveRoot 1; moveActiveDown 1;
41.152 if get_pos 1 1 = ([1], Frm) then ()
41.153 - else raise error "inform.sml: diff.behav. cut calculation 1";
41.154 + else error "inform.sml: diff.behav. cut calculation 1";
41.155
41.156 replaceFormula 1 "x + 1 = 4 + -2"; refFormula 1 (get_pos 1 1);
41.157 val ((pt,p),_) = get_calc 1;
41.158 val str = pr_ptree pr_short pt;
41.159 writeln str;
41.160 if p = ([1], Res) then ()
41.161 - else raise error "inform.sml: diff.behav. cut calculation 2";
41.162 + else error "inform.sml: diff.behav. cut calculation 2";
41.163
41.164
41.165
41.166 @@ -385,7 +385,7 @@
41.167 (*the empty CalcHead is checked w.r.t the model and re-established as such*)
41.168 val (b,pt,ocalhd) = input_icalhd pt (p,"", empty_model, Pbl, e_spec);
41.169 val pbl = get_obj g_pbl pt (fst p); (writeln o (itms2str_ ctxt)) pbl;
41.170 - if ocalhd2str ocalhd = "(Pbl, ??.empty, [\n(0 ,[] ,false ,#Given ,Inc fixedValues [] ,(??.empty, [])),\n(0 ,[] ,false ,#Find ,Inc maximum ,(??.empty, [])),\n(0 ,[] ,false ,#Find ,Inc valuesFor ,(??.empty, [])),\n(0 ,[] ,false ,#Relate ,Inc relations [] ,(??.empty, []))], [], \n(\"e_domID\", [\"e_pblID\"], [\"e_metID\"]) )" then () else raise error "informtest.sml: diff.behav. max 1";
41.171 + if ocalhd2str ocalhd = "(Pbl, ??.empty, [\n(0 ,[] ,false ,#Given ,Inc fixedValues [] ,(??.empty, [])),\n(0 ,[] ,false ,#Find ,Inc maximum ,(??.empty, [])),\n(0 ,[] ,false ,#Find ,Inc valuesFor ,(??.empty, [])),\n(0 ,[] ,false ,#Relate ,Inc relations [] ,(??.empty, []))], [], \n(\"e_domID\", [\"e_pblID\"], [\"e_metID\"]) )" then () else error "informtest.sml: diff.behav. max 1";
41.172
41.173 (*there is one input to the model (could be more)*)
41.174 val (b,pt,ocalhd) =
41.175 @@ -394,7 +394,7 @@
41.176 Relate ["relations"]], Pbl, e_spec);
41.177 val pbl = get_obj g_pbl pt (fst p); (writeln o (itms2str_ ctxt)) pbl;
41.178 if ocalhd2str ocalhd = "(Pbl, ??.empty, [\n(1 ,[1,2,3] ,true ,#Given ,Cor fixedValues [r = Arbfix] ,(fix_, [[r = Arbfix]])),\n(0 ,[] ,false ,#Find ,Inc maximum ,(??.empty, [])),\n(0 ,[] ,false ,#Find ,Inc valuesFor ,(??.empty, [])),\n(0 ,[] ,false ,#Relate ,Inc relations [] ,(??.empty, []))], [], \n(\"e_domID\", [\"e_pblID\"], [\"e_metID\"]) )" then ()
41.179 - else raise error "informtest.sml: diff.behav. max 2";
41.180 + else error "informtest.sml: diff.behav. max 2";
41.181
41.182 (*this input is complete in variant 3, but the ME doesn't recognize FIXXXXME
41.183 val (b,pt''''',ocalhd) =
41.184 @@ -435,7 +435,7 @@
41.185 val str = pr_ptree pr_short pt;
41.186 writeln str;
41.187 if str = ". ----- pblobj -----\n1. x + 1 = 2\n" then ()
41.188 - else raise error "inform.sml: diff.behav.appendFormula: syntax error";
41.189 + else error "inform.sml: diff.behav.appendFormula: syntax error";
41.190
41.191
41.192 "--------- CAS-command on ([],Pbl) -------------------------------";
41.193 @@ -449,7 +449,7 @@
41.194 val nxt = ("Apply_Method",Apply_Method ["Test","squ-equ-test-subpbl1"]);
41.195 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
41.196 if p = ([1], Frm) andalso f2str f = "x + 1 = 2" then ()
41.197 -else raise error "inform.sml: diff.behav. CAScmd ([],Pbl)";
41.198 +else error "inform.sml: diff.behav. CAScmd ([],Pbl)";
41.199
41.200
41.201 "--------- CAS-command on ([],Pbl) FE-interface ------------------";
41.202 @@ -464,7 +464,7 @@
41.203 val ((pt,p),_) = get_calc 1;
41.204 show_pt pt;
41.205 if p = ([], Res) then ()
41.206 -else raise error "inform.sml: diff.behav. CAScmd ([],Pbl) FE-interface";
41.207 +else error "inform.sml: diff.behav. CAScmd ([],Pbl) FE-interface";
41.208
41.209
41.210 "--------- inform [rational,simplification] ----------------------";
41.211 @@ -484,20 +484,20 @@
41.212 appendFormula 1 "(4 * y + -3 * x) / (x * y) + -1";
41.213 val ((pt,p),_) = get_calc 1;
41.214 if p = ([4], Res) andalso (length o children o (get_nd pt)) (fst p) = 2 then ()
41.215 -else raise error ("inform.sml: [rational,simplification] 1");
41.216 +else error ("inform.sml: [rational,simplification] 1");
41.217
41.218 "--- input the next formula that would be presented by mat-engine";
41.219 (*autoCalculate 1 (Step 1);*)
41.220 appendFormula 1 "(4 * y + -3 * x + -1 * (x * y)) / (x * y)";
41.221 val ((pt,p),_) = get_calc 1;
41.222 if p = ([5], Res) andalso (length o children o (get_nd pt)) (fst p) = 0 then ()
41.223 -else raise error ("inform.sml: [rational,simplification] 2");
41.224 +else error ("inform.sml: [rational,simplification] 2");
41.225
41.226 "--- input the exact final result";(*TODO: Exception- LIST "last_elem" raised*)
41.227 appendFormula 1 "(-3 * x + 4 * y + -1 * x * y) / (x * y)";
41.228 val ((pt,p),_) = get_calc 1;
41.229 if p = ([6], Res) andalso (length o children o (get_nd pt)) (fst p) = 2 then ()
41.230 -else raise error ("inform.sml: [rational,simplification] 3");
41.231 +else error ("inform.sml: [rational,simplification] 3");
41.232 show_pt pt;
41.233
41.234 "--------- Take as 1st tac, start with <NEW> (CAS input) ---------";
41.235 @@ -565,7 +565,7 @@
41.236 val Form res = (#1 o pt_extract) (pt, ([],Res));
41.237 show_pt pt;
41.238 if p = ([], Res) andalso term2str res = "1 + 2 * x" then ()
41.239 -else raise error "diff.sml behav.changed for Diff (x^2 + x + 1, x)";
41.240 +else error "diff.sml behav.changed for Diff (x^2 + x + 1, x)";
41.241
41.242
41.243 "--------- Take as 1st tac, start from exp -----------------------";
41.244 @@ -609,7 +609,7 @@
41.245 val ((pt,p),_) = get_calc 1;
41.246 val Form res = (#1 o pt_extract) (pt, p);
41.247 if term2str res = "d_d x (x ^^^ 2 + x + 1)" then ()
41.248 -else raise error "diff.sml Diff (x^2 + x + 1, x) from exp";
41.249 +else error "diff.sml Diff (x^2 + x + 1, x) from exp";
41.250
41.251
41.252 "--------- init_form, start with <NEW> (CAS input) ---------------";
42.1 --- a/test/Tools/isac/Interpret/mathengine.sml Tue Sep 28 08:58:06 2010 +0200
42.2 +++ b/test/Tools/isac/Interpret/mathengine.sml Tue Sep 28 09:06:56 2010 +0200
42.3 @@ -36,20 +36,20 @@
42.4 val pp = par_pblobj pt p;
42.5 val keID = guh2kestoreID guh;
42.6 case context_pbl keID pt pp of (true,["univariate", "equation"],_,_,_)=>()
42.7 -| _ => raise error "mathengine.sml: context_pbl .. pbl_equ_univ checked";
42.8 +| _ => error "mathengine.sml: context_pbl .. pbl_equ_univ checked";
42.9
42.10 case get_obj g_spec pt p of (_, ["e_pblID"], _) => ()
42.11 -| _ => raise error "mathengine.sml: context_pbl .. pbl still empty";
42.12 +| _ => error "mathengine.sml: context_pbl .. pbl still empty";
42.13 setContext 1 pos guh;
42.14 val ((pt,_),_) = get_calc 1;
42.15 case get_obj g_spec pt p of (_, ["univariate", "equation"], _) => ()
42.16 -| _ => raise error "mathengine.sml: context_pbl .. pbl set";
42.17 +| _ => error "mathengine.sml: context_pbl .. pbl set";
42.18
42.19
42.20 setContext 1 pos "met_eq_lin";
42.21 val ((pt,_),_) = get_calc 1;
42.22 case get_obj g_spec pt p of (_, _, ["LinEq", "solve_lineq_equation"]) => ()
42.23 -| _ => raise error "mathengine.sml: context_pbl .. pbl set";
42.24 +| _ => error "mathengine.sml: context_pbl .. pbl set";
42.25
42.26
42.27 "----------- tryrefine -------------------------------------------";
43.1 --- a/test/Tools/isac/Interpret/me.sml Tue Sep 28 08:58:06 2010 +0200
43.2 +++ b/test/Tools/isac/Interpret/me.sml Tue Sep 28 09:06:56 2010 +0200
43.3 @@ -106,7 +106,7 @@
43.4 ([4], Res),
43.5 ([5], Res),
43.6 ([], Res)] => ()
43.7 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1f";
43.8 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1f";
43.9 case map fst (get_interval ([],Frm) ([],Res) 1 pt) of
43.10 [([], Frm),
43.11 ([1], Frm),
43.12 @@ -117,11 +117,11 @@
43.13 ([4], Res),
43.14 ([5], Res),
43.15 ([], Res)] => ()
43.16 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1f";
43.17 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1f";
43.18 case map fst (get_interval ([],Frm) ([],Res) 0 pt) of
43.19 [([], Frm),
43.20 ([], Res)] => ()
43.21 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1f";
43.22 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1f";
43.23
43.24 case map fst (get_interval ([1,3],Res) ([4,1,1],Frm) 99999 pt) of
43.25 [([1, 3], Res),
43.26 @@ -132,7 +132,7 @@
43.27 ([4], Pbl),
43.28 ([4, 1], Frm),
43.29 ([4, 1, 1], Frm)] => ()
43.30 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1a";
43.31 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1a";
43.32
43.33 (*this pos' is not generated bu move_dn:......vvv: goes to end of calc*)
43.34 case map fst (get_interval ([2],Res) ([4,3,2],Frm) 99999 pt) of
43.35 @@ -155,7 +155,7 @@
43.36 ([4], Res), (*this is beyond 'to'*)
43.37 ([5], Res), (*this is beyond 'to'*)
43.38 ([], Res)] => () (*this is beyond 'to'*)
43.39 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1b";
43.40 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1b";
43.41 case map fst (get_interval ([1,4],Res) ([4,3,1],Frm) 99999 pt) of
43.42 [([1, 4], Res),
43.43 ([1], Res),
43.44 @@ -169,7 +169,7 @@
43.45 ([4, 2], Res),
43.46 ([4, 3], Pbl),
43.47 ([4, 3, 1], Frm)] => ()
43.48 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1c";
43.49 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1c";
43.50 case map fst (get_interval ([4,2],Res) ([5],Res) 99999 pt) of
43.51 [([4, 2], Res),
43.52 ([4, 3], Pbl),
43.53 @@ -182,7 +182,7 @@
43.54 ([4, 3], Res),
43.55 ([4], Res),
43.56 ([5], Res)]=>()
43.57 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1d";
43.58 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1d";
43.59 case map fst (get_interval ([],Frm) ([4,3,2],Res) 99999 pt) of
43.60 [([], Frm),
43.61 ([1], Frm),
43.62 @@ -204,7 +204,7 @@
43.63 ([4, 3, 1], Frm),
43.64 ([4, 3, 1], Res),
43.65 ([4, 3, 2], Res)] => ()
43.66 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1e";
43.67 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1e";
43.68 case map fst (get_interval ([4,3],Frm) ([4,3],Res) 99999 pt) of
43.69 [([4, 3], Frm),
43.70 ([4, 3, 1], Frm),
43.71 @@ -214,7 +214,7 @@
43.72 ([4, 3, 4], Res),
43.73 ([4, 3, 5], Res),
43.74 ([4, 3], Res)] => ()
43.75 - | _ => raise error "diff.behav.in ctree.sml: get_interval lev 1g";
43.76 + | _ => error "diff.behav.in ctree.sml: get_interval lev 1g";
43.77
43.78
43.79
43.80 @@ -351,7 +351,7 @@
43.81 (1 ,[1] ,true ,#Given ,Cor equality (1 + -1 * 2 + x = 0) ,(e_, [1 + -1 * 2 + x = 0]))]*)
43.82 val (pt,p) = complete_mod (pt, p);
43.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 ()
43.84 - else raise error "completetest.sml: new behav. in complete_mod 1";
43.85 + else error "completetest.sml: new behav. in complete_mod 1";
43.86 writeln (itms2str_ ctxt (get_obj g_pbl pt (fst p)));
43.87 (*[
43.88 (1 ,[1] ,true ,#Given ,Cor equality (1 + -1 * 2 + x = 0) ,(e_, [1 + -1 * 2 + x = 0])),
43.89 @@ -359,7 +359,7 @@
43.90 (3 ,[1] ,true ,#Find ,Cor solutions L ,(solutions, [L]))]*)
43.91 val mits = get_obj g_met pt (fst p);
43.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]))]"
43.93 - then () else raise error "completetest.sml: new behav. in complete_mod 2";
43.94 + then () else error "completetest.sml: new behav. in complete_mod 2";
43.95 writeln (itms2str_ ctxt mits);
43.96 (*[
43.97 (1 ,[1] ,true ,#Given ,Cor equality (1 + -1 * 2 + x = 0) ,(e_, [1 + -1 * 2 + x = 0])),
43.98 @@ -468,7 +468,7 @@
43.99 0 <= x & x <= 2 * r}])),
43.100 (11 ,[1,2,3] ,true ,#undef ,Cor errorBound (eps = 0) ,(errorBound, [eps = 0]))]*)
43.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 ()
43.102 - else raise error "completetest.sml: new behav. in complete_metitms 1";
43.103 + else error "completetest.sml: new behav. in complete_metitms 1";
43.104
43.105
43.106 "--------- maximum-example: complete_mod -------------------------";
43.107 @@ -503,7 +503,7 @@
43.108 val (pt,p) = complete_mod (pt,p);
43.109 val pits = get_obj g_pbl pt (fst p);
43.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]]))]"
43.111 - then () else raise error "completetest.sml: new behav. in complete_mod 3";
43.112 + then () else error "completetest.sml: new behav. in complete_mod 3";
43.113 writeln (itms2str_ ctxt pits);
43.114 (*[
43.115 (1 ,[1,2,3] ,true,#Given,Cor fixedValues [r = Arbfix] ,(fix_, [[r = Arbfix]])),
43.116 @@ -513,7 +513,7 @@
43.117 2 = r ^^^ 2] ,(relations, [[A = a * b],[(a / 2) ^^^ 2 + (b / 2) ^^^ 2 = r ^^^ 2]]))]*)
43.118 val mits = get_obj g_met pt (fst p);
43.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]))]"
43.120 - then () else raise error "completetest.sml: new behav. in complete_mod 3";
43.121 + then () else error "completetest.sml: new behav. in complete_mod 3";
43.122 writeln (itms2str_ ctxt mits);
43.123 (*[
43.124 (1 ,[1,2,3] ,true ,#Given ,Cor fixedValues [r = Arbfix] ,(fix_, [[r = Arbfix]])),
44.1 --- a/test/Tools/isac/Interpret/ptyps.sml Tue Sep 28 08:58:06 2010 +0200
44.2 +++ b/test/Tools/isac/Interpret/ptyps.sml Tue Sep 28 09:06:56 2010 +0200
44.3 @@ -145,7 +145,7 @@
44.4 (*case 4: refined to children (without child)*)
44.5 val opt = refine_ori ori4 ["pbla"];
44.6 if opt = SOME ["pbla2y","pbla2","pbla"] then ()
44.7 -else raise error "new behaviour in refine.sml case 4";
44.8 +else error "new behaviour in refine.sml case 4";
44.9
44.10 (*case 5: start refinement somewhere in ptyps*)
44.11 refine_ori ori4 ["pbla2","pbla"];
44.12 @@ -419,7 +419,7 @@
44.13 val (p,_,f,nxt,_,pt) = me nxt p c pt;
44.14 val Form' (FormKF (~1,EdUndef,_,Nundef,res)) = f;
44.15 if (snd nxt)=End_Proof' andalso res="[x = 2]" then ()
44.16 -else raise error "new behaviour in test:refine.sml:miniscript with mini-subpb";
44.17 +else error "new behaviour in test:refine.sml:miniscript with mini-subpb";
44.18
44.19
44.20 "----------- fun coll_guhs ---------------------------------------";
45.1 --- a/test/Tools/isac/Interpret/rewtools.sml Tue Sep 28 08:58:06 2010 +0200
45.2 +++ b/test/Tools/isac/Interpret/rewtools.sml Tue Sep 28 09:06:56 2010 +0200
45.3 @@ -102,7 +102,7 @@
45.4 "----------- fun thy_containing_thm ------------------------------";
45.5 val (str, (thy', thy)) = ("real_diff_minus",("Root.thy", Root.thy));
45.6 if thy_contains_thm str ("XXX",thy) then ()
45.7 -else raise error "rewtools.sml: NOT thy_contains_thm \
45.8 +else error "rewtools.sml: NOT thy_contains_thm \
45.9 \(real_diff_minus,(Root.thy,.";
45.10 (rev (!theory'));
45.11 dropuntil (curry op= thy');
45.12 @@ -111,15 +111,15 @@
45.13 (#1:theory' * theory -> theory'))
45.14 (rev (!theory'));
45.15 if thy_containing_thm thy' str = ("IsacKnowledge", "Root.thy") then ()
45.16 -else raise error "rewtools.sml: NOT thy_containin_thm \
45.17 +else error "rewtools.sml: NOT thy_containin_thm \
45.18 \(real_diff_minus,(Root.thy,.";
45.19
45.20 "----- search the same theorem somewhere further below in the list";
45.21 if thy_contains_thm str ("XXX",Poly.thy) then ()
45.22 -else raise error "rewtools.sml: NOT thy_contains_thm \
45.23 +else error "rewtools.sml: NOT thy_contains_thm \
45.24 \(real_diff_minus,(Poly.thy,.";
45.25 if thy_containing_thm "LinEq.thy" str = ("IsacKnowledge", "Poly.thy") then ()
45.26 -else raise error "rewtools.sml: NOT thy_containing_thm \
45.27 +else error "rewtools.sml: NOT thy_containing_thm \
45.28 \(real_diff_minus,(Poly.thy,.";
45.29
45.30 "----- second test -------------------------------";
45.31 @@ -132,7 +132,7 @@
45.32 length (!theory');
45.33 length startsearch;
45.34 if thy_containing_thm thy' str = ("IsacKnowledge", "Test.thy") then ()
45.35 -else raise error "rewtools.sml: diff.behav. in \
45.36 +else error "rewtools.sml: diff.behav. in \
45.37 \thy_containing_thm Test radd_commute";
45.38
45.39
45.40 @@ -144,7 +144,7 @@
45.41 (#1:theory' * theory -> theory'))
45.42 (rev (!theory'));
45.43 if length (!theory') <> length dropthys then ()
45.44 -else raise error "rewtools.sml: diff.behav. in thy_containing_rls 1";
45.45 +else error "rewtools.sml: diff.behav. in thy_containing_rls 1";
45.46 val dropthy's = map (get_thy o (#1 : (theory' * theory) -> theory'))
45.47 dropthys;
45.48 print_depth 99; dropthy's; print_depth 3;
45.49 @@ -161,16 +161,16 @@
45.50 (rev (!ruleset'));
45.51 print_depth 99; map (#1 o #2) startsearch; print_depth 3;
45.52 if length (!ruleset') <> length startsearch then ()
45.53 -else raise error "rewtools.sml: diff.behav. in thy_containing_rls 2";
45.54 +else error "rewtools.sml: diff.behav. in thy_containing_rls 2";
45.55
45.56 val rls' = "norm_Poly";
45.57 case assoc (startsearch, rls') of
45.58 SOME (thy', _) => thyID2theory' thy'
45.59 - | _ => raise error ("thy_containing_rls : rls '"^str^
45.60 + | _ => error ("thy_containing_rls : rls '"^str^
45.61 "' not in !rulset' und thy '"^thy'^"'");
45.62
45.63 if thy_containing_rls thy' rls' = ("IsacKnowledge", "Poly.thy") then ()
45.64 -else raise error "rewtools.sml: diff.behav. in thy_containing_rls 3";
45.65 +else error "rewtools.sml: diff.behav. in thy_containing_rls 3";
45.66
45.67
45.68 "----------- fun thy_containing_cal ------------------------------";
45.69 @@ -207,7 +207,7 @@
45.70 interSteps 1 ([1,1],Res);
45.71 val ((pt,p),_) = get_calc 1; show_pt pt;
45.72 if existpt' ([1,1,1], Frm) pt then ()
45.73 -else raise error "integrate.sml: interSteps on Rewrite_Set_Inst 1";
45.74 +else error "integrate.sml: interSteps on Rewrite_Set_Inst 1";
45.75
45.76 initContext 1 Thy_ ([1,1,1], Frm);
45.77 --------------------TODO.new_c: cvs before 071227, 11:50*)
45.78 @@ -241,7 +241,7 @@
45.79 val ContThm {thm,result,...} = context_thy (pt,p) tac;
45.80 if thm = "thy_isac_Test-thm-radd_left_commute"
45.81 andalso term2str result = "-2 + (1 + x) = 0" then ()
45.82 -else raise error"rewtools.sml initContext..Th_ thy_Test-thm-radd_left_commute";
45.83 +else error"rewtools.sml initContext..Th_ thy_Test-thm-radd_left_commute";
45.84
45.85 val p = ([3,1,1], Frm);
45.86 val tac = Rewrite_Inst (["(bdv, x)"],("risolate_bdv_add",""));
45.87 @@ -251,7 +251,7 @@
45.88 val ContThmInst {thm,result,...} = context_thy (pt,p) tac;
45.89 if thm = "thy_isac_Test-thm-risolate_bdv_add"
45.90 andalso term2str result = "x = 0 + -1 * -1" then ()
45.91 -else raise error "rewtools.sml initContext..Th_ thy_Test-thm-risolate_bdv_add";
45.92 +else error "rewtools.sml initContext..Th_ thy_Test-thm-risolate_bdv_add";
45.93
45.94 initContext 1 Thy_ ([2,5], Res);
45.95 (*Res->Res, Calculate "plus" -2 + (1 + x) = 0 -> -1 + x = 0
45.96 @@ -270,7 +270,7 @@
45.97 val ContRls {rls,result,...} = context_thy (pt,p) tac;
45.98 if rls = "thy_isac_Test-rls-Test_simplify"
45.99 andalso term2str result = "-1 + x = 0" then ()
45.100 -else raise error "rewtools.sml initContext..Th_ thy_Test-thm-risolate_bdv_add";
45.101 +else error "rewtools.sml initContext..Th_ thy_Test-thm-risolate_bdv_add";
45.102
45.103 val p = ([3,1], Frm);
45.104 val tac = Rewrite_Set_Inst (["(bdv, x)"],"isolate_bdv");
45.105 @@ -280,7 +280,7 @@
45.106 val ContRlsInst {rls,result,...} = context_thy (pt,p) tac;
45.107 if rls = "thy_isac_Test-rls-isolate_bdv"
45.108 andalso term2str result = "x = 0 + -1 * -1" then ()
45.109 -else raise error "rewtools.sml initContext..Th_ thy_Test-thm-risolate_bdv_add";
45.110 +else error "rewtools.sml initContext..Th_ thy_Test-thm-risolate_bdv_add";
45.111
45.112
45.113
45.114 @@ -297,7 +297,7 @@
45.115 val ContThm {thm,result,...} = context_thy (pt,p) tac;
45.116 if thm = "thy_isac_Test-thm-radd_left_commute"
45.117 andalso term2str result = "-2 + (1 + x) = 0" then ()
45.118 -else raise error "rewtools.sml checkContext.._ thy_Test-thm-radd_left_commute";
45.119 +else error "rewtools.sml checkContext.._ thy_Test-thm-radd_left_commute";
45.120
45.121 val p = ([3,1,1], Frm);
45.122 val tac = Rewrite_Inst (["(bdv,x)"],("risolate_bdv_add",""));
45.123 @@ -307,7 +307,7 @@
45.124 val ContThmInst {thm,result,...} = context_thy (pt,p) tac;
45.125 if thm = "thy_isac_Test-thm-risolate_bdv_add"
45.126 andalso term2str result = "x = 0 + -1 * -1" then ()
45.127 -else raise error "rewtools.sml checkContext..T_ thy_Test-thm-risolate_bdv_add";
45.128 +else error "rewtools.sml checkContext..T_ thy_Test-thm-risolate_bdv_add";
45.129
45.130 val p = ([2,5], Res);
45.131 val tac = Calculate "plus";
45.132 @@ -332,7 +332,7 @@
45.133 val ContRls {rls,result,...} = context_thy (pt,p) tac;
45.134 if rls = "thy_isac_Test-rls-Test_simplify"
45.135 andalso term2str result = "-1 + x = 0" then ()
45.136 -else raise error "rewtools.sml checkContext..Thy_ thy_Test-rls-Test_simplify";
45.137 +else error "rewtools.sml checkContext..Thy_ thy_Test-rls-Test_simplify";
45.138
45.139 val p = ([3,1], Frm);
45.140 val tac = Rewrite_Set_Inst (["(bdv, x)"],"isolate_bdv");
45.141 @@ -340,7 +340,7 @@
45.142 val ContRlsInst {rls,result,...} = context_thy (pt,p) tac;
45.143 if rls = "thy_isac_Test-rls-isolate_bdv"
45.144 andalso term2str result = "x = 0 + -1 * -1" then ()
45.145 -else raise error "rewtools.sml checkContext..Thy_ thy_Test-thm-isolate_bdv";
45.146 +else error "rewtools.sml checkContext..Thy_ thy_Test-thm-isolate_bdv";
45.147
45.148
45.149 "----------- checkContext..Thy_ on last formula ------------------";
45.150 @@ -387,7 +387,7 @@
45.151 val xstr = takerest (5, rest');
45.152
45.153 if guh2theID guh = ["IsacScripts", "ListG", "Theorems", "zip_Nil"] then ()
45.154 -else raise error "rewtools.sml: guh2theID thy_scri_ListG-thm-zip_Nil changed";
45.155 +else error "rewtools.sml: guh2theID thy_scri_ListG-thm-zip_Nil changed";
45.156
45.157
45.158 "----------- debugging on Tests/solve_linear_as_rootpbl ----------";
45.159 @@ -405,13 +405,13 @@
45.160
45.161 autoCalculate 1 (Step 1); val (ptp as (pt,p), tacis) = get_calc 1; show_pt pt;
45.162 if is_curr_endof_calc pt ([1],Frm) then ()
45.163 -else raise error "rewtools.sml is_curr_endof_calc ([1],Frm)";
45.164 +else error "rewtools.sml is_curr_endof_calc ([1],Frm)";
45.165
45.166 autoCalculate 1 (Step 1); val (ptp as (pt,p), tacis) = get_calc 1; show_pt pt;
45.167 if not (is_curr_endof_calc pt ([1],Frm)) then ()
45.168 -else raise error "rewtools.sml is_curr_endof_calc ([1],Frm) not";
45.169 +else error "rewtools.sml is_curr_endof_calc ([1],Frm) not";
45.170 if is_curr_endof_calc pt ([1],Res) then ()
45.171 -else raise error "rewtools.sml is_curr_endof_calc ([1],Res)";
45.172 +else error "rewtools.sml is_curr_endof_calc ([1],Res)";
45.173
45.174 initContext 1 Thy_ ([1],Res);
45.175
45.176 @@ -473,7 +473,7 @@
45.177 "----- thus we repair the [.] in string_of_thmI...";
45.178 val thm = ((num_str o (get_thm thy)) (implode id)) RS sym;
45.179 if string_of_thmI thm = "(?b1 = ?a1) = (- ?b1 = - ?a1)" then ()
45.180 -else raise error ("rewtools.sml: string_of_thmI " ^ string_of_thm thm ^
45.181 +else error ("rewtools.sml: string_of_thmI " ^ string_of_thm thm ^
45.182 " = " ^ string_of_thmI thm);
45.183
45.184
45.185 @@ -496,7 +496,7 @@
45.186 val ((pt,(p,p_)), _) = get_calc 1; show_pt pt;
45.187 if get_obj g_tac pt p = Rewrite ("sym_real_minus_eq_cancel",
45.188 "(?b1 = ?a1) = (- ?b1 = - ?a1)") then ()
45.189 -else raise error "rewtools.sml: string_of_thmI ?!?";
45.190 +else error "rewtools.sml: string_of_thmI ?!?";
45.191
45.192 getTactic 1 ([1],Frm);
45.193
45.194 @@ -514,7 +514,7 @@
45.195 [Rewrite ("radd_commute", "?m + ?n = ?n + ?m"),
45.196 Rewrite ("radd_assoc", "?m + ?n + ?k = ?m + (?n + ?k)"),
45.197 Calculate "plus"] then ()
45.198 -else raise error "rewtools.sml filter_appl_rews a + z + 2*a + 3*z + 5 + 6";
45.199 +else error "rewtools.sml filter_appl_rews a + z + 2*a + 3*z + 5 + 6";
45.200
45.201
45.202 "----------- fun is_contained_in ---------------------------------";
45.203 @@ -522,12 +522,12 @@
45.204 "----------- fun is_contained_in ---------------------------------";
45.205 val r1 = Thm ("real_diff_minus",num_str @{thm real_diff_minus});
45.206 if contains_rule r1 Test_simplify then ()
45.207 -else raise error "rewtools.sml contains_rule Thm";
45.208 +else error "rewtools.sml contains_rule Thm";
45.209
45.210 val r1 = Calc ("Groups.plus_class.plus", eval_binop "#add_");
45.211 if contains_rule r1 Test_simplify then ()
45.212 -else raise error "rewtools.sml contains_rule Calc";
45.213 +else error "rewtools.sml contains_rule Calc";
45.214
45.215 val r1 = Calc ("Groups.minus_class.minus", eval_binop "#add_");
45.216 if not (contains_rule r1 Test_simplify) then ()
45.217 -else raise error "rewtools.sml contains_rule Calc";
45.218 +else error "rewtools.sml contains_rule Calc";
46.1 --- a/test/Tools/isac/Interpret/script.sml Tue Sep 28 08:58:06 2010 +0200
46.2 +++ b/test/Tools/isac/Interpret/script.sml Tue Sep 28 09:06:56 2010 +0200
46.3 @@ -75,7 +75,7 @@
46.4 atomty sc';
46.5 val {scr=Script sc,...} = get_met ["IntegrierenUndKonstanteBestimmen"];
46.6 (*---------------------------------------------------------------------
46.7 -if sc = sc' then () else raise error"script.sml, doesnt find Substitute #1";
46.8 +if sc = sc' then () else error"script.sml, doesnt find Substitute #1";
46.9 ---------------------------------------------------------------------*)
46.10
46.11 val fmz = ["Traegerlaenge L",
46.12 @@ -97,7 +97,7 @@
46.13 val (p,_,f,nxt,_,pt) = me nxt p c pt;
46.14 val (p,_,f,nxt,_,pt) = me nxt p c pt;
46.15 case nxt of (_, Apply_Method ["IntegrierenUndKonstanteBestimmen"]) => ()
46.16 - | _ => raise error "script.sml, doesnt find Substitute #2";
46.17 + | _ => error "script.sml, doesnt find Substitute #2";
46.18 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
46.19 (* *** generate1: not impl.for Substitute' !!!!!!!!!!(*#1#*)!!!!!!!!!!!*)
46.20 (* val nxt = ("Check_Postcond",.. !!!!!!!!!!!!!!!!!!!(*#2#*)!!!!!!!!!!!*)
46.21 @@ -109,7 +109,7 @@
46.22 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
46.23 (*---------------------------------------------------------------------*)
46.24 case nxt of (_, End_Proof') => ()
46.25 - | _ => raise error "script.sml, doesnt find Substitute #3";
46.26 + | _ => error "script.sml, doesnt find Substitute #3";
46.27 (*---------------------------------------------------------------------*)
46.28 (*the reason, that next_tac didnt find the 2nd Substitute, was that
46.29 the Take inbetween was missing, and thus the 2nd Substitute was applied
46.30 @@ -151,7 +151,7 @@
46.31
46.32 val {scr=Script sc,...} = get_met ["IntegrierenUndKonstanteBestimmen"];
46.33 (*---------------------------------------------------------------------
46.34 -if sc = sc' then () else raise error"script.sml, doesnt find Substitute #1";
46.35 +if sc = sc' then () else error"script.sml, doesnt find Substitute #1";
46.36 ---------------------------------------------------------------------*)
46.37 val fmz = ["Traegerlaenge L",
46.38 "Streckenlast (- q_0 * x^^^2 / 2 + x * c + c_2)",
46.39 @@ -172,7 +172,7 @@
46.40 val (p,_,f,nxt,_,pt) = me nxt p c pt;
46.41 val (p,_,f,nxt,_,pt) = me nxt p c pt;
46.42 case nxt of (_, Apply_Method ["IntegrierenUndKonstanteBestimmen"]) => ()
46.43 - | _ => raise error "script.sml, doesnt find Substitute #2";
46.44 + | _ => error "script.sml, doesnt find Substitute #2";
46.45 trace_rewrite:=true;
46.46 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f(*------------------------*);
46.47 trace_rewrite:=false;
46.48 @@ -195,7 +195,7 @@
46.49 val e1__ = str2term"nth_ 1 [M_b 0 = 0, M_b L = 0]";
46.50 val e1__ = eval_listexpr_ Biegelinie.thy srls e1__; term2str e1__;
46.51 if term2str e1__ = "M_b 0 = 0" then () else
46.52 -raise error"script.sml diff.beh. eval_listexpr_ nth_ 1 [...";
46.53 +error"script.sml diff.beh. eval_listexpr_ nth_ 1 [...";
46.54
46.55 (*TODO.WN050913 ??? doesnt eval_listexpr_ go into subterms ???...
46.56 val x1__ = str2term"argument_in (lhs (M_b 0 = 0))";
46.57 @@ -235,7 +235,7 @@
46.58 [Rewrite ("radd_commute", "?m + ?n = ?n + ?m"),
46.59 Rewrite ("radd_assoc", "?m + ?n + ?k = ?m + (?n + ?k)"),
46.60 Calculate "times"] then ()
46.61 -else raise error "script.sml fun sel_appl_atomic_tacs diff.behav.";
46.62 +else error "script.sml fun sel_appl_atomic_tacs diff.behav.";
46.63
46.64 trace_script := true;
46.65 trace_script := false;
47.1 --- a/test/Tools/isac/Interpret/solve.sml Tue Sep 28 08:58:06 2010 +0200
47.2 +++ b/test/Tools/isac/Interpret/solve.sml Tue Sep 28 09:06:56 2010 +0200
47.3 @@ -52,7 +52,7 @@
47.4 (*with "Script SimplifyScript (t_::real) = -----------------
47.5 \ ((Rewrite_Set norm_Rational False) t_)"
47.6 case pt of Nd (PblObj _, [Nd _]) => ((*met only applies norm_Rational*))
47.7 - | _ => raise error "solve.sml: interSteps on norm_Rational 1";
47.8 + | _ => error "solve.sml: interSteps on norm_Rational 1";
47.9 interSteps 1 ([1], Res);
47.10 getFormulaeFromTo 1 ([1], Frm) ([1,12], Res) 99999 false;
47.11 interSteps 1 ([1,3], Res);
47.12 @@ -68,7 +68,7 @@
47.13 --------------------------------------------------------------------*)
47.14
47.15 case pt of Nd (PblObj _, [Nd _, Nd _, Nd _, Nd _, Nd _, Nd _]) => ()
47.16 - | _ => raise error "solve.sml: interSteps on norm_Rational 1";
47.17 + | _ => error "solve.sml: interSteps on norm_Rational 1";
47.18 (*these have been done now by the script ^^^ immediately...
47.19 interSteps 1 ([1], Res);
47.20 getFormulaeFromTo 1 ([1], Frm) ([1,12], Res) 99999 false;
47.21 @@ -84,7 +84,7 @@
47.22 case (term2str form, tac, terms2strs asm) of
47.23 ("1 / 2", Check_Postcond ["rational", "simplification"],
47.24 ["-36 * x + 4 * x ^^^ 3 ~= 0"]) => ()
47.25 - | _ => raise error "solve.sml: interSteps on norm_Rational 2";
47.26 + | _ => error "solve.sml: interSteps on norm_Rational 2";
47.27
47.28
47.29
47.30 @@ -161,7 +161,7 @@
47.31 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
47.32 (*"(3 + -1 * x) / (3 + x)"*)
47.33 if nxt = ("End_Proof'",End_Proof') then ()
47.34 -else raise error "details.sml, changed behaviour in: without detail";
47.35 +else error "details.sml, changed behaviour in: without detail";
47.36
47.37 val str = pr_ptree pr_short pt;
47.38 writeln str;
47.39 @@ -218,7 +218,7 @@
47.40 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
47.41 if f = Form' (FormKF (~1,EdUndef,0,Nundef,"(3 - x) / (3 + x)"))
47.42 andalso nxt = ("End_Proof'",End_Proof') then ()
47.43 -else raise error "new behaviour in details.sml, \
47.44 +else error "new behaviour in details.sml, \
47.45 \cancel, rev-rew (cancel) afterwards";
47.46 FIXXXXXME.040216 #####################################################*)
47.47
47.48 @@ -273,7 +273,7 @@
47.49 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
47.50 (*"(3 + -1 * x) / (3 + x)"*)
47.51 if nxt = ("End_Proof'",End_Proof') then ()
47.52 -else raise error "details.sml, changed behaviour in: cancel_p, without detail";
47.53 +else error "details.sml, changed behaviour in: cancel_p, without detail";
47.54
47.55 "-------------- cancel_p, detail rev-rew (cancel) afterwards ----------";
47.56 "-------------- cancel_p, detail rev-rew (cancel) afterwards ----------";
47.57 @@ -328,7 +328,7 @@
47.58 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
47.59 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
47.60 if nxt = ("End_Detail",End_Detail) then ()
47.61 - else raise error "details.sml: new behav. in Detail make_polynomial";
47.62 + else error "details.sml: new behav. in Detail make_polynomial";
47.63 ----------------------------------------------------------------------*)
47.64
47.65 (*---------------
47.66 @@ -346,7 +346,7 @@
47.67 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
47.68 if f = Form' (FormKF (~1,EdUndef,0,Nundef,"(3 + x) / (3 - x)"))
47.69 andalso nxt = ("End_Proof'",End_Proof') then ()
47.70 -else raise error "new behaviour in details.sml, cancel_p afterwards";
47.71 +else error "new behaviour in details.sml, cancel_p afterwards";
47.72
47.73 ----------------*)
47.74
47.75 @@ -401,8 +401,8 @@
47.76 val ("donesteps",_(*,ss*), lastpos) = detailstep pt ip;
47.77 (*case ss of [(_,_,t1),(_,_,t2),(_,_,t3),(_,_,t4),(_,_,t5),(_,_,t6)] =>
47.78 (writeln o terms2str) [t1,t2,t3,t4,t5,t6]
47.79 - | _ => raise error "details.sml: diff.behav. in detail miniscript";*) if lastpos = ([4], Res) then ()
47.80 - else raise error "details.sml: diff.behav. in interSteps'donesteps' 1";
47.81 + | _ => error "details.sml: diff.behav. in detail miniscript";*) if lastpos = ([4], Res) then ()
47.82 + else error "details.sml: diff.behav. in interSteps'donesteps' 1";
47.83
47.84 moveActiveDown 1;
47.85 moveActiveDown 1;
47.86 @@ -414,8 +414,8 @@
47.87 val ("donesteps",_(*,ss*), lastpos) = detailstep pt ip;
47.88 (*case ss of [(_,_,t1),(_,_,t2),(_,_,t3)] =>
47.89 (writeln o terms2str) [t1,t2,t3]
47.90 - | _ => raise error "details.sml: diff.behav. in detail miniscript";*) if lastpos = ([3, 2], Res) then ()
47.91 - else raise error "details.sml: diff.behav. in interSteps'donesteps' 1";
47.92 + | _ => error "details.sml: diff.behav. in detail miniscript";*) if lastpos = ([3, 2], Res) then ()
47.93 + else error "details.sml: diff.behav. in interSteps'donesteps' 1";
47.94
47.95
47.96 (* val [(_,(((pt,_),_),[(_,ip)]))] = !states;
47.97 @@ -446,7 +446,7 @@
47.98 interSteps 1 ([2],Res);
47.99 val [(_,(((pt,_),_),[(_,(p,_))]))] = !states;
47.100 if length (children (get_nd pt p)) = 6 then ()
47.101 - else raise error "details.sml: diff.behav. in interSteps'detailrls' 1";
47.102 + else error "details.sml: diff.behav. in interSteps'detailrls' 1";
47.103
47.104 moveActiveDown 1;
47.105 moveActiveDown 1; refFormula 1 (get_pos 1 1); (* 3,1 Frm, <ISA> -1 + x = 0 </ISA> *);
47.106 @@ -454,7 +454,7 @@
47.107 interSteps 1 ([3,1],Frm) (*<ERROR> first formula on level has NO detail </E*);
47.108 val [(_,(((pt,_),_),[(_,(p,_))]))] = !states;
47.109 if length (children (get_nd pt p)) = 0 then () (*NO detail at ([xxx,1],Frm)*)
47.110 - else raise error "details.sml: diff.behav. in interSteps'detailrls' 2";
47.111 + else error "details.sml: diff.behav. in interSteps'detailrls' 2";
47.112
47.113 moveActiveDown 1;
47.114 refFormula 1 (get_pos 1 1); (* 3,1 Res, <ISA> x = 0 + -1 * -1 </ISA> *)
47.115 @@ -471,7 +471,7 @@
47.116 interSteps 1 ([3,2],Res);
47.117 val [(_,(((pt,_),_),[(_,(p,_))]))] = !states;
47.118 if length (children (get_nd pt p)) = 2 then ()
47.119 - else raise error "details.sml: diff.behav. in interSteps'detailrls' 3";
47.120 + else error "details.sml: diff.behav. in interSteps'detailrls' 3";
47.121
47.122 val ((pt,p),_) = get_calc 1; show_pt pt;
47.123
47.124 @@ -498,7 +498,7 @@
47.125 val ((pt,p),_) = get_calc 1; show_pt pt;
47.126 val (_,_,lastpos) =detailstep pt p;
47.127 if p = ([2], Res) andalso lastpos = ([2, 9], Res) then ()
47.128 -else raise error "solve.sml: diff.beh. after appendFormula x - 1 = 0";
47.129 +else error "solve.sml: diff.beh. after appendFormula x - 1 = 0";
47.130
47.131
47.132 "------ Detail_Set -----------------------------------------------";
48.1 --- a/test/Tools/isac/Knowledge/algein.sml Tue Sep 28 08:58:06 2010 +0200
48.2 +++ b/test/Tools/isac/Knowledge/algein.sml Tue Sep 28 09:06:56 2010 +0200
48.3 @@ -88,14 +88,14 @@
48.4 val (p,_,f,nxt,_,pt) = me nxt p c pt(*Rewrite_Set "norm_Rational"*);f2str f;
48.5 val (p,_,f,nxt,_,pt) = me nxt p c pt(**);
48.6 if f2str f = "L = 32 + senkrecht + unten" then ()
48.7 -else raise error "algein.sml diff.behav. in erstSymbolisch 1";
48.8 +else error "algein.sml diff.behav. in erstSymbolisch 1";
48.9 val (p,_,f,nxt,_,pt) = me nxt p c pt;val(p,_,f,nxt,_,pt)=me nxt p c pt;f2str f;
48.10 val (p,_,f,nxt,_,pt) = me nxt p c pt;val(p,_,f,nxt,_,pt)=me nxt p c pt;f2str f;
48.11 val (p,_,f,nxt,_,pt) = me nxt p c pt;val(p,_,f,nxt,_,pt)=me nxt p c pt;f2str f;
48.12 val (p,_,f,nxt,_,pt) = me nxt p c pt;val(p,_,f,nxt,_,pt)=me nxt p c pt;f2str f;
48.13 val (p,_,f,nxt,_,pt) = me nxt p c pt;
48.14 if f2str f = "L = 104" andalso nxt = ("End_Proof'", End_Proof') then ()
48.15 -else raise error "algein.sml diff.behav. in erstSymbolisch 99";
48.16 +else error "algein.sml diff.behav. in erstSymbolisch 99";
48.17
48.18
48.19 "----------- auto 'Berechnung' 'erstSymbolisch' ------------------";
48.20 @@ -115,7 +115,7 @@
48.21 autoCalculate 1 CompleteCalc;
48.22 val ((pt,p),_) = get_calc 1; show_pt pt;
48.23 if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "L = 104" then()
48.24 -else raise error "algein.sml: 'Berechnung' 'erstSymbolisch' changed";
48.25 +else error "algein.sml: 'Berechnung' 'erstSymbolisch' changed";
48.26
48.27 (*
48.28 show_pt pt;
49.1 --- a/test/Tools/isac/Knowledge/atools.sml Tue Sep 28 08:58:06 2010 +0200
49.2 +++ b/test/Tools/isac/Knowledge/atools.sml Tue Sep 28 09:06:56 2010 +0200
49.3 @@ -26,12 +26,12 @@
49.4 fun str2term str = (term_of o the o (parse thy )) str;
49.5 fun term2s t = Syntax.string_of_term (thy2ctxt thy) t;
49.6 val t = str2term "x";
49.7 -if occurs_in t t then "OK" else raise error "atools.sml: occurs_in x x -> f";
49.8 +if occurs_in t t then "OK" else error "atools.sml: occurs_in x x -> f";
49.9
49.10 val t = str2term "x occurs_in x";
49.11 val SOME (str, t') = eval_occurs_in 0 "Atools.occurs'_in" t 0;
49.12 if (term2s t') = "x occurs_in x = True" then ()
49.13 -else raise error "atools.sml: x occurs_in x = True ???";
49.14 +else error "atools.sml: x occurs_in x = True ???";
49.15
49.16 "------- some_occur_in";
49.17 some_occur_in [str2term"c",str2term"c_2"] (str2term"a + b + c");
49.18 @@ -40,14 +40,14 @@
49.19 val SOME (str,t') = eval_some_occur_in 0 "Atools.some'_occur'_in" t 0;
49.20 if term2str t' =
49.21 "some_of [c, c_2, c_3, c_4] occur_in -1 * q_0 * L ^^^ 2 / 2 + L * c + c_2 =\nTrue" then ()
49.22 -else raise error "atools.sml: some_occur_in true";
49.23 +else error "atools.sml: some_occur_in true";
49.24
49.25 val t = str2term "some_of [c_3, c_4] occur_in \
49.26 \-1 * q_0 * L ^^^ 2 / 2 + L * c + c_2";
49.27 val SOME (str,t') = eval_some_occur_in 0 "Atools.some'_occur'_in" t 0;
49.28 if term2str t' =
49.29 "some_of [c_3, c_4] occur_in -1 * q_0 * L ^^^ 2 / 2 + L * c + c_2 = False" then ()
49.30 -else raise error "atools.sml: some_occur_in false";
49.31 +else error "atools.sml: some_occur_in false";
49.32
49.33
49.34 "----------- argument_of -----------------------------------------";
49.35 @@ -56,7 +56,7 @@
49.36 val t = str2term "argument_in (M_b x)";
49.37 val SOME (str, t') = eval_argument_in 0 "Atools.argument'_in" t 0;
49.38 if term2s t' = "(argument_in M_b x) = x" then ()
49.39 -else raise error "atools.sml:(argument_in M_b x) = x ???";
49.40 +else error "atools.sml:(argument_in M_b x) = x ???";
49.41
49.42 "----------- sameFunId -------------------------------------------";
49.43 "----------- sameFunId -------------------------------------------";
49.44 @@ -91,7 +91,7 @@
49.45 \[M_b x = c + L*x, y' x = c + L*x, y x = c + L*x]";
49.46 val SOME (str, es) = eval_filter_sameFunId "" "Atools.filter'_sameFunId" p "";
49.47 if term2str es = "(filter_sameFunId y' L [M_b x = c + L * x, y' x = c + L * x,\n y x = c + L * x]) =\n[y' x = c + L * x]" then ()
49.48 -else raise error "atools.slm diff.behav. in filter_sameFunId";
49.49 +else error "atools.slm diff.behav. in filter_sameFunId";
49.50
49.51
49.52 "----------- boollist2sum ----------------------------------------";
49.53 @@ -114,7 +114,7 @@
49.54
49.55 val SOME (str, pred) = eval_boollist2sum "" "Atools.boollist2sum" t "";
49.56 if term2str pred = "boollist2sum\n [b1 = k - 2 * q, b2 = k - 2 * q, b3 = k - 2 * q, b4 = k - 2 * q] =\nb1 + b2 + b3 + b4" then ()
49.57 -else raise error "atools.sml diff.behav. in eval_boollist2sum";
49.58 +else error "atools.sml diff.behav. in eval_boollist2sum";
49.59
49.60 trace_rewrite:=true;
49.61 val srls_ = append_rls "srls_..Berechnung-erstSymbolisch" e_rls
49.62 @@ -122,7 +122,7 @@
49.63 val t = str2term
49.64 "boollist2sum [b1 = k - 2*q, b2 = k - 2*q, b3 = k - 2*q, b4 = k - 2*q]";
49.65 case rewrite_set_ thy false srls_ t of SOME _ => ()
49.66 -| _ => raise error "atools.sml diff.rewrite boollist2sum";
49.67 +| _ => error "atools.sml diff.rewrite boollist2sum";
49.68 trace_rewrite:=false;
49.69
49.70
50.1 --- a/test/Tools/isac/Knowledge/biegelinie.sml Tue Sep 28 08:58:06 2010 +0200
50.2 +++ b/test/Tools/isac/Knowledge/biegelinie.sml Tue Sep 28 09:06:56 2010 +0200
50.3 @@ -37,16 +37,16 @@
50.4
50.5 val t = rewrit Belastung_Querkraft (str2term "- q_ x = - q_0"); term2s t;
50.6 if term2s t = "Q' x = - q_0" then ()
50.7 -else raise error "/biegelinie.sml: Belastung_Querkraft";
50.8 +else error "/biegelinie.sml: Belastung_Querkraft";
50.9
50.10 val t = rewrit Querkraft_Moment (str2term "Q x = - q_0 * x + c"); term2s t;
50.11 if term2s t = "M_b' x = - q_0 * x + c" then ()
50.12 -else raise error "/biegelinie.sml: Querkraft_Moment";
50.13 +else error "/biegelinie.sml: Querkraft_Moment";
50.14
50.15 val t = rewrit Moment_Neigung (str2term "M_b x = -q_0 * x^^^2/2 + q_0/2 *L*x");
50.16 term2s t;
50.17 if term2s t = "- EI * y'' x = - q_0 * x ^^^ 2 / 2 + q_0 / 2 * L * x" then ()
50.18 -else raise error "biegelinie.sml: Moment_Neigung";
50.19 +else error "biegelinie.sml: Moment_Neigung";
50.20
50.21
50.22 "----------- Script [IntegrierenUndKonstanteBestimmen] -----------";
50.23 @@ -160,13 +160,13 @@
50.24 rewrite_set_ thy false srls
50.25 (str2term"(nth_::[real,bool list]=>bool) 1 " $ rm_);
50.26 if term2str e1__ = "M_b 0 = 0" then ()
50.27 -else raise error "biegelinie.sml simplify nth_ 1 rm_";
50.28 +else error "biegelinie.sml simplify nth_ 1 rm_";
50.29
50.30 val SOME (x1__,_) =
50.31 rewrite_set_ thy false srls
50.32 (str2term"argument_in (lhs (M_b 0 = 0))");
50.33 if term2str x1__ = "0" then ()
50.34 -else raise error "biegelinie.sml simplify argument_in (lhs (M_b 0 = 0)";
50.35 +else error "biegelinie.sml simplify argument_in (lhs (M_b 0 = 0)";
50.36
50.37 trace_rewrite:=true;
50.38 trace_rewrite:=false;
50.39 @@ -195,69 +195,69 @@
50.40 (*if itms2str_ ctxt pits = ... all 5 model-items*)
50.41 val mits = get_obj g_met pt (fst p); writeln (itms2str_ ctxt mits);
50.42 if itms2str_ ctxt mits = "[]" then ()
50.43 -else raise error "biegelinie.sml: Bsp 7.27 #2";
50.44 +else error "biegelinie.sml: Bsp 7.27 #2";
50.45
50.46 val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.47 case nxt of (_,Add_Given "FunktionsVariable x") => ()
50.48 - | _ => raise error "biegelinie.sml: Bsp 7.27 #4a";
50.49 + | _ => error "biegelinie.sml: Bsp 7.27 #4a";
50.50 val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.51 val mits = get_obj g_met pt (fst p);writeln (itms2str_ ctxt mits);
50.52 (*if itms2str_ ctxt mits = ... all 6 guard-items*)
50.53 case nxt of (_, Apply_Method ["IntegrierenUndKonstanteBestimmen"]) => ()
50.54 - | _ => raise error "biegelinie.sml: Bsp 7.27 #4b";
50.55 + | _ => error "biegelinie.sml: Bsp 7.27 #4b";
50.56
50.57 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.58 case pt of Nd (PblObj _, [Nd _]) => ((*Apply_Method + Take*))
50.59 - | _ => raise error "biegelinie.sml: Bsp 7.27 #4c";
50.60 + | _ => error "biegelinie.sml: Bsp 7.27 #4c";
50.61 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.62 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.63
50.64 case nxt of
50.65 (_,Subproblem ("Biegelinie", ["named", "integrate", "function"])) => ()
50.66 - | _ => raise error "biegelinie.sml: Bsp 7.27 #4c";
50.67 + | _ => error "biegelinie.sml: Bsp 7.27 #4c";
50.68 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.69 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.70 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.71 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.72 case nxt of (_, Apply_Method ["diff", "integration", "named"]) => ()
50.73 - | _ => raise error "biegelinie.sml: Bsp 7.27 #5";
50.74 + | _ => error "biegelinie.sml: Bsp 7.27 #5";
50.75 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.76 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.77 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.78 case nxt of
50.79 ("Check_Postcond", Check_Postcond ["named", "integrate", "function"]) => ()
50.80 - | _ => raise error "biegelinie.sml: Bsp 7.27 #5a";
50.81 + | _ => error "biegelinie.sml: Bsp 7.27 #5a";
50.82
50.83 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.84 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.85 case nxt of
50.86 (_, Subproblem ("Biegelinie", ["named", "integrate", "function"]))=>()
50.87 - | _ => raise error "biegelinie.sml: Bsp 7.27 #5b";
50.88 + | _ => error "biegelinie.sml: Bsp 7.27 #5b";
50.89
50.90 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.91 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.92 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.93 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.94 case nxt of (_, Apply_Method ["diff", "integration","named"]) => ()
50.95 - | _ => raise error "biegelinie.sml: Bsp 7.27 #6";
50.96 + | _ => error "biegelinie.sml: Bsp 7.27 #6";
50.97
50.98 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.99 val (p,_,f,nxt,_,pt) = me nxt p c pt(*nxt = Check_Postcond ["named", "int..*);
50.100 f2str f;
50.101 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.102 case nxt of (_, Substitute ["x = 0"]) => ()
50.103 - | _ => raise error "biegelinie.sml: Bsp 7.27 #7";
50.104 + | _ => error "biegelinie.sml: Bsp 7.27 #7";
50.105
50.106 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.107 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.108 if f2str f = "0 = c_2 + c * 0 + -1 * q_0 / 2 * 0 ^^^ 2" then ()
50.109 -else raise error "biegelinie.sml: Bsp 7.27 #8";
50.110 +else error "biegelinie.sml: Bsp 7.27 #8";
50.111
50.112 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.113 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.114 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.115 if f2str f = "0 = c_2 + c * L + -1 * q_0 / 2 * L ^^^ 2" then ()
50.116 -else raise error "biegelinie.sml: Bsp 7.27 #9";
50.117 +else error "biegelinie.sml: Bsp 7.27 #9";
50.118
50.119 (*val nxt = (+, Subproblem ("Biegelinie", ["normalize", ..lin..sys]))*)
50.120 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.121 @@ -266,7 +266,7 @@
50.122 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.123 val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.124 case nxt of (_, Apply_Method ["EqSystem", "normalize", "2x2"]) => ()
50.125 - | _ => raise error "biegelinie.sml: Bsp 7.27 #10";
50.126 + | _ => error "biegelinie.sml: Bsp 7.27 #10";
50.127
50.128 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.129 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.130 @@ -279,7 +279,7 @@
50.131 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.132 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.133 case nxt of (_, Apply_Method["EqSystem", "top_down_substitution", "2x2"]) => ()
50.134 - | _ => raise error "biegelinie.sml: Bsp 7.27 #11";
50.135 + | _ => error "biegelinie.sml: Bsp 7.27 #11";
50.136 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.137 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.138 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.139 @@ -290,7 +290,7 @@
50.140 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.141 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.142 case nxt of (_, Check_Postcond ["normalize", "2x2", "linear", "system"]) => ()
50.143 - | _ => raise error "biegelinie.sml: Bsp 7.27 #12";
50.144 + | _ => error "biegelinie.sml: Bsp 7.27 #12";
50.145
50.146 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.147 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.148 @@ -300,46 +300,46 @@
50.149 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.150 case nxt of
50.151 (_, Subproblem ("Biegelinie", ["named", "integrate", "function"]))=>()
50.152 - | _ => raise error "biegelinie.sml: Bsp 7.27 #13";
50.153 + | _ => error "biegelinie.sml: Bsp 7.27 #13";
50.154
50.155 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.156 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.157 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.158 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.159 case nxt of (_, Apply_Method ["diff", "integration", "named"]) => ()
50.160 - | _ => raise error "biegelinie.sml: Bsp 7.27 #14";
50.161 + | _ => error "biegelinie.sml: Bsp 7.27 #14";
50.162
50.163 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.164 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.165 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.166 case nxt of
50.167 (_, Check_Postcond ["named", "integrate", "function"]) => ()
50.168 - | _ => raise error "biegelinie.sml: Bsp 7.27 #15";
50.169 + | _ => error "biegelinie.sml: Bsp 7.27 #15";
50.170
50.171 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.172 if f2str f =
50.173 "y' x = c + 1 / (-1 * EI) * (L * q_0 / 4 * x ^^^ 2 + -1 * q_0 / 6 * x ^^^ 3)"
50.174 -then () else raise error "biegelinie.sml: Bsp 7.27 #16 f";
50.175 +then () else error "biegelinie.sml: Bsp 7.27 #16 f";
50.176 case nxt of
50.177 (_, Subproblem ("Biegelinie", ["named", "integrate", "function"]))=>()
50.178 - | _ => raise error "biegelinie.sml: Bsp 7.27 #16";
50.179 + | _ => error "biegelinie.sml: Bsp 7.27 #16";
50.180
50.181 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.182 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.183 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.184 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.185 case nxt of (_, Apply_Method ["diff", "integration", "named"]) => ()
50.186 - | _ => raise error "biegelinie.sml: Bsp 7.27 #17";
50.187 + | _ => error "biegelinie.sml: Bsp 7.27 #17";
50.188
50.189 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.190 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.191 if f2str f =
50.192 "y x =\nc_2 + c * x +\n\
50.193 \1 / (-1 * EI) * (L * q_0 / 12 * x ^^^ 3 + -1 * q_0 / 24 * x ^^^ 4)"
50.194 -then () else raise error "biegelinie.sml: Bsp 7.27 #18 f";
50.195 +then () else error "biegelinie.sml: Bsp 7.27 #18 f";
50.196 case nxt of
50.197 (_, Check_Postcond ["named", "integrate", "function"]) => ()
50.198 - | _ => raise error "biegelinie.sml: Bsp 7.27 #18";
50.199 + | _ => error "biegelinie.sml: Bsp 7.27 #18";
50.200
50.201 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.202 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.203 @@ -350,32 +350,32 @@
50.204 case nxt of
50.205 (_, Subproblem
50.206 ("Biegelinie", ["normalize", "2x2", "linear", "system"])) => ()
50.207 - | _ => raise error "biegelinie.sml: Bsp 7.27 #19";
50.208 + | _ => error "biegelinie.sml: Bsp 7.27 #19";
50.209 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.210 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.211 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.212 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.213 val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.214 case nxt of (_, Apply_Method ["EqSystem", "normalize", "2x2"]) => ()
50.215 - | _ => raise error "biegelinie.sml: Bsp 7.27 #20";
50.216 + | _ => error "biegelinie.sml: Bsp 7.27 #20";
50.217 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.218 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.219 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.220 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.221 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.222 if f2str f = "[c_2 = 0, L * c + c_2 = -1 * q_0 * L ^^^ 4 / (-24 * EI)]" then ()
50.223 -else raise error "biegelinie.sml: Bsp 7.27 #21 f";
50.224 +else error "biegelinie.sml: Bsp 7.27 #21 f";
50.225 case nxt of
50.226 (_, Subproblem
50.227 ("Biegelinie", ["triangular", "2x2", "linear", "system"])) =>()
50.228 - | _ => raise error "biegelinie.sml: Bsp 7.27 #21";
50.229 + | _ => error "biegelinie.sml: Bsp 7.27 #21";
50.230 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.231 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.232 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.233 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.234 val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.235 case nxt of (_, Apply_Method["EqSystem", "top_down_substitution", "2x2"]) => ()
50.236 - | _ => raise error "biegelinie.sml: Bsp 7.27 #22";
50.237 + | _ => error "biegelinie.sml: Bsp 7.27 #22";
50.238 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.239 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.240 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.241 @@ -386,7 +386,7 @@
50.242 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.243 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.244 case nxt of (_, Check_Postcond ["normalize", "2x2", "linear", "system"]) => ()
50.245 - | _ => raise error "biegelinie.sml: Bsp 7.27 #23";
50.246 + | _ => error "biegelinie.sml: Bsp 7.27 #23";
50.247
50.248 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.249 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.250 @@ -397,9 +397,9 @@
50.251 "y x =\n-1 * q_0 * L ^^^ 4 / (-24 * EI * L) * x +\n\
50.252 \(2 * L * q_0 / (-1 * 24 * EI) * x ^^^ 3 +\n\
50.253 \ -1 * q_0 / (-1 * 24 * EI) * x ^^^ 4)" then ()
50.254 -else raise error "biegelinie.sml: Bsp 7.27 #24 f";
50.255 +else error "biegelinie.sml: Bsp 7.27 #24 f";
50.256 case nxt of ("End_Proof'", End_Proof') => ()
50.257 - | _ => raise error "biegelinie.sml: Bsp 7.27 #24";
50.258 + | _ => error "biegelinie.sml: Bsp 7.27 #24";
50.259
50.260 (* use"../smltest/IsacKnowledge/biegelinie.sml";
50.261 *)
50.262 @@ -469,14 +469,14 @@
50.263 autoCalculate 1 (Step 1) (*->GENERATED ([1], Frm)*);
50.264 val ((pt,_),_) = get_calc 1;
50.265 case pt of Nd (PblObj _, [Nd _]) => ((*Apply_Method + Take*))
50.266 - | _ => raise error "biegelinie.sml: Bsp 7.27 autoCalculate#4c";
50.267 + | _ => error "biegelinie.sml: Bsp 7.27 autoCalculate#4c";
50.268
50.269 autoCalculate 1 CompleteCalc;
50.270 val ((pt,p),_) = get_calc 1;
50.271 if p = ([], Res) andalso length (children pt) = 23 andalso
50.272 term2str (get_obj g_res pt (fst p)) =
50.273 "y x =\n-1 * q_0 * L ^^^ 4 / (-24 * EI * L) * x +\n(2 * L * q_0 / (-1 * 24 * EI) * x ^^^ 3 +\n -1 * q_0 / (-1 * 24 * EI) * x ^^^ 4)"
50.274 -then () else raise error "biegelinie.sml: 1st biegelin.7.27 changed";
50.275 +then () else error "biegelinie.sml: 1st biegelin.7.27 changed";
50.276
50.277 val (unc, del, gen) = (([],Pbl), ([],Pbl), ([],Res));
50.278 getFormulaeFromTo 1 unc gen 1 (*only level 1*) false;
50.279 @@ -509,13 +509,13 @@
50.280 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.281 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.282 if nxt = ("Apply_Method", Apply_Method ["Biegelinien", "ausBelastung"])
50.283 -then () else raise error "biegelinie.sml met2 b";
50.284 +then () else error "biegelinie.sml met2 b";
50.285
50.286 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "q_ x = q_0";
50.287 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "- q_ x = - q_0";
50.288 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "Q' x = - q_0";
50.289 case nxt of (_, Subproblem (_, ["named", "integrate", "function"])) => ()
50.290 -| _ => raise error "biegelinie.sml met2 c";
50.291 +| _ => error "biegelinie.sml met2 c";
50.292
50.293 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.294 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.295 @@ -527,7 +527,7 @@
50.296 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "Q x = c + -1 * q_0 * x";
50.297 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "M_b' x = c + -1 * q_0 * x";
50.298 case nxt of (_,Subproblem (_, ["named", "integrate", "function"])) => ()
50.299 -| _ => raise error "biegelinie.sml met2 d";
50.300 +| _ => error "biegelinie.sml met2 d";
50.301
50.302 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.303 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.304 @@ -568,7 +568,7 @@
50.305 val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.306 if nxt = ("End_Proof'", End_Proof') andalso f2str f =
50.307 "[Q x = c + -1 * q_0 * x, M_b x = c_2 + c * x + -1 * q_0 / 2 * x ^^^ 2,\n y' x =\n c_3 + 1 / (-1 * EI) * (c_2 * x + c / 2 * x ^^^ 2 + -1 * q_0 / 6 * x ^^^ 3),\n y x =\n c_4 + c_3 * x +\n 1 / (-1 * EI) *\n (c_2 / 2 * x ^^^ 2 + c / 6 * x ^^^ 3 + -1 * q_0 / 24 * x ^^^ 4)]" then ()
50.308 -else raise error "biegelinie.sml met2 e";
50.309 +else error "biegelinie.sml met2 e";
50.310
50.311
50.312
50.313 @@ -639,7 +639,7 @@
50.314 (* f2str f = "0 = c_2 + L * c + -1 * q_0 / 2 * L ^^^ 2"
50.315 CHANGE NOT considered, already on leave*)
50.316 f2str f = "0 = (2 * c_2 + 2 * L * c + -1 * L ^^^ 2 * q_0) / 2"
50.317 -then () else raise error "biegelinie.sml: SubProblem (_,[setzeRandbed";
50.318 +then () else error "biegelinie.sml: SubProblem (_,[setzeRandbed";
50.319
50.320
50.321 "----------- method [Biegelinien,setzeRandbedingungenEin] + exec -";
50.322 @@ -724,7 +724,7 @@
50.323 val screxp1 = subst_atomic [(rb_, rb)] screxp1_; term2str screxp1;
50.324 val SOME (b1,_) = rewrite_set_ Isac.thy false srls2 screxp1; term2str b1;
50.325 if term2str b1 = "Take (y 0 = 0)" then ()
50.326 -else raise error "biegelinie.sml: rew. Bieglie2 --1";
50.327 +else error "biegelinie.sml: rew. Bieglie2 --1";
50.328 val b1 = str2term "(y 0 = 0)";
50.329
50.330 "--- script expression 2";
50.331 @@ -733,7 +733,7 @@
50.332 val screxp2 = subst_atomic [(b1_,b1),(funs_,funs)] screxp2_; term2str screxp2;
50.333 val SOME (fs,_) = rewrite_set_ Isac.thy false srls2 screxp2; term2str fs;
50.334 if term2str fs = "[y x =\n c_4 + c_3 * x +\n 1 / (-1 * EI) *\n (c_2 / 2 * x ^^^ 2 + c / 6 * x ^^^ 3 + -1 * q_0 / 24 * x ^^^ 4)]" then ()
50.335 -else raise error "biegelinie.sml: rew. Bieglie2 --2";
50.336 +else error "biegelinie.sml: rew. Bieglie2 --2";
50.337
50.338 "--- script expression 3";
50.339 val screxp3_ = str2term "SubProblem (Biegelinie_,[makeFunctionTo,equation],\
50.340 @@ -744,7 +744,7 @@
50.341 writeln (term2str screxp3);
50.342 val SOME (equ,_) = rewrite_set_ Isac.thy false srls2 screxp3;
50.343 if term2str equ = "SubProblem\n (Biegelinie_, [makeFunctionTo, equation], [Equation, fromFunction])\n [BOOL\n (y x =\n c_4 + c_3 * x +\n 1 / (-1 * EI) *\n (c_2 / 2 * x ^^^ 2 + c / 6 * x ^^^ 3 + -1 * q_0 / 24 * x ^^^ 4)),\n BOOL (y 0 = 0)]" then ()
50.344 -else raise error "biegelinie.sml: rew. Bieglie2 --3";
50.345 +else error "biegelinie.sml: rew. Bieglie2 --3";
50.346 writeln (term2str equ);
50.347 (*SubProblem
50.348 (Biegelinie_, [makeFunctionTo, equation], [Equation, fromFunction])
50.349 @@ -776,13 +776,13 @@
50.350 "--- before 1.subpbl [Equation, fromFunction]";
50.351 val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.352 case nxt of (_, Apply_Method ["Biegelinien", "setzeRandbedingungenEin"])=>()
50.353 -| _ => raise error "biegelinie.sml: met setzeRandbed*Ein aa";
50.354 +| _ => error "biegelinie.sml: met setzeRandbed*Ein aa";
50.355 "----- Randbedingung y 0 = 0 in SUBpbl with met [Equation, fromFunction]";
50.356 val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.357 if (#1 o (get_obj g_fmz pt)) (fst p) =
50.358 ["functionEq\n (y x =\n c_4 + c_3 * x +\n 1 / (-1 * EI) *\n (c_2 / 2 * x ^^^ 2 + c / 6 * x ^^^ 3 + -1 * q_0 / 24 * x ^^^ 4))",
50.359 "substitution (y 0 = 0)", "equality equ___"] then ()
50.360 -else raise error "biegelinie.sml met setzeRandbed*Ein bb";
50.361 +else error "biegelinie.sml met setzeRandbed*Ein bb";
50.362 (writeln o istate2str) (get_istate pt p);
50.363 "--- after 1.subpbl [Equation, fromFunction]";
50.364
50.365 @@ -791,46 +791,46 @@
50.366 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.367 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.368 case nxt of (_, Apply_Method["Equation", "fromFunction"]) => ()
50.369 -| _ => raise error "biegelinie.sml met2 ff";
50.370 +| _ => error "biegelinie.sml met2 ff";
50.371 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f =
50.372 "y x =\nc_4 + c_3 * x +\n1 / (-1 * EI) *\n(c_2 / 2 * x ^^^ 2 + c / 6 * x ^^^ 3 + -1 * q_0 / 24 * x ^^^ 4)";
50.373 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.374 val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.375 case nxt of (_, Check_Postcond ["makeFunctionTo", "equation"]) => ()
50.376 -| _ => raise error "biegelinie.sml met2 gg";
50.377 +| _ => error "biegelinie.sml met2 gg";
50.378
50.379 "--- before 2.subpbl [Equation, fromFunction]";
50.380 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "0 = c_4 + 0 / (-1 * EI)" ;
50.381 case nxt of (_,Subproblem (_, ["makeFunctionTo", "equation"])) => ()
50.382 -| _ => raise error "biegelinie.sml met2 hh";
50.383 +| _ => error "biegelinie.sml met2 hh";
50.384 "--- after 1st arrival at 2.subpbl [Equation, fromFunction]";
50.385
50.386 val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.387 if (#1 o (get_obj g_fmz pt)) (fst p) =
50.388 ["functionEq\n (y x =\n c_4 + c_3 * x +\n 1 / (-1 * EI) *\n (c_2 / 2 * x ^^^ 2 + c / 6 * x ^^^ 3 + -1 * q_0 / 24 * x ^^^ 4))",
50.389 "substitution (y L = 0)", "equality equ___"] then ()
50.390 -else raise error "biegelinie.sml metsetzeRandbed*Ein bb ";
50.391 +else error "biegelinie.sml metsetzeRandbed*Ein bb ";
50.392 val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.393 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.394 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.395
50.396 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.397 case nxt of (_, Apply_Method["Equation", "fromFunction"]) => ()
50.398 -| _ => raise error "biegelinie.sml met2 ii";
50.399 +| _ => error "biegelinie.sml met2 ii";
50.400 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "y x =\nc_4 + c_3 * x +\n1 / (-1 * EI) *\n(c_2 / 2 * x ^^^ 2 + c / 6 * x ^^^ 3 + -1 * q_0 / 24 * x ^^^ 4)";
50.401 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "y L =\nc_4 + c_3 * L +\n1 / (-1 * EI) *\n(c_2 / 2 * L ^^^ 2 + c / 6 * L ^^^ 3 + -1 * q_0 / 24 * L ^^^ 4)";
50.402 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "0 =\nc_4 + c_3 * L +\n1 / (-1 * EI) *\n(c_2 / 2 * L ^^^ 2 + c / 6 * L ^^^ 3 + -1 * q_0 / 24 * L ^^^ 4)";
50.403 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "0 =\nc_4 + L * c_3 +\n(12 * L ^^^ 2 * c_2 + 4 * L ^^^ 3 * c + -1 * L ^^^ 4 * q_0) / (-24 * EI)" ;
50.404 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "0 =\nc_4 + L * c_3 +\n(12 * L ^^^ 2 * c_2 + 4 * L ^^^ 3 * c + -1 * L ^^^ 4 * q_0) / (-24 * EI)";
50.405 case nxt of (_,Subproblem (_, ["makeFunctionTo", "equation"])) => ()
50.406 -| _ => raise error "biegelinie.sml met2 jj";
50.407 +| _ => error "biegelinie.sml met2 jj";
50.408
50.409 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.410 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.411 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.412 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.413 case nxt of (_, Apply_Method ["Equation", "fromFunction"])=>()
50.414 -| _ => raise error "biegelinie.sml met2 kk";
50.415 +| _ => error "biegelinie.sml met2 kk";
50.416
50.417 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "M_b x = c_2 + c * x + -1 * q_0 / 2 * x ^^^ 2"(*true*);
50.418 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "0 = c_2 + c * 0 + -1 * q_0 / 2 * 0 ^^^ 2";
50.419 @@ -838,14 +838,14 @@
50.420 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "0 = c_2";
50.421 val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.422 case nxt of (_,Subproblem (_, ["makeFunctionTo", "equation"])) => ()
50.423 -| _ => raise error "biegelinie.sml met2 ll";
50.424 +| _ => error "biegelinie.sml met2 ll";
50.425
50.426 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.427 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.428 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.429 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.430 case nxt of (_, Apply_Method ["Equation", "fromFunction"])=>()
50.431 -| _ => raise error "biegelinie.sml met2 mm";
50.432 +| _ => error "biegelinie.sml met2 mm";
50.433
50.434 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "M_b x = c_2 + c * x + -1 * q_0 / 2 * x ^^^ 2";
50.435 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "M_b L = c_2 + c * L + -1 * q_0 / 2 * L ^^^ 2";
50.436 @@ -853,12 +853,12 @@
50.437 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "0 = (2 * c_2 + 2 * L * c + -1 * L ^^^ 2 * q_0) / 2";
50.438 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "0 = (2 * c_2 + 2 * L * c + -1 * L ^^^ 2 * q_0) / 2";
50.439 case nxt of (_, Check_Postcond ["setzeRandbedingungen", "Biegelinien"]) => ()
50.440 -| _ => raise error "biegelinie.sml met2 nn";
50.441 +| _ => error "biegelinie.sml met2 nn";
50.442 val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.443 if nxt = ("End_Proof'", End_Proof') andalso f2str f =
50.444 (* "[0 = c_4,\n 0 =\n c_4 + L * c_3 +\n (12 * L ^^^ 2 * c_2 + 4 * L ^^^ 3 * c + -1 * L ^^^ 4 * q_0) / (-24 * EI),\n 0 = c_2, 0 = (2 * c_2 + 2 * L * c + -1 * L ^^^ 2 * q_0) / 2]" *)
50.445 "[0 = c_4,\n 0 =\n c_4 + L * c_3 +\n (12 * L ^^^ 2 * c_2 + 4 * L ^^^ 3 * c + -1 * L ^^^ 4 * q_0) /\n (-1 * EI * 24),\n 0 = c_2, 0 = (2 * c_2 + 2 * L * c + -1 * L ^^^ 2 * q_0) / 2]"
50.446 -then () else raise error "biegelinie.sml met2 oo";
50.447 +then () else error "biegelinie.sml met2 oo";
50.448
50.449 (*
50.450 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
50.451 @@ -964,7 +964,7 @@
50.452 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.453 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
50.454 if nxt = ("Apply_Method", Apply_Method ["IntegrierenUndKonstanteBestimmen2"])
50.455 -then () else raise error "biegelinie.sml met2 a";
50.456 +then () else error "biegelinie.sml met2 a";
50.457
50.458 (*** actual arg(s) missing for '["(#Find, (Funktionen, funs_))"]' i.e. should be 'copy-named' by '*_._'
50.459 ... THIS MEANS:
50.460 @@ -996,7 +996,7 @@
50.461 val ((pt,p),_) = get_calc 1; show_pt pt;
50.462 if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) =
50.463 "y x =\n-6 * q_0 * L ^^^ 2 / (-24 * EI) * x ^^^ 2 +\n4 * L * q_0 / (-24 * EI) * x ^^^ 3 +\n-1 * q_0 / (-24 * EI) * x ^^^ 4" then ()
50.464 -else raise error "biegelinie.sml: diff.behav.7.70 with autoCalculate";
50.465 +else error "biegelinie.sml: diff.behav.7.70 with autoCalculate";
50.466
50.467 val is = get_istate pt ([],Res); writeln (istate2str is);
50.468 val t = str2term " last \
51.1 --- a/test/Tools/isac/Knowledge/diff.sml Tue Sep 28 08:58:06 2010 +0200
51.2 +++ b/test/Tools/isac/Knowledge/diff.sml Tue Sep 28 09:06:56 2010 +0200
51.3 @@ -108,7 +108,7 @@
51.4 (*got: false instead true; ~~~~~~~~~~~ replaced by 'is_atom'*)
51.5 val SOME (ctt,_) =
51.6 (rewrite_inst thy' "tless_true" "erls" false [("bdv","s")] thm ct);
51.7 -if ctt = "0" then () else raise error "diff.sml: thm 'diff_const' diff.behav.";
51.8 +if ctt = "0" then () else error "diff.sml: thm 'diff_const' diff.behav.";
51.9 trace_rewrite := false;
51.10 "----- for 'd_d s a' we had 'a is_const' --> False --------^^^-----";
51.11
51.12 @@ -171,11 +171,11 @@
51.13 val (ct,_) = the (rewrite_inst thy' "tless_true" "erls" true
51.14 [("bdv","x::real")] thm ct);
51.15 if ct = "2 * x ^^^ (2 - 1) + 3 * 1 + 0" then ()
51.16 -else raise error "diff.sml diff.behav. in rewrite 1";
51.17 +else error "diff.sml diff.behav. in rewrite 1";
51.18 "--- 7 ---";
51.19 val rls = ("Test_simplify");
51.20 val (ct,_) = the (rewrite_set thy' false rls ct);
51.21 -if ct="3 + 2 * x" then () else raise error "new behaviour in test-example";
51.22 +if ct="3 + 2 * x" then () else error "new behaviour in test-example";
51.23
51.24 val ct = "2 * x ^^^ (2 - 1) + 3 * 1 + 0";
51.25 val (ct,_) = the (rewrite_set thy' true rls ct);
51.26 @@ -249,7 +249,7 @@
51.27 (*val nxt = ("Rewrite_Inst",Rewrite_Inst (["(bdv,x)"],("diff_var","")));*)
51.28 val (p,_,f,nxt,_,pt) = me nxt p c pt;
51.29 if f2str f = "2 * x ^^^ (2 - 1) + 3 * 1 + 0" then ()
51.30 -else raise error "diff.sml: diff.behav. in d_d x ^^^ 2 + 3 * x + 4";
51.31 +else error "diff.sml: diff.behav. in d_d x ^^^ 2 + 3 * x + 4";
51.32 "--- 7 ---";
51.33 (*------------------------------11.3.03--------------------
51.34 trace_rewrite:=true;
51.35 @@ -291,8 +291,8 @@
51.36 (*val nxt = ("End_Proof'",End_Proof');*)
51.37 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
51.38 if nxt = ("End_Proof'",End_Proof') andalso f2str f = "3 + 2 * x" then ()
51.39 -else raise error "diff.sml: new.behav. in me (*+ tacs input*)";
51.40 -(*if f = EmptyMout then () else raise error "new behaviour in + tacs input";
51.41 +else error "diff.sml: new.behav. in me (*+ tacs input*)";
51.42 +(*if f = EmptyMout then () else error "new behaviour in + tacs input";
51.43 meNEW extracts Form once more*)
51.44
51.45
51.46 @@ -464,7 +464,7 @@
51.47 val (p,_,f,nxt,_,pt) = me nxt p c pt;
51.48 val (p,_,f,nxt,_,pt) = me nxt p c pt;
51.49 if nxt = ("End_Proof'",End_Proof') then ()
51.50 -else raise error "new behaviour in tests/differentiate, 1.5.02 me from script";
51.51 +else error "new behaviour in tests/differentiate, 1.5.02 me from script";
51.52
51.53 "----------- primed id -------------------------------------------";
51.54 "----------- primed id -------------------------------------------";
51.55 @@ -483,7 +483,7 @@
51.56
51.57 val SOME (f'_,_) = rewrite_set_ Isac.thy false srls_diff screxp1;
51.58 if term2str f'_= "Take (A' = d_d s (s * (a - s)))" then ()
51.59 -else raise error "diff.sml: diff.behav. in 'primed'";
51.60 +else error "diff.sml: diff.behav. in 'primed'";
51.61 atomty f'_;
51.62
51.63 val str = "Script DiffEqScr (f_f::bool) (v_v::real) = \
51.64 @@ -525,15 +525,15 @@
51.65
51.66 val t = str2term "2/x^^^2";
51.67 val SOME (t,_) = rewrite_set_inst_ thy false subs rls t; term2str t;
51.68 -if term2str t = "2 * x ^^^ -2" then () else raise error "diff.sml 1/x";
51.69 +if term2str t = "2 * x ^^^ -2" then () else error "diff.sml 1/x";
51.70
51.71 val t = str2term "sqrt (x^^^3)";
51.72 val SOME (t,_) = rewrite_set_inst_ thy false subs rls t; term2str t;
51.73 -if term2str t = "x ^^^ (3 / 2)" then () else raise error "diff.sml x^1/2";
51.74 +if term2str t = "x ^^^ (3 / 2)" then () else error "diff.sml x^1/2";
51.75
51.76 val t = str2term "2 / sqrt x^^^3";
51.77 val SOME (t,_) = rewrite_set_inst_ thy false subs rls t; term2str t;
51.78 -if term2str t = "2 * x ^^^ (-3 / 2)" then () else raise error"diff.sml x^-1/2";
51.79 +if term2str t = "2 * x ^^^ (-3 / 2)" then () else error"diff.sml x^-1/2";
51.80 (* trace_rewrite := true;
51.81 trace_rewrite := false;
51.82 *)
51.83 @@ -541,16 +541,16 @@
51.84
51.85 val t = str2term "2 * x ^^^ -2";
51.86 val SOME (t,_) = rewrite_set_inst_ thy false subs rls t; term2str t;
51.87 -if term2str t = "2 / x ^^^ 2" then () else raise error "diff.sml sym 1/x";
51.88 +if term2str t = "2 / x ^^^ 2" then () else error "diff.sml sym 1/x";
51.89
51.90
51.91 val t = str2term "x ^^^ (3 / 2)";
51.92 val SOME (t,_) = rewrite_set_inst_ thy false subs rls t; term2str t;
51.93 -if term2str t = "sqrt (x ^^^ 3)" then () else raise error"diff.sml sym x^1/x";
51.94 +if term2str t = "sqrt (x ^^^ 3)" then () else error"diff.sml sym x^1/x";
51.95
51.96 val t = str2term "2 * x ^^^ (-3 / 2)";
51.97 val SOME (t,_) = rewrite_set_inst_ thy false subs rls t; term2str t;
51.98 -if term2str t ="2 / sqrt (x ^^^ 3)"then()else raise error"diff.sml sym x^-1/x";
51.99 +if term2str t ="2 / sqrt (x ^^^ 3)"then()else error"diff.sml sym x^-1/x";
51.100
51.101
51.102 (* trace_rewrite:=true;
51.103 @@ -576,7 +576,7 @@
51.104 val ((pt,p),_) = get_calc 1; show_pt pt;
51.105 if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) =
51.106 "1 + 2 * x + -1 / x ^^^ 2 + -4 / x ^^^ 3" then ()
51.107 -else raise error "diff.sml: differentiate_on_R 2/x^2 changed";
51.108 +else error "diff.sml: differentiate_on_R 2/x^2 changed";
51.109
51.110 "-----------------------------------------------------------------";
51.111 states:=[];
51.112 @@ -598,7 +598,7 @@
51.113
51.114 if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) =
51.115 "8 * x ^^^ 7" then ()
51.116 -else raise error "diff.sml: differentiate_on_R (x^3 * x^5) changed";
51.117 +else error "diff.sml: differentiate_on_R (x^3 * x^5) changed";
51.118
51.119
51.120 "----------- autoCalculate diff after_simplification -------------";
51.121 @@ -621,7 +621,7 @@
51.122 *)
51.123 val ((pt,p),_) = get_calc 1; show_pt pt;
51.124 if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "8 * x ^^^ 7"
51.125 -then () else raise error "biegelinie.sml: 1st biegelin.7.27 changed";
51.126 +then () else error "biegelinie.sml: 1st biegelin.7.27 changed";
51.127
51.128 "-----------------------------------------------------------------";
51.129 states:=[];
51.130 @@ -635,7 +635,7 @@
51.131 autoCalculate 1 CompleteCalc;
51.132 val ((pt,p),_) = get_calc 1; show_pt pt;
51.133 if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "15 * x ^^^ 14"
51.134 -then () else raise error "biegelinie.sml: 1st biegelin.7.27 changed";
51.135 +then () else error "biegelinie.sml: 1st biegelin.7.27 changed";
51.136
51.137
51.138
51.139 @@ -689,4 +689,4 @@
51.140 appendFormula 1 "2*x + d_d x x + d_d x 1";
51.141 val ((pt,p),_) = get_calc 1; show_pt pt;
51.142 if existpt' ([3], Res) pt then ()
51.143 -else raise error "diff.sml: inform d_d x (x^2 + x + 1) doesnt work";
51.144 +else error "diff.sml: inform d_d x (x^2 + x + 1) doesnt work";
52.1 --- a/test/Tools/isac/Knowledge/diffapp.sml Tue Sep 28 08:58:06 2010 +0200
52.2 +++ b/test/Tools/isac/Knowledge/diffapp.sml Tue Sep 28 09:06:56 2010 +0200
52.3 @@ -280,7 +280,7 @@
52.4 val (p,_,f,nxt,_,pt) = me nxt p c pt;
52.5 val (p,_,f,nxt,_,pt) = me nxt p c pt;
52.6 case nxt of (_, Specify_Method ["DiffApp","max_by_calculus"]) => ()
52.7 - | _ => raise error "diffapp.sml: max-exp me, nxt = Specify_Method";
52.8 + | _ => error "diffapp.sml: max-exp me, nxt = Specify_Method";
52.9
52.10 val oris = fst3 (get_obj g_origin pt (fst p)); writeln(oris2str oris);
52.11 val pits = get_obj g_pbl pt (fst p); writeln(itms2str_ ctxt pits);
52.12 @@ -291,7 +291,7 @@
52.13 val (p,_,f,nxt,_,pt) = me nxt p c pt;
52.14 val (p,_,f,nxt,_,pt) = me nxt p c pt;
52.15 case nxt of (_,Apply_Method ["DiffApp","max_by_calculus"] ) => ()
52.16 - | _ => raise error "diffapp.sml: max-exp me, nxt = Apply_Method";
52.17 + | _ => error "diffapp.sml: max-exp me, nxt = Apply_Method";
52.18 val (p,_,f,nxt,_,pt) = me nxt p c pt;
52.19
52.20 (*since 0508 Apply_Method does the 1st step, if NONE init_form -------------
52.21 @@ -302,7 +302,7 @@
52.22 (*val nxt = ("Model_Problem",Model_Problem ["by_explicit","make","function"])*)
52.23 ----------------------------------------------------------------------------*)
52.24 case nxt of (_, Model_Problem(*["by_explicit", "make", "function"]*)) => ()
52.25 - | _ => raise error "diffapp.sml: max-exp me, nxt = Model_Problem";
52.26 + | _ => error "diffapp.sml: max-exp me, nxt = Model_Problem";
52.27
52.28 val (p,_,f,nxt,_,pt) = me nxt p c pt;
52.29 val (p,_,f,nxt,_,pt) = me nxt p c pt;
52.30 @@ -318,7 +318,7 @@
52.31 val (p,_,f,nxt,_,pt) = me nxt p c pt;
52.32 val (p,_,f,nxt,_,pt) = me nxt p c pt;
52.33 case nxt of (_, Apply_Method ["DiffApp", "make_fun_by_explicit"]) => ()
52.34 - | _ => raise error "diffapp.sml: max-exp Apply_Method ([1], Met) ";
52.35 + | _ => error "diffapp.sml: max-exp Apply_Method ([1], Met) ";
52.36
52.37 (*----since WN050901 (ie. corr. mathengine#nxt_specify_ ..nxt_spec Pbl->p_
52.38 we get at ...
52.39 @@ -429,12 +429,12 @@
52.40 writeln (itms2str_ ctxt mits);
52.41 (*
52.42 if itms2str_ ctxt mits = "[\n(1 ,[1] ,true ,#Given ,Cor functionEq (hd r_s) ,(t_, [hd r_s])),\n(2 ,[1] ,true ,#Given ,Cor boundVariable v_v ,(v_, [v_])),\n(3 ,[1] ,true ,#Given ,Cor interval itv_ ,(itv_, [itv_])),\n(4 ,[1] ,true ,#Find ,Cor maxArgument v__0 ,(v_0, [v__0]))]" then ()
52.43 - else raise error "diffapp.sml: diff.behav. in autoCalc .. scripts for max 1";
52.44 + else error "diffapp.sml: diff.behav. in autoCalc .. scripts for max 1";
52.45 *)
52.46 (*FIXME: the environments contain identifers, and NOT values ?!?!?*)
52.47 (* WN051209 while extending 'fun step' for initac, this became better ...
52.48 if itms2str_ ctxt mits = "[\n(1 ,[1,2,3] ,true ,#Given ,Cor fixedValues [r = Arbfix] ,(f_ix, [[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] ,(v_s, [[a],[b]])),\n(4 ,[1,2] ,true ,#Relate ,Cor relations [A = a * b, (a / 2) ^^^ 2 + (b / 2) ^^^ 2 = r ^^^ 2] ,(r_s, [[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 ()
52.49 - else raise error "diffapp.sml: diff.behav. in autoCalc .. scripts for max 1";
52.50 + else error "diffapp.sml: diff.behav. in autoCalc .. scripts for max 1";
52.51 *)
52.52
52.53
52.54 @@ -478,7 +478,7 @@
52.55 "(hd o filterVar A) [A = a * b, (a / 2) ^^^ 2 + (b / 2) ^^^ 2 = r ^^^ 2]";
52.56 val SOME (s',_) = rewrite_set_ thy false list_rls s;
52.57 val s'' = term2str s';
52.58 -if s''="A = a * b" then () else raise error "new behaviour with list_rls 1.1.";
52.59 +if s''="A = a * b" then () else error "new behaviour with list_rls 1.1.";
52.60 val env = env @ [(str2term "e_::bool",str2term "A = a * b")];
52.61
52.62 (*--- 2.line: condition alone ---*)
52.63 @@ -488,7 +488,7 @@
52.64 "1 < length_ [A = a * b, (a / 2) ^^^ 2 + (b / 2) ^^^ 2 = r ^^^ 2]";
52.65 val SOME (s',_) = rewrite_set_ thy false list_rls s;
52.66 val s'' = term2str s';
52.67 -if s''="True" then () else raise error "new behaviour with list_rls 1.2.";
52.68 +if s''="True" then () else error "new behaviour with list_rls 1.2.";
52.69
52.70 (*--- 2.line in script ---*)
52.71 val t = str2term
52.72 @@ -509,7 +509,7 @@
52.73 "SubProblem (Reals_, [make, function], [no_met])\n\
52.74 \ [REAL A, REAL b,\n\
52.75 \ BOOL_LIST [A = a * b, (a / 2) ^^^ 2 + (b / 2) ^^^ 2 = r ^^^ 2]]" then ()
52.76 -else raise error "new behaviour with list_rls 1.3.";
52.77 +else error "new behaviour with list_rls 1.3.";
52.78 val env = env @ [(str2term "t_::bool",
52.79 str2term "A = (2*sqrt(r^^^2-(b/2)^^^2)) * b")];
52.80
52.81 @@ -544,7 +544,7 @@
52.82 "(hd o filterVar b) [A = a * b, (a / 2) ^^^ 2 + (b / 2) ^^^ 2 = r ^^^ 2]";
52.83 val SOME (t',_) = rewrite_set_ thy false list_rls t;
52.84 val s' = term2str t';
52.85 -if s' = "A = a * b" then () else raise error "new behaviour with list_rls 2.1";
52.86 +if s' = "A = a * b" then () else error "new behaviour with list_rls 2.1";
52.87 val env = env @ [(str2term "h_::bool", str2term s')];
52.88
52.89 (*--- 2.line in script ---*)
52.90 @@ -559,7 +559,7 @@
52.91 val SOME (t',_) = rewrite_set_ thy false list_rls t;
52.92 val s' = term2str t';
52.93 if s' = "(a / 2) ^^^ 2 + (b / 2) ^^^ 2 = r ^^^ 2" then ()
52.94 -else raise error "new behaviour with list_rls 2.2";
52.95 +else error "new behaviour with list_rls 2.2";
52.96 val env = env @ [(str2term "e_1::bool", str2term s')];
52.97
52.98 (*--- 3.line in script ---*)
52.99 @@ -569,7 +569,7 @@
52.100 val t = str2term "dropWhile (ident A) (Vars (A = a * b))";
52.101 val SOME (t',_) = rewrite_set_ thy false list_rls t;
52.102 val s' = term2str t';
52.103 -if s' = "[a, b]" then () else raise error "new behaviour with list_rls 2.3";
52.104 +if s' = "[a, b]" then () else error "new behaviour with list_rls 2.3";
52.105 val env = env @ [(str2term "vs_::real list", str2term s')];
52.106
52.107 (*--- 4.line in script ---*)
52.108 @@ -579,7 +579,7 @@
52.109 val t = str2term "hd (dropWhile (ident b) [a, b])";
52.110 val SOME (t',_) = rewrite_set_ thy false list_rls t;
52.111 val s' = term2str t';
52.112 -if s' = "a" then () else raise error "new behaviour with list_rls 2.4.";
52.113 +if s' = "a" then () else error "new behaviour with list_rls 2.4.";
52.114 val env = env @ [(str2term "v_1::real", str2term s')];
52.115
52.116 (*--- 5.line in script ---*)
52.117 @@ -603,7 +603,7 @@
52.118 val SOME (t',_) = rewrite_set_ thy false list_rls t;
52.119 val s' = term2str t';
52.120 if s' = "Substitute [a = 2 * sqrt (r ^^^ 2 - (b / 2) ^^^ 2)] (A = a * b)"
52.121 -then () else raise error "new behaviour with list_rls 2.6.";
52.122 +then () else error "new behaviour with list_rls 2.6.";
52.123
52.124
52.125 "---------------------- 2.5.03: Make_fun_by_new_variable -----------------";
52.126 @@ -642,7 +642,7 @@
52.127 val SOME (t',_) = rewrite_set_ thy false list_rls t;
52.128 trace_rewrite:=false;
52.129 val s' = term2str t';
52.130 -if s' = "A = a * b" then() else raise error "new behaviour with list_rls 3.1.";
52.131 +if s' = "A = a * b" then() else error "new behaviour with list_rls 3.1.";
52.132 val env = env @ [(str2term "h_::bool", str2term s')];
52.133
52.134 (*--- 2.line in script ---*)
52.135 @@ -655,7 +655,7 @@
52.136 val SOME (t',_) = rewrite_set_ thy false list_rls t;
52.137 val s' = term2str t';
52.138 if s' = "[a / 2 = r * sin alpha, b / 2 = r * cos alpha]"
52.139 -then () else raise error "new behaviour with list_rls 3.2.";
52.140 +then () else error "new behaviour with list_rls 3.2.";
52.141 val env = env @ [(str2term "es_::bool list", str2term s')];
52.142
52.143 (*--- 3.line in script ---*)
52.144 @@ -665,7 +665,7 @@
52.145 val t = str2term "dropWhile (ident A) (Vars (A = a * b))";
52.146 val SOME (t',_) = rewrite_set_ thy false list_rls t;
52.147 val s' = term2str t';
52.148 -if s' = "[a, b]" then () else raise error "new behaviour with list_rls 3.3.";
52.149 +if s' = "[a, b]" then () else error "new behaviour with list_rls 3.3.";
52.150 val env = env @ [(str2term "vs_::real list", str2term s')];
52.151
52.152 (*--- 4.line in script ---*)
52.153 @@ -675,7 +675,7 @@
52.154 val t = str2term "nth_ 1 [a, b]";
52.155 val SOME (t',_) = rewrite_set_ thy false list_rls t;
52.156 val s' = term2str t';
52.157 -if s' = "a" then () else raise error "new behaviour with list_rls 3.4.";
52.158 +if s' = "a" then () else error "new behaviour with list_rls 3.4.";
52.159 val env = env @ [(str2term "v_1", str2term s')];
52.160
52.161 (*--- 5.line in script ---*)
52.162 @@ -685,7 +685,7 @@
52.163 val t = str2term "nth_ 2 [a, b]";
52.164 val SOME (t',_) = rewrite_set_ thy false list_rls t;
52.165 val s' = term2str t';
52.166 -if s' = "b" then () else raise error "new behaviour with list_rls 3.5.";
52.167 +if s' = "b" then () else error "new behaviour with list_rls 3.5.";
52.168 val env = env @ [(str2term "v_2", str2term s')];
52.169
52.170 (*--- 6.line in script ---*)
52.171 @@ -697,7 +697,7 @@
52.172 val SOME (t',_) = rewrite_set_ thy false list_rls t;
52.173 val s' = term2str t';
52.174 if s' = "a / 2 = r * sin alpha" then ()
52.175 -else raise error "new behaviour with list_rls 3.6.";
52.176 +else error "new behaviour with list_rls 3.6.";
52.177 val e_1 = str2term "e_1::bool";
52.178 val env = env @ [(e_1, str2term s')];
52.179
52.180 @@ -710,7 +710,7 @@
52.181 val SOME (t',_) = rewrite_set_ thy false list_rls t;
52.182 val s' = term2str t';
52.183 if s' = "b / 2 = r * cos alpha" then ()
52.184 -else raise error "new behaviour with list_rls 3.7.";
52.185 +else error "new behaviour with list_rls 3.7.";
52.186 val env = env @ [(str2term "e_2::bool", str2term s')];
52.187
52.188 (*--- 8.line in script ---*)
52.189 @@ -744,7 +744,7 @@
52.190 val s'' = term2str s';
52.191 if s'' =
52.192 "Substitute [a = 2 * r * sin alpha, b = 2 * r * cos alpha] (A = a * b)"
52.193 -then () else raise error "new behaviour with list_rls 3.10.";
52.194 +then () else error "new behaviour with list_rls 3.10.";
52.195
52.196
52.197
53.1 --- a/test/Tools/isac/Knowledge/eqsystem.sml Tue Sep 28 08:58:06 2010 +0200
53.2 +++ b/test/Tools/isac/Knowledge/eqsystem.sml Tue Sep 28 09:06:56 2010 +0200
53.3 @@ -39,37 +39,37 @@
53.4 val t = str2term"0 = -1 * q_0 * L ^^^ 2 / 2 + L * c + c_2";
53.5
53.6 if occur_exactly_in [str2term"c", str2term"c_2"] all t
53.7 -then () else raise error "eqsystem.sml occur_exactly_in 1";
53.8 +then () else error "eqsystem.sml occur_exactly_in 1";
53.9
53.10 if not (occur_exactly_in [str2term"c", str2term"c_2", str2term"c_3"] all t)
53.11 -then () else raise error "eqsystem.sml occur_exactly_in 2";
53.12 +then () else error "eqsystem.sml occur_exactly_in 2";
53.13
53.14 if not (occur_exactly_in [str2term"c_2"] all t)
53.15 -then () else raise error "eqsystem.sml occur_exactly_in 3";
53.16 +then () else error "eqsystem.sml occur_exactly_in 3";
53.17
53.18
53.19 val t = str2term"[c,c_2] from_ [c,c_2,c_3] occur_exactly_in \
53.20 \-1 * q_0 * L ^^^ 2 / 2 + L * c + c_2";
53.21 val SOME (str, t') = eval_occur_exactly_in 0 "EqSystem.occur'_exactly'_in" t 0;
53.22 if str = "[c, c_2] from_ [c, c_2,\n c_3] occur_exactly_in -1 * q_0 * L ^^^ 2 / 2 + L * c + c_2 = True" then ()
53.23 -else raise error "eval_occur_exactly_in [c, c_2]";
53.24 +else error "eval_occur_exactly_in [c, c_2]";
53.25
53.26 val t = str2term"[c,c_2,c_3] from_ [c,c_2,c_3] occur_exactly_in \
53.27 \-1 * q_0 * L ^^^ 2 / 2 + L * c + c_2";
53.28 val SOME (str, t') = eval_occur_exactly_in 0 "EqSystem.occur'_exactly'_in" t 0;
53.29 if str = "[c, c_2,\n c_3] from_ [c, c_2,\n c_3] occur_exactly_in -1 * q_0 * L ^^^ 2 / 2 + L * c + c_2 = False" then ()
53.30 -else raise error "eval_occur_exactly_in [c, c_2, c_3]";
53.31 +else error "eval_occur_exactly_in [c, c_2, c_3]";
53.32
53.33 val t = str2term"[c_2] from_ [c,c_2,c_3] occur_exactly_in \
53.34 \-1 * q_0 * L ^^^ 2 / 2 + L * c + c_2";
53.35 val SOME (str, t') = eval_occur_exactly_in 0 "EqSystem.occur'_exactly'_in" t 0;
53.36 if str = "[c_2] from_ [c, c_2,\n c_3] occur_exactly_in -1 * q_0 * L ^^^ 2 / 2 + L * c + c_2 = False" then ()
53.37 -else raise error "eval_occur_exactly_in [c, c_2, c_3]";
53.38 +else error "eval_occur_exactly_in [c, c_2, c_3]";
53.39
53.40 val t = str2term"[] from_ [c,c_2,c_3] occur_exactly_in 0";
53.41 val SOME (str, t') = eval_occur_exactly_in 0 "EqSystem.occur'_exactly'_in" t 0;
53.42 if str = "[] from_ [c, c_2, c_3] occur_exactly_in 0 = True" then ()
53.43 -else raise error "eval_occur_exactly_in [c, c_2, c_3]";
53.44 +else error "eval_occur_exactly_in [c, c_2, c_3]";
53.45
53.46 val t =
53.47 str2term
53.48 @@ -77,7 +77,7 @@
53.49 val SOME (str, t') = eval_occur_exactly_in 0 "EqSystem.occur'_exactly'_in" t 0;
53.50 if str = "[] from_ [c, c_2, c_3, c_4] occur_exactly_in \
53.51 \-1 * (q_0 * L ^^^ 2) / 2 = True" then ()
53.52 -else raise error "eval_occur_exactly_in [c, c_2, c_3, c_4]";
53.53 +else error "eval_occur_exactly_in [c, c_2, c_3, c_4]";
53.54
53.55
53.56 "----------- problems --------------------------------------------";
53.57 @@ -93,7 +93,7 @@
53.58 ];
53.59 val SOME (t',_) = rewrite_set_ thy false testrls t;
53.60 if term2str t' = "True" then ()
53.61 -else raise error "eqsystem.sml: length_ [x+y=1,y=2] = 2";
53.62 +else error "eqsystem.sml: length_ [x+y=1,y=2] = 2";
53.63
53.64 val SOME t = parse EqSystem.thy "solution L";
53.65 atomty (term_of t);
53.66 @@ -118,7 +118,7 @@
53.67 "#eval_occur_exactly_in_")
53.68 ]) t;
53.69 if t = HOLogic.true_const then ()
53.70 -else raise error "eqsystem.sml ..occur_exactly_in (nth_ 1 [c_4..";
53.71 +else error "eqsystem.sml ..occur_exactly_in (nth_ 1 [c_4..";
53.72
53.73
53.74 "----------- rewrite-order ord_simplify_System -------------------";
53.75 @@ -128,28 +128,28 @@
53.76 "--- add_commute ---";
53.77 if ord_simplify_System false thy [] (str2term"-1 * q_0 * (x ^^^ 2 / 2)",
53.78 str2term"c * x") then ()
53.79 -else raise error "integrate.sml, (-1 * q_0 * (x ^^^ 2 / 2)) < (c * x) not#1";
53.80 +else error "integrate.sml, (-1 * q_0 * (x ^^^ 2 / 2)) < (c * x) not#1";
53.81
53.82 if ord_simplify_System false thy [] (str2term"-1 * q_0 * (x ^^^ 2 / 2)",
53.83 str2term"c_2") then ()
53.84 -else raise error "integrate.sml, (-1 * q_0 * (x ^^^ 2 / 2)) < (c_2) not#2";
53.85 +else error "integrate.sml, (-1 * q_0 * (x ^^^ 2 / 2)) < (c_2) not#2";
53.86
53.87 if ord_simplify_System false thy [] (str2term"c * x",
53.88 str2term"c_2") then ()
53.89 -else raise error "integrate.sml, (c * x) < (c_2) not#3";
53.90 +else error "integrate.sml, (c * x) < (c_2) not#3";
53.91
53.92 "--- mult_commute ---";
53.93 if ord_simplify_System false thy [] (str2term"x * c",
53.94 str2term"c * x") then ()
53.95 -else raise error "integrate.sml, (x * c) < (c * x) not#4";
53.96 +else error "integrate.sml, (x * c) < (c * x) not#4";
53.97
53.98 if ord_simplify_System false thy [] (str2term"-1 * q_0 * (x ^^^ 2 / 2) * c",
53.99 str2term"-1 * q_0 * c * (x ^^^ 2 / 2)")
53.100 -then () else raise error "integrate.sml, (. * .) < (. * .) not#5";
53.101 +then () else error "integrate.sml, (. * .) < (. * .) not#5";
53.102
53.103 if ord_simplify_System false thy [] (str2term"-1 * q_0 * (x ^^^ 2 / 2) * c",
53.104 str2term"c * -1 * q_0 * (x ^^^ 2 / 2)")
53.105 -then () else raise error "integrate.sml, (. * .) < (. * .) not#6";
53.106 +then () else error "integrate.sml, (. * .) < (. * .) not#6";
53.107
53.108
53.109 "----------- rewrite in [EqSystem,normalize,2x2] -----------------";
53.110 @@ -161,19 +161,19 @@
53.111 (str2term"bdv_2",str2term"c_2")];
53.112 val SOME(t,_)= rewrite_set_inst_ thy true bdvs simplify_System_parenthesized t;
53.113 if term2str t = "[0 = -1 * q_0 * L ^^^ 2 / 2 + (L * c + c_2), 0 = c_2]"
53.114 -then () else raise error "eqsystem.sml rewrite in 2x2 simplify_System_par.1";
53.115 +then () else error "eqsystem.sml rewrite in 2x2 simplify_System_par.1";
53.116
53.117 val SOME (t,_) = rewrite_set_inst_ thy true bdvs isolate_bdvs t;
53.118 if term2str t = "[L * c + c_2 = 0 + -1 * (-1 * q_0 * L ^^^ 2 / 2), c_2 = 0]"
53.119 -then () else raise error "eqsystem.sml rewrite in 2x2 isolate_bdvs";
53.120 +then () else error "eqsystem.sml rewrite in 2x2 isolate_bdvs";
53.121
53.122 val SOME(t,_)= rewrite_set_inst_ thy true bdvs simplify_System t;
53.123 if term2str t = "[L * c + c_2 = q_0 * L ^^^ 2 / 2, c_2 = 0]"
53.124 -then () else raise error "eqsystem.sml rewrite in 2x2 simplify_System_par.2";
53.125 +then () else error "eqsystem.sml rewrite in 2x2 simplify_System_par.2";
53.126
53.127 val SOME (t,_) = rewrite_set_ thy true order_system t;
53.128 if term2str t = "[c_2 = 0, L * c + c_2 = q_0 * L ^^^ 2 / 2]"
53.129 -then () else raise error "eqsystem.sml rewrite in 2x2 simplify_System_par.3";
53.130 +then () else error "eqsystem.sml rewrite in 2x2 simplify_System_par.3";
53.131
53.132
53.133 "----------- rewrite example from 2nd [EqSystem,normalize,2x2] ---";
53.134 @@ -187,23 +187,23 @@
53.135 \ -1 * q_0 / 24 * L ^^^ 4)]";
53.136 val SOME (t,_) = rewrite_set_ thy true norm_Rational t;
53.137 if term2str t="[0 = c_2, 0 = c_2 + L * c + L ^^^ 4 * q_0 / (EI * 24)]"
53.138 -then () else raise error "eqsystem.sml rewrite in 2x2 simplify_System_par.0b";
53.139 +then () else error "eqsystem.sml rewrite in 2x2 simplify_System_par.0b";
53.140
53.141 val SOME(t,_)= rewrite_set_inst_ thy true bdvs simplify_System_parenthesized t;
53.142 if term2str t = "[0 = c_2, 0 = q_0 * L ^^^ 4 / (24 * EI) + (L * c + c_2)]"
53.143 -then () else raise error "eqsystem.sml rewrite in 2x2 simplify_System_par.1b";
53.144 +then () else error "eqsystem.sml rewrite in 2x2 simplify_System_par.1b";
53.145
53.146 val SOME (t,_) = rewrite_set_inst_ thy true bdvs isolate_bdvs t;
53.147 if term2str t = "[c_2 = 0, L * c + c_2 = 0 + -1 * (q_0 * L ^^^ 4 / (24 * EI))]"
53.148 -then () else raise error "eqsystem.sml rewrite in 2x2 isolate_bdvs b";
53.149 +then () else error "eqsystem.sml rewrite in 2x2 isolate_bdvs b";
53.150
53.151 val SOME(t,_)= rewrite_set_inst_ thy true bdvs simplify_System t;
53.152 if term2str t = "[c_2 = 0, L * c + c_2 = -1 * q_0 * L ^^^ 4 / (24 * EI)]"
53.153 -then () else raise error "eqsystem.sml rewrite in 2x2 simplify_System.2b";
53.154 +then () else error "eqsystem.sml rewrite in 2x2 simplify_System.2b";
53.155
53.156 val xxx = rewrite_set_ thy true order_system t;
53.157 if is_none xxx
53.158 -then () else raise error "eqsystem.sml rewrite in 2x2 simplify_System.3b";
53.159 +then () else error "eqsystem.sml rewrite in 2x2 simplify_System.3b";
53.160
53.161
53.162 "----------- rewrite in [EqSystem,top_down_substitution,2x2] -----";
53.163 @@ -215,27 +215,27 @@
53.164 (str2term"bdv_2",str2term"c_2")];
53.165 val SOME (e2__,_) = rewrite_terms_ thy dummy_ord Erls [e1__] e2__;
53.166 if term2str e2__ = "L * c + 77 = q_0 * L ^^^ 2 / 2" then ()
53.167 -else raise error "eqsystem.sml top_down_substitution,2x2] subst";
53.168 +else error "eqsystem.sml top_down_substitution,2x2] subst";
53.169
53.170 val SOME (e2__,_) =
53.171 rewrite_set_inst_ thy true bdvs simplify_System_parenthesized e2__;
53.172 if term2str e2__ = "77 + L * c = q_0 * L ^^^ 2 / 2" then ()
53.173 -else raise error "eqsystem.sml top_down_substitution,2x2] simpl_par";
53.174 +else error "eqsystem.sml top_down_substitution,2x2] simpl_par";
53.175
53.176 val SOME (e2__,_) = rewrite_set_inst_ thy true bdvs isolate_bdvs e2__;
53.177 if term2str e2__ = "c = (q_0 * L ^^^ 2 / 2 + -1 * 77) / L" then ()
53.178 -else raise error "eqsystem.sml top_down_substitution,2x2] isolate";
53.179 +else error "eqsystem.sml top_down_substitution,2x2] isolate";
53.180
53.181 val t = str2term "[c_2 = 77, c = (q_0 * L ^^^ 2 / 2 + -1 * 77) / L]";
53.182 val SOME (t,_) = rewrite_set_ thy true order_system t;
53.183 if term2str t = "[c = (q_0 * L ^^^ 2 / 2 + -1 * 77) / L, c_2 = 77]" then ()
53.184 -else raise error "eqsystem.sml top_down_substitution,2x2] order_system";
53.185 +else error "eqsystem.sml top_down_substitution,2x2] order_system";
53.186
53.187 if not (ord_simplify_System
53.188 false thy []
53.189 (str2term"[c_2 = 77, c = (q_0 * L ^^^ 2 / 2 + -1 * 77) / L]",
53.190 str2term"[c = (q_0 * L ^^^ 2 / 2 + -1 * 77) / L, c_2 = 77]"))
53.191 -then () else raise error "eqsystem.sml, order_result rew_ord";
53.192 +then () else error "eqsystem.sml, order_result rew_ord";
53.193
53.194 trace_rewrite:=true;
53.195 trace_rewrite:=false;
53.196 @@ -257,27 +257,27 @@
53.197 rewrite_set_inst_ thy true bdvs simplify_System_parenthesized t;
53.198 if term2str t = "[0 = c_4, 0 = -1 * q_0 * L ^^^ 2 / 2 + (L * c_3 + c_4),\n\
53.199 \ c + (c_2 + (c_3 + c_4)) = 0, c_2 + (c_3 + c_4) = 0]"
53.200 -then () else raise error "eqsystem.sml rewrite in 4x4 simplify_System_paren";
53.201 +then () else error "eqsystem.sml rewrite in 4x4 simplify_System_paren";
53.202
53.203 val SOME (t,_) = rewrite_set_inst_ thy true bdvs isolate_bdvs t;
53.204 if term2str t = "[c_4 = 0, \
53.205 \L * c_3 + c_4 = 0 + -1 * (-1 * q_0 * L ^^^ 2 / 2),\n \
53.206 \c + (c_2 + (c_3 + c_4)) = 0, c_2 + (c_3 + c_4) = 0]"
53.207 -then () else raise error "eqsystem.sml rewrite in 4x4 isolate_bdvs";
53.208 +then () else error "eqsystem.sml rewrite in 4x4 isolate_bdvs";
53.209
53.210 val SOME(t,_)= rewrite_set_inst_ thy true bdvs simplify_System_parenthesized t;
53.211 if term2str t = "[c_4 = 0,\
53.212 \ L * c_3 + c_4 = q_0 * L ^^^ 2 / 2,\
53.213 \ c + (c_2 + (c_3 + c_4)) = 0,\n\
53.214 \ c_2 + (c_3 + c_4) = 0]"
53.215 -then () else raise error "eqsystem.sml rewrite in 4x4 simplify_System_p..2";
53.216 +then () else error "eqsystem.sml rewrite in 4x4 simplify_System_p..2";
53.217
53.218 val SOME (t,_) = rewrite_set_ thy true order_system t;
53.219 if term2str t = "[c_4 = 0,\
53.220 \ L * c_3 + c_4 = q_0 * L ^^^ 2 / 2,\
53.221 \ c_2 + (c_3 + c_4) = 0,\n\
53.222 \ c + (c_2 + (c_3 + c_4)) = 0]"
53.223 -then () else raise error "eqsystem.sml rewrite in 4x4 order_system";
53.224 +then () else error "eqsystem.sml rewrite in 4x4 order_system";
53.225
53.226
53.227 "----------- script [EqSystem,normalize,2x2] ---------------------";
53.228 @@ -678,7 +678,7 @@
53.229 Correct "solveForVars [c, c_2]"],
53.230 Where = [],
53.231 Relate = []})] => ()
53.232 - | _ => raise error "eqsystem.sml refine ['normalize','2x2'...]";
53.233 + | _ => error "eqsystem.sml refine ['normalize','2x2'...]";
53.234
53.235
53.236 val fmz = ["equalities [c_2 = 0, L * c + c_2 = q_0 * L ^^^ 2 / 2]",
53.237 @@ -699,7 +699,7 @@
53.238 Correct
53.239 "[c, c_2] from_ [c, c_2] occur_exactly_in nth_ 2\n [c_2 = 0, L * c + c_2 = q_0 * L ^^^ 2 / 2]"],
53.240 Relate = []})] => ()
53.241 - | _ => raise error "eqsystem.sml refine ['triangular','2x2'...]";
53.242 + | _ => error "eqsystem.sml refine ['triangular','2x2'...]";
53.243
53.244
53.245 (*WN051014----------------------------------------------------------------
53.246 @@ -747,7 +747,7 @@
53.247 Matches (["4x4", "linear", "system"], _),
53.248 NoMatch (["triangular", "4x4", "linear", "system"], _),
53.249 Matches (["normalize", "4x4", "linear", "system"], _)] => ()
53.250 - | _ => raise error "eqsystem.sml: refine relaxed triangular sys NoMatch";
53.251 + | _ => error "eqsystem.sml: refine relaxed triangular sys NoMatch";
53.252 (*WN060914 does NOT match, because 3rd and 4th equ are not ordered*)
53.253
53.254 val fmz = ["equalities [L * q_0 = c, \
53.255 @@ -760,7 +760,7 @@
53.256 *)
53.257 case matches of
53.258 [Matches (["triangular", "4x4", "linear", "system"], _)] => ()
53.259 - | _ => raise error "eqsystem.sml: refine relaxed triangular sys Matches";
53.260 + | _ => error "eqsystem.sml: refine relaxed triangular sys Matches";
53.261 val matches = refine fmz ["linear","system"];
53.262
53.263
53.264 @@ -874,7 +874,7 @@
53.265 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.266 val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.267 case nxt of ("Specify_Method",_) => ()
53.268 - | _ => raise error "eqsystem.sml [EqSystem,normalize,2x2] specify";
53.269 + | _ => error "eqsystem.sml [EqSystem,normalize,2x2] specify";
53.270
53.271 val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.272 val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f;
53.273 @@ -884,7 +884,7 @@
53.274 val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f;
53.275 case nxt of
53.276 (_, Subproblem ("Biegelinie", ["triangular", "2x2", "linear",_])) => ()
53.277 - | _ => raise error "eqsystem.sml me [EqSystem,normalize,2x2] SubProblem";
53.278 + | _ => error "eqsystem.sml me [EqSystem,normalize,2x2] SubProblem";
53.279
53.280 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.281 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.282 @@ -892,7 +892,7 @@
53.283 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.284 case nxt of
53.285 (_, Specify_Method ["EqSystem", "top_down_substitution", "2x2"]) => ()
53.286 - | _ => raise error "eqsystem.sml me [EqSys...2x2] top_down_substitution";
53.287 + | _ => error "eqsystem.sml me [EqSys...2x2] top_down_substitution";
53.288
53.289 val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.290 val PblObj {probl,...} = get_obj I pt [5];
53.291 @@ -912,14 +912,14 @@
53.292 val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f;
53.293 case nxt of
53.294 (_, Check_Postcond ["triangular", "2x2", "linear", "system"]) => ()
53.295 - | _ => raise error "eqsystem.sml me Subpbl .[EqSys...2x2] finished";
53.296 + | _ => error "eqsystem.sml me Subpbl .[EqSys...2x2] finished";
53.297 val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f;
53.298 val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f;
53.299 if f2str f = "[c = L * q_0 / 2, c_2 = 0]" then ()
53.300 -else raise error "eqsystem.sml me [EqSys...2x2] finished f2str f";
53.301 +else error "eqsystem.sml me [EqSys...2x2] finished f2str f";
53.302 case nxt of
53.303 (_, End_Proof') => ()
53.304 - | _ => raise error "eqsystem.sml me [EqSys...2x2] finished End_Proof'";
53.305 + | _ => error "eqsystem.sml me [EqSys...2x2] finished End_Proof'";
53.306
53.307
53.308 "----------- me [linear,system] ..normalize..top_down_sub..-------";
53.309 @@ -941,7 +941,7 @@
53.310 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.311 val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.312 case nxt of (_,Specify_Method ["EqSystem", "normalize", "2x2"]) => ()
53.313 - | _ => raise error "eqsystem.sml [linear,system] specify b";
53.314 + | _ => error "eqsystem.sml [linear,system] specify b";
53.315 val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.316 val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f;
53.317 val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f;
53.318 @@ -950,10 +950,10 @@
53.319 val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f;
53.320 if f2str f =
53.321 "[c_2 = 0, L * c + c_2 = -1 * q_0 * L ^^^ 4 / (24 * EI)]"
53.322 -then () else raise error "eqsystem.sml me simpl. before SubProblem b";
53.323 +then () else error "eqsystem.sml me simpl. before SubProblem b";
53.324 case nxt of
53.325 (_, Subproblem ("Biegelinie", ["triangular", "2x2", "linear",_])) => ()
53.326 - | _ => raise error "eqsystem.sml me [linear,system] SubProblem b";
53.327 + | _ => error "eqsystem.sml me [linear,system] SubProblem b";
53.328
53.329 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.330 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.331 @@ -961,7 +961,7 @@
53.332 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.333 case nxt of
53.334 (_, Specify_Method ["EqSystem", "top_down_substitution", "2x2"]) => ()
53.335 - | _ => raise error "eqsystem.sml me [EqSys...2x2] top_down_substitution b";
53.336 + | _ => error "eqsystem.sml me [EqSys...2x2] top_down_substitution b";
53.337
53.338 val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.339 val PblObj {probl,...} = get_obj I pt [5];
53.340 @@ -981,15 +981,15 @@
53.341 val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f;
53.342 case nxt of
53.343 (_, Check_Postcond ["triangular", "2x2", "linear", "system"]) => ()
53.344 - | _ => raise error "eqsystem.sml me Subpbl .[EqSys...2x2] finished b";
53.345 + | _ => error "eqsystem.sml me Subpbl .[EqSys...2x2] finished b";
53.346 val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f;
53.347 val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f;
53.348 if f2str f =
53.349 "[c = -1 * q_0 * L ^^^ 4 / (24 * EI * L), c_2 = 0]"
53.350 -then () else raise error "eqsystem.sml me [EqSys...2x2] finished f2str f b";
53.351 +then () else error "eqsystem.sml me [EqSys...2x2] finished f2str f b";
53.352 case nxt of
53.353 (_, End_Proof') => ()
53.354 - | _ => raise error "eqsystem.sml me [EqSys...2x2] finished End_Proof'" b;
53.355 + | _ => error "eqsystem.sml me [EqSys...2x2] finished End_Proof'" b;
53.356
53.357
53.358 "----------- all systems from Biegelinie -------------------------";
53.359 @@ -1114,7 +1114,7 @@
53.360 term2str t ="[c = L * q_0, L * c + c_2 = q_0 * L ^^^ 2 / 2, c_4 = 0, c_3 = 0]";
53.361 val SOME (t,_) = rewrite_set_ thy false order_system t;
53.362 if term2str t ="[c = L * q_0, L * c + c_2 = q_0 * L ^^^ 2 / 2, c_3 = 0, c_4 = 0]" then ()
53.363 -else raise error "eqsystem.sml: exp 7.70 normalize 4x4 by rewrite changed";
53.364 +else error "eqsystem.sml: exp 7.70 normalize 4x4 by rewrite changed";
53.365
53.366
53.367 "----- 7.70 with met normalize: ";
53.368 @@ -1133,7 +1133,7 @@
53.369 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.370 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.371 case nxt of (_,Apply_Method ["EqSystem", "normalize", "4x4"]) => ()
53.372 - | _ => raise error "eqsystem.sml [EqSystem,normalize,4x4] specify";
53.373 + | _ => error "eqsystem.sml [EqSystem,normalize,4x4] specify";
53.374 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
53.375 "bbbbbbbbbbbbbbbbbbbbbbbbbbbbb outcommented vvvvvvvvvvvvvvvvvvvvvv";
53.376 (*vvvWN080102 Exception- Match raised
53.377 @@ -1148,7 +1148,7 @@
53.378 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
53.379 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
53.380 if f2str f ="[c = L * q_0, L * c + c_2 = q_0 * L ^^^ 2 / 2, c_3 = 0, c_4 = 0]"
53.381 -then () else raise error "eqsystem.sml: exp 7.70 normalize 4x4 by met changed";
53.382 +then () else error "eqsystem.sml: exp 7.70 normalize 4x4 by met changed";
53.383 --------------------------------------------------------------------------*)
53.384
53.385 "----- 7.70 with met top_down_: ";
53.386 @@ -1311,7 +1311,7 @@
53.387 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.388 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
53.389 case nxt of (_,Apply_Method ["EqSystem", "top_down_substitution", "4x4"]) => ()
53.390 - | _ => raise error "eqsystem.sml [EqSystem,top_down_,4x4] specify";
53.391 + | _ => error "eqsystem.sml [EqSystem,top_down_,4x4] specify";
53.392 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
53.393 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
53.394 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
53.395 @@ -1320,7 +1320,7 @@
53.396 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
53.397 if nxt = ("End_Proof'", End_Proof') andalso
53.398 f2str f = "[c = L * q_0, c_2 = -1 * L ^^^ 2 * q_0 / 2, c_3 = 0, c_4 = 0]"
53.399 -then () else raise error "eqsystem.sml: 7.70 with met top_down_: me";
53.400 +then () else error "eqsystem.sml: 7.70 with met top_down_: me";
53.401
53.402
53.403 "------- Bsp 7.71";
54.1 --- a/test/Tools/isac/Knowledge/equation.sml Tue Sep 28 08:58:06 2010 +0200
54.2 +++ b/test/Tools/isac/Knowledge/equation.sml Tue Sep 28 09:06:56 2010 +0200
54.3 @@ -30,4 +30,4 @@
54.4 val Form res = (#1 o pt_extract) (pt, ([],Res));
54.5 show_pt pt;
54.6 if p = ([], Res) andalso term2str res = "[x = 1]" then ()
54.7 -else raise error "equation.sml behav.changed for CAS solve (x+1=2, x))";
54.8 +else error "equation.sml behav.changed for CAS solve (x+1=2, x))";
55.1 --- a/test/Tools/isac/Knowledge/inssort.sml Tue Sep 28 08:58:06 2010 +0200
55.2 +++ b/test/Tools/isac/Knowledge/inssort.sml Tue Sep 28 09:06:56 2010 +0200
55.3 @@ -12,7 +12,7 @@
55.4 val rls = "ins_sort";
55.5 val (ct,_) = the (rewrite_set thy' "eval_rls" false rls ct);
55.6 if ct="[1, 2, 3, 4]" then "sort [1,4,3,2] OK"
55.7 -else raise error "sort [1,4,3,2] didn't work";
55.8 +else error "sort [1,4,3,2] didn't work";
55.9
55.10
55.11 "---------------- sort [1,3,2] by rewrite stepwise ----------------";
55.12 @@ -83,7 +83,7 @@
55.13 val (ct,_) = the (rewrite thy' "tless_true" "eval_rls" false thm ct);
55.14 (*val ct = "[#1, #2, #3]"*)
55.15 if ct="[1, 2, 3]" then "sort [1,3,2] OK"
55.16 -else raise error "sort [1,3,2] didn't work";
55.17 +else error "sort [1,3,2] didn't work";
55.18
55.19
55.20 "---------------- sort [1,3,2] from script ----------------";
56.1 --- a/test/Tools/isac/Knowledge/integrate.sml Tue Sep 28 08:58:06 2010 +0200
56.2 +++ b/test/Tools/isac/Knowledge/integrate.sml Tue Sep 28 09:06:56 2010 +0200
56.3 @@ -46,7 +46,7 @@
56.4
56.5 val t = str2term "ff x is_f_x";
56.6 case t of Const ("Integrate.is'_f'_x", _) $ _ => ()
56.7 - | _ => raise error "integrate.sml: parsing: ff x is_f_x";
56.8 + | _ => error "integrate.sml: parsing: ff x is_f_x";
56.9
56.10
56.11 "----------- integrate by rewriting ---------------------";
56.12 @@ -99,50 +99,50 @@
56.13 "----------- test add_new_c, is_f_x ---------------------";
56.14 val term = str2term "x^^^2*c + c_2";
56.15 val cc = new_c term;
56.16 -if term2str cc = "c_3" then () else raise error "integrate.sml: new_c ???";
56.17 +if term2str cc = "c_3" then () else error "integrate.sml: new_c ???";
56.18
56.19 val SOME (id,t') = eval_add_new_c "" "Integrate.add'_new'_c" term thy;
56.20 if term2str t' = "x ^^^ 2 * c + c_2 = x ^^^ 2 * c + c_2 + c_3" then ()
56.21 -else raise error "intergrate.sml: diff. eval_add_new_c";
56.22 +else error "intergrate.sml: diff. eval_add_new_c";
56.23
56.24 val cc = ("Integrate.add'_new'_c", eval_add_new_c "add_new_c_");
56.25 val SOME (thmstr, thm) = get_calculation1_ thy cc term;
56.26
56.27 val SOME (t',_) = rewrite_set_ thy true add_new_c term;
56.28 if term2str t' = "x ^^^ 2 * c + c_2 + c_3" then ()
56.29 -else raise error "intergrate.sml: diff. rewrite_set add_new_c 1";
56.30 +else error "intergrate.sml: diff. rewrite_set add_new_c 1";
56.31
56.32 val term = str2term "ff x = x^^^2*c + c_2";
56.33 val SOME (t',_) = rewrite_set_ thy true add_new_c term;
56.34 if term2str t' = "ff x = x ^^^ 2 * c + c_2 + c_3" then ()
56.35 -else raise error "intergrate.sml: diff. rewrite_set add_new_c 2";
56.36 +else error "intergrate.sml: diff. rewrite_set add_new_c 2";
56.37
56.38
56.39 (*WN080222 replace call_new_c with add_new_c----------------------
56.40 val term = str2term "new_c (c * x^^^2 + c_2)";
56.41 val SOME (_,t') = eval_new_c 0 0 term 0;
56.42 if term2s t' = "new_c c * x ^^^ 2 + c_2 = c_3" then ()
56.43 -else raise error "integrate.sml: eval_new_c ???";
56.44 +else error "integrate.sml: eval_new_c ???";
56.45
56.46 val t = str2term "matches (?u + new_c ?v) (x ^^^ 2 / 2)";
56.47 val SOME (_,t') = eval_matches "" "Tools.matches" t thy; term2s t';
56.48 if term2s t' = "matches (?u + new_c ?v) (x ^^^ 2 / 2) = False" then ()
56.49 -else raise error "integrate.sml: matches new_c = False";
56.50 +else error "integrate.sml: matches new_c = False";
56.51
56.52 val t = str2term "matches (?u + new_c ?v) (x ^^^ 2 / 2 + new_c x ^^^ 2 / 2)";
56.53 val SOME (_,t') = eval_matches "" "Tools.matches" t thy; term2s t';
56.54 if term2s t'="matches (?u + new_c ?v) (x ^^^ 2 / 2 + new_c x ^^^ 2 / 2) = True"
56.55 -then () else raise error "integrate.sml: matches new_c = True";
56.56 +then () else error "integrate.sml: matches new_c = True";
56.57
56.58 val t = str2term "ff x is_f_x";
56.59 val SOME (_,t') = eval_is_f_x "" "" t thy; term2s t';
56.60 if term2s t' = "(ff x is_f_x) = True" then ()
56.61 -else raise error "integrate.sml: eval_is_f_x --> true";
56.62 +else error "integrate.sml: eval_is_f_x --> true";
56.63
56.64 val t = str2term "q_0/2 * L * x is_f_x";
56.65 val SOME (_,t') = eval_is_f_x "" "" t thy; term2s t';
56.66 if term2s t' = "(q_0 / 2 * L * x is_f_x) = False" then ()
56.67 -else raise error "integrate.sml: eval_is_f_x --> false";
56.68 +else error "integrate.sml: eval_is_f_x --> false";
56.69
56.70 val conditions_in_integration =
56.71 Rls {id="conditions_in_integration",
56.72 @@ -183,20 +183,20 @@
56.73 "----- stepwise from the rulesets in simplify_Integral and below-----";
56.74 val rls = norm_Rational_noadd_fractions;
56.75 case rewrite_set_inst_ thy true subs rls t of
56.76 - SOME _ => raise error "integrate.sml simplify by ruleset norm_Rational_.#2"
56.77 + SOME _ => error "integrate.sml simplify by ruleset norm_Rational_.#2"
56.78 | NONE => ();
56.79
56.80 "===== test 2";
56.81 val rls = order_add_mult_in;
56.82 val SOME (t,[]) = rewrite_set_ thy true rls t;
56.83 if term2str t = "1 / EI * (L * (q_0 * x) / 2 + -1 * (q_0 * x ^^^ 2) / 2)" then()
56.84 -else raise error "integrate.sml simplify by ruleset order_add_mult_in #2";
56.85 +else error "integrate.sml simplify by ruleset order_add_mult_in #2";
56.86
56.87 "===== test 3";
56.88 val rls = discard_parentheses;
56.89 val SOME (t,[]) = rewrite_set_ thy true rls t;
56.90 if term2str t = "1 / EI * (L * q_0 * x / 2 + -1 * q_0 * x ^^^ 2 / 2)" then ()
56.91 -else raise error "integrate.sml simplify by ruleset discard_parenth.. #3";
56.92 +else error "integrate.sml simplify by ruleset discard_parenth.. #3";
56.93
56.94 "===== test 4";
56.95 val rls =
56.96 @@ -223,14 +223,14 @@
56.97
56.98 val SOME (t, []) = rewrite_set_inst_ thy true subs rls t;
56.99 if term2str t = "1 / EI * (L * q_0 / 2 * x + -1 * q_0 / 2 * x ^^^ 2)" then ()
56.100 -else raise error "integrate.sml simplify by ruleset separate_bdv.. #4";
56.101 +else error "integrate.sml simplify by ruleset separate_bdv.. #4";
56.102
56.103 "===== test 5";
56.104 val t = str2term "1/EI * (L * q_0 * x / 2 + -1 * q_0 * x^^^2 / 2)";
56.105 val rls = simplify_Integral;
56.106 val SOME (t,[]) = rewrite_set_inst_ thy true subs rls t;
56.107 if term2str t = "1 / EI * (L * q_0 / 2 * x + -1 * q_0 / 2 * x ^^^ 2)" then ()
56.108 -else raise error "integrate.sml, simplify_Integral #99";
56.109 +else error "integrate.sml, simplify_Integral #99";
56.110
56.111
56.112 "........... 2nd integral ........................................";
56.113 @@ -247,7 +247,7 @@
56.114 "Integral 1 / EI * (L * q_0 / 4 * x ^^^ 2 + -1 * q_0 / 6 * x ^^^ 3) D x"
56.115 GOON: still 2*3 TODO...
56.116 "Integral 1 / EI * (L * q_0 / 4 * x ^^^ 2 + -1 * q_0 / (2 * 3) * x ^^^ 3) D x"
56.117 -then () else raise error "integrate.sml, simplify_Integral #198";
56.118 +then () else error "integrate.sml, simplify_Integral #198";
56.119
56.120
56.121 trace_rewrite := true;
56.122 @@ -263,7 +263,7 @@
56.123 val SOME (t,[]) = rewrite_set_ thy true rls t;
56.124 if term2str t =
56.125 "1 / EI * (L * q_0 / 4 * (x ^^^ 3 / 3) + -1 * q_0 / 6 * (x ^^^ 4 / 4))"
56.126 -then () else raise error "integrate.sml, simplify_Integral #199";
56.127 +then () else error "integrate.sml, simplify_Integral #199";
56.128
56.129
56.130
56.131 @@ -286,45 +286,45 @@
56.132 val str = rewrit_sinst subs rls "Integral x D x";
56.133 val str = rewrit_sinst subs rls "Integral c * x ^^^ 2 + c_2 D x";
56.134 if str = "c * (x ^^^ 3 / 3) + c_2 * x"
56.135 -then () else raise error "integrate.sml: diff.behav. in integration_rules";
56.136 +then () else error "integrate.sml: diff.behav. in integration_rules";
56.137
56.138 val rls = "add_new_c";
56.139 val str = rewrit_sinst subs rls "c * (x ^^^ 3 / 3) + c_2 * x";
56.140 if str = "c * (x ^^^ 3 / 3) + c_2 * x + c_3" then ()
56.141 -else raise error "integrate.sml: diff.behav. in add_new_c simpl.";
56.142 +else error "integrate.sml: diff.behav. in add_new_c simpl.";
56.143
56.144 val str = rewrit_sinst subs rls "F x = x ^^^ 3 / 3 + x";
56.145 if str = "F x = x ^^^ 3 / 3 + x + c"(*not "F x + c =..."*) then ()
56.146 -else raise error "integrate.sml: diff.behav. in add_new_c equation";
56.147 +else error "integrate.sml: diff.behav. in add_new_c equation";
56.148
56.149 val rls = "simplify_Integral";
56.150 (*~~~~~~~~~~~~~~~~~~~~~~~~~~~*)
56.151 val str = "ff x = c * x + -1 * q_0 * (x ^^^ 2 / 2) + c_2";
56.152 val str = rewrit_sinst subs rls str;
56.153 if str = "ff x = c_2 + c * x + -1 * q_0 / 2 * x ^^^ 2"
56.154 -then () else raise error "integrate.sml: diff.behav. in simplify_I #1";
56.155 +then () else error "integrate.sml: diff.behav. in simplify_I #1";
56.156
56.157 val rls = "integration";
56.158 (*~~~~~~~~~~~~~~~~~~~~~~~~~~~*)
56.159 val str = rewrit_sinst subs rls "Integral c * x ^^^ 2 + c_2 D x";
56.160 if str = "c_3 + c_2 * x + c / 3 * x ^^^ 3"
56.161 -then () else raise error "integrate.sml: diff.behav. in integration #1";
56.162 +then () else error "integrate.sml: diff.behav. in integration #1";
56.163
56.164 val str = rewrit_sinst subs rls "Integral 3*x^^^2 + 2*x + 1 D x";
56.165 if str = "c + x + x ^^^ 2 + x ^^^ 3" then ()
56.166 -else raise error "integrate.sml: diff.behav. in integration #2";
56.167 +else error "integrate.sml: diff.behav. in integration #2";
56.168
56.169 val str = rewrit_sinst subs rls
56.170 "Integral 1 / EI * (L * q_0 / 2 * x + -1 * q_0 / 2 * x ^^^ 2) D x";
56.171 if str =
56.172 "c + 1 / EI * (L * q_0 / 4 * x ^^^ 2 + -1 * q_0 / 6 * x ^^^ 3)"
56.173 -then () else raise error "integrate.sml: diff.behav. in integration #3";
56.174 +then () else error "integrate.sml: diff.behav. in integration #3";
56.175
56.176 val str = "Integral "^str^" D x";
56.177 val str = rewrit_sinst subs rls str;
56.178 if str =
56.179 "c_2 + c * x + 1 / EI * (L * q_0 / 12 * x ^^^ 3 + -1 * q_0 / 24 * x ^^^ 4)"
56.180 -then () else raise error "integrate.sml: diff.behav. in integration #4";
56.181 +then () else error "integrate.sml: diff.behav. in integration #4";
56.182
56.183
56.184 "----------- rewrite 3rd integration in 7.27 ------------";
56.185 @@ -337,11 +337,11 @@
56.186 val SOME(t,_)= rewrite_set_inst_ thy true bdv simplify_Integral t;
56.187 if term2str t =
56.188 "Integral 1 / EI * (L * q_0 / 2 * x + -1 * q_0 / 2 * x ^^^ 2) D x" then ()
56.189 -else raise error "integrate.sml 3rd integration in 7.27, simplify_Integral";
56.190 +else error "integrate.sml 3rd integration in 7.27, simplify_Integral";
56.191
56.192 val SOME(t,_)= rewrite_set_inst_ thy true bdv integration t;
56.193 if term2str t = "c + 1 / EI * (L * q_0 / 4 * x ^^^ 2 + -1 * q_0 / 6 * x ^^^ 3)"
56.194 -then () else raise error "integrate.sml 3rd integration in 7.27, integration";
56.195 +then () else error "integrate.sml 3rd integration in 7.27, integration";
56.196
56.197
56.198 "----------- check probem type --------------------------";
56.199 @@ -357,7 +357,7 @@
56.200 val t2 = (term_of o hd o tl) chkmodel;
56.201 val t3 = (term_of o hd o tl o tl) chkmodel;
56.202 case t3 of Const ("Integrate.antiDerivative", _) $ _ => ()
56.203 - | _ => raise error "integrate.sml: Integrate.antiDerivative ???";
56.204 + | _ => error "integrate.sml: Integrate.antiDerivative ???";
56.205
56.206 val model = {Given =["functionTerm f_f", "integrateBy v_v"],
56.207 Where =[],
56.208 @@ -369,7 +369,7 @@
56.209 val t2 = (term_of o hd o tl) chkmodel;
56.210 val t3 = (term_of o hd o tl o tl) chkmodel;
56.211 case t3 of Const ("Integrate.antiDerivativeName", _) $ _ => ()
56.212 - | _ => raise error "integrate.sml: Integrate.antiDerivativeName";
56.213 + | _ => error "integrate.sml: Integrate.antiDerivativeName";
56.214
56.215 "----- compare 'Find's from problem, script, formalization -------";
56.216 val {ppc,...} = get_pbt ["named","integrate","function"];
56.217 @@ -377,18 +377,18 @@
56.218 F1_ as Free ("F_", F1_type))) = last_elem ppc;
56.219 val {scr = Script sc,... } = get_met ["diff","integration","named"];
56.220 val [_,_, F2_] = formal_args sc;
56.221 -if F1_ = F2_ then () else raise error "integrate.sml: unequal find's";
56.222 +if F1_ = F2_ then () else error "integrate.sml: unequal find's";
56.223
56.224 val ((dsc as Const ("Integrate.antiDerivativeName", _))
56.225 $ Free ("ff", F3_type)) = str2term "antiDerivativeName ff";
56.226 -if is_dsc dsc then () else raise error "integrate.sml: no description";
56.227 +if is_dsc dsc then () else error "integrate.sml: no description";
56.228 if F1_type = F3_type then ()
56.229 -else raise error "integrate.sml: unequal types in find's";
56.230 +else error "integrate.sml: unequal types in find's";
56.231
56.232 show_ptyps();
56.233 val pbl = get_pbt ["integrate","function"];
56.234 case #cas pbl of SOME (Const ("Integrate.Integrate",_) $ _) => ()
56.235 - | _ => raise error "integrate.sml: Integrate.Integrate ???";
56.236 + | _ => error "integrate.sml: Integrate.Integrate ???";
56.237
56.238
56.239 "----------- check Scripts ------------------------------";
56.240 @@ -432,7 +432,7 @@
56.241 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
56.242 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
56.243 if f2str f = "c + x + 1 / 3 * x ^^^ 3" then ()
56.244 -else raise error "integrate.sml: method [diff,integration]";
56.245 +else error "integrate.sml: method [diff,integration]";
56.246
56.247
56.248 "----------- me method [diff,integration,named] ---------";
56.249 @@ -457,7 +457,7 @@
56.250 val (p,_,f,nxt,_,pt) = me nxt p c pt;
56.251 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
56.252 if f2str f = "F x = c + x + 1 / 3 * x ^^^ 3" then()
56.253 -else raise error "integrate.sml: method [diff,integration,named]";
56.254 +else error "integrate.sml: method [diff,integration,named]";
56.255
56.256
56.257 "----------- me met [diff,integration,named] Biegelinie.Q";
56.258 @@ -484,7 +484,7 @@
56.259 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
56.260
56.261 if f2str f = "Q x = c + -1 * q_0 * x" then()
56.262 -else raise error "integrate.sml: method [diff,integration,named] .Q";
56.263 +else error "integrate.sml: method [diff,integration,named] .Q";
56.264
56.265
56.266 "----------- interSteps [diff,integration] --------------";
56.267 @@ -503,7 +503,7 @@
56.268 interSteps 1 ([1],Res);
56.269 val ((pt,p),_) = get_calc 1; show_pt pt;
56.270 if existpt' ([1,3], Res) pt then ()
56.271 -else raise error "integrate.sml: interSteps on Rewrite_Set_Inst 1";
56.272 +else error "integrate.sml: interSteps on Rewrite_Set_Inst 1";
56.273
56.274
56.275 "----------- method analog to rls 'integration' ---------";
56.276 @@ -551,7 +551,7 @@
56.277 autoCalculate 1 CompleteCalc;
56.278 val ((pt,p),_) = get_calc 1; show_pt pt;
56.279 if existpt' ([3], Res) pt then ()
56.280 -else raise error "integrate.sml: test-script doesnt work";
56.281 +else error "integrate.sml: test-script doesnt work";
56.282
56.283
56.284 "----------- Ambiguous input: Integral ?u + ?v D ?bdv = .";
56.285 @@ -587,7 +587,7 @@
56.286 *)
56.287
56.288 if existpt' ([1,1,5], Res) pt then ()
56.289 -else raise error "integrate.sml: interSteps on Rewrite_Set_Inst 2";
56.290 +else error "integrate.sml: interSteps on Rewrite_Set_Inst 2";
56.291
56.292
56.293 "----------- CAS input ----------------------------------";
56.294 @@ -595,7 +595,7 @@
56.295 "----------- CAS input ----------------------------------";
56.296 val t = str2term "Integrate (x^^^2 + x + 1, x)";
56.297 case t of Const ("Integrate.Integrate", _) $ _ => ()
56.298 - | _ => raise error "diff.sml behav.changed for Integrate (..., x)";
56.299 + | _ => error "diff.sml behav.changed for Integrate (..., x)";
56.300 atomty t;
56.301
56.302 states:=[];
56.303 @@ -609,7 +609,7 @@
56.304 show_pt pt;
56.305 (* WN070703 does not work like Diff due to error in next-pos
56.306 if p = ([], Res) andalso term2str res = "5 * a" then ()
56.307 -else raise error "diff.sml behav.changed for Integrate (x^2 + x + 1, x)";
56.308 +else error "diff.sml behav.changed for Integrate (x^2 + x + 1, x)";
56.309 *)
56.310
56.311 ===== inhibit exn ============================================================*)
57.1 --- a/test/Tools/isac/Knowledge/logexp.sml Tue Sep 28 08:58:06 2010 +0200
57.2 +++ b/test/Tools/isac/Knowledge/logexp.sml Tue Sep 28 09:06:56 2010 +0200
57.3 @@ -48,7 +48,7 @@
57.4 val (p,_,f,nxt,_,pt) = me nxt p c pt;
57.5 val (p,_,f,nxt,_,pt) = me nxt p c pt;
57.6 case nxt of ("Apply_Method",_) => ()
57.7 - | _ => raise error "logexp.sml setup innsbruck";
57.8 + | _ => error "logexp.sml setup innsbruck";
57.9 val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f;
57.10
57.11
58.1 --- a/test/Tools/isac/Knowledge/poly.sml Tue Sep 28 08:58:06 2010 +0200
58.2 +++ b/test/Tools/isac/Knowledge/poly.sml Tue Sep 28 09:06:56 2010 +0200
58.3 @@ -32,7 +32,7 @@
58.4 "-------- check is'_polyexp is_polyexp ------------------";
58.5 "-------- check is'_polyexp is_polyexp ------------------";
58.6 if is_polyexp @{term "x / x"}
58.7 -then raise error "poly.sml: check is'_polyexp is_polyexp" else ();
58.8 +then error "poly.sml: check is'_polyexp is_polyexp" else ();
58.9
58.10
58.11 (*===== inhibit exn ?===========================================================
58.12 @@ -128,7 +128,7 @@
58.13 if (term2str t) =
58.14 "17 + 15 * x ^^^ 2 + -48 * x ^^^ 4 + 3 * x ^^^ 5 + 6 * x ^^^ 7 + -8 * x ^^^ 9"
58.15 then ()
58.16 -else raise error "poly.sml: diff.behav. in make_polynomial 1";
58.17 +else error "poly.sml: diff.behav. in make_polynomial 1";
58.18
58.19 (*SPB Schalk I p.63 No.275b*)
58.20 val t = str2term
58.21 @@ -139,7 +139,7 @@
58.22 "3 * x ^^^ 4 + -2 * x ^^^ 3 * y + -5 * x ^^^ 2 * y ^^^ 2 + \
58.23 \4 * x * y ^^^ 3 +\n-2 * y ^^^ 4"
58.24 then ()
58.25 -else raise error "poly.sml: diff.behav. in make_polynomial 2";
58.26 +else error "poly.sml: diff.behav. in make_polynomial 2";
58.27
58.28 (*SPB Schalk I p.63 No.279b*)
58.29 val t = str2term
58.30 @@ -150,7 +150,7 @@
58.31 if (term2str t) =
58.32 "a * b * c * d + -1 * a * b * c * x + -1 * a * b * d * x + a * b * x ^^^ 2 +\n-1 * a * c * d * x +\na * c * x ^^^ 2 +\na * d * x ^^^ 2 +\n-1 * a * x ^^^ 3 +\n-1 * b * c * d * x +\nb * c * x ^^^ 2 +\nb * d * x ^^^ 2 +\n-1 * b * x ^^^ 3 +\nc * d * x ^^^ 2 +\n-1 * c * x ^^^ 3 +\n-1 * d * x ^^^ 3 +\nx ^^^ 4"
58.33 then ()
58.34 -else raise error "poly.sml: diff.behav. in make_polynomial 3";
58.35 +else error "poly.sml: diff.behav. in make_polynomial 3";
58.36
58.37 (*SPB Schalk I p.63 No.291*)
58.38 val t = str2term
58.39 @@ -160,7 +160,7 @@
58.40 if (term2str t) =
58.41 "50 + -770 * x + 4520 * x ^^^ 2 + -16320 * x ^^^ 3 + -26880 * x ^^^ 4"
58.42 then ()
58.43 -else raise error "poly.sml: diff.behav. in make_polynomial 4";
58.44 +else error "poly.sml: diff.behav. in make_polynomial 4";
58.45
58.46 (*SPB Schalk I p.64 No.295c*)
58.47 val t = str2term
58.48 @@ -171,7 +171,7 @@
58.49 "169 * a ^^^ 8 * b ^^^ 18 * c ^^^ 2 + -312 * a ^^^ 7 * b ^^^ 15 * c ^^^ 10\
58.50 \ +\n144 * a ^^^ 6 * b ^^^ 12 * c ^^^ 18"
58.51 then ()
58.52 -else raise error "poly.sml: diff.behav. in make_polynomial 5";
58.53 +else error "poly.sml: diff.behav. in make_polynomial 5";
58.54
58.55 (*SPB Schalk I p.64 No.299a*)
58.56 val t = str2term
58.57 @@ -181,7 +181,7 @@
58.58 if (term2str t) =
58.59 "x ^^^ 2 + -1 * y ^^^ 2"
58.60 then ()
58.61 -else raise error "poly.sml: diff.behav. in make_polynomial 6";
58.62 +else error "poly.sml: diff.behav. in make_polynomial 6";
58.63
58.64 (*SPB Schalk I p.64 No.300c*)
58.65 val t = str2term
58.66 @@ -191,14 +191,14 @@
58.67 if (term2str t) =
58.68 "-1 + 9 * x ^^^ 4 * y ^^^ 2"
58.69 then ()
58.70 -else raise error "poly.sml: diff.behav. in make_polynomial 7";
58.71 +else error "poly.sml: diff.behav. in make_polynomial 7";
58.72
58.73 (*SPB Schalk I p.64 No.302*)
58.74 val t = str2term
58.75 "(13*x^^^2 + 5)*(13*x^^^2 - 5) - (5*x^^^2 + 3)*(5*x^^^2 - 3) - (12*x^^^2 + 4)*(12*x^^^2 - 4)";
58.76 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.77 if term2str t = "0" then ()
58.78 -else raise error "poly.sml: diff.behav. in make_polynomial 8";
58.79 +else error "poly.sml: diff.behav. in make_polynomial 8";
58.80 (* Bei Berechnung sollte 3 mal real_plus_minus_binom1_p aus expand_poly verwendet werden *)
58.81
58.82
58.83 @@ -206,7 +206,7 @@
58.84 val t = str2term "((x^^^2 + 1)*(x^^^2 - 1))^^^2";
58.85 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.86 if (term2str t) = "1 + 2 * x ^^^ 4 + 2 * -2 * x ^^^ 4 + x ^^^ 8" then ()
58.87 -else raise error "poly.sml: diff.behav. in make_polynomial: not confluent \
58.88 +else error "poly.sml: diff.behav. in make_polynomial: not confluent \
58.89 \2 * x ^^^ 4 + 2 * -2 * x ^^^ 4 = -2 * x ^^^ 4 works again";
58.90
58.91
58.92 @@ -215,38 +215,38 @@
58.93 val t = str2term "1 + 2 * x ^^^ 4 + 2 * -2 * x ^^^ 4 + x ^^^ 8";
58.94 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.95 if (term2str t) = "1 + -2 * x ^^^ 4 + x ^^^ 8" then ()
58.96 -else raise error "poly.sml: diff.behav. in make_polynomial 9b";
58.97 +else error "poly.sml: diff.behav. in make_polynomial 9b";
58.98
58.99 (*SPB Schalk I p.64 No.296a*)
58.100 val t = str2term "(x - a)^^^3";
58.101 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.102 if (term2str t) = "-1 * a ^^^ 3 + 3 * a ^^^ 2 * x + -3 * a * x ^^^ 2 + x ^^^ 3"
58.103 -then () else raise error "poly.sml: diff.behav. in make_polynomial 10";
58.104 +then () else error "poly.sml: diff.behav. in make_polynomial 10";
58.105
58.106 (*SPB Schalk I p.64 No.296c*)
58.107 val t = str2term "(-3*x - 4*y)^^^3";
58.108 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.109 if (term2str t) =
58.110 "-27 * x ^^^ 3 + -108 * x ^^^ 2 * y + -144 * x * y ^^^ 2 + -64 * y ^^^ 3"
58.111 -then () else raise error "poly.sml: diff.behav. in make_polynomial 11";
58.112 +then () else error "poly.sml: diff.behav. in make_polynomial 11";
58.113
58.114 (*SPB Schalk I p.62 No.242c*)
58.115 val t = str2term "x^^^(-4)*(x^^^(-4)*y^^^(-2))^^^(-1)*y^^^(-2)";
58.116 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.117 if (term2str t) = "1" then ()
58.118 -else raise error "poly.sml: diff.behav. in make_polynomial 12";
58.119 +else error "poly.sml: diff.behav. in make_polynomial 12";
58.120
58.121 (*SPB Schalk I p.60 No.209a*)
58.122 val t = str2term "a^^^(7-x) * a^^^x";
58.123 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.124 if term2str t = "a ^^^ 7" then ()
58.125 -else raise error "poly.sml: diff.behav. in make_polynomial 13";
58.126 +else error "poly.sml: diff.behav. in make_polynomial 13";
58.127
58.128 (*SPB Schalk I p.60 No.209d*)
58.129 val t = str2term "d^^^x * d^^^(x+1) * d^^^(2 - 2*x)";
58.130 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.131 if term2str t = "d ^^^ 3" then ()
58.132 -else raise error "poly.sml: diff.behav. in make_polynomial 14";
58.133 +else error "poly.sml: diff.behav. in make_polynomial 14";
58.134
58.135
58.136 (*---------------------------------------------------------------------*)
58.137 @@ -257,7 +257,7 @@
58.138 val t = str2term "(a + 2*b)*(a^^^2 + 4*b^^^2)*(a - 2*b) - (a - 6*b)*(a^^^2 + 36*b^^^2)*(a + 6*b)";
58.139 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.140 if term2str t = "1280 * b ^^^ 4" then ()
58.141 -else raise error "poly.sml: diff.behav. in make_polynomial 14b";
58.142 +else error "poly.sml: diff.behav. in make_polynomial 14b";
58.143 (* Richtig - aber Binomische Formel wurde nicht verwendet! *)
58.144
58.145
58.146 @@ -268,62 +268,62 @@
58.147 val t = str2term "a^^^2*a^^^(-2)";
58.148 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.149 if term2str t = "1" then ()
58.150 -else raise error "poly.sml: diff.behav. in make_polynomial 15";
58.151 +else error "poly.sml: diff.behav. in make_polynomial 15";
58.152 (*SPO*)
58.153 val t = str2term "a + a + a";
58.154 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.155 if term2str t = "3 * a" then ()
58.156 -else raise error "poly.sml: diff.behav. in make_polynomial 16";
58.157 +else error "poly.sml: diff.behav. in make_polynomial 16";
58.158 (*SPO*)
58.159 val t = str2term "a + b + b + b";
58.160 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.161 if term2str t = "a + 3 * b" then ()
58.162 -else raise error "poly.sml: diff.behav. in make_polynomial 17";
58.163 +else error "poly.sml: diff.behav. in make_polynomial 17";
58.164 (*SPO*)
58.165 val t = str2term "a^^^2*b*b^^^(-1)";
58.166 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.167 if term2str t = "a ^^^ 2" then ()
58.168 -else raise error "poly.sml: diff.behav. in make_polynomial 18";
58.169 +else error "poly.sml: diff.behav. in make_polynomial 18";
58.170 (*SPO*)
58.171 val t = str2term "a^^^2*a^^^(-2)";
58.172 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.173 if (term2str t) = "1" then ()
58.174 -else raise error "poly.sml: diff.behav. in make_polynomial 19";
58.175 +else error "poly.sml: diff.behav. in make_polynomial 19";
58.176 (*SPO*)
58.177 val t = str2term "b + a - b";
58.178 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.179 if (term2str t) = "a" then ()
58.180 -else raise error "poly.sml: diff.behav. in make_polynomial 20";
58.181 +else error "poly.sml: diff.behav. in make_polynomial 20";
58.182 (*SPO*)
58.183 val t = str2term "b * a * a";
58.184 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.185 if term2str t = "a ^^^ 2 * b" then ()
58.186 -else raise error "poly.sml: diff.behav. in make_polynomial 21";
58.187 +else error "poly.sml: diff.behav. in make_polynomial 21";
58.188 (*SPO*)
58.189 val t = str2term "(a^^^2)^^^3";
58.190 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.191 if term2str t = "a ^^^ 6" then ()
58.192 -else raise error "poly.sml: diff.behav. in make_polynomial 22";
58.193 +else error "poly.sml: diff.behav. in make_polynomial 22";
58.194 (*SPO*)
58.195 val t = str2term "x^^^2 * y^^^2 + x * x^^^2 * y";
58.196 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.197 if term2str t = "x ^^^ 3 * y + x ^^^ 2 * y ^^^ 2" then ()
58.198 -else raise error "poly.sml: diff.behav. in make_polynomial 23";
58.199 +else error "poly.sml: diff.behav. in make_polynomial 23";
58.200 (*SPO*)
58.201 val t = (term_of o the o (parse thy)) "a^^^2 * (-a)^^^2";
58.202 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.203 if (term2str t) = "a ^^^ 4" then ()
58.204 -else raise error "poly.sml: diff.behav. in make_polynomial 24";
58.205 +else error "poly.sml: diff.behav. in make_polynomial 24";
58.206 (*SPO*)
58.207 val t = str2term "a * b * b^^^(-1) + a";
58.208 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.209 if (term2str t) = "2 * a" then ()
58.210 -else raise error "poly.sml: diff.behav. in make_polynomial 25";
58.211 +else error "poly.sml: diff.behav. in make_polynomial 25";
58.212 (*SPO*)
58.213 val t = str2term "a*c*b^^^(2*n) + 3*a + 5*b^^^(2*n)*c*b";
58.214 val SOME (t,_) = rewrite_set_ thy false make_polynomial t; term2str t;
58.215 if (term2str t) = "3 * a + 5 * b ^^^ (1 + 2 * n) * c + a * b ^^^ (2 * n) * c"
58.216 -then () else raise error "poly.sml: diff.behav. in make_polynomial 26";
58.217 +then () else error "poly.sml: diff.behav. in make_polynomial 26";
58.218
58.219
58.220 (*MG.27.6.03 -------------vvv-: Verschachtelte Terme -----------*)
58.221 @@ -332,12 +332,12 @@
58.222 val SOME (t,_) = rewrite_set_ thy false make_polynomial t;
58.223 term2str t;
58.224 if term2str t = "(1 + x + a * x * y) ^^^ (1 + x + a * x * y)"
58.225 - then () else raise error "poly.sml: diff.behav. in make_polynomial 27";(*SPO*)
58.226 + then () else error "poly.sml: diff.behav. in make_polynomial 27";(*SPO*)
58.227 val t = str2term "(1 + x*(y*z)*zz)^^^(1 + x*(y*z)*zz)";
58.228 val SOME (t,_) = rewrite_set_ thy false make_polynomial t;
58.229 term2str t;
58.230 if term2str t = "(1 + x * y * z * zz) ^^^ (1 + x * y * z * zz)"
58.231 - then () else raise error "poly.sml: diff.behav. in make_polynomial 28";
58.232 + then () else error "poly.sml: diff.behav. in make_polynomial 28";
58.233
58.234 "-------- Script 'simplification for_polynomials' ----------------";
58.235 "-------- Script 'simplification for_polynomials' ----------------";
58.236 @@ -358,7 +358,7 @@
58.237 (*0*)
58.238 case refine fmz ["polynomial","simplification"]of
58.239 [Matches (["polynomial", "simplification"], _)] => ()
58.240 - | _ => raise error "poly.sml diff.behav. in check pbl, refine";
58.241 + | _ => error "poly.sml diff.behav. in check pbl, refine";
58.242 (*...if there is an error, then ...*)
58.243
58.244 (*1*)
58.245 @@ -385,7 +385,7 @@
58.246 val SOME (t',_) = rewrite_set_ thy false prls t;
58.247 trace_rewrite:=false;
58.248 if t' = HOLogic.true_const then ()
58.249 -else raise error "poly.sml: diff.behav. in check pbl 'polynomial..";
58.250 +else error "poly.sml: diff.behav. in check pbl 'polynomial..";
58.251 (*... if this works, but (*1*) does still NOT work, check types:*)
58.252
58.253 (*4*)
58.254 @@ -421,7 +421,7 @@
58.255 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
58.256 if f2str f =
58.257 "17 + 15 * x ^^^ 2 + -48 * x ^^^ 4 + 3 * x ^^^ 5 + 6 * x ^^^ 7 + -8 * x ^^^ 9"
58.258 -then () else raise error "poly.sml diff.behav. in me Schalk I p.63 No.267b";
58.259 +then () else error "poly.sml diff.behav. in me Schalk I p.63 No.267b";
58.260
58.261
58.262 "-------- interSteps for Schalk 299a -----------------------------";
58.263 @@ -440,12 +440,12 @@
58.264 interSteps 1 ([1],Res)(*<ERROR> syserror in detailstep </ERROR>*);
58.265 val ((pt,p),_) = get_calc 1; show_pt pt;
58.266 if existpt' ([1,1], Frm) pt then ()
58.267 -else raise error "poly.sml: interSteps doesnt work again 1";
58.268 +else error "poly.sml: interSteps doesnt work again 1";
58.269
58.270 interSteps 1 ([1,1],Res)(*<ERROR> syserror in detailstep </ERROR>*);
58.271 val ((pt,p),_) = get_calc 1; show_pt pt;
58.272 if existpt' ([1,1,1], Frm) pt then ()
58.273 -else raise error "poly.sml: interSteps doesnt work again 2";
58.274 +else error "poly.sml: interSteps doesnt work again 2";
58.275
58.276
58.277 "-------- norm_Poly NOT COMPLETE ---------------------------------";
58.278 @@ -464,7 +464,7 @@
58.279 val t2 = str2term "3 * a + 3 * b + 2 * b";
58.280
58.281 if ord_make_polynomial true Poly.thy [] (t1, t2) then ()
58.282 -else raise error "poly.sml: diff.behav. in ord_make_polynomial";
58.283 +else error "poly.sml: diff.behav. in ord_make_polynomial";
58.284
58.285 (*WN071202: ^^^ why then is there no rewriting ...*)
58.286 val term = str2term "2*b + (3*a + 3*b)";
59.1 --- a/test/Tools/isac/Knowledge/polyeq.sml Tue Sep 28 08:58:06 2010 +0200
59.2 +++ b/test/Tools/isac/Knowledge/polyeq.sml Tue Sep 28 09:06:56 2010 +0200
59.3 @@ -41,60 +41,60 @@
59.4 val t1 = (term_of o the o (parse thy)) "lhs (-8 - 2*x + x^^^2 = 0)";
59.5 val SOME (t,_) = rewrite_set_ PolyEq.thy false PolyEq_prls t1;
59.6 if ((term2str t) = "-8 - 2 * x + x ^^^ 2") then ()
59.7 - else raise error "polyeq.sml: diff.behav. in lhs";
59.8 + else error "polyeq.sml: diff.behav. in lhs";
59.9
59.10
59.11 val t2 = (term_of o the o (parse thy)) "(-8 - 2*x + x^^^2) is_expanded_in x";
59.12 val SOME (t,_) = rewrite_set_ PolyEq.thy false PolyEq_prls t2;
59.13 if (term2str t) = "True" then ()
59.14 - else raise error "polyeq.sml: diff.behav. 1 in is_expended_in";
59.15 + else error "polyeq.sml: diff.behav. 1 in is_expended_in";
59.16
59.17 val t0 = (term_of o the o (parse thy)) "(sqrt(x)) is_poly_in x";
59.18 val SOME (t,_) = rewrite_set_ PolyEq.thy false PolyEq_prls t0;
59.19 if (term2str t) = "False" then ()
59.20 - else raise error "polyeq.sml: diff.behav. 2 in is_poly_in";
59.21 + else error "polyeq.sml: diff.behav. 2 in is_poly_in";
59.22
59.23
59.24 val t3 = (term_of o the o (parse thy)) "(-8 + (-1)*2*x + x^^^2) is_poly_in x";
59.25 val SOME (t,_) = rewrite_set_ PolyEq.thy false PolyEq_prls t3;
59.26 if (term2str t) = "True" then ()
59.27 - else raise error "polyeq.sml: diff.behav. 3 in is_poly_in";
59.28 + else error "polyeq.sml: diff.behav. 3 in is_poly_in";
59.29
59.30
59.31 val t4 = (term_of o the o (parse thy)) "(lhs (-8 + (-1)*2*x + x^^^2 = 0)) is_expanded_in x";
59.32 val SOME (t,_) = rewrite_set_ PolyEq.thy false PolyEq_prls t4;
59.33 if (term2str t) = "True" then ()
59.34 - else raise error "polyeq.sml: diff.behav. 4 in is_expended_in";
59.35 + else error "polyeq.sml: diff.behav. 4 in is_expended_in";
59.36
59.37
59.38 val t6 = (term_of o the o (parse thy)) "(lhs (-8 - 2*x + x^^^2 = 0)) is_expanded_in x";
59.39 val SOME (t,_) = rewrite_set_ PolyEq.thy false PolyEq_prls t6;
59.40 if (term2str t) = "True" then ()
59.41 - else raise error "polyeq.sml: diff.behav. 5 in is_expended_in";
59.42 + else error "polyeq.sml: diff.behav. 5 in is_expended_in";
59.43
59.44 val t3 = (term_of o the o (parse thy))"((-8 - 2*x + x^^^2) has_degree_in x) = 2";
59.45 val SOME (t,_) = rewrite_set_ PolyEq.thy false PolyEq_prls t3;
59.46 if (term2str t) = "True" then ()
59.47 - else raise error "polyeq.sml: diff.behav. in has_degree_in_in";
59.48 + else error "polyeq.sml: diff.behav. in has_degree_in_in";
59.49
59.50
59.51 val t3 = (term_of o the o (parse thy)) "((sqrt(x)) has_degree_in x) = 2";
59.52 val SOME (t,_) = rewrite_set_ PolyEq.thy false PolyEq_prls t3;
59.53 if (term2str t) = "False" then ()
59.54 - else raise error "polyeq.sml: diff.behav. 6 in has_degree_in_in";
59.55 + else error "polyeq.sml: diff.behav. 6 in has_degree_in_in";
59.56
59.57 val t4 = (term_of o the o (parse thy))
59.58 "((-8 - 2*x + x^^^2) has_degree_in x) = 1";
59.59 val SOME (t,_) = rewrite_set_ PolyEq.thy false PolyEq_prls t4;
59.60 if (term2str t) = "False" then ()
59.61 - else raise error "polyeq.sml: diff.behav. 7 in has_degree_in_in";
59.62 + else error "polyeq.sml: diff.behav. 7 in has_degree_in_in";
59.63
59.64
59.65 val t5 = (term_of o the o (parse thy))
59.66 "((-8 - 2*x + x^^^2) has_degree_in x) = 2";
59.67 val SOME (t,_) = rewrite_set_ PolyEq.thy false PolyEq_prls t5;
59.68 if (term2str t) = "True" then ()
59.69 - else raise error "polyeq.sml: diff.behav. 8 in has_degree_in_in";
59.70 + else error "polyeq.sml: diff.behav. 8 in has_degree_in_in";
59.71
59.72
59.73 "----------- test matching problems --------------------------0---";
59.74 @@ -138,7 +138,7 @@
59.75 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.76 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.77 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[]")) => ()
59.78 - | _ => raise error "polyeq.sml: diff.behav. in 1 = 0 -> []";
59.79 + | _ => error "polyeq.sml: diff.behav. in 1 = 0 -> []";
59.80
59.81 "----- d0_true ------";
59.82 (*EP-7*)
59.83 @@ -156,7 +156,7 @@
59.84 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.85 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.86 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"UniversalList")) => ()
59.87 - | _ => raise error "polyeq.sml: diff.behav. in 0 = 0 -> UniversalList";
59.88 + | _ => error "polyeq.sml: diff.behav. in 0 = 0 -> UniversalList";
59.89
59.90 "-------------------- test thm's degree_2 ------------------------------------------";
59.91 "-------------------- test thm's degree_2 ------------------------------------------";
59.92 @@ -189,7 +189,7 @@
59.93 ([5],Res) "[x = 2, x = -1]" Check_Postcond*)
59.94 val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.95 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -1]")) => ()
59.96 - | _ => raise error "polyeq.sml: diff.behav. in -2 + (-1)*x + x^2 = 0 -> [x = 2, x = -1]";
59.97 + | _ => error "polyeq.sml: diff.behav. in -2 + (-1)*x + x^2 = 0 -> [x = 2, x = -1]";
59.98
59.99 "----- d2_pqformula1_neg ------";
59.100 (*EP-8*)
59.101 @@ -213,7 +213,7 @@
59.102 val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.103 val asm = get_assumptions_ pt p;
59.104 if f = Form' (FormKF (~1,EdUndef,0,Nundef,"[]")) andalso asm = [] then ()
59.105 -else raise error "polyeq.sml: diff.behav. in 2 +(-1)*x + x^^^2 = 0";
59.106 +else error "polyeq.sml: diff.behav. in 2 +(-1)*x + x^^^2 = 0";
59.107
59.108 "----- d2_pqformula2 ------";
59.109 val fmz = ["equality (-2 +(-1)*x + 1*x^^^2 = 0)", "solveFor x","solutions L"];
59.110 @@ -232,7 +232,7 @@
59.111 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.112 val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.113 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -1]")) => ()
59.114 - | _ => raise error "polyeq.sml: diff.behav. in -2 + (-1)*x + x^2 = 0 -> [x = 2, x = -1]";
59.115 + | _ => error "polyeq.sml: diff.behav. in -2 + (-1)*x + x^2 = 0 -> [x = 2, x = -1]";
59.116
59.117
59.118 "----- d2_pqformula2_neg ------";
59.119 @@ -273,7 +273,7 @@
59.120 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.121 val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.122 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1, x = -2]")) => ()
59.123 - | _ => raise error "polyeq.sml: diff.behav. in -2 + x + x^2 = 0-> [x = 1, x = -2]";
59.124 + | _ => error "polyeq.sml: diff.behav. in -2 + x + x^2 = 0-> [x = 1, x = -2]";
59.125
59.126 "----- d2_pqformula3_neg ------";
59.127 val fmz = ["equality ( 2 + x + x^^^2 = 0)", "solveFor x","solutions L"];
59.128 @@ -312,7 +312,7 @@
59.129 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.130 val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.131 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1, x = -2]")) => ()
59.132 - | _ => raise error "polyeq.sml: diff.behav. in -2 + x + 1*x^^^2 = 0 -> [x = 1, x = -2]";
59.133 + | _ => error "polyeq.sml: diff.behav. in -2 + x + 1*x^^^2 = 0 -> [x = 1, x = -2]";
59.134
59.135 "----- d2_pqformula4_neg ------";
59.136 val fmz = ["equality ( 2 + x + 1*x^^^2 = 0)", "solveFor x","solutions L"];
59.137 @@ -349,7 +349,7 @@
59.138 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.139 val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.140 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 0, x = -1]")) => ()
59.141 - | _ => raise error "polyeq.sml: diff.behav. in 1*x + x^2 = 0 -> [x = 0, x = -1]";
59.142 + | _ => error "polyeq.sml: diff.behav. in 1*x + x^2 = 0 -> [x = 0, x = -1]";
59.143
59.144 "----- d2_pqformula6 ------";
59.145 val fmz = ["equality (1*x + 1*x^^^2 = 0)", "solveFor x","solutions L"];
59.146 @@ -368,7 +368,7 @@
59.147 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.148 val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.149 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 0, x = -1]")) => ()
59.150 - | _ => raise error "polyeq.sml: diff.behav. in 1*x + 1*x^2 = 0 -> [x = 0, x = -1]";
59.151 + | _ => error "polyeq.sml: diff.behav. in 1*x + 1*x^2 = 0 -> [x = 0, x = -1]";
59.152
59.153 "----- d2_pqformula7 ------";
59.154 (*EP-10*)
59.155 @@ -388,7 +388,7 @@
59.156 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.157 val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.158 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 0, x = -1]")) => ()
59.159 - | _ => raise error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1]";
59.160 + | _ => error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1]";
59.161
59.162 "----- d2_pqformula8 ------";
59.163 val fmz = ["equality ( x + 1*x^^^2 = 0)", "solveFor x","solutions L"];
59.164 @@ -408,7 +408,7 @@
59.165 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.166 val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.167 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 0, x = -1]")) => ()
59.168 - | _ => raise error "polyeq.sml: diff.behav. in x + 1*x^2 = 0 -> [x = 0, x = -1]";
59.169 + | _ => error "polyeq.sml: diff.behav. in x + 1*x^2 = 0 -> [x = 0, x = -1]";
59.170
59.171 "----- d2_pqformula9 ------";
59.172 val fmz = ["equality (-4 + x^^^2 = 0)", "solveFor x","solutions L"];
59.173 @@ -427,7 +427,7 @@
59.174 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.175 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.176 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -2]")) => ()
59.177 - | _ => raise error "polyeq.sml: diff.behav. in -4 + x^2 = 0 -> [x = 2, x = -2]";
59.178 + | _ => error "polyeq.sml: diff.behav. in -4 + x^2 = 0 -> [x = 2, x = -2]";
59.179
59.180
59.181 "----- d2_pqformula10_neg ------";
59.182 @@ -467,7 +467,7 @@
59.183 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.184 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.185 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -2]")) => ()
59.186 - | _ => raise error "polyeq.sml: diff.behav. in -4 + 1*x^2 = 0 -> [x = 2, x = -2]";
59.187 + | _ => error "polyeq.sml: diff.behav. in -4 + 1*x^2 = 0 -> [x = 2, x = -2]";
59.188
59.189 "----- d2_pqformula9_neg ------";
59.190 val fmz = ["equality (4 + 1*x^^^2 = 0)", "solveFor x","solutions L"];
59.191 @@ -508,7 +508,7 @@
59.192 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.193 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.194 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1, x = -1 / 2]")) => ()
59.195 - | _ => raise error "polyeq.sml: diff.behav. in -1 + (-1)*x + 2*x^2 = 0 -> [x = 1, x = -1/2]";
59.196 + | _ => error "polyeq.sml: diff.behav. in -1 + (-1)*x + 2*x^2 = 0 -> [x = 1, x = -1/2]";
59.197
59.198 val fmz = ["equality ( 1 +(-1)*x + 2*x^^^2 = 0)", "solveFor x","solutions L"];
59.199 val (dI',pI',mI') = ("PolyEq",["abcFormula","degree_2","polynomial","univariate","equation"],
59.200 @@ -545,7 +545,7 @@
59.201 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.202 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.203 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1 / 2, x = -1]")) => ()
59.204 - | _ => raise error "polyeq.sml: diff.behav. in -1 + x + 2*x^2 = 0 -> [x = 1/2, x = -1]";
59.205 + | _ => error "polyeq.sml: diff.behav. in -1 + x + 2*x^2 = 0 -> [x = 1/2, x = -1]";
59.206
59.207 val fmz = ["equality ( 1 + x + 2*x^^^2 = 0)", "solveFor x","solutions L"];
59.208 val (dI',pI',mI') = ("PolyEq",["abcFormula","degree_2","polynomial","univariate","equation"],
59.209 @@ -582,7 +582,7 @@
59.210 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.211 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.212 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1, x = -2]")) => ()
59.213 - | _ => raise error "polyeq.sml: diff.behav. in -2 + 1*x + x^2 = 0 -> [x = 1, x = -2]";
59.214 + | _ => error "polyeq.sml: diff.behav. in -2 + 1*x + x^2 = 0 -> [x = 1, x = -2]";
59.215
59.216 val fmz = ["equality ( 2 + 1*x + x^^^2 = 0)", "solveFor x","solutions L"];
59.217 val (dI',pI',mI') = ("PolyEq",["abcFormula","degree_2","polynomial","univariate","equation"],
59.218 @@ -620,7 +620,7 @@
59.219 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.220 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.221 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1, x = -2]")) => ()
59.222 - | _ => raise error "polyeq.sml: diff.behav. in -2 + x + x^2 = 0 -> [x = 1, x = -2]";
59.223 + | _ => error "polyeq.sml: diff.behav. in -2 + x + x^2 = 0 -> [x = 1, x = -2]";
59.224
59.225 val fmz = ["equality ( 2 + x + x^^^2 = 0)", "solveFor x","solutions L"];
59.226 val (dI',pI',mI') = ("PolyEq",["abcFormula","degree_2","polynomial","univariate","equation"],
59.227 @@ -658,7 +658,7 @@
59.228 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.229 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.230 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -2]")) => ()
59.231 - | _ => raise error "polyeq.sml: diff.behav. in -8 + 2*x^2 = 0 -> [x = 2, x = -2]";
59.232 + | _ => error "polyeq.sml: diff.behav. in -8 + 2*x^2 = 0 -> [x = 2, x = -2]";
59.233
59.234 val fmz = ["equality ( 8+ 2*x^^^2 = 0)", "solveFor x","solutions L"];
59.235 val (dI',pI',mI') = ("PolyEq",["abcFormula","degree_2","polynomial","univariate","equation"],
59.236 @@ -694,7 +694,7 @@
59.237 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.238 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.239 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -2]")) => ()
59.240 - | _ => raise error "polyeq.sml: diff.behav. in -4 + x^2 = 0 -> [x = 2, x = -2]";
59.241 + | _ => error "polyeq.sml: diff.behav. in -4 + x^2 = 0 -> [x = 2, x = -2]";
59.242
59.243
59.244 val fmz = ["equality ( 4+ x^^^2 = 0)", "solveFor x","solutions L"];
59.245 @@ -731,7 +731,7 @@
59.246 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.247 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.248 case f of Form' (FormKF (~1,EdUndef,_,Nundef,"[x = 0, x = -1]")) => ()
59.249 - | _ => raise error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1]";
59.250 + | _ => error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1]";
59.251
59.252 val fmz = ["equality (1*x + x^^^2 = 0)", "solveFor x","solutions L"];
59.253 val (dI',pI',mI') = ("PolyEq",["abcFormula","degree_2","polynomial","univariate","equation"],
59.254 @@ -749,7 +749,7 @@
59.255 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.256 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.257 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 0, x = -1]")) => ()
59.258 - | _ => raise error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1]";
59.259 + | _ => error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1]";
59.260
59.261 (*EP-16*)
59.262 val fmz = ["equality (x + 2*x^^^2 = 0)", "solveFor x","solutions L"];
59.263 @@ -768,7 +768,7 @@
59.264 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.265 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.266 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 0, x = -1 / 2]")) => ()
59.267 - | _ => raise error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1 / 2]";
59.268 + | _ => error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1 / 2]";
59.269
59.270 (*EP-//*)
59.271 val fmz = ["equality (x + x^^^2 = 0)", "solveFor x","solutions L"];
59.272 @@ -787,7 +787,7 @@
59.273 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.274 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.275 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 0, x = -1]")) => ()
59.276 - | _ => raise error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1]";
59.277 + | _ => error "polyeq.sml: diff.behav. in x + x^2 = 0 -> [x = 0, x = -1]";
59.278
59.279 "----------- (-8 - 2*x + x^^^2 = 0), (*Schalk 2, S.67 Nr.31.b----";
59.280 "----------- (-8 - 2*x + x^^^2 = 0), (*Schalk 2, S.67 Nr.31.b----";
59.281 @@ -835,10 +835,10 @@
59.282 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
59.283 (* FIXXXME
59.284 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = -2, x = 4]")) => () TODO
59.285 - | _ => raise error "polyeq.sml: diff.behav. in [x = -2, x = 4]";
59.286 + | _ => error "polyeq.sml: diff.behav. in [x = -2, x = 4]";
59.287 *)
59.288 if f2str f = "[x = -1 * -1 + -1 * sqrt (1 ^^^ 2 - -8),\n x = -1 * -1 + -1 * (-1 * sqrt (1 ^^^ 2 - -8))]" then ()
59.289 -else raise error "polyeq.sml corrected?behav. in [x = -2, x = 4]";
59.290 +else error "polyeq.sml corrected?behav. in [x = -2, x = 4]";
59.291
59.292
59.293 "-------------------- (3 - 10*x + 3*x^^^2 = 0), ----------------------";
59.294 @@ -849,7 +849,7 @@
59.295 val SOME (t,_) = rewrite_set_ PolyEq.thy false PolyEq_erls t1;
59.296 val t' = term2str t;
59.297 (*if t'= "True" then ()
59.298 - else raise error "polyeq.sml: diff.behav. in 'rewrite_set_.. PolyEq_erls";*)
59.299 + else error "polyeq.sml: diff.behav. in 'rewrite_set_.. PolyEq_erls";*)
59.300 (* *)
59.301 val fmz = ["equality (3 - 10*x + 3*x^^^2 = 0)",
59.302 "solveFor x","solutions L"];
59.303 @@ -904,7 +904,7 @@
59.304 val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.305 (* FIXXXXME n1.,
59.306 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -4]")) => () TODO
59.307 - | _ => raise error "polyeq.sml: diff.behav. in [x = 2, x = -4]";
59.308 + | _ => error "polyeq.sml: diff.behav. in [x = 2, x = -4]";
59.309 *)
59.310
59.311 "----------- (a*b - (a+b)*x + x^^^2 = 0), (*Schalk 2,S.68Nr.44.a*)";
59.312 @@ -946,7 +946,7 @@
59.313 (~1,EdUndef,0,Nundef,
59.314 "[x = (a + b) / 2 + -1 * sqrt ((a + b) ^^^ 2 / 2 ^^^ 2 - a * b),\n x = (a + b) / 2 + sqrt ((a + b) ^^^ 2 / 2 ^^^ 2 - a * b)]"))
59.315 => ()
59.316 - | _ => raise error "polyeq.sml: diff.behav. in a*b - (a+b)*x + x^^^2 = 0";
59.317 + | _ => error "polyeq.sml: diff.behav. in a*b - (a+b)*x + x^^^2 = 0";
59.318 this will be simplified [x = a, x = b] to by Factor.ML*)
59.319
59.320
59.321 @@ -978,7 +978,7 @@
59.322 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
59.323 (*WN.2.5.03 TODO "[x = sqrt (0 - -64), x = -1 * sqrt (0 - -64)]"
59.324 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 8, x = -8]")) => ()
59.325 - | _ => raise error "polyeq.sml: diff.behav. in [x = 8, x = -8]";
59.326 + | _ => error "polyeq.sml: diff.behav. in [x = 8, x = -8]";
59.327 *)
59.328
59.329 "----------- (-147 + 3*x^^^2 = 0), (*Schalk 2, S.66 Nr.1.b------*)";
59.330 @@ -1004,10 +1004,10 @@
59.331 val (p,_,f,nxt,_,pt) = me nxt p c pt;
59.332 (*WN.2.5.03 TODO "[x = sqrt (0 - -49), x = -1 * sqrt (0 - -49)]"
59.333 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 7, x = -7]")) => ()
59.334 - | _ => raise error "polyeq.sml: diff.behav. in [x = 7, x = -7]";
59.335 + | _ => error "polyeq.sml: diff.behav. in [x = 7, x = -7]";
59.336 *)
59.337 if f2str f = "[x = sqrt (0 - -49), x = -1 * sqrt (0 - -49)]" then ()
59.338 -else raise error "polyeq.sml CORRECTED?behav. in [x = 7, x = -7]";
59.339 +else error "polyeq.sml CORRECTED?behav. in [x = 7, x = -7]";
59.340
59.341
59.342 "----------- (3*x - 1 - (5*x - (2 - 4*x)) = -11),(*Schalk Is86Bsp5";
59.343 @@ -1052,7 +1052,7 @@
59.344 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
59.345 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
59.346 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2]")) => ()
59.347 - | _ => raise error "polyeq.sml: diff.behav. in [x = 2]";
59.348 + | _ => error "polyeq.sml: diff.behav. in [x = 2]";
59.349
59.350
59.351 "----------- ((x+1)*(x+2) - (3*x - 2)^^^2=.. Schalk II s.68 Bsp 37";
59.352 @@ -1097,7 +1097,7 @@
59.353 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
59.354 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
59.355 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2 / 15, x = 1]")) => ()
59.356 - | _ => raise error "polyeq.sml: diff.behav. in [x = 2 / 15, x = 1]";
59.357 + | _ => error "polyeq.sml: diff.behav. in [x = 2 / 15, x = 1]";
59.358
59.359
59.360 " -4 + x^^^2 =0 ";
59.361 @@ -1121,7 +1121,7 @@
59.362 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
59.363 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
59.364 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -2]")) => ()
59.365 - | _ => raise error "polyeq.sml: diff.behav. in [x = 2, x = -2]";
59.366 + | _ => error "polyeq.sml: diff.behav. in [x = 2, x = -2]";
59.367
59.368 "----------------- polyeq.sml end ------------------";
59.369
60.1 --- a/test/Tools/isac/Knowledge/polyminus.sml Tue Sep 28 08:58:06 2010 +0200
60.2 +++ b/test/Tools/isac/Knowledge/polyminus.sml Tue Sep 28 09:06:56 2010 +0200
60.3 @@ -36,31 +36,31 @@
60.4 ist_monom (str2term "12");
60.5 case eval_ist_monom 0 0 (str2term "12 ist_monom") 0 of
60.6 SOME ("12 ist_monom = True", _) => ()
60.7 - | _ => raise error "polyminus.sml: 12 ist_monom = True";
60.8 + | _ => error "polyminus.sml: 12 ist_monom = True";
60.9
60.10 case eval_ist_monom 0 0 (str2term "a ist_monom") 0 of
60.11 SOME ("a ist_monom = True", _) => ()
60.12 - | _ => raise error "polyminus.sml: a ist_monom = True";
60.13 + | _ => error "polyminus.sml: a ist_monom = True";
60.14
60.15 case eval_ist_monom 0 0 (str2term "(3*a) ist_monom") 0 of
60.16 SOME ("3 * a ist_monom = True", _) => ()
60.17 - | _ => raise error "polyminus.sml: 3 * a ist_monom = True";
60.18 + | _ => error "polyminus.sml: 3 * a ist_monom = True";
60.19
60.20 case eval_ist_monom 0 0 (str2term "(a^^^2) ist_monom") 0 of
60.21 SOME ("a ^^^ 2 ist_monom = True", _) => ()
60.22 - | _ => raise error "polyminus.sml: a^^^2 ist_monom = True";
60.23 + | _ => error "polyminus.sml: a^^^2 ist_monom = True";
60.24
60.25 case eval_ist_monom 0 0 (str2term "(3*a^^^2) ist_monom") 0 of
60.26 SOME ("3 * a ^^^ 2 ist_monom = True", _) => ()
60.27 - | _ => raise error "polyminus.sml: 3*a^^^2 ist_monom = True";
60.28 + | _ => error "polyminus.sml: 3*a^^^2 ist_monom = True";
60.29
60.30 case eval_ist_monom 0 0 (str2term "(a*b) ist_monom") 0 of
60.31 SOME ("a * b ist_monom = True", _) => ()
60.32 - | _ => raise error "polyminus.sml: a*b ist_monom = True";
60.33 + | _ => error "polyminus.sml: a*b ist_monom = True";
60.34
60.35 case eval_ist_monom 0 0 (str2term "(3*a*b) ist_monom") 0 of
60.36 SOME ("3 * a * b ist_monom = True", _) => ()
60.37 - | _ => raise error "polyminus.sml: 3*a*b ist_monom = True";
60.38 + | _ => error "polyminus.sml: 3*a*b ist_monom = True";
60.39
60.40
60.41 "----------- watch order_add_mult -------------------------------";
60.42 @@ -72,7 +72,7 @@
60.43 val t = str2term "((a + d) + c) + b";
60.44 val SOME (t,_) = rewrite_set_ thy false order_add_mult t; term2str t;
60.45 if term2str t = "a + (b + (c + d))" then ()
60.46 -else raise error "polyminus.sml 1 watch order_add_mult";
60.47 +else error "polyminus.sml 1 watch order_add_mult";
60.48 trace_rewrite:=false;
60.49
60.50 "----- the same stepwise...";
60.51 @@ -88,7 +88,7 @@
60.52 val SOME (t,_) = rewrite_ thy od e_rls true add_left_commute t;term2str t;
60.53 "a + (b + (c + d))";
60.54 if term2str t = "a + (b + (c + d))" then ()
60.55 -else raise error "polyminus.sml 2 watch order_add_mult";
60.56 +else error "polyminus.sml 2 watch order_add_mult";
60.57
60.58 "----- if parentheses are right, left_commute is (almost) sufficient...";
60.59 val t = str2term "a + (d + (c + b))";
60.60 @@ -105,7 +105,7 @@
60.61 val t = str2term "((5*a + 4*d) + 3*c) + 2*b";
60.62 val SOME (t,_) = rewrite_set_ thy false order_add_mult t; term2str t;
60.63 if term2str t = "2 * b + (3 * c + (4 * d + 5 * a))" then ()
60.64 -else raise error "polyminus.sml: order_add_mult changed";
60.65 +else error "polyminus.sml: order_add_mult changed";
60.66
60.67 "----- here we see rew_sub going into subterm with ord.rew....";
60.68 val od = ord_make_polynomial false Poly.thy;
60.69 @@ -130,31 +130,31 @@
60.70 (*
60.71 case eval_kleiner 0 0 (str2term "123 kleiner 32") 0 of
60.72 SOME ("12 kleiner 9 = False", _) => ()
60.73 - | _ => raise error "polyminus.sml: 12 kleiner 9 = False";
60.74 + | _ => error "polyminus.sml: 12 kleiner 9 = False";
60.75 *)
60.76 case eval_kleiner 0 0 (str2term "a kleiner b") 0 of
60.77 SOME ("a kleiner b = True", _) => ()
60.78 - | _ => raise error "polyminus.sml: a kleiner b = True";
60.79 + | _ => error "polyminus.sml: a kleiner b = True";
60.80
60.81 case eval_kleiner 0 0 (str2term "(10*g) kleiner f") 0 of
60.82 SOME ("10 * g kleiner f = False", _) => ()
60.83 - | _ => raise error "polyminus.sml: 10 * g kleiner f = False";
60.84 + | _ => error "polyminus.sml: 10 * g kleiner f = False";
60.85
60.86 case eval_kleiner 0 0 (str2term "(a^^^2) kleiner b") 0 of
60.87 SOME ("a ^^^ 2 kleiner b = True", _) => ()
60.88 - | _ => raise error "polyminus.sml: a ^^^ 2 kleiner b = True";
60.89 + | _ => error "polyminus.sml: a ^^^ 2 kleiner b = True";
60.90
60.91 case eval_kleiner 0 0 (str2term "(3*a^^^2) kleiner b") 0 of
60.92 SOME ("3 * a ^^^ 2 kleiner b = True", _) => ()
60.93 - | _ => raise error "polyminus.sml: 3 * a ^^^ 2 kleiner b = True";
60.94 + | _ => error "polyminus.sml: 3 * a ^^^ 2 kleiner b = True";
60.95
60.96 case eval_kleiner 0 0 (str2term "(a*b) kleiner c") 0 of
60.97 SOME ("a * b kleiner c = True", _) => ()
60.98 - | _ => raise error "polyminus.sml: a * b kleiner b = True";
60.99 + | _ => error "polyminus.sml: a * b kleiner b = True";
60.100
60.101 case eval_kleiner 0 0 (str2term "(3*a*b) kleiner c") 0 of
60.102 SOME ("3 * a * b kleiner c = True", _) => ()
60.103 - | _ => raise error "polyminus.sml: 3 * a * b kleiner b = True";
60.104 + | _ => error "polyminus.sml: 3 * a * b kleiner b = True";
60.105
60.106
60.107
60.108 @@ -165,7 +165,7 @@
60.109 val t = str2term "b + a";
60.110 val SOME (t,_) = rewrite_ thy od erls false tausche_plus t; term2str t;
60.111 if term2str t = "a + b" then ()
60.112 -else raise error "polyminus.sml: ordne_alphabetisch1 b + a";
60.113 +else error "polyminus.sml: ordne_alphabetisch1 b + a";
60.114
60.115 val erls = Atools_erls;
60.116 val t = str2term "2*a + 3*a";
60.117 @@ -177,41 +177,41 @@
60.118 val t = str2term "b + a";
60.119 val SOME (t,_) = rewrite_set_ thy false ordne_alphabetisch t; term2str t;
60.120 if term2str t = "a + b" then ()
60.121 -else raise error "polyminus.sml: ordne_alphabetisch a + b";
60.122 +else error "polyminus.sml: ordne_alphabetisch a + b";
60.123
60.124 val t = str2term "2*b + a";
60.125 val SOME (t,_) = rewrite_set_ thy false ordne_alphabetisch t; term2str t;
60.126 if term2str t = "a + 2 * b" then ()
60.127 -else raise error "polyminus.sml: ordne_alphabetisch a + 2 * b";
60.128 +else error "polyminus.sml: ordne_alphabetisch a + 2 * b";
60.129
60.130 val t = str2term "a + c + b";
60.131 val SOME (t,_) = rewrite_set_ thy false ordne_alphabetisch t; term2str t;
60.132 if term2str t = "a + b + c" then ()
60.133 -else raise error "polyminus.sml: ordne_alphabetisch a + b + c";
60.134 +else error "polyminus.sml: ordne_alphabetisch a + b + c";
60.135
60.136 "----- rewrite goes into subterms";
60.137 val t = str2term "a + c + b + d";
60.138 val SOME (t,_) = rewrite_ thy od erls false tausche_plus_plus t; term2str t;
60.139 if term2str t = "a + b + c + d" then ()
60.140 -else raise error "polyminus.sml: ordne_alphabetisch1 a + b + c + d";
60.141 +else error "polyminus.sml: ordne_alphabetisch1 a + b + c + d";
60.142
60.143 val t = str2term "a + c + d + b";
60.144 val SOME (t,_) = rewrite_set_ thy false ordne_alphabetisch t; term2str t;
60.145 if term2str t = "a + b + c + d" then ()
60.146 -else raise error "polyminus.sml: ordne_alphabetisch2 a + b + c + d";
60.147 +else error "polyminus.sml: ordne_alphabetisch2 a + b + c + d";
60.148
60.149 "----- here we see rew_sub going into subterm with cond.rew....";
60.150 val t = str2term "b + a + c + d";
60.151 val SOME (t,_) = rewrite_ thy od erls false tausche_plus t; term2str t;
60.152 if term2str t = "a + b + c + d" then ()
60.153 -else raise error "polyminus.sml: ordne_alphabetisch3 a + b + c + d";
60.154 +else error "polyminus.sml: ordne_alphabetisch3 a + b + c + d";
60.155
60.156 "----- compile rls for the most complicated terms";
60.157 val t = str2term "5*e + 6*f - 8*g - 9 - 7*e - 4*f + 10*g + 12";
60.158 "5 * e + 6 * f - 8 * g - 9 - 7 * e - 4 * f + 10 * g + 12";
60.159 val SOME (t,_) = rewrite_set_ thy false ordne_alphabetisch t;
60.160 if term2str t = "- 9 + 12 + 5 * e - 7 * e + 6 * f - 4 * f - 8 * g + 10 * g"
60.161 -then () else raise error "polyminus.sml: ordne_alphabetisch finished";
60.162 +then () else error "polyminus.sml: ordne_alphabetisch finished";
60.163
60.164
60.165 "----------- build fasse_zusammen --------------------------------";
60.166 @@ -220,7 +220,7 @@
60.167 val t = str2term "- 9 + 12 + 5 * e - 7 * e + 6 * f - 4 * f - 8 * g + 10 * g";
60.168 val SOME (t,_) = rewrite_set_ thy false fasse_zusammen t;
60.169 if term2str t = "3 + -2 * e + 2 * f + 2 * g" then ()
60.170 -else raise error "polyminus.sml: fasse_zusammen finished";
60.171 +else error "polyminus.sml: fasse_zusammen finished";
60.172
60.173 "----------- build verschoenere ----------------------------------";
60.174 "----------- build verschoenere ----------------------------------";
60.175 @@ -228,7 +228,7 @@
60.176 val t = str2term "3 + -2 * e + 2 * f + 2 * g";
60.177 val SOME (t,_) = rewrite_set_ thy false verschoenere t;
60.178 if term2str t = "3 - 2 * e + 2 * f + 2 * g" then ()
60.179 -else raise error "polyminus.sml: verschoenere 3 + -2 * e ...";
60.180 +else error "polyminus.sml: verschoenere 3 + -2 * e ...";
60.181
60.182 trace_rewrite:=true;
60.183 trace_rewrite:=false;
60.184 @@ -259,7 +259,7 @@
60.185 val ((pt,p),_) = get_calc 1; show_pt pt;
60.186 if p = ([], Res) andalso
60.187 term2str (get_obj g_res pt (fst p)) = "3 - 2 * e + 2 * f + 2 * g"
60.188 -then () else raise error "polyminus.sml: Vereinfache (3 - 2 * e + 2 * f...";
60.189 +then () else error "polyminus.sml: Vereinfache (3 - 2 * e + 2 * f...";
60.190
60.191 "----------- 140 d ---";
60.192 states:=[];
60.193 @@ -272,7 +272,7 @@
60.194 val ((pt,p),_) = get_calc 1; show_pt pt;
60.195 if p = ([], Res) andalso
60.196 term2str (get_obj g_res pt (fst p)) = "3 + 3 * r + 6 * s - 8 * t"
60.197 -then () else raise error "polyminus.sml: Vereinfache 140 d)";
60.198 +then () else error "polyminus.sml: Vereinfache 140 d)";
60.199
60.200
60.201 "----------- 139 c ---";
60.202 @@ -286,7 +286,7 @@
60.203 val ((pt,p),_) = get_calc 1; show_pt pt;
60.204 if p = ([], Res) andalso
60.205 term2str (get_obj g_res pt (fst p)) = "- (3 * f)"
60.206 -then () else raise error "polyminus.sml: Vereinfache 139 c)";
60.207 +then () else error "polyminus.sml: Vereinfache 139 c)";
60.208
60.209 "----------- 139 b ---";
60.210 states:=[];
60.211 @@ -299,7 +299,7 @@
60.212 val ((pt,p),_) = get_calc 1; show_pt pt;
60.213 if p = ([], Res) andalso
60.214 term2str (get_obj g_res pt (fst p)) = "-3 * u - v"
60.215 -then () else raise error "polyminus.sml: Vereinfache 139 b)";
60.216 +then () else error "polyminus.sml: Vereinfache 139 b)";
60.217
60.218 "----------- 138 a ---";
60.219 states:=[];
60.220 @@ -312,7 +312,7 @@
60.221 val ((pt,p),_) = get_calc 1; show_pt pt;
60.222 if p = ([], Res) andalso
60.223 term2str (get_obj g_res pt (fst p)) = "-4 * u + 2 * v"
60.224 -then () else raise error "polyminus.sml: Vereinfache 138 a)";
60.225 +then () else error "polyminus.sml: Vereinfache 138 a)";
60.226
60.227
60.228 "----------- met probe fuer_polynom ------------------------------";
60.229 @@ -349,7 +349,7 @@
60.230 although analogies work in interface.sml: FIXME.WN081114 in "Pruefe"*)
60.231 val ((pt,p),_) = get_calc 1;
60.232 if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "11 = 11"
60.233 -then () else raise error "polyminus.sml: Probe 11 = 11";
60.234 +then () else error "polyminus.sml: Probe 11 = 11";
60.235 show_pt pt;
60.236
60.237
60.238 @@ -366,7 +366,7 @@
60.239 val ((pt,p),_) = get_calc 1;
60.240 if p = ([], Res) andalso
60.241 term2str (get_obj g_res pt (fst p)) = "1 + 14 * u"
60.242 -then () else raise error "polyminus.sml: Vereinfache (2*u - 5 - (3 - ...";
60.243 +then () else error "polyminus.sml: Vereinfache (2*u - 5 - (3 - ...";
60.244 show_pt pt;
60.245
60.246 "----- probe p.34 -----";
60.247 @@ -380,7 +380,7 @@
60.248 autoCalculate 1 CompleteCalc;
60.249 val ((pt,p),_) = get_calc 1;
60.250 if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "29 = 29"
60.251 -then () else raise error "polyminus.sml: Probe 29 = 29";
60.252 +then () else error "polyminus.sml: Probe 29 = 29";
60.253 show_pt pt;
60.254
60.255
60.256 @@ -456,7 +456,7 @@
60.257 autoCalculate 1 CompleteCalc;
60.258 val ((pt,p),_) = get_calc 1; show_pt pt;
60.259 if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "2 * g + h"
60.260 -then () else raise error "polyminus.sml: addiere_vor_minus";
60.261 +then () else error "polyminus.sml: addiere_vor_minus";
60.262
60.263
60.264 states:=[];
60.265 @@ -468,7 +468,7 @@
60.266 autoCalculate 1 CompleteCalc;
60.267 val ((pt,p),_) = get_calc 1; show_pt pt;
60.268 if p = ([], Res) andalso term2str (get_obj g_res pt (fst p)) = "f + 2 * g"
60.269 -then () else raise error "polyminus.sml: tausche_vor_plus";
60.270 +then () else error "polyminus.sml: tausche_vor_plus";
60.271
60.272
60.273 "----------- pbl binom polynom vereinfachen p.39 -----------------";
60.274 @@ -520,7 +520,7 @@
60.275 (*
60.276 if p = ([], Res) andalso
60.277 term2str (get_obj g_res pt (fst p)) = "1 + 14 * u"
60.278 -then () else raise error "polyminus.sml: Vereinfache (2*u - 5 - (3 - ...";
60.279 +then () else error "polyminus.sml: Vereinfache (2*u - 5 - (3 - ...";
60.280 *)
60.281
60.282
60.283 @@ -555,7 +555,7 @@
60.284 case ma of
60.285 SOME ("matchsub (?a * (?b - ?c)) (8 * (a - q) + \
60.286 \a - 2 * q + 3 * (a - 2 * q)) = True", _) => ()
60.287 - | _ => raise error "polyminus.sml matchsub (?a * (?b - ?c)...A";
60.288 + | _ => error "polyminus.sml matchsub (?a * (?b - ?c)...A";
60.289
60.290 "--- does the respective prls rewrite ?";
60.291 val prls = append_rls "prls_pbl_vereinf_poly" e_rls
60.292 @@ -583,7 +583,7 @@
60.293 val SOME (t', _) = rewrite_set_ thy false prls t;
60.294 trace_rewrite := false;
60.295 if term2str t' = "False" then ()
60.296 -else raise error "polyminus.sml Not (matchsub (?a * (?b + ?c)) (8 ...";
60.297 +else error "polyminus.sml Not (matchsub (?a * (?b + ?c)) (8 ...";
60.298
60.299
60.300
61.1 --- a/test/Tools/isac/Knowledge/rateq.sml Tue Sep 28 08:58:06 2010 +0200
61.2 +++ b/test/Tools/isac/Knowledge/rateq.sml Tue Sep 28 09:06:56 2010 +0200
61.3 @@ -14,30 +14,30 @@
61.4 val t = (term_of o the o (parse RatEq.thy)) "(1/b+1/x=1) is_ratequation_in x";
61.5 val SOME(t_, _) = rewrite_set_ RatEq.thy false RatEq_prls t;
61.6 val result = term2str t_;
61.7 -if result <> "True" then raise error "rateq.sml: new behaviour 1:" else ();
61.8 +if result <> "True" then error "rateq.sml: new behaviour 1:" else ();
61.9
61.10 val t = (term_of o the o (parse RatEq.thy)) "(sqrt(x)=1) is_ratequation_in x";
61.11 val SOME(t_, _) = rewrite_set_ RatEq.thy false RatEq_prls t;
61.12 val result = term2str t_;
61.13 -if result <> "False" then raise error "rateq.sml: new behaviour 2:" else ();
61.14 +if result <> "False" then error "rateq.sml: new behaviour 2:" else ();
61.15
61.16 val t = (term_of o the o (parse RatEq.thy)) "(x=-1) is_ratequation_in x";
61.17 val SOME(t_,_) = rewrite_set_ RatEq.thy false RatEq_prls t;
61.18 val result = term2str t_;
61.19 -if result <> "False" then raise error "rateq.sml: new behaviour 3:" else ();
61.20 +if result <> "False" then error "rateq.sml: new behaviour 3:" else ();
61.21
61.22 val t = (term_of o the o (parse RatEq.thy)) "(3 + x^^^2 + 1/(x^^^2+3)=1) is_ratequation_in x";
61.23 val SOME(t_,_) = rewrite_set_ RatEq.thy false RatEq_prls t;
61.24 val result = term2str t_;
61.25 -if result <> "True" then raise error "rateq.sml: new behaviour 4:" else ();
61.26 +if result <> "True" then error "rateq.sml: new behaviour 4:" else ();
61.27
61.28 val result = match_pbl ["equality (x=1)","solveFor x","solutions L"]
61.29 (get_pbt ["rational","univariate","equation"]);
61.30 -case result of NoMatch' _ => () | _ => raise error "rateq.sml: new behaviour: 5";
61.31 +case result of NoMatch' _ => () | _ => error "rateq.sml: new behaviour: 5";
61.32
61.33 val result = match_pbl ["equality (3 + x^^^2 + 1/(x^^^2+3)=1)","solveFor x","solutions L"]
61.34 (get_pbt ["rational","univariate","equation"]);
61.35 -case result of Matches' _ => () | _ => raise error "rateq.sml: new behaviour: 6";
61.36 +case result of Matches' _ => () | _ => error "rateq.sml: new behaviour: 6";
61.37
61.38
61.39 (*---------rateq---- 23.8.02 ---------------------*)
61.40 @@ -90,7 +90,7 @@
61.41 (* "x = 1 / 5" *)
61.42 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
61.43 if mout2str(f) = "Form' FormKF (~1,EdUndef,0,Nundef,([x = 1 / 5])" then ()
61.44 -else raise error "rateq.sml: new behaviour: [x = 1 / 5]";
61.45 +else error "rateq.sml: new behaviour: [x = 1 / 5]";
61.46
61.47
61.48
61.49 @@ -140,6 +140,6 @@
61.50 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
61.51 (* "x = -2, x = 10" *)
61.52 if mout2str(f) = "Form' FormKF (~1,EdUndef,0,Nundef,([x = -2, x = 10])" then()
61.53 -else raise error "rateq.sml: new behaviour: [x = -2, x = 10]";
61.54 +else error "rateq.sml: new behaviour: [x = -2, x = 10]";
61.55
61.56 "----------- rateq.sml end--------";
62.1 --- a/test/Tools/isac/Knowledge/rational-old.sml Tue Sep 28 08:58:06 2010 +0200
62.2 +++ b/test/Tools/isac/Knowledge/rational-old.sml Tue Sep 28 09:06:56 2010 +0200
62.3 @@ -12,50 +12,50 @@
62.4 print("\n\n***** divide tests *****\n");
62.5 val mv_pquot1 = (#1(mv_division([(1,[1,1,1]),(1,[1,1,0]),(1,[1,0,1]),(1,[0,0,0])],[(1,[1,1,0]),(1,[0,0,0])],LEX_)));
62.6 (* result: [(1,[0,0,1]),(1,[0,0,0])] *)
62.7 -if mv_pquot1=[(1,[0,0,1]),(1,[0,0,0])] then () else raise error ("Test failed");
62.8 +if mv_pquot1=[(1,[0,0,1]),(1,[0,0,0])] then () else error ("Test failed");
62.9
62.10 val mv_prest1 = (#2(mv_division([(1,[1,1,1]),(1,[1,1,0]),(1,[1,0,1]),(1,[0,0,0])],[(1,[1,1,0]),(1,[0,0,0])],LEX_)));
62.11 (* result: [(1,[1,0,1]),(~1,[0,0,1])] *)
62.12 -if mv_prest1=[(1,[1,0,1]),(~1,[0,0,1])] then () else raise error ("Test failed");
62.13 +if mv_prest1=[(1,[1,0,1]),(~1,[0,0,1])] then () else error ("Test failed");
62.14
62.15 val mv_pquot2 = (#1(mv_division([(4,[2]),(8,[1]),(16,[0])],[(1,[1]),(1,[0])],LEX_)));
62.16 (* result: [(4,[1]),(4,[0])] *)
62.17 -if mv_pquot2=[(4,[1]),(4,[0])] then () else raise error ("Test failed");
62.18 +if mv_pquot2=[(4,[1]),(4,[0])] then () else error ("Test failed");
62.19
62.20 val mv_prest2 = (#2(mv_division([(4,[2]),(8,[1]),(16,[0])],[(1,[1]),(1,[0])],LEX_)));
62.21 (* result: [(12,[0]] *)
62.22 -if mv_prest2=[(12,[0])] then () else raise error ("Test failed");
62.23 +if mv_prest2=[(12,[0])] then () else error ("Test failed");
62.24
62.25 val mv_pquot3 = (#1(mv_division([(4,[2]),(~4,[0])],[(2,[1]),(2,[0])],LEX_)));
62.26 (* [(2,[1]),(~2,[0])] *)
62.27 -if mv_pquot3=[(2,[1]),(~2,[0])] then () else raise error ("Test failed");
62.28 +if mv_pquot3=[(2,[1]),(~2,[0])] then () else error ("Test failed");
62.29
62.30 val mv_prest3 = (#2(mv_division([(1,[2]),(~1,[0])],[(2,[1]),(2,[0])],LEX_)));
62.31 (* [(1,[2]),(~1,[0])] *)
62.32 -if mv_prest3=[(1,[2]),(~1,[0])] then () else raise error ("Test failed");
62.33 +if mv_prest3=[(1,[2]),(~1,[0])] then () else error ("Test failed");
62.34
62.35 val mv_pquot4 = (#1(mv_division([(3,[1,1,1]),(4,[1,0,1]),(3,[0,0,1])],[(2,[1,0,0]),(4,[0,0,1])],LEX_)));
62.36 (* [(1,[0,1,1])] *)
62.37 -if mv_pquot4=[(1,[0,1,1])] then () else raise error ("Test failed");
62.38 +if mv_pquot4=[(1,[0,1,1])] then () else error ("Test failed");
62.39
62.40 val mv_prest4 = (#2(mv_division([(3,[1,1,1]),(4,[1,0,1]),(3,[0,0,1])],[(2,[1,0,0]),(4,[0,0,1])],GGO_)));
62.41 (* [(1,[1,1,1]),(~4,[0,1,2]),(4,[1,0,1]),(3,[0,0,1])] *)
62.42 -if mv_prest4 =[(1,[1,1,1]),(~4,[0,1,2]),(4,[1,0,1]),(3,[0,0,1])] then () else raise error ("Test failed");
62.43 +if mv_prest4 =[(1,[1,1,1]),(~4,[0,1,2]),(4,[1,0,1]),(3,[0,0,1])] then () else error ("Test failed");
62.44
62.45 val mv_pquot5 = (#1(mv_division([(3,[1,1,1]),(4,[1,0,1]),(3,[0,0,1]),(6,[2,1,3]),(4,[0,4,1]),(1,[2,2,1])],[(1,[0,0,1])],LEX_)));
62.46 (* [(1,[2,2,0]),(6,[2,1,2]),(3,[1,1,0]),(4,[1,0,0]),(4,[0,4,0]),(3,[0,0,0])]*)
62.47 -if mv_pquot5=[(1,[2,2,0]),(6,[2,1,2]),(3,[1,1,0]),(4,[1,0,0]),(4,[0,4,0]),(3,[0,0,0])] then () else raise error ("Test failed");
62.48 +if mv_pquot5=[(1,[2,2,0]),(6,[2,1,2]),(3,[1,1,0]),(4,[1,0,0]),(4,[0,4,0]),(3,[0,0,0])] then () else error ("Test failed");
62.49
62.50 val mv_prest5 = (#2(mv_division([(3,[1,1,1]),(4,[1,0,1]),(3,[0,0,1]),(6,[2,1,3]),(4,[0,4,1]),(1,[2,2,1])],[(1,[0,0,1])],LEX_)));
62.51 (* [] *)
62.52 -if mv_prest5=[] then () else raise error ("Test failed");
62.53 +if mv_prest5=[] then () else error ("Test failed");
62.54
62.55 (* (x^2 + 2(a+1)x + (a^2+2a+1)) / (x+a+1) = x+a+1 *)
62.56 val mv_pquot6 = (#1(mv_division([(1,[2,0,0]),(2,[1,1,0]),(2,[1,0,0]),(1,[0,2,0]),(2,[0,1,0]),(1,[0,0,0])],[(1,[1,0,0]),(1,[0,1,0]),(1,[0,0,0])],LEX_)));
62.57 -if mv_pquot6=[(1,[1,0,0]),(1,[0,1,0]),(1,[0,0,0])] then () else raise error ("Test failed");
62.58 +if mv_pquot6=[(1,[1,0,0]),(1,[0,1,0]),(1,[0,0,0])] then () else error ("Test failed");
62.59
62.60 val mv_prest6 = (#2(mv_division([(1,[2,0,0]),(2,[1,1,0]),(2,[1,0,0]),(1,[0,2,0]),(2,[0,1,0]),(1,[0,0,0])],[(1,[1,0,0]),(1,[0,1,0]),(1,[0,0,0])],LEX_)));
62.61 -if mv_prest6=[] then () else raise error ("Test failed");
62.62 +if mv_prest6=[] then () else error ("Test failed");
62.63
62.64 (* Exception tests *)
62.65 (* mv_division ([(1,[0,0,0])],[(0,[1,2,3])],LEX_); *)
62.66 @@ -63,115 +63,115 @@
62.67 print("\n\n***** MV_CONTENT-TESTS *****\n");
62.68 val mv_cont1=mv_content([(1,[2,1]),(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,1]),(1,[0,0])]);
62.69 (* [(1,[0,1]),(1,[0,0])] *)
62.70 -if mv_cont1=[(1,[0,1]),(1,[0,0])] then () else raise error ("Test failed");
62.71 +if mv_cont1=[(1,[0,1]),(1,[0,0])] then () else error ("Test failed");
62.72
62.73 val mv_pp1=mv_pp([(1,[1,1]),(1,[1,0]),(1,[0,1]),(1,[0,0])]);
62.74 (*[(1,[1,0]),(1,[0,0])]*)
62.75 -if mv_pp1=[(1,[1,0]),(1,[0,0])] then () else raise error ("Test failed");
62.76 +if mv_pp1=[(1,[1,0]),(1,[0,0])] then () else error ("Test failed");
62.77
62.78 val mv_cont2=mv_content([(2,[1]),(4,[0])]);
62.79 (* [(2,[0])] *)
62.80 -if mv_cont2=[(2,[0])] then () else raise error ("Test failed");
62.81 +if mv_cont2=[(2,[0])] then () else error ("Test failed");
62.82
62.83 val mv_pp2=mv_pp([(2,[1]),(4,[0])]);
62.84 (* [(1,[1]),(2,[0])] *)
62.85 -if mv_pp2=[(1,[1]),(2,[0])] then () else raise error ("Test failed");
62.86 +if mv_pp2=[(1,[1]),(2,[0])] then () else error ("Test failed");
62.87
62.88 val mv_cont3=mv_content[(8,[2,1,1]),(12,[1,0,2]),(10,[2,2,0]),(16,[1,1,1])];
62.89 (* [(2,[0,0,0])] *)
62.90 -if mv_cont3=[(2,[0,0,0])] then () else raise error ("Test failed");
62.91 +if mv_cont3=[(2,[0,0,0])] then () else error ("Test failed");
62.92
62.93 val mv_pp3=mv_pp[(8,[2,1,1]),(12,[1,0,2]),(10,[2,2,0]),(16,[1,1,1])];
62.94 (* [(5,[2,2,0]),(4,[2,1,1]),(8,[1,1,1]),(6,[1,0,2])] *)
62.95 -if mv_pp3=[(5,[2,2,0]),(4,[2,1,1]),(8,[1,1,1]),(6,[1,0,2])] then () else raise error ("Test failed");
62.96 +if mv_pp3=[(5,[2,2,0]),(4,[2,1,1]),(8,[1,1,1]),(6,[1,0,2])] then () else error ("Test failed");
62.97
62.98 val mv_cont4=mv_content[(2,[2,1,0]),(3,[1,0,1]),(2,[1,1,0]),(3,[0,0,1])];
62.99 (* [(1,[0,0,0])] *)
62.100 -if mv_cont4=[(1,[0,0,0])] then () else raise error ("Test failed");
62.101 +if mv_cont4=[(1,[0,0,0])] then () else error ("Test failed");
62.102
62.103 val mv_pp4=mv_pp [(2,[2,1,0]),(3,[1,0,1]),(2,[1,1,0]),(3,[0,0,1])];
62.104 (* [(2,[2,1,0]),(2,[1,1,0]),(3,[1,0,1]),(3,[0,0,1])] *)
62.105 -if mv_pp4=[(2,[2,1,0]),(2,[1,1,0]),(3,[1,0,1]),(3,[0,0,1])] then () else raise error ("Test failed");
62.106 +if mv_pp4=[(2,[2,1,0]),(2,[1,1,0]),(3,[1,0,1]),(3,[0,0,1])] then () else error ("Test failed");
62.107
62.108 val con1=mv_content([(9,[2,0]),(15,[1,1]),(12,[1,0]),(6,[0,2]),(12,[0,1])]);
62.109 (* [(3,[0,0])] *)
62.110 -if con1=[(3,[0,0])] then () else raise error ("Test failed");
62.111 +if con1=[(3,[0,0])] then () else error ("Test failed");
62.112
62.113 val pp1=mv_pp([(9,[2,0]),(15,[1,1]),(12,[1,0]),(6,[0,2]),(12,[0,1])]);
62.114 (* [(3,[2,0]),(5,[1,1]),(4,[1,0]),(2,[0,2]),(4,[0,1])] *)
62.115 -if pp1=[(3,[2,0]),(5,[1,1]),(4,[1,0]),(2,[0,2]),(4,[0,1])] then () else raise error ("Test failed");
62.116 +if pp1=[(3,[2,0]),(5,[1,1]),(4,[1,0]),(2,[0,2]),(4,[0,1])] then () else error ("Test failed");
62.117
62.118 val con2=mv_content([(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,2]),(1,[0,1])]);
62.119 (* [(1,[0,0])] *)
62.120 -if con2=[(1,[0,0])] then () else raise error ("Test failed");
62.121 +if con2=[(1,[0,0])] then () else error ("Test failed");
62.122
62.123 val pp2 =mv_pp([(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,2]),(1,[0,1])]);
62.124 (* [(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,2]),(1,[0,1])] *)
62.125 -if pp2=[(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,2]),(1,[0,1])] then () else raise error ("Test failed");
62.126 +if pp2=[(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,2]),(1,[0,1])] then () else error ("Test failed");
62.127
62.128 val cont1 = mv_content [(1,[2,1,0]),(2,[2,1,0])];
62.129 (* [(3,[0,1,0])] *)
62.130 -if cont1=[(3,[0,1,0])] then () else raise error ("Test failed");
62.131 +if cont1=[(3,[0,1,0])] then () else error ("Test failed");
62.132
62.133 val pp1 = mv_pp [(1,[2,1,0]),(2,[2,1,0])];
62.134 (* [(1,[2,0,0])] *)
62.135 -if pp1=[(1,[2,0,0])] then () else raise error ("Test failed");
62.136 +if pp1=[(1,[2,0,0])] then () else error ("Test failed");
62.137
62.138 val cont2 = mv_content [(4,[1,2,0]),(2,[2,1,0])];
62.139 (* [(2,[0,1,0])] *)
62.140 -if cont2=[(2,[0,1,0])] then () else raise error ("Test failed");
62.141 +if cont2=[(2,[0,1,0])] then () else error ("Test failed");
62.142
62.143 val pp2 = mv_pp [(4,[1,2,0]),(2,[2,1,0])];
62.144 (* [(1,[2,0,0]),(2,[1,1,0])] *)
62.145 -if pp2=[(1,[2,0,0]),(2,[1,1,0])] then () else raise error ("Test failed");
62.146 +if pp2=[(1,[2,0,0]),(2,[1,1,0])] then () else error ("Test failed");
62.147
62.148 print("\n\n\n\n********************************************************\n\n");
62.149 val cont3=mv_content [(65,[3,2,2]),(52,[3,2,1]),(26,[3,1,2]),(~95,[2,2,3]),(~76,[2,2,2]),(35,[2,2,1]),(28,[2,2,0]),(~38,[2,1,3]),(14,[2,1,1])];
62.150 -(*if cont3=[(1,[0,1,0])] then () else raise error ("Test failed"); *)
62.151 +(*if cont3=[(1,[0,1,0])] then () else error ("Test failed"); *)
62.152 val pp3=mv_pp [(65,[3,2,2]),(52,[3,2,1]),(26,[3,1,2]),(~95,[2,2,3]),(~76,[2,2,2]),(35,[2,2,1]),(28,[2,2,0]),(~38,[2,1,3]),(14,[2,1,1])];
62.153
62.154
62.155 print("\n\n***** gcd-tests *****\n");
62.156 val ggt1 = gcd_poly [(4,[2,2]),(8,[1,1]),(4,[0,0])] [(2,[1,1]),(2,[0,0])];
62.157 (* [(2,[1,1]),(2,[0,0])] *)
62.158 -if ggt1=[(2,[1,1]),(2,[0,0])] then () else raise error ("Test failed");
62.159 +if ggt1=[(2,[1,1]),(2,[0,0])] then () else error ("Test failed");
62.160
62.161 val ggt2 = gcd_poly [(8,[2,1,1]),(12,[1,0,2]),(10,[2,2,0]),(15,[1,1,1])] [(2,[2,1,0]),(3,[1,0,1]),(2,[1,1,0]),(3,[0,0,1])];
62.162 (* [(2,[1,1,0]),(3,[0,0,1])] *)
62.163 -if ggt2=[(2,[1,1,0]),(3,[0,0,1])] then () else raise error ("Test failed");
62.164 +if ggt2=[(2,[1,1,0]),(3,[0,0,1])] then () else error ("Test failed");
62.165
62.166 val ggt3 = gcd_poly [(1,[2,0,0]),(~2,[1,0,1]),(1,[0,0,2])] [(1,[1,0,0]),(~1,[0,0,1])];
62.167 (* [(1,[1,0,0]),(~1,[0,0,1])] *)
62.168 -if ggt3=[(1,[1,0,0]),(~1,[0,0,1])] then () else raise error ("Test failed");
62.169 +if ggt3=[(1,[1,0,0]),(~1,[0,0,1])] then () else error ("Test failed");
62.170
62.171 val ggt4 = gcd_poly [(1,[2,1,0]),(2,[2,1,0])] [(5,[1,0,0])];
62.172 (* [(1,[1,0,0])] *)
62.173 -if ggt4=[(1,[1,0,0])] then () else raise error ("Test failed");
62.174 +if ggt4=[(1,[1,0,0])] then () else error ("Test failed");
62.175
62.176 val ggt5 = gcd_poly [(4,[2,0,0]),(~8,[1,0,1]),(4,[0,0,2])] [(1,[2,0,0]),(~1,[0,0,2])];
62.177 (* [(1,[1,0,0]),(~1,[0,0,1])] *)
62.178 -if ggt5=[(1,[1,0,0]),(~1,[0,0,1])] then () else raise error ("Test failed");
62.179 +if ggt5=[(1,[1,0,0]),(~1,[0,0,1])] then () else error ("Test failed");
62.180
62.181 val ggt6 = gcd_poly [(10,[2,1,1]),(14,[1,1,0]),(3,[1,0,1]),(20,[1,2,1])] [(5,[1,1,1]),(7,[2,1,1])];
62.182 (* [(1,[0,0,0])] *)
62.183 -if ggt6=[(1,[1,0,0])] then () else raise error ("Test failed");
62.184 +if ggt6=[(1,[1,0,0])] then () else error ("Test failed");
62.185
62.186 val ggt7 = gcd_poly [(~169,[4,3,3]),(273,[4,2,2]),(247,[3,3,4]),(~91,[3,3,2]),(78,[3,3,1]),(~399,[3,2,3]),(147,[3,2,1]),(~114,[2,3,2]),(42,[2,3,0])] [(65,[3,2,2]),(52,[3,2,1]),(26,[3,1,2]),(~95,[2,2,3]),(~76,[2,2,2]),(35,[2,2,1]),(28,[2,2,0]),(~38,[2,1,3]),(14,[2,1,1])];
62.187 (* [(13,[3,1,1]),(~19,[2,1,2]),(7,[2,1,0])] *)
62.188 -if ggt7=[(13,[3,1,1]),(~19,[2,1,2]),(7,[2,1,0])] then () else raise error ("Test failed");
62.189 +if ggt7=[(13,[3,1,1]),(~19,[2,1,2]),(7,[2,1,0])] then () else error ("Test failed");
62.190
62.191 print("\n\n***** kgv-tests *****\n");
62.192 val kgv1=lcm_poly [(10,[])] [(15,[])];
62.193 (* [(30,[])] *)
62.194 -if kgv1=[(30,[])] then () else raise error ("Test failed");
62.195 +if kgv1=[(30,[])] then () else error ("Test failed");
62.196
62.197 val kgv2=lcm_poly [(1,[2,0,0]),(~2,[1,0,1]),(1,[0,0,2])] [(1,[1,0,0]),(~1,[0,0,1])];
62.198 (* [(1,[2,0,0]),(~2,[1,0,1]),(1,[0,0,2])] *)
62.199 -if kgv2=[(1,[2,0,0]),(~2,[1,0,1]),(1,[0,0,2])] then () else raise error ("Test failed");
62.200 +if kgv2=[(1,[2,0,0]),(~2,[1,0,1]),(1,[0,0,2])] then () else error ("Test failed");
62.201
62.202 val kgv3=lcm_poly [(4,[2,0,0]),(~8,[1,0,1]),(4,[0,0,2])] [(1,[2,0,0]),(~1,[0,0,2])];
62.203 (* [(4,[3,0,0]),(~4,[2,0,1]),(~4,[1,0,2]),(4,[0,0,3])] *)
62.204 -if kgv3=[(4,[3,0,0]),(~4,[2,0,1]),(~4,[1,0,2]),(4,[0,0,3])] then () else raise error ("Test failed");
62.205 +if kgv3=[(4,[3,0,0]),(~4,[2,0,1]),(~4,[1,0,2]),(4,[0,0,3])] then () else error ("Test failed");
62.206
62.207 (*
62.208 print("***** TERM2POLY-TESTS *****\n");
62.209 @@ -211,11 +211,11 @@
62.210
62.211 val term1 = (term_of o the o (parse thy)) "(10 * a^^^2 * b * c + 14 * a * b + 3 * a * c + 20 * a * b^^^2 * c) /// a";
62.212 val div1 = step_cancel term1;
62.213 -(*if div1 = (term_of o the o (parse thy)) "((10 * a * b * c + 14 * b + 3 * c + 20 * b^^^2 * c) * a) /// (1 * a)" then () else raise raise error ("Test failed");*)
62.214 +(*if div1 = (term_of o the o (parse thy)) "((10 * a * b * c + 14 * b + 3 * c + 20 * b^^^2 * c) * a) /// (1 * a)" then () else raise error ("Test failed");*)
62.215
62.216 val term2 = (term_of o the o (parse thy)) "(10 * a^^^2 * b * c + 14 * a * b + 3 * a * c + 20 * a * b^^^2 * c) /// (5 * a * b * c + 7 * a^^^2 * b * c) ";
62.217 val div2 = step_cancel term2;
62.218 -(*if div2 = ([(10,[1,1,1]),(20,[0,2,1]),(14,[0,1,0]),(3,[0,0,1])],[(1,[1,0,0])],[(7,[1,1,1]),(5,[0,1,1])]) then () else raise raise error ("Test failed");*)
62.219 +(*if div2 = ([(10,[1,1,1]),(20,[0,2,1]),(14,[0,1,0]),(3,[0,0,1])],[(1,[1,0,0])],[(7,[1,1,1]),(5,[0,1,1])]) then () else raise error ("Test failed");*)
62.220
62.221
62.222 val term3 = (term_of o the o (parse thy)) "(10 * a^^^2 * b * c) /// (1 * x * y * z) ";
62.223 @@ -229,7 +229,7 @@
62.224 val t1=mv_mul(mul1,mul2,LEX_);
62.225 val t2=mv_mul(mul3,mul2,LEX_);
62.226 val div3=step_cancel t1 t2;
62.227 -if div3=([(5,[0,1,1]),(4,[0,1,0]),(2,[0,0,1])],[(13,[3,1,1]),(~19,[2,1,2]),(7,[2,1,0])],[(~13,[1,2,2]),(21,[1,1,1]),(6,[0,2,0])]) then () else raise error ("Test failed");*)
62.228 +if div3=([(5,[0,1,1]),(4,[0,1,0]),(2,[0,0,1])],[(13,[3,1,1]),(~19,[2,1,2]),(7,[2,1,0])],[(~13,[1,2,2]),(21,[1,1,1]),(6,[0,2,0])]) then () else error ("Test failed");*)
62.229
62.230 print("\n\n***** all tests successfull ;-) ******\n\n");
62.231
62.232 @@ -247,7 +247,7 @@
62.233 val t' = "(1 + 1 * a ^^^ 1)///(-2 + 2 * a ^^^ 2)";
62.234 val (t',asm') = the (rewrite_set thy' "eval_rls" false rls' t');
62.235 (*if t' = "1 /// (-2 + 2 * a)" then ()
62.236 -else raise error "tests/rationals.sml(1): new behaviour";*)
62.237 +else error "tests/rationals.sml(1): new behaviour";*)
62.238
62.239
62.240 val thy' = "Rational";
62.241 @@ -311,7 +311,7 @@
62.242 val e188a = the (rewrite_set thy' "rational_erls" false rls' e188a');
62.243 val SOME (t,_) = rewrite_set thy' "rational_erls" false mp "(8*((-1) + x))/(9*((-1) + x))";
62.244 if t="((-8) + 8 * x) / ((-9) + 9 * x)"then()
62.245 -else raise error "rationals.sml: e188a new behaviour";
62.246 +else error "rationals.sml: e188a new behaviour";
62.247 print("b)\n");
62.248 val e188b'="(5 * x + -15) / (6 * x + -18 )";
62.249 val e188b = the (rewrite_set thy' "rational_erls" false rls' e188b');
62.250 @@ -320,7 +320,7 @@
62.251 val e188c = the (rewrite_set thy' "rational_erls" false rls' e188c');
62.252 val SOME (t,_) = rewrite_set thy' "rational_erls" false mp "((-1)*(b + (-1) * a))/(1*(b + (-1) * a))";
62.253 if t="(a + -1 * b) / (b + -1 * a)"then()
62.254 -else raise error "rationals.sml: e188c new behaviour";
62.255 +else error "rationals.sml: e188c new behaviour";
62.256
62.257 print("\n\nexample 190:\n");
62.258 print("c)\n");
62.259 @@ -329,7 +329,7 @@
62.260 val SOME (t,_) = rewrite_set thy' "rational_erls" false mp "((1 + 9 * a ^^^ 2)*(1 + 3 * a))/((3 * a + 9 * a ^^^ 2)*(1 + 3 * a))";
62.261 if t="(1 + (3 * a + (27 * a ^^^ 3 + 9 * a ^^^ 2))) /\n(3 * a + (18 * a ^^^ 2 + 27 * a ^^^ 3))"then()
62.262 (*TERMORDER ~~~~~~~ ~~~~~~~*)
62.263 -else raise error "rationals.sml: e190c new behaviour";
62.264 +else error "rationals.sml: e190c new behaviour";
62.265
62.266 print("\n\nexample 191:\n");
62.267 print("a)\n");
62.268 @@ -337,13 +337,13 @@
62.269 val e191a = the (rewrite_set thy' "rational_erls" false rls' e191a');
62.270 val SOME (t,_) = rewrite_set thy' "rational_erls" false mp "((x + (-1) * y)*(x + y))/((1)*(x + y))";
62.271 if t="(x ^^^ 2 + -1 * y ^^^ 2) / (x + y)"then()
62.272 -else raise error "rationals.sml: e191a new behaviour";
62.273 +else error "rationals.sml: e191a new behaviour";
62.274 print("c)\n");
62.275 val e191c'="( 9 * x^^^2 + -30 * x + 25 ) / ( 9 * x^^^2 + -25 )";
62.276 val e191c = the (rewrite_set thy' "rational_erls" false rls' e191c');
62.277 val SOME (t,_) = rewrite_set thy' "rational_erls" false mp "(((-5) + 3 * x)*((-5) + 3 * x))/((5 + 3 * x)*((-5) + 3 * x))";
62.278 if t="(25 + ((-30) * x + 9 * x ^^^ 2)) / ((-25) + 9 * x ^^^ 2)"then()
62.279 -else raise error "rationals.sml: 'e191c' new behaviour";
62.280 +else error "rationals.sml: 'e191c' new behaviour";
62.281
62.282 print("\n\nexample 192:\n");
62.283 print("b)\n");
62.284 @@ -352,7 +352,7 @@
62.285 val SOME (t,_) = rewrite_set thy' "rational_erls" false mp "((x ^^^ 2)*(7 * x + (-1) * y))/((y ^^^ 2)*(7 * x + (-1) * y))";
62.286 if t="(7 * x ^^^ 3 + -1 * (y * x ^^^ 2)) / (-1 * y ^^^ 3 + 7 * (x * y ^^^ 2))"then()
62.287 (*TERMORDER ~~~~~*)
62.288 -else raise error "rationals.sml: 'e192b' new behaviour";
62.289 +else error "rationals.sml: 'e192b' new behaviour";
62.290
62.291 print("\n\nexample 193:\n");
62.292 print("a)\n");
62.293 @@ -595,7 +595,7 @@
62.294 val est1'="(7) / (-14) + (-2) / (4)";
62.295 val est1 = the (rewrite_set thy' "rational_erls" false rls' est1');
62.296 if est1 = ("(-1) / 1",[]) then ()
62.297 -else raise error "new behaviour in rationals.sml: est1'";
62.298 +else error "new behaviour in rationals.sml: est1'";
62.299 -------------------------------------------------------------------------*)
62.300
62.301
62.302 @@ -669,7 +669,7 @@
62.303 val (r,(t,asm))::_ = loc revsets t r;
62.304 val ss = term2str t;
62.305 if ss = "(3 - x) / (3 + x)" then ()
62.306 - else raise error "rational.sml: new behav. in rev-set cancel";
62.307 + else error "rational.sml: new behav. in rev-set cancel";
62.308 terms2str asm;
62.309
62.310
63.1 --- a/test/Tools/isac/Knowledge/rational.sml Tue Sep 28 08:58:06 2010 +0200
63.2 +++ b/test/Tools/isac/Knowledge/rational.sml Tue Sep 28 09:06:56 2010 +0200
63.3 @@ -68,120 +68,120 @@
63.4 print("\n\n***** divide tests *****\n");
63.5 val mv_pquot1 = (#1(mv_division([(1,[1,1,1]),(1,[1,1,0]),(1,[1,0,1]),(1,[0,0,0])],[(1,[1,1,0]),(1,[0,0,0])],LEX_)));
63.6 (* result: [(1,[0,0,1]),(1,[0,0,0])] *)
63.7 -if mv_pquot1=[(1,[0,0,1]),(1,[0,0,0])] then () else raise error ("rational.sml: example failed");
63.8 +if mv_pquot1=[(1,[0,0,1]),(1,[0,0,0])] then () else error ("rational.sml: example failed");
63.9
63.10 val mv_prest1 = (#2(mv_division([(1,[1,1,1]),(1,[1,1,0]),(1,[1,0,1]),(1,[0,0,0])],[(1,[1,1,0]),(1,[0,0,0])],LEX_)));
63.11 (* result: [(1,[1,0,1]),(~1,[0,0,1])] *)
63.12 -if mv_prest1=[(1,[1,0,1]),(~1,[0,0,1])] then () else raise error ("rational.sml: example failed");
63.13 +if mv_prest1=[(1,[1,0,1]),(~1,[0,0,1])] then () else error ("rational.sml: example failed");
63.14
63.15 val mv_pquot2 = (#1(mv_division([(4,[2]),(8,[1]),(16,[0])],[(1,[1]),(1,[0])],LEX_)));
63.16 (* result: [(4,[1]),(4,[0])] *)
63.17 -if mv_pquot2=[(4,[1]),(4,[0])] then () else raise error ("rational.sml: example failed");
63.18 +if mv_pquot2=[(4,[1]),(4,[0])] then () else error ("rational.sml: example failed");
63.19
63.20 val mv_prest2 = (#2(mv_division([(4,[2]),(8,[1]),(16,[0])],[(1,[1]),(1,[0])],LEX_)));
63.21 (* result: [(12,[0]] *)
63.22 -if mv_prest2=[(12,[0])] then () else raise error ("rational.sml: example failed");
63.23 +if mv_prest2=[(12,[0])] then () else error ("rational.sml: example failed");
63.24
63.25 val mv_pquot3 = (#1(mv_division([(4,[2]),(~4,[0])],[(2,[1]),(2,[0])],LEX_)));
63.26 (* [(2,[1]),(~2,[0])] *)
63.27 -if mv_pquot3=[(2,[1]),(~2,[0])] then () else raise error ("rational.sml: example failed");
63.28 +if mv_pquot3=[(2,[1]),(~2,[0])] then () else error ("rational.sml: example failed");
63.29
63.30 val mv_prest3 = (#2(mv_division([(1,[2]),(~1,[0])],[(2,[1]),(2,[0])],LEX_)));
63.31 (* [(1,[2]),(~1,[0])] *)
63.32 -if mv_prest3=[(1,[2]),(~1,[0])] then () else raise error ("rational.sml: example failed");
63.33 +if mv_prest3=[(1,[2]),(~1,[0])] then () else error ("rational.sml: example failed");
63.34
63.35 val mv_pquot4 = (#1(mv_division([(3,[1,1,1]),(4,[1,0,1]),(3,[0,0,1])],[(2,[1,0,0]),(4,[0,0,1])],LEX_)));
63.36 (* [(1,[0,1,1])] *)
63.37 -if mv_pquot4=[(1,[0,1,1])] then () else raise error ("rational.sml: example failed");
63.38 +if mv_pquot4=[(1,[0,1,1])] then () else error ("rational.sml: example failed");
63.39
63.40 val mv_prest4 = (#2(mv_division([(3,[1,1,1]),(4,[1,0,1]),(3,[0,0,1])],[(2,[1,0,0]),(4,[0,0,1])],GGO_)));
63.41 (* [(1,[1,1,1]),(~4,[0,1,2]),(4,[1,0,1]),(3,[0,0,1])] *)
63.42 -if mv_prest4 =[(1,[1,1,1]),(~4,[0,1,2]),(4,[1,0,1]),(3,[0,0,1])] then () else raise error ("rational.sml: example failed");
63.43 +if mv_prest4 =[(1,[1,1,1]),(~4,[0,1,2]),(4,[1,0,1]),(3,[0,0,1])] then () else error ("rational.sml: example failed");
63.44
63.45 val mv_pquot5 = (#1(mv_division([(3,[1,1,1]),(4,[1,0,1]),(3,[0,0,1]),(6,[2,1,3]),(4,[0,4,1]),(1,[2,2,1])],[(1,[0,0,1])],LEX_)));
63.46 (* [(1,[2,2,0]),(6,[2,1,2]),(3,[1,1,0]),(4,[1,0,0]),(4,[0,4,0]),(3,[0,0,0])]*)
63.47 -if mv_pquot5=[(1,[2,2,0]),(6,[2,1,2]),(3,[1,1,0]),(4,[1,0,0]),(4,[0,4,0]),(3,[0,0,0])] then () else raise error ("rational.sml: example failed");
63.48 +if mv_pquot5=[(1,[2,2,0]),(6,[2,1,2]),(3,[1,1,0]),(4,[1,0,0]),(4,[0,4,0]),(3,[0,0,0])] then () else error ("rational.sml: example failed");
63.49
63.50 val mv_prest5 = (#2(mv_division([(3,[1,1,1]),(4,[1,0,1]),(3,[0,0,1]),(6,[2,1,3]),(4,[0,4,1]),(1,[2,2,1])],[(1,[0,0,1])],LEX_)));
63.51 (* [] *)
63.52 -if mv_prest5=[] then () else raise error ("rational.sml: example failed");
63.53 +if mv_prest5=[] then () else error ("rational.sml: example failed");
63.54
63.55 (* (x^2 + 2(a+1)x + (a^2+2a+1)) / (x+a+1) = x+a+1 *)
63.56 val mv_pquot6 = (#1(mv_division([(1,[2,0,0]),(2,[1,1,0]),(2,[1,0,0]),(1,[0,2,0]),(2,[0,1,0]),(1,[0,0,0])],[(1,[1,0,0]),(1,[0,1,0]),(1,[0,0,0])],LEX_)));
63.57 -if mv_pquot6=[(1,[1,0,0]),(1,[0,1,0]),(1,[0,0,0])] then () else raise error ("rational.sml: example failed");
63.58 +if mv_pquot6=[(1,[1,0,0]),(1,[0,1,0]),(1,[0,0,0])] then () else error ("rational.sml: example failed");
63.59
63.60 val mv_prest6 = (#2(mv_division([(1,[2,0,0]),(2,[1,1,0]),(2,[1,0,0]),(1,[0,2,0]),(2,[0,1,0]),(1,[0,0,0])],[(1,[1,0,0]),(1,[0,1,0]),(1,[0,0,0])],LEX_)));
63.61 -if mv_prest6=[] then () else raise error ("rational.sml: example failed");
63.62 +if mv_prest6=[] then () else error ("rational.sml: example failed");
63.63
63.64
63.65 print("\n\n***** MV_CONTENT-TESTS *****\n");
63.66 val mv_cont1=mv_content([(1,[2,1]),(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,1]),(1,[0,0])]);
63.67 (* [(1,[0,1]),(1,[0,0])] *)
63.68 -if mv_cont1=[(1,[0,1]),(1,[0,0])] then () else raise error ("rational.sml: example failed");
63.69 +if mv_cont1=[(1,[0,1]),(1,[0,0])] then () else error ("rational.sml: example failed");
63.70
63.71 val mv_pp1=mv_pp([(1,[1,1]),(1,[1,0]),(1,[0,1]),(1,[0,0])]);
63.72 (*[(1,[1,0]),(1,[0,0])]*)
63.73 -if mv_pp1=[(1,[1,0]),(1,[0,0])] then () else raise error ("rational.sml: example failed");
63.74 +if mv_pp1=[(1,[1,0]),(1,[0,0])] then () else error ("rational.sml: example failed");
63.75
63.76 val mv_cont2=mv_content([(2,[1]),(4,[0])]);
63.77 (* [(2,[0])] *)
63.78 -if mv_cont2=[(2,[0])] then () else raise error ("rational.sml: example failed");
63.79 +if mv_cont2=[(2,[0])] then () else error ("rational.sml: example failed");
63.80
63.81 val mv_pp2=mv_pp([(2,[1]),(4,[0])]);
63.82 (* [(1,[1]),(2,[0])] *)
63.83 -if mv_pp2=[(1,[1]),(2,[0])] then () else raise error ("rational.sml: example failed");
63.84 +if mv_pp2=[(1,[1]),(2,[0])] then () else error ("rational.sml: example failed");
63.85
63.86 val mv_cont3=mv_content[(8,[2,1,1]),(12,[1,0,2]),(10,[2,2,0]),(16,[1,1,1])];
63.87 (* [(2,[0,0,0])] *)
63.88 -if mv_cont3=[(2,[0,0,0])] then () else raise error ("rational.sml: example failed");
63.89 +if mv_cont3=[(2,[0,0,0])] then () else error ("rational.sml: example failed");
63.90
63.91 val mv_pp3=mv_pp[(8,[2,1,1]),(12,[1,0,2]),(10,[2,2,0]),(16,[1,1,1])];
63.92 (* [(5,[2,2,0]),(4,[2,1,1]),(8,[1,1,1]),(6,[1,0,2])] *)
63.93 -if mv_pp3=[(5,[2,2,0]),(4,[2,1,1]),(8,[1,1,1]),(6,[1,0,2])] then () else raise error ("rational.sml: example failed");
63.94 +if mv_pp3=[(5,[2,2,0]),(4,[2,1,1]),(8,[1,1,1]),(6,[1,0,2])] then () else error ("rational.sml: example failed");
63.95
63.96 val mv_cont4=mv_content[(2,[2,1,0]),(3,[1,0,1]),(2,[1,1,0]),(3,[0,0,1])];
63.97 (* [(1,[0,0,0])] *)
63.98 -if mv_cont4=[(1,[0,0,0])] then () else raise error ("rational.sml: example failed");
63.99 +if mv_cont4=[(1,[0,0,0])] then () else error ("rational.sml: example failed");
63.100
63.101 val mv_pp4=mv_pp [(2,[2,1,0]),(3,[1,0,1]),(2,[1,1,0]),(3,[0,0,1])];
63.102 (* [(2,[2,1,0]),(2,[1,1,0]),(3,[1,0,1]),(3,[0,0,1])] *)
63.103 -if mv_pp4=[(2,[2,1,0]),(2,[1,1,0]),(3,[1,0,1]),(3,[0,0,1])] then () else raise error ("rational.sml: example failed");
63.104 +if mv_pp4=[(2,[2,1,0]),(2,[1,1,0]),(3,[1,0,1]),(3,[0,0,1])] then () else error ("rational.sml: example failed");
63.105
63.106 val con1=mv_content([(9,[2,0]),(15,[1,1]),(12,[1,0]),(6,[0,2]),(12,[0,1])]);
63.107 (* [(3,[0,0])] *)
63.108 -if con1=[(3,[0,0])] then () else raise error ("rational.sml: example failed");
63.109 +if con1=[(3,[0,0])] then () else error ("rational.sml: example failed");
63.110
63.111 val pp1=mv_pp([(9,[2,0]),(15,[1,1]),(12,[1,0]),(6,[0,2]),(12,[0,1])]);
63.112 (* [(3,[2,0]),(5,[1,1]),(4,[1,0]),(2,[0,2]),(4,[0,1])] *)
63.113 -if pp1=[(3,[2,0]),(5,[1,1]),(4,[1,0]),(2,[0,2]),(4,[0,1])] then () else raise error ("rational.sml: example failed");
63.114 +if pp1=[(3,[2,0]),(5,[1,1]),(4,[1,0]),(2,[0,2]),(4,[0,1])] then () else error ("rational.sml: example failed");
63.115
63.116 val con2=mv_content([(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,2]),(1,[0,1])]);
63.117 (* [(1,[0,0])] *)
63.118 -if con2=[(1,[0,0])] then () else raise error ("rational.sml: example failed");
63.119 +if con2=[(1,[0,0])] then () else error ("rational.sml: example failed");
63.120
63.121 val pp2 =mv_pp([(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,2]),(1,[0,1])]);
63.122 (* [(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,2]),(1,[0,1])] *)
63.123 -if pp2=[(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,2]),(1,[0,1])] then () else raise error ("rational.sml: example failed");
63.124 +if pp2=[(1,[2,0]),(1,[1,1]),(1,[1,0]),(1,[0,2]),(1,[0,1])] then () else error ("rational.sml: example failed");
63.125
63.126 val cont1 = mv_content [(1,[2,1,0]),(2,[2,1,0])];
63.127 (* [(3,[0,1,0])] *)
63.128 -if cont1=[(3,[0,1,0])] then () else raise error ("rational.sml: example failed");
63.129 +if cont1=[(3,[0,1,0])] then () else error ("rational.sml: example failed");
63.130
63.131 val pp1 = mv_pp [(1,[2,1,0]),(2,[2,1,0])];
63.132 (* [(1,[2,0,0])] *)
63.133 -if pp1=[(1,[2,0,0])] then () else raise error ("rational.sml: example failed");
63.134 +if pp1=[(1,[2,0,0])] then () else error ("rational.sml: example failed");
63.135
63.136 val cont2 = mv_content [(4,[1,2,0]),(2,[2,1,0])];
63.137 (* [(2,[0,1,0])] *)
63.138 -if cont2=[(2,[0,1,0])] then () else raise error ("rational.sml: example failed");
63.139 +if cont2=[(2,[0,1,0])] then () else error ("rational.sml: example failed");
63.140
63.141 val pp2 = mv_pp [(4,[1,2,0]),(2,[2,1,0])];
63.142 (* [(1,[2,0,0]),(2,[1,1,0])] *)
63.143 -if pp2=[(1,[2,0,0]),(2,[1,1,0])] then () else raise error ("rational.sml: example failed");
63.144 +if pp2=[(1,[2,0,0]),(2,[1,1,0])] then () else error ("rational.sml: example failed");
63.145
63.146 print("\n\n\n\n********************************************************\n\n");
63.147 val cont3=mv_content [(65,[3,2,2]),(52,[3,2,1]),(26,[3,1,2]),(~95,[2,2,3]),(~76,[2,2,2]),(35,[2,2,1]),(28,[2,2,0]),(~38,[2,1,3]),(14,[2,1,1])];
63.148 -if cont3=[(5,[0,2,1]),(4,[0,2,0]),(2,[0,1,1])] then () else raise error ("rational.sml: example failed");
63.149 +if cont3=[(5,[0,2,1]),(4,[0,2,0]),(2,[0,1,1])] then () else error ("rational.sml: example failed");
63.150 val pp3=mv_pp [(65,[3,2,2]),(52,[3,2,1]),(26,[3,1,2]),(~95,[2,2,3]),(~76,[2,2,2]),(35,[2,2,1]),(28,[2,2,0]),(~38,[2,1,3]),(14,[2,1,1])];
63.151
63.152
63.153 @@ -213,60 +213,60 @@
63.154 print("\n\n***** mv_gcd-tests *****\n");
63.155 val ggt1 = mv_gcd [(4,[2,2]),(8,[1,1]),(4,[0,0])] [(2,[1,1]),(2,[0,0])];
63.156 (* [(2,[1,1]),(2,[0,0])] *)
63.157 -if ggt1=[(2,[1,1]),(2,[0,0])] then () else raise error ("rational.sml: example failed");
63.158 +if ggt1=[(2,[1,1]),(2,[0,0])] then () else error ("rational.sml: example failed");
63.159
63.160 val ggt2 = mv_gcd [(8,[2,1,1]),(12,[1,0,2]),(10,[2,2,0]),(15,[1,1,1])] [(2,[2,1,0]),(3,[1,0,1]),(2,[1,1,0]),(3,[0,0,1])];
63.161 (* [(2,[1,1,0]),(3,[0,0,1])] *)
63.162 -if ggt2=[(2,[1,1,0]),(3,[0,0,1])] then () else raise error ("rational.sml: example failed");
63.163 +if ggt2=[(2,[1,1,0]),(3,[0,0,1])] then () else error ("rational.sml: example failed");
63.164
63.165
63.166 val ggt3 = mv_gcd [(1,[2,0]),(~2,[1,1]),(1,[0,2])] [(1,[1,0]),(~1,[0,1])];
63.167 (* [(1,[1,0]),(~1,[0,1])] *)
63.168 -if ggt3=[(1,[1,0]),(~1,[0,1])] then () else raise error ("rational.sml: example failed");
63.169 +if ggt3=[(1,[1,0]),(~1,[0,1])] then () else error ("rational.sml: example failed");
63.170
63.171
63.172 val ggt4 = mv_gcd [(1,[2,1,0]),(2,[2,1,0])] [(5,[1,0,0])];
63.173 (* [(1,[1,0,0])] *)
63.174 -if ggt4=[(1,[1,0,0])] then () else raise error ("rational.sml: example failed");
63.175 +if ggt4=[(1,[1,0,0])] then () else error ("rational.sml: example failed");
63.176
63.177
63.178 val ggt5 = mv_gcd [(4,[2,0]),(~8,[1,1]),(4,[0,2])] [(1,[2,0]),(~1,[0,2])];
63.179 (* [(1,[1,0]),(~1,[0,1])] *)
63.180 -if ggt5=[(1,[1,0]),(~1,[0,1])] then () else raise error ("rational.sml: example failed");
63.181 +if ggt5=[(1,[1,0]),(~1,[0,1])] then () else error ("rational.sml: example failed");
63.182
63.183
63.184 val ggt6 = mv_gcd [(10,[2,1,1]),(14,[1,1,0]),(3,[1,0,1]),(20,[1,2,1])] [(5,[1,1,1]),(7,[2,1,1])];
63.185 (* [(1,[0,0,0])] *)
63.186 -if ggt6=[(1,[1,0,0])] then () else raise error ("rational.sml: example failed");
63.187 +if ggt6=[(1,[1,0,0])] then () else error ("rational.sml: example failed");
63.188
63.189 print("\n\n***** kgv-tests *****\n");
63.190 val kgv1=mv_lcm [(10,[])] [(15,[])];
63.191 (* [(30,[])] *)
63.192 -if kgv1=[(30,[])] then () else raise error ("rational.sml: example failed");
63.193 +if kgv1=[(30,[])] then () else error ("rational.sml: example failed");
63.194
63.195 val kgv2=mv_lcm [(1,[2,0]),(~2,[1,1]),(1,[0,2])] [(1,[1,0]),(~1,[0,1])];
63.196 (* [(1,[2,0]),(~2,[1,1]),(1,[0,2])] *)
63.197 -if kgv2=[(1,[2,0]),(~2,[1,1]),(1,[0,2])] then () else raise error ("rational.sml: example failed");
63.198 +if kgv2=[(1,[2,0]),(~2,[1,1]),(1,[0,2])] then () else error ("rational.sml: example failed");
63.199
63.200 val kgv3=mv_lcm [(4,[2,0]),(~8,[1,1]),(4,[0,2])] [(1,[2,0]),(~1,[0,2])];
63.201 (* [(4,[3,0]),(~4,[2,1]),(~4,[1,2]),(4,[0,3])] *)
63.202 -if kgv3=[(4,[3,0]),(~4,[2,1]),(~4,[1,2]),(4,[0,3])] then () else raise error ("rational.sml: example failed");
63.203 +if kgv3=[(4,[3,0]),(~4,[2,1]),(~4,[1,2]),(4,[0,3])] then () else error ("rational.sml: example failed");
63.204
63.205 (*!!!--------
63.206 print("\n\n***** STEP_CANCEL_TESTS: *****\n");
63.207
63.208 val term2 = (term_of o the o (parse thy)) " (9 * a^^^2 * b) / (6 * a * c)";
63.209 val div2 = term2str (step_cancel term2);
63.210 -if div2 = "3 * (a * b) * (3 * a) / (2 * c * (3 * a))" then () else raise error ("rational.sml: example failed");
63.211 +if div2 = "3 * (a * b) * (3 * a) / (2 * c * (3 * a))" then () else error ("rational.sml: example failed");
63.212
63.213
63.214 val term1 = (term_of o the o (parse thy)) "(10 * a^^^2 * b * c + 14 * a * b + 3 * a * c + 20 * a * b^^^2 * c) / a";
63.215 val div1 = term2str(step_cancel term1);
63.216 -if div1 = "(3 * c + 14 * b + 20 * (b ^^^ 2 * c) + 10 * (a * (b * c))) * a / (1 * a)" then () else raise error ("rational.sml: example failed");
63.217 +if div1 = "(3 * c + 14 * b + 20 * (b ^^^ 2 * c) + 10 * (a * (b * c))) * a / (1 * a)" then () else error ("rational.sml: example failed");
63.218
63.219 val term3 = (term_of o the o (parse thy)) "(10 * a^^^2 * b * c) / (1 * x * y * z) ";
63.220 val div3 = term2str(step_cancel term3);
63.221 -if div3="10 * a ^^^ 2 * b * c / (1 * x * y * z)" then () else raise error ("rational.sml: example failed");
63.222 +if div3="10 * a ^^^ 2 * b * c / (1 * x * y * z)" then () else error ("rational.sml: example failed");
63.223
63.224 --------------------------------------------------------------------------!!!*)
63.225
63.226 @@ -430,16 +430,16 @@
63.227 val SOME (t'',_) = add_fraction_ thy t;
63.228 if term2str t' = "(-1 * y ^^^ 2 + x ^^^ 2) / ((-1 * y + x) * (-1 * y + x))\
63.229 \ +\n1 * (-1 * y + x) / ((-1 * y + x) * (-1 * y + x))" then ()
63.230 -else raise error "rational.sml lex-ord 1";
63.231 +else error "rational.sml lex-ord 1";
63.232 if term2str t'' = "(-1 - y - x) / (y - x)" then ()
63.233 -else raise error "rational.sml lex-ord 2";
63.234 +else error "rational.sml lex-ord 2";
63.235 (*WN.16.10.02 WN070905 lexicographische Ordnung erhalten ! SK.ord*)
63.236
63.237
63.238 val t = str2term "(x^^^2 - y^^^2)/(x^^^2 - 2*x*y + y^^^2)";
63.239 val SOME (t',_) = norm_expanded_rat_ thy t;
63.240 if term2str t' = "(x + y) / (x - y)" then ()
63.241 -else raise error "rational.sml term2poly: invalid x ^^^ 2 - y ^^^ 2 1";
63.242 +else error "rational.sml term2poly: invalid x ^^^ 2 - y ^^^ 2 1";
63.243 (*val SOME (t'',_) = norm_rational_ thy t;
63.244 *** RATIONALS_TERM2POLY_EXCEPTION: Invalid Polynomial
63.245 WN.16.10.02 ?! + WN060831???SK4
63.246 @@ -449,7 +449,7 @@
63.247 val t = str2term "(9 - x^^^2)/(9 - 6*x + x^^^2) + (1)/(3 + x)";
63.248 val SOME (t',_) = norm_expanded_rat_ thy t;
63.249 if term2str t' = "(12 + 5 * x + x ^^^ 2) / (9 - x ^^^ 2)" then ()
63.250 -else raise error "rational.sml (9 - x^^^2)/(9 - 6*x + x^^^2) +...";
63.251 +else error "rational.sml (9 - x^^^2)/(9 - 6*x + x^^^2) +...";
63.252 (*val SOME (t'',_) = norm_rational_ thy t;
63.253 *** RATIONALS_TERM2POLY_EXCEPTION: Invalid Polynomial WN.16.10.02 ?!
63.254 WN070906 *** term2poly: invalid = 9 - x ^^^ 2 SK.term2poly*)
63.255 @@ -510,7 +510,7 @@
63.256 is_expanded (parse_rat "8 * x + -8");
63.257 (* e188a = ("8 / 9",["not ((-1) + x = 0)"]) then () 13.3.03*)
63.258 if e188a = ("8 / 9",["-1 + x ~= 0"]) then ()
63.259 -else raise error "rational.sml: e188a new behaviour";
63.260 +else error "rational.sml: e188a new behaviour";
63.261 val SOME (t,_) = rewrite_set thy' false mp
63.262 "(8*((-1) + x))/(9*((-1) + x))";
63.263 print("b)\n");
63.264 @@ -525,7 +525,7 @@
63.265 val SOME (t,_) =
63.266 rewrite_set thy' false mp "((-1)*(b + (-1) * a))/(1*(b + (-1) * a))";
63.267 if t= "(a + -1 * b) / (-1 * a + b)" then()
63.268 -else raise error "rational.sml: e188c new behaviour";
63.269 +else error "rational.sml: e188c new behaviour";
63.270
63.271 print("\n\nexample 190:\n");
63.272 print("c)\n");
63.273 @@ -533,7 +533,7 @@
63.274 val e190c = the (rewrite_set thy' false "cancel" e190c');
63.275 val SOME (t,_) = rewrite_set thy' false mp "((1 + 9 * a ^^^ 2)*(1 + 3 * a))/((3 * a + 9 * a ^^^ 2)*(1 + 3 * a))";
63.276 if t = "(1 + 3 * a + 9 * a ^^^ 2 + 27 * a ^^^ 3) /\n(3 * a + 18 * a ^^^ 2 + 27 * a ^^^ 3)" then ()
63.277 -else raise error "rational.sml: e190c new behaviour";
63.278 +else error "rational.sml: e190c new behaviour";
63.279
63.280 print("\n\nexample 191:\n");
63.281 print("a)\n");
63.282 @@ -547,7 +547,7 @@
63.283 val SOME (t,_) = rewrite_set thy' false mp "((x + (-1) * y)*(x + y))/((1)*(x + y))";
63.284 (* t="(x ^^^ 2 + -1 * y ^^^ 2) / (x + y)" then() WN.13.3.03*)
63.285 if t="(x ^^^ 2 + -1 * y ^^^ 2) / (x + y)" then()
63.286 -else raise error "rational.sml: e191a new behaviour";
63.287 +else error "rational.sml: e191a new behaviour";
63.288
63.289 print("c)\n");
63.290 val e191c'="( 9 * x^^^2 + -30 * x + 25 ) / ( 9 * x^^^2 + -25 )";
63.291 @@ -562,7 +562,7 @@
63.292 val SOME (t,_) = rewrite_set thy' false mp "(((-5) + 3 * x)*((-5) + 3 * x))/((5 + 3 * x)*((-5) + 3 * x))";
63.293 (* t="(25 + ((-30) * x + 9 * x ^^^ 2)) / ((-25) + 9 * x ^^^ 2)"then() 13.3.03*)
63.294 if t= "(25 + -30 * x + 9 * x ^^^ 2) / (-25 + 9 * x ^^^ 2)" then()
63.295 -else raise error "rational.sml: 'e191c' new behaviour";
63.296 +else error "rational.sml: 'e191c' new behaviour";
63.297
63.298
63.299 print("\n\nexample 192:\n");
63.300 @@ -574,11 +574,11 @@
63.301 val SOME (t',_) = rewrite_set thy' false mp "((x ^^^ 2)*(7 * x + (-1) * y))/((y ^^^ 2)*(7 * x + (-1) * y))";
63.302 if t' = "(7 * x ^^^ 3 + -1 * x ^^^ 2 * y) / (7 * x * y ^^^ 2 + -1 * y ^^^ 3)"
63.303 (*"(-1 * y * x ^^^ 2 + 7 * x ^^^ 3) / (-1 * y ^^^ 3 + 7 * x * y ^^^ 2)"WN050929*)
63.304 -then () else raise error "rational.sml: 'e192b' new behaviour";
63.305 +then () else error "rational.sml: 'e192b' new behaviour";
63.306 (*^^^ works with MG's simplifier vvv*)
63.307 val t =str2term"((x ^^^ 2)*(7 * x + (-1) * y))/((y ^^^ 2)*(7 * x + (-1) * y))";
63.308 val SOME (t',_) = rewrite_set_ Isac.thy false make_polynomial t;
63.309 -if term2str t' = "(7 * x ^^^ 3 + -1 * x ^^^ 2 * y) / (7 * x * y ^^^ 2 + -1 * y ^^^ 3)" then () else raise error "rational.sml: 'e192b'MG new behaviour";
63.310 +if term2str t' = "(7 * x ^^^ 3 + -1 * x ^^^ 2 * y) / (7 * x * y ^^^ 2 + -1 * y ^^^ 3)" then () else error "rational.sml: 'e192b'MG new behaviour";
63.311
63.312
63.313 print("\n\nexample 193:\n");
63.314 @@ -600,7 +600,7 @@
63.315 val SOME (t,_) = rewrite_set thy' false "cancel" wn01;
63.316 (* t = "((-5) + 3 * x) / 1" then () WN.13.3.03*)
63.317 if t = "(-5 + 3 * x) / 1" then ()
63.318 -else raise error "rational.sml: new behav. in cancel wn01";
63.319 +else error "rational.sml: new behav. in cancel wn01";
63.320
63.321
63.322 "-------- common_nominator_p ---------------------------- --------";
63.323 @@ -838,7 +838,7 @@
63.324 val est1'="(7) / (-14) + (-2) / (4)";
63.325 val est1 = the (rewrite_set thy' false "common_nominator_p" est1');
63.326 if est1 = ("-1 / 1",[]) then ()
63.327 -else raise error "new behaviour in rational.sml: est1'";
63.328 +else error "new behaviour in rational.sml: est1'";
63.329
63.330 val t = (term_of o the o (parse thy))
63.331 "(9 - x ^^^ 2) / (9 - 6 * x + x ^^^ 2)";
63.332 @@ -909,7 +909,7 @@
63.333 val (r,(t,asm))::_ = loc revsets t r;
63.334 val ss = term2str t;
63.335 if ss = "(3 - x) / (3 + x)" then ()
63.336 - else raise error "rational.sml: new behav. in rev-set cancel";
63.337 + else error "rational.sml: new behav. in rev-set cancel";
63.338 terms2str asm;
63.339
63.340
63.341 @@ -963,18 +963,18 @@
63.342 "-------- norm_Rational ------------------------------------------";
63.343 val t = str2term "(3*x+5)/18 - x/2 - -(3*x - 2)/9 = 0";
63.344 val SOME (t',_) = rewrite_set_ thy false norm_Rational t; term2str t';
63.345 -if term2str t' = "1 / 18 = 0" then () else raise error "rational.sml 1";
63.346 +if term2str t' = "1 / 18 = 0" then () else error "rational.sml 1";
63.347
63.348 val t = str2term "(17*x - 51)/9 - (-(13*x - 3)/6) + 11 - (9*x - 7)/4 = 0";
63.349 val SOME (t',_) = rewrite_set_ thy false norm_Rational t; term2str t';
63.350 if term2str t' = "(237 + 65 * x) / 36 = 0" then ()
63.351 -else raise error "rational.sml 2";
63.352 +else error "rational.sml 2";
63.353
63.354 val t = str2term "(1/2 + (5*x)/2)^^^2 - ((13*x)/2 - 5/2)^^^2 - (6*x)^^^2 + 29";
63.355 val SOME (t',_) = rewrite_set_ thy false norm_Rational t; term2str t';
63.356 (*before 040209:if term2str t' = "(23 + (35 * x + -72 * x ^^^ 2)) / 1"then()*)
63.357 if term2str t' = "23 + 35 * x + -72 * x ^^^ 2" then ()
63.358 -else raise error "rational.sml 3";
63.359 +else error "rational.sml 3";
63.360 (*trace_rewrite:=true;*)
63.361 val t = str2term "Not (6*x is_atom)";
63.362 val SOME (t',_) = rewrite_set_ thy false powers_erls t; term2str t';
63.363 @@ -990,37 +990,37 @@
63.364
63.365 val t = str2term "-1 * (-2 * (5 / 2 * (13 * x / 2)))";
63.366 val SOME (t',_) = rewrite_set_ thy false norm_Rational t; term2str t';
63.367 -if term2str t' = "65 * x / 2" then () else raise error "rational.sml 4";
63.368 +if term2str t' = "65 * x / 2" then () else error "rational.sml 4";
63.369
63.370 val t = str2term "1 - ((13*x)/2 - 5/2)^^^2";
63.371 val SOME (t',_) = rewrite_set_ thy false norm_Rational t; term2str t';
63.372 (*bef.040209: if term2str t' = "(-21 + (130 * x + -169 * x ^^^ 2)) / 4"then()*)
63.373 if term2str t' = "(-21 + 130 * x + -169 * x ^^^ 2) / 4" then ()
63.374 -else raise error "rational.sml 5";
63.375 +else error "rational.sml 5";
63.376
63.377 (*SRAM Schalk I, p.92 Nr. 609a*)
63.378 val t = str2term "2*(3 - x/5)/3 - 4*(1 - x/3) - x/3 - 2*(x/2 - 1/4)/27 +5/54";
63.379 val SOME (t',_) = rewrite_set_ thy false norm_Rational t; term2str t';
63.380 if term2str t' = "(-255 + 112 * x) / 135" then ()
63.381 -else raise error "rational.sml 6";
63.382 +else error "rational.sml 6";
63.383
63.384 (*SRAM Schalk I, p.92 Nr. 610c*)
63.385 val t = str2term "((x- 1)/(x+1) + 1) / ((x- 1)/(x+1) - (x+1)/(x- 1)) - 2";
63.386 val SOME (t',_) = rewrite_set_ thy false norm_Rational t; term2str t';
63.387 -if term2str t' = "(-3 + -1 * x) / 2" then () else raise error "rational.sml 7";
63.388 +if term2str t' = "(-3 + -1 * x) / 2" then () else error "rational.sml 7";
63.389
63.390 (*SRAM Schalk I, p.92 Nr. 476a*)
63.391 val t = str2term "(x^^^2/(1 - x^^^2) + 1)/(x/(1 - x) + 1) *\
63.392 \ (1 + x)";(*. a/b : c/d translated to a/b * d/c .*)
63.393 val SOME (t',_) = rewrite_set_ thy false norm_Rational t; term2str t';
63.394 -(*if term2str t' = "1 / 1" then () else raise error "rational.sml 8";3.6.03*)
63.395 -if term2str t' = "1" then () else raise error "rational.sml 8";
63.396 +(*if term2str t' = "1 / 1" then () else error "rational.sml 8";3.6.03*)
63.397 +if term2str t' = "1" then () else error "rational.sml 8";
63.398
63.399 (*............................vvv---TODO: sollte gehen mit poly_order *)
63.400 (*Schalk I, p.92 Nr. 472a*)
63.401 val t = str2term "((8*x^^^2 - 32*y^^^2)/(2*x + 4*y))/((4*x - 8*y)/(x + y))";
63.402 val SOME (t',_) = rewrite_set_ thy false norm_Rational t; term2str t';
63.403 -if term2str t' = "x + y" then () else raise error "rational.sml p.92 Nr. 472a";
63.404 +if term2str t' = "x + y" then () else error "rational.sml p.92 Nr. 472a";
63.405
63.406 (*Schalk I, p.70 Nr. 480b; a/b : c/d translated to a/b * d/c*)
63.407 val t = str2term "((12*x*y/(9*x^^^2 - y^^^2))/\
63.408 @@ -1067,14 +1067,14 @@
63.409 val SOME (t,_) = rewrite_set_ thy false norm_Rational(*_mg*) t;
63.410 term2str t;
63.411 if (term2str t) = "19 / 21" then ()
63.412 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 1";
63.413 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 1";
63.414
63.415 (*SRA Schalk I, p.40 Nr. 166a *)
63.416 val t = str2term "((5/4)/(4+22/7) + 37/20)*(110/3 - 110/9 * 23/11)";
63.417 val SOME (t,_) = rewrite_set_ thy false norm_Rational(*_mg*) t;
63.418 term2str t;
63.419 if (term2str t) = "45 / 2" then ()
63.420 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 2";
63.421 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 2";
63.422
63.423
63.424 "-------- cancellation -------------------------------------------";
63.425 @@ -1089,7 +1089,7 @@
63.426 if (term2str t) =
63.427 "(1 + 9 * a ^^^ 2) / (3 * a + 9 * a ^^^ 2)"
63.428 then ()
63.429 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 3";
63.430 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 3";
63.431
63.432 (* e192b Stefan K.*)
63.433 val t = str2term
63.434 @@ -1099,7 +1099,7 @@
63.435 if (term2str t) =
63.436 "x ^^^ 2 / y ^^^ 2"
63.437 then ()
63.438 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 4";
63.439 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 4";
63.440
63.441 (*SRC Schalk I, p.66 Nr. 379c *)
63.442 val t = str2term
63.443 @@ -1109,7 +1109,7 @@
63.444 if (term2str t) =
63.445 "-1"
63.446 then ()
63.447 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 5";
63.448 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 5";
63.449
63.450 (*SRC Schalk I, p.66 Nr. 380b *)
63.451 val t = str2term
63.452 @@ -1119,7 +1119,7 @@
63.453 if (term2str t) =
63.454 "(27 + 12 * x) / (28 + 8 * x)"
63.455 then ()
63.456 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 6";
63.457 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 6";
63.458
63.459 (*Schalk I, p.60 Nr. 215c *)
63.460 (* Falsches Ergebnis: rechnet lange und cancel_p kann nicht weiter krzen!!!*)
63.461 @@ -1130,7 +1130,7 @@
63.462 if (term2str t) =
63.463 "(a ^^^ 4 * x + -1 * a ^^^ 4 * y + 4 * a ^^^ 3 * b * x + -4 * a ^^^ 3 * b * y + 6 * a ^^^ 2 * b ^^^ 2 * x + -6 * a ^^^ 2 * b ^^^ 2 * y + 4 * a * b ^^^ 3 * x + -4 * a * b ^^^ 3 * y + b ^^^ 4 * x + -1 * b ^^^ 4 * y) /(a ^^^ 2 * x ^^^ 3 + -3 * a ^^^ 2 * x ^^^ 2 * y + 3 * a ^^^ 2 * x * y ^^^ 2 + -1 * a ^^^ 2 * y ^^^ 3 + 2 * a * b * x ^^^ 3 + -6 * a * b * x ^^^ 2 * y + 6 * a * b * x * y ^^^ 2 + -2 * a * b * y ^^^ 3 + b ^^^ 2 * x ^^^ 3 + -3 * b ^^^ 2 * x ^^^ 2 * y + 3 * b ^^^ 2 * x * y ^^^ 2 + -1 * b ^^^ 2 * y ^^^ 3)"
63.464 then ()
63.465 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 7";
63.466 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 7";
63.467 *)
63.468 (*val t = str2term
63.469 "(a ^^^ 4 * x + -1 * a ^^^ 4 * y + 4 * a ^^^ 3 * b * x + -4 * a ^^^ 3 * b * y + 6 * a ^^^ 2 * b ^^^ 2 * x + -6 * a ^^^ 2 * b ^^^ 2 * y + 4 * a * b ^^^ 3 * x + -4 * a * b ^^^ 3 * y + b ^^^ 4 * x + -1 * b ^^^ 4 * y) /(a ^^^ 2 * x ^^^ 3 + -3 * a ^^^ 2 * x ^^^ 2 * y + 3 * a ^^^ 2 * x * y ^^^ 2 + -1 * a ^^^ 2 * y ^^^ 3 + 2 * a * b * x ^^^ 3 + -6 * a * b * x ^^^ 2 * y + 6 * a * b * x * y ^^^ 2 + -2 * a * b * y ^^^ 3 + b ^^^ 2 * x ^^^ 3 + -3 * b ^^^ 2 * x ^^^ 2 * y + 3 * b ^^^ 2 * x * y ^^^ 2 + -1 * b ^^^ 2 * y ^^^ 3)"
63.470 @@ -1147,7 +1147,7 @@
63.471 term2str t;
63.472 if (term2str t) =
63.473 "(a + b) / (4 * a + -4 * b)"
63.474 -then () else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 8";
63.475 +then () else error "rational.sml.sml: diff.behav. in norm_Rational_mg 8";
63.476 *)
63.477
63.478 (*SRC Schalk I, p.66 Nr. 381b *)
63.479 @@ -1158,7 +1158,7 @@
63.480 if (term2str t) =
63.481 "-1 / (5 + -2 * x)"
63.482 then ()
63.483 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 9";
63.484 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 9";
63.485
63.486 (*SRC Schalk I, p.66 Nr. 381c *)
63.487 val t = str2term
63.488 @@ -1168,7 +1168,7 @@
63.489 if (term2str t) =
63.490 "(1 + 9 * a ^^^ 2) / (3 * a + 9 * a ^^^ 2)"
63.491 then ()
63.492 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 10";
63.493 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 10";
63.494
63.495 (*SRC Schalk I, p.66 Nr. 383a *)
63.496 val t = str2term
63.497 @@ -1178,7 +1178,7 @@
63.498 if (term2str t) =
63.499 "5 * a / (a + -1 * b)"
63.500 then ()
63.501 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 11";
63.502 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 11";
63.503
63.504 "-------- common denominator -------------------------------------";
63.505 "-------- common denominator -------------------------------------";
63.506 @@ -1192,7 +1192,7 @@
63.507 if (term2str t) =
63.508 "(-3 * x + 4 * y + -1 * x * y) / (x * y)"
63.509 then ()
63.510 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 12";
63.511 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 12";
63.512
63.513 (*SRA Schalk I, p.67 Nr. 407b *)
63.514 val t = str2term
63.515 @@ -1202,7 +1202,7 @@
63.516 if (term2str t) =
63.517 "4 / c"
63.518 then ()
63.519 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 13";
63.520 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 13";
63.521
63.522 (*SRA Schalk I, p.67 Nr. 410b *)
63.523 val t = str2term
63.524 @@ -1212,7 +1212,7 @@
63.525 if (term2str t) =
63.526 "(5 + 3 * x) / (6 + 11 * x + 6 * x ^^^ 2 + x ^^^ 3)"
63.527 then ()
63.528 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 14";
63.529 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 14";
63.530
63.531 (*SRA Schalk I, p.67 Nr. 413b *)
63.532 val t = str2term
63.533 @@ -1222,7 +1222,7 @@
63.534 if (term2str t) =
63.535 "6 * x / (1 + -1 * x ^^^ 2)"
63.536 then ()
63.537 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 15";
63.538 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 15";
63.539
63.540 (*SRA Schalk I, p.68 Nr. 414a *)
63.541 val t = str2term
63.542 @@ -1232,7 +1232,7 @@
63.543 if (term2str t) =
63.544 "(-2 + -5 * x + 2 * x ^^^ 2) / (2 + -3 * x + x ^^^ 2)"
63.545 then ()
63.546 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 16";
63.547 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 16";
63.548
63.549 (*SRA Schalk I, p.68 Nr. 423a *)
63.550 val t = str2term
63.551 @@ -1242,7 +1242,7 @@
63.552 if (term2str t) =
63.553 "1"
63.554 then ()
63.555 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 17";
63.556 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 17";
63.557
63.558 (*SRA Schalk I, p.68 Nr. 428b *)
63.559 val t = str2term
63.560 @@ -1252,7 +1252,7 @@
63.561 if (term2str t) =
63.562 "4 / (a ^^^ 4 + -2 * a ^^^ 2 * b ^^^ 2 + b ^^^ 4)"
63.563 then ()
63.564 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 18";
63.565 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 18";
63.566
63.567 (*SRA Schalk I, p.68 Nr. 430b *)
63.568 val t = str2term
63.569 @@ -1262,7 +1262,7 @@
63.570 if (term2str t) =
63.571 "a + 3 * b"
63.572 then ()
63.573 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 19";
63.574 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 19";
63.575
63.576
63.577 (*SRA Schalk I, p.68 Nr. 432 *)
63.578 @@ -1273,7 +1273,7 @@
63.579 if (term2str t) =
63.580 "0"
63.581 then ()
63.582 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 20";
63.583 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 20";
63.584
63.585 (*Eigenes*)
63.586 val t = str2term
63.587 @@ -1283,7 +1283,7 @@
63.588 if (term2str t) =
63.589 "(3 * y + b * x) / (b * y)"
63.590 then ()
63.591 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 21";
63.592 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 21";
63.593
63.594
63.595 "-------- multiply and cancel ------------------------------------";
63.596 @@ -1298,7 +1298,7 @@
63.597 if (term2str t) =
63.598 "(5 * x + -5 * y) / (18 * x + 18 * y)"
63.599 then ()
63.600 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 22";
63.601 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 22";
63.602
63.603 (*SRM.test Schalk I, p.68 Nr. 436b *)
63.604 (*WN060420???MG3 crashes with method 'simplify' in
63.605 @@ -1309,26 +1309,26 @@
63.606 if (term2str t) =
63.607 "5 * a / (a + -1 * b)"
63.608 then ()
63.609 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 23";
63.610 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 23";
63.611
63.612 (*Schalk I, p.68 Nr. 437a *)
63.613 val t = str2term "(3*a - 4*b)/(4*c+3*e) * (3*a+4*b)/(9*a^^^2 - 16*b^^^2)";
63.614 val SOME (t,_) = rewrite_set_ thy false norm_Rational(*_mg*) t;
63.615 if (term2str t) = "1 / (4 * c + 3 * e)" then ()
63.616 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 24";
63.617 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 24";
63.618
63.619 "----- S.K. corrected non-termination 060904";
63.620 val t = str2term "(3*a - 4*b) * (3*a+4*b)/((4*c+3*e)*(9*a^^^2 - 16*b^^^2))";
63.621 val SOME (t',_) = rewrite_set_ thy false make_polynomial t;
63.622 if term2str t' = "(9 * a ^^^ 2 + -16 * b ^^^ 2) /\n(36 * a ^^^ 2 * c + 27 * a ^^^ 2 * e + -64 * b ^^^ 2 * c +\n -48 * b ^^^ 2 * e)" then ()
63.623 -else raise error "rational.sml.sml: S.K.8..corrected 060904-6";
63.624 +else error "rational.sml.sml: S.K.8..corrected 060904-6";
63.625
63.626 "----- S.K. corrected non-termination of cancel_p_";
63.627 val t'' = str2term "(9 * a ^^^ 2 + -16 * b ^^^ 2) /\
63.628 \(36 * a^^^2 * c + (27 * a^^^2 * e + (-64 * b^^^2 * c + -48 * b^^^2 * e)))";
63.629 val SOME (t',_) = rewrite_set_ thy false cancel_p t'';
63.630 if term2str t' = "1 / (4 * c + 3 * e)" then ()
63.631 -else raise error "rational.sml.sml: diff.behav. in cancel_p S.K.8";
63.632 +else error "rational.sml.sml: diff.behav. in cancel_p S.K.8";
63.633
63.634 (**)
63.635
63.636 @@ -1354,7 +1354,7 @@
63.637 if (term2str t) =
63.638 "x ^^^ 2"
63.639 then ()
63.640 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 24";
63.641 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 24";
63.642
63.643 (*SRM Schalk I, p.68 Nr. 439b *)
63.644 val t = str2term
63.645 @@ -1364,7 +1364,7 @@
63.646 if (term2str t) =
63.647 "(x + -4 * x ^^^ 3) / 2"
63.648 then ()
63.649 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 25";
63.650 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 25";
63.651
63.652 (*SRM Schalk I, p.68 Nr. 440a *)
63.653 val t = str2term
63.654 @@ -1374,20 +1374,20 @@
63.655 if (term2str t) =
63.656 "(-3 + x) / (2 + x)"
63.657 then ()
63.658 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 26";
63.659 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 26";
63.660
63.661 "----- Schalk I, p.68 Nr. 440b SK11 works since 0707xx";
63.662 val t = str2term
63.663 "(a^^^3 - 9*a)/(a^^^3*b - a*b^^^3)*(a^^^2*b+a*b^^^2)/(a+3)";
63.664 val SOME (t,_) = rewrite_set_ thy false norm_Rational t;
63.665 if term2str t = "(-3 * a + a ^^^ 2) / (a + -1 * b)" then ()
63.666 -else raise error "rational.sml.sml: diff.behav. in norm_Rational 27";
63.667 +else error "rational.sml.sml: diff.behav. in norm_Rational 27";
63.668
63.669 "----- SK12 works since 0707xx";
63.670 val t = str2term "(a^^^3 - 9*a)*(a^^^2*b+a*b^^^2)/((a^^^3*b - a*b^^^3)*(a+3))";
63.671 val SOME (t',_) = rewrite_set_ thy false norm_Rational t; term2str t';
63.672 if term2str t' = "(-3 * a + a ^^^ 2) / (a + -1 * b)" then ()
63.673 -else raise error "rational.sml.sml: diff.behav. in norm_Rational 28";
63.674 +else error "rational.sml.sml: diff.behav. in norm_Rational 28";
63.675
63.676
63.677 "-------- common denominator and multiplication ------------------";
63.678 @@ -1406,7 +1406,7 @@
63.679 if (term2str t) =
63.680 "(36 * b ^^^ 3 + 3 * a ^^^ 2 * b ^^^ 2 + 16 * a ^^^ 4 * b) / (9 * a ^^^ 4)"
63.681 then ()
63.682 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 28";
63.683 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 28";
63.684
63.685 (*SRAM Schalk I, p.69 Nr. 442b *)
63.686 val t = str2term "(15*a^^^2/x^^^3 - 5*b^^^4/x^^^2 + 25*c^^^2/x)*(x^^^3/(5*a*b^^^3*c^^^3)) + 1/c^^^3 * (b*x/a - 3*a/b^^^3)";
63.687 @@ -1415,7 +1415,7 @@
63.688 if (term2str t) =
63.689 "5 * x ^^^ 2 / (a * b ^^^ 3 * c)"
63.690 then ()
63.691 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 29";
63.692 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 29";
63.693
63.694 (*SRAM Schalk I, p.69 Nr. 443b *)
63.695 val t = str2term "(a/2 + b/3)*(b/3 - a/2)";
63.696 @@ -1424,7 +1424,7 @@
63.697 if (term2str t) =
63.698 "(-9 * a ^^^ 2 + 4 * b ^^^ 2) / 36"
63.699 then ()
63.700 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 30";
63.701 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 30";
63.702
63.703 (*SRAM Schalk I, p.69 Nr. 445b *)
63.704 val t = str2term "(a^^^2/9 + 2*a/(3*b) + 4/b^^^2)*(a/3 - 2/b) + 8/b^^^3";
63.705 @@ -1433,7 +1433,7 @@
63.706 if (term2str t) =
63.707 "a ^^^ 3 / 27"
63.708 then ()
63.709 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 31";
63.710 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 31";
63.711
63.712 (*SRAM Schalk I, p.69 Nr. 446b *)
63.713 val t = str2term "(x/(5*x + 4*y) - y/(5*x - 4*y) + 1)*(25*x^^^2 - 16*y^^^2)";
63.714 @@ -1442,7 +1442,7 @@
63.715 if (term2str t) =
63.716 "30 * x ^^^ 2 + -9 * x * y + -20 * y ^^^ 2"
63.717 then ()
63.718 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 32";
63.719 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 32";
63.720
63.721 (*SRAM Schalk I, p.69 Nr. 449a *)(*Achtung: rechnet ca 8 Sekunden*)
63.722 val t = str2term
63.723 @@ -1452,7 +1452,7 @@
63.724 if (term2str t) =
63.725 "(-81 * x ^^^ 4 + 16 * x ^^^ 8 * y ^^^ 4) / (81 * y ^^^ 8)"
63.726 then ()
63.727 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 33";
63.728 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 33";
63.729
63.730 (*SRAM Schalk I, p.69 Nr. 450a *)
63.731 val t = str2term
63.732 @@ -1462,7 +1462,7 @@
63.733 if (term2str t) =
63.734 "(52 * x ^^^ 2 + 16 * y ^^^ 2) / (9 * y ^^^ 2)"
63.735 then ()
63.736 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 34";
63.737 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 34";
63.738
63.739 "-------- double fractions ---------------------------------------";
63.740 "-------- double fractions ---------------------------------------";
63.741 @@ -1476,7 +1476,7 @@
63.742 if (term2str t) =
63.743 "(-4 + 4 * x + -1 * x ^^^ 2) / (4 * a ^^^ 2)"
63.744 then ()
63.745 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 35";
63.746 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 35";
63.747
63.748 (*SRD Schalk I, p.69 Nr. 455a *)
63.749 val t = str2term
63.750 @@ -1485,26 +1485,26 @@
63.751 term2str t;
63.752 if (term2str t) =
63.753 "(1 + a ^^^ 2) / (1 + 2 * a + a ^^^ 2)" then ()
63.754 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 36";
63.755 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 36";
63.756
63.757
63.758 "----- Schalk I, p.69 Nr. 455b";
63.759 val t = str2term "(x^^^2 - 4)/(y^^^2 - 9)/((2+x)/(3 - y))";
63.760 val SOME (t,_) = rewrite_set_ thy false norm_Rational(*_mg*) t;
63.761 if term2str t = "(2 + -1 * x) / (3 + y)" then ()
63.762 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 37";
63.763 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 37";
63.764
63.765 "----- SK060904-1a non-termination of cancel_p_ ?: worked before 0707xx";
63.766 val t = str2term "(x^^^2 - 4)*(3 - y)/((y^^^2 - 9)*(2+x))";
63.767 val SOME (t,_) = rewrite_set_ thy false norm_Rational t;
63.768 if term2str t = "(2 + -1 * x) / (3 + y)" then ()
63.769 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 37b";
63.770 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 37b";
63.771
63.772 "----- ?: worked before 0707xx";
63.773 val t = str2term "(3 + -1 * y) / (-9 + y ^^^ 2)";
63.774 val SOME (t,_) = rewrite_set_ thy false norm_Rational t;
63.775 if term2str t = "-1 / (3 + y)" then ()
63.776 -else raise error "rational.sml: -1 / (3 + y) norm_Rational";
63.777 +else error "rational.sml: -1 / (3 + y) norm_Rational";
63.778
63.779 (*SRD Schalk I, p.69 Nr. 456b *)
63.780 val t = str2term
63.781 @@ -1512,7 +1512,7 @@
63.782 val SOME (t,_) = rewrite_set_ thy false norm_Rational(*_mg*) t;
63.783 term2str t;
63.784 if (term2str t) = "b / (1 + 2 * b + b ^^^ 2)" then ()
63.785 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 38";
63.786 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 38";
63.787
63.788 (*SRD Schalk I, p.69 Nr. 457b *)
63.789 val t = str2term
63.790 @@ -1522,20 +1522,20 @@
63.791 if (term2str t) =
63.792 "8 * a ^^^ 2 + -6 * a * b + -12 * a ^^^ 2 * b + 9 * a * b ^^^ 2"
63.793 then ()
63.794 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 39";
63.795 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 39";
63.796
63.797 "----- Schalk I, p.69 Nr. 458b works since 0707";
63.798 val t = str2term
63.799 "(2*a^^^2*x - a^^^2)/(a*x - b*x) / (b^^^2*(2*x - 1)/(x*(a - b)))";
63.800 val SOME (t,_) = rewrite_set_ thy false norm_Rational t;
63.801 if term2str t = "a ^^^ 2 / b ^^^ 2" then ()
63.802 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 39b";
63.803 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 39b";
63.804
63.805 (*SRD Schalk I, p.69 Nr. 459b *)
63.806 val t = str2term "(a^^^2 - b^^^2)/(a*b) / (4*(a+b)^^^2/a)";
63.807 val SOME (t,_) = rewrite_set_ thy false norm_Rational t;
63.808 if term2str t = "(a + -1 * b) / (4 * a * b + 4 * b ^^^ 2)" then ()
63.809 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 41";
63.810 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 41";
63.811
63.812
63.813 (*Schalk I, p.69 Nr. 460b nonterm.SK
63.814 @@ -1544,7 +1544,7 @@
63.815 val SOME (t,_) = rewrite_set_ thy false norm_Rational(*_mg*) t;
63.816 if term2str t =
63.817 then ()
63.818 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 42";
63.819 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 42";
63.820
63.821 val t = str2term
63.822 "9*(x^^^2 - 8*x+16)*(16*y - 16)/(4*(y^^^2 - 2*y+1)*(3*x - 12))";
63.823 @@ -1563,7 +1563,7 @@
63.824 if (term2str t) =
63.825 "x + y"
63.826 then ()
63.827 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 43";
63.828 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 43";
63.829
63.830
63.831 (*----------------------------------------------------------------------*)
63.832 @@ -1578,7 +1578,7 @@
63.833 if (term2str t) =
63.834 "1 / 2"
63.835 then ()
63.836 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 44";
63.837 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 44";
63.838
63.839 (*SRD Schalk I, p.69 Nr. 464b *)
63.840 val t = str2term
63.841 @@ -1588,7 +1588,7 @@
63.842 if (term2str t) =
63.843 "(3 + -1 * a) / (1 + -1 * a)"
63.844 then ()
63.845 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 45";
63.846 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 45";
63.847
63.848 (*SRD Schalk I, p.69 Nr. 465b *)
63.849 val t = str2term
63.850 @@ -1598,7 +1598,7 @@
63.851 if (term2str t) =
63.852 "(4 * x + 6 * y + -9 * z) / (4 * x)"
63.853 then ()
63.854 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 46";
63.855 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 46";
63.856
63.857 (*SRD Schalk I, p.69 Nr. 466b *)
63.858 val t = str2term
63.859 @@ -1608,7 +1608,7 @@
63.860 if (term2str t) =
63.861 "(25 + -10 * x + x ^^^ 2) / 18"
63.862 then ()
63.863 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 47";
63.864 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 47";
63.865
63.866 (*SRD Schalk I, p.70 Nr. 469 *)
63.867 val t = str2term
63.868 @@ -1618,7 +1618,7 @@
63.869 if (term2str t) =
63.870 "3 * b ^^^ 3 / (2 * a + -2 * b)"
63.871 then ()
63.872 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 48";
63.873 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 48";
63.874
63.875 (*----------------------------------------------------------------------*)
63.876 (*---------------------- Mehrfache Dppelbrueche ------------------------*)
63.877 @@ -1630,7 +1630,7 @@
63.878 "((a^^^2 - b^^^2)/(2*a*b)+2*a*b/(a^^^2 - b^^^2))/((a^^^2+b^^^2)/(2*a*b)+1) / ((a^^^2+b^^^2)^^^2/(a+b)^^^2)";
63.879 val SOME (t,_) = rewrite_set_ thy false norm_Rational t;
63.880 if term2str t = "1 / (a ^^^ 2 + -1 * b ^^^ 2)" then ()
63.881 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 49";
63.882 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 49";
63.883
63.884 "----- Schalk I, p.70 Nr. 477a";
63.885 (* MG Achtung: terme explodieren; Bsp zu komplex;
63.886 @@ -1653,11 +1653,11 @@
63.887 if term2str t' =
63.888 "(2 * a ^^^ 3 + 2 * a ^^^ 2 * b) / (a ^^^ 2 * b + b ^^^ 3)"
63.889 then ()
63.890 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 51";
63.891 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 51";
63.892
63.893 (* TODO.new_c:WN050820 STOP_REW_SUB introduced gave ...
63.894 if term2str t' = "(a ^^^ 4 + -1 * a ^^^ 2 * b ^^^ 2) /\n(a * b * (b + (a * (a + -1 * b) + -1 * b * (a + -1 * b)) / (2 * a)) *\n (a + -1 * b))" then ()
63.895 -else raise error "rational.sml: works again";
63.896 +else error "rational.sml: works again";
63.897 re-outcommented with TODO.new_c: cvs before 071227, 11:50*)
63.898
63.899
63.900 @@ -1671,7 +1671,7 @@
63.901 if (term2str t) =
63.902
63.903 then ()
63.904 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 52";
63.905 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 52";
63.906
63.907 (*MG Berechne Zwischenergebnisse: WN060831 nonterm.SK00*)
63.908 val t = str2term
63.909 @@ -1751,7 +1751,7 @@
63.910 val t = str2term " (1 + x^^^5) / (y + x) + x^^^3 / x ";
63.911 val SOME (t,_) = rewrite_set_ thy false common_nominator_p t;
63.912 if term2str t = "(1 + x ^^^ 3 + x ^^^ 5 + y * x ^^^ 2) / (x + y)" then()
63.913 -else raise error "";
63.914 +else error "";
63.915
63.916 (*--------------------------------------------------------------------*)
63.917 (* cancel_p liefert nicht immer Polynomnormalform (2): WN060831???SK3b
63.918 @@ -1793,19 +1793,19 @@
63.919 val t = str2term "(a^^^2 + -1)/(a+1)";
63.920 val SOME (t',_) = rewrite_set_ thy false cancel_p t;
63.921 if term2str t' = "(-1 + a) / 1" then ()
63.922 -else raise error "rational.sml MG tests 3d";
63.923 +else error "rational.sml MG tests 3d";
63.924
63.925 "----- NOT TERMINATING ?: worked before 0707xx";
63.926 val t = str2term "(a^^^2 - 1)*(b + 1) / ((b^^^2 - 1)*(a+1))";
63.927 val SOME (t'',_) = rewrite_set_ thy false norm_Rational t;
63.928 if term2str t'' = "(1 + -1 * a) / (1 + -1 * b)" then ()
63.929 -else raise error "rational.sml MG tests 3e";
63.930 +else error "rational.sml MG tests 3e";
63.931
63.932 "----- corrected SK060905";
63.933 val t = str2term "(4*x^^^2 - 20*x + 25)/(2*x - 5)^^^3";
63.934 val SOME (t',_) = rewrite_set_ thy false norm_Rational(*_mg*) t;
63.935 if term2str t' = "-1 / (5 + -2 * x)" then ()
63.936 -else raise error "rational.sml corrected SK060905";
63.937 +else error "rational.sml corrected SK060905";
63.938
63.939
63.940 "--------------------------------------------------------------------";
63.941 @@ -1820,7 +1820,7 @@
63.942 if (term2str t) =
63.943 "5 * x ^^^ 2 / (b ^^^ 3 * c)"
63.944 then ()
63.945 -else raise error "rational.sml.sml: diff.behav. in norm_Rational_mg 53";
63.946 +else error "rational.sml.sml: diff.behav. in norm_Rational_mg 53";
63.947
63.948 "-------- me Schalk I No.186 -------------------------------------";
63.949 "-------- me Schalk I No.186 -------------------------------------";
63.950 @@ -1845,7 +1845,7 @@
63.951 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;(*++ for explicit script*)
63.952 case (f2str f, nxt) of
63.953 ("14", ("End_Proof'", _)) => ()
63.954 - | _ => raise error "rational.sml diff.behav. in me Schalk I No.186";
63.955 + | _ => error "rational.sml diff.behav. in me Schalk I No.186";
63.956
63.957
63.958 "-------- interSteps ..Simp_Rat_Double_No-1.xml ------------------";
63.959 @@ -1889,7 +1889,7 @@
63.960 val newnds = children (get_nd pt [2,1]) (*see "fun detailrls"*);
63.961 (*if length newnds = 12 then () WN060905*)
63.962 if length newnds = 13 then ()
63.963 -else raise error "rational.sml: interSteps cancel_p rev_rew_p";
63.964 +else error "rational.sml: interSteps cancel_p rev_rew_p";
63.965
63.966 val p = ([2,1,9],Res);
63.967 getTactic 1 p;
63.968 @@ -1897,7 +1897,7 @@
63.969 (*case tac of SOME (Rewrite ("sym_real_plus_binom_times1", _)) => ()
63.970 WN060905*)
63.971 case tac of SOME (Rewrite ("sym_real_add_mult_distrib2", _)) => ()
63.972 -| _ => raise error "rational.sml: getTactic, sym_real_plus_binom_times1";
63.973 +| _ => error "rational.sml: getTactic, sym_real_plus_binom_times1";
63.974
63.975
63.976 "-------- investigate rulesets for cancel_p ----------------------";
63.977 @@ -1998,14 +1998,14 @@
63.978 val t = str2term "(x^^^2 - 4)*(3 - y) / ((y^^^2 - 9)*(2+x))";
63.979 val SOME (t',_) = rewrite_set_ thy false norm_Rational t;
63.980 if term2str t' = "(2 + -1 * x) / (3 + y)" then ()
63.981 -else raise error "rational.sml SK060904-1a worked since 0707xx";
63.982 +else error "rational.sml SK060904-1a worked since 0707xx";
63.983
63.984 "----- SK060904-1b non-termination of cancel_p_ ... worked before 0707xx";
63.985 val t = str2term "(9 * a ^^^ 2 + -16 * b ^^^ 2) /\
63.986 \(36 * a^^^2 * c + (27 * a^^^2 * e + (-64 * b^^^2 * c + -48 * b^^^2 * e)))";
63.987 val SOME (t',_) = cancel_p_ thy t;
63.988 if term2str t' = "1 / (4 * c + 3 * e)" then ()
63.989 -else raise error "rational.sml SK060904-1b";
63.990 +else error "rational.sml SK060904-1b";
63.991
63.992
63.993 "----- SK060904-2a non-termination of add_fraction_p_";
63.994 @@ -2027,14 +2027,14 @@
63.995 "-------- how to stepwise construct Scripts ----------------------";
63.996 "-------- how to stepwise construct Scripts ----------------------";
63.997 "-------- how to stepwise construct Scripts ----------------------";
63.998 -lse raise error "rational.sml SK060904-1a worked since 0707xx";
63.999 +lse error "rational.sml SK060904-1a worked since 0707xx";
63.1000
63.1001 "----- SK060904-1b non-termination of cancel_p_ ... worked before 0707xx";
63.1002 val t = str2term "(9 * a ^^^ 2 + -16 * b ^^^ 2) /\
63.1003 \(36 * a^^^2 * c + (27 * a^^^2 * e + (-64 * b^^^2 * c + -48 * b^^^2 * e)))";
63.1004 val SOME (t',_) = cancel_p_ thy t;
63.1005 if term2str t' = "1 / (4 * c + 3 * e)" then ()
63.1006 -else raise error "rational.sml SK060904-1b";
63.1007 +else error "rational.sml SK060904-1b";
63.1008
63.1009
63.1010 "----- SK060904-2a non-termination of add_fraction_p_";
63.1011 @@ -2056,14 +2056,14 @@
63.1012 "-------- how to stepwise construct Scripts ----------------------";
63.1013 "-------- how to stepwise construct Scripts ----------------------";
63.1014 "-------- how to stepwise construct Scripts ----------------------";
63.1015 -lse raise error "rational.sml SK060904-1a worked since 0707xx";
63.1016 +lse error "rational.sml SK060904-1a worked since 0707xx";
63.1017
63.1018 "----- SK060904-1b non-termination of cancel_p_ ... worked before 0707xx";
63.1019 val t = str2term "(9 * a ^^^ 2 + -16 * b ^^^ 2) /\
63.1020 \(36 * a^^^2 * c + (27 * a^^^2 * e + (-64 * b^^^2 * c + -48 * b^^^2 * e)))";
63.1021 val SOME (t',_) = cancel_p_ thy t;
63.1022 if term2str t' = "1 / (4 * c + 3 * e)" then ()
63.1023 -else raise error "rational.sml SK060904-1b";
63.1024 +else error "rational.sml SK060904-1b";
63.1025
63.1026
63.1027 "----- SK060904-2a non-termination of add_fraction_p_";
64.1 --- a/test/Tools/isac/Knowledge/rlang.sml Tue Sep 28 08:58:06 2010 +0200
64.2 +++ b/test/Tools/isac/Knowledge/rlang.sml Tue Sep 28 09:06:56 2010 +0200
64.3 @@ -79,7 +79,7 @@
64.4 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.5 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.6 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2]")) => ()
64.7 - | _ => raise error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 5 [x = 2]";
64.8 + | _ => error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 5 [x = 2]";
64.9
64.10 (*----------------- Schalk I s.86 Bsp 19 ------------------------*)
64.11 "Schalk I s.86 Bsp 19 (x - 5)*(10 - x) = (3 - x)*(2 + x) + 2*(x + 20)";
64.12 @@ -109,7 +109,7 @@
64.13 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.14 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.15 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 8]")) => ()
64.16 - | _ => raise error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 19 [x = 8]";
64.17 + | _ => error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 19 [x = 8]";
64.18
64.19 (*----------------- Schalk I s.86 Bsp 23 ------------------------*)
64.20 "Schalk I s.86 Bsp 19 ((2*x+5)^^^2+(3*x+4)^^^2=(13*x+2)*(x+1)+2*(15+14*x))";
64.21 @@ -139,7 +139,7 @@
64.22 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.23 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.24 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = -9]")) => ()
64.25 - | _ => raise error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 23 [x = -9]";
64.26 + | _ => error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 23 [x = -9]";
64.27
64.28 (*----------------- Schalk I s.86 Bsp 25 ------------------------*)
64.29 "Schalk I s.86 Bsp 25 ((2*x+1)^^^3+(x+1)^^^3=(2*x+1)^^^2*2*x+(x+2)^^^3+x^^^2)";
64.30 @@ -169,7 +169,7 @@
64.31 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.32 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.33 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = -6 / 5]")) => ()
64.34 - | _ => raise error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 25 [x = -6 / 5]";
64.35 + | _ => error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 25 [x = -6 / 5]";
64.36
64.37 (*----------------- Schalk I s.86 Bsp 28b ------------------------*)
64.38 "Schalk I s.86 Bsp 28b ((3*x+5)/18 - x/2 = -((3*x - 2)/9))";
64.39 @@ -197,7 +197,7 @@
64.40 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.41 val (p,_,f,nxt,_,pt) = me nxt p [1] pt; f2str f;
64.42 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[]")) => ()
64.43 - | _ => raise error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 28b []";
64.44 + | _ => error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 28b []";
64.45
64.46 (*WN---v *)
64.47 val bdv= (term_of o the o (parse thy)) "bdv";
64.48 @@ -205,12 +205,12 @@
64.49 val t = (term_of o the o (parse thy)) "3 * x / 5";
64.50 val SOME (t',_) = rewrite_set_inst_ PolyEq.thy true
64.51 [(bdv, v)] make_ratpoly_in t;
64.52 -if term2str t' = "3 / 5 * x" then () else raise error "rlang.sml: 1";
64.53 +if term2str t' = "3 / 5 * x" then () else error "rlang.sml: 1";
64.54
64.55 val t = str2term "(3*x+5)/18 - x/2 - -(3*x - 2)/9 = 0";
64.56 val subst = [(str2term "bdv", str2term "x")];
64.57 val SOME (t',_) = rewrite_set_inst_ thy false subst make_ratpoly_in t;
64.58 -if term2str t' = "1 / 18 = 0" then () else raise error "rlang.sml: 2";
64.59 +if term2str t' = "1 / 18 = 0" then () else error "rlang.sml: 2";
64.60 (*WN---^ *)
64.61
64.62 (*----------------- Schalk I s.87 Bsp 36b ------------------------*)
64.63 @@ -240,7 +240,7 @@
64.64 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.65 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.66 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = -237 / 65]")) => ()
64.67 - | _ => raise error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 36b [x = -237 / 65]";
64.68 + | _ => error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 36b [x = -237 / 65]";
64.69
64.70
64.71 (*WN---v *)
64.72 @@ -249,7 +249,7 @@
64.73 val SOME (t',_) = rewrite_set_inst_ thy false subst make_ratpoly_in t;
64.74 term2str t';
64.75 if term2str t' = "79 / 12 + 65 / 36 * x = 0" then ()
64.76 -else raise error "rlang.sml: 3";
64.77 +else error "rlang.sml: 3";
64.78 (*WN---^ *)
64.79
64.80
64.81 @@ -279,7 +279,7 @@
64.82 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.83 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.84 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "296 + -3900 * x = 0")) then ()
64.85 -else raise error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 38b";
64.86 +else error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 38b";
64.87 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.88 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.89 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.90 @@ -291,7 +291,7 @@
64.91 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.92 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.93 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 74 / 975]")) => ()
64.94 - | _ => raise error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 38b [x = 74 / 975]";
64.95 + | _ => error "rlang.sml: diff.behav. in Schalk I s.86 Bsp 38b [x = 74 / 975]";
64.96
64.97 (*----------------- Schalk I s.87 Bsp 40b ------------------------*)
64.98 "Schalk I s.87 Bsp 40b ((x+3)/(2*x - 4)=3)";
64.99 @@ -321,7 +321,7 @@
64.100 (*val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.101 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;*)
64.102 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "15 + -5 * x = 0")) then ()
64.103 -else raise error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 40b";
64.104 +else error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 40b";
64.105 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.106 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.107 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.108 @@ -332,7 +332,7 @@
64.109 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.110 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.111 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 3]")) => ()
64.112 - | _ => raise error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 40b [x = 3]";
64.113 + | _ => error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 40b [x = 3]";
64.114
64.115
64.116 (*----------------- Schalk I s.87 Bsp 44a ------------------------*)
64.117 @@ -365,20 +365,20 @@
64.118 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.119 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.120 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1]")) => ()
64.121 - | _ => raise error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 44a [x = 1]";
64.122 + | _ => error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 44a [x = 1]";
64.123
64.124 (*WN---v *)
64.125 val t = str2term "(1/2 + (5*x)/2)^^^2 - ((13*x)/2 - 5/2)^^^2 - (6*x)^^^2 + 29";
64.126 val subst = [(str2term "bdv", str2term "x")];
64.127 val SOME (t',_) = rewrite_set_inst_ thy false subst make_ratpoly_in t;
64.128 if term2str t' = "23 + 35 * x + -72 * x ^^^ 2" then ()
64.129 -else raise error "rlang.sml: 4";
64.130 +else error "rlang.sml: 4";
64.131
64.132 val t = str2term "(1/2 + (5*x)/2)^^^2 - ((13*x)/2 - 5/2)^^^2 + (6*x)^^^2 - 29";
64.133 val subst = [(str2term "bdv", str2term "x")];
64.134 val SOME (t',_) = rewrite_set_inst_ thy false subst make_ratpoly_in t;
64.135 if term2str t' = "-35 + 35 * x" then ()
64.136 -else raise error "rlang.sml: 4.1";
64.137 +else error "rlang.sml: 4.1";
64.138 (*WN---^ *)
64.139
64.140 (*----------------- Schalk I s.87 Bsp 52a ------------------------*)
64.141 @@ -404,7 +404,7 @@
64.142 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.143 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.144 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "16 + 12 * x = 0")) then ()
64.145 -else raise error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 52a";
64.146 +else error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 52a";
64.147 (*Subproblem["degree_1", "polynomial", "univariate", "equation"]*)
64.148 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.149 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.150 @@ -416,7 +416,7 @@
64.151 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.152 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.153 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = -4 / 3]")) => ()
64.154 - | _ => raise error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 52a [x = -4 / 3]";
64.155 + | _ => error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 52a [x = -4 / 3]";
64.156
64.157 (*----------------- Schalk I s.87 Bsp 55b ------------------------*)
64.158 "Schalk I s.87 Bsp 55b (x/(x^^^2 - 6*x+9) - 1/(x^^^2 - 3*x) =1/x)";
64.159 @@ -447,7 +447,7 @@
64.160 (*val (p,_,f,nxt,_,pt) = me nxt p [1] pt; 040209 MGs norm_Rational*)
64.161 (* val nxt = Subproblem ("PolyEq",["polynomial","univariate","equation"])*)
64.162 if f= Form' (FormKF (~1, EdUndef, 0, Nundef, "-6 * x + 5 * x ^^^ 2 = 0"))then()
64.163 -else raise error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 55b";
64.164 +else error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 55b";
64.165 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.166 (*nxt=Model_Problem["bdv_only","degree_2","polynomial","univariate","equation*)
64.167 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.168 @@ -477,11 +477,11 @@
64.169 val nxt = ("Check_elementwise",Check_elementwise "Assumptions")*)
64.170 val [(aaa,ppp)] = get_assumptions_ pt p;
64.171 if term2str aaa = "9 * x + -6 * x ^^^ 2 + x ^^^ 3 ~= 0" then ()
64.172 -else raise error "rlang.sml: diff.behav. in I s.87 Bsp 55b [x = 6 / 5], asms";
64.173 +else error "rlang.sml: diff.behav. in I s.87 Bsp 55b [x = 6 / 5], asms";
64.174 (*WN060717 unintentionally changed some rls/ord while
64.175 completing knowl. for thes2file...
64.176 if term2str aaa = "9 * x + (x ^^^ 3 + -6 * x ^^^ 2) ~= 0" then ()
64.177 -else raise error "rlang.sml: diff.behav. in I s.87 Bsp 55b [x = 6 / 5], asms";
64.178 +else error "rlang.sml: diff.behav. in I s.87 Bsp 55b [x = 6 / 5], asms";
64.179 .... but it became even better*)
64.180
64.181 (*22.10.03:
64.182 @@ -502,7 +502,7 @@
64.183 val nxt =Check_Postcond ["rational","univariate","equation"]) *)
64.184 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.185 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 6 / 5]")) => ()
64.186 - | _ => raise error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 55b [x = 6 / 5]";
64.187 + | _ => error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 55b [x = 6 / 5]";
64.188
64.189 (*----------------- Schalk I s.88 Bsp 64c ------------------------*)
64.190 "Schalk I s.88 Bsp 64c (((x - 1)/(x+1)+1)/((x - 1)/(x+1) - (x+1)/(x - 1))=2)";
64.191 @@ -530,7 +530,7 @@
64.192 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.193 val (p,_,f,nxt,_,pt) = me nxt p [1] pt; f2str f;
64.194 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "-3 + -1 * x = 0")) then ()
64.195 -else raise error "rlangsml: diff.behav. in Schalk I s.88 Bsp 64c";
64.196 +else error "rlangsml: diff.behav. in Schalk I s.88 Bsp 64c";
64.197 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.198 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.199 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.200 @@ -542,7 +542,7 @@
64.201 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.202 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.203 case f of Form' (FormKF (_,_,0,_,"[x = -3]")) => ()
64.204 - | _ => raise error "rlang.sml: diff.behav. in Schalk I s.88 Bsp 64c [x = -3]";
64.205 + | _ => error "rlang.sml: diff.behav. in Schalk I s.88 Bsp 64c [x = -3]";
64.206
64.207 (*----------------- Schalk I s.88 Bsp 79a (2) ------------------------*)
64.208 "Schalk I s.88 Bsp 79a (2) (m1*v1+m2*v2=0)";
64.209 @@ -571,7 +571,7 @@
64.210 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.211 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.212 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[m1 = -1 * m2 * v2 / v1]")) => ()
64.213 - | _ => raise error "rlang.sml: diff.behav. in Schalk I s.88 Bsp 79a (2) [m1 = -1 * m2 * v2 / v1]";
64.214 + | _ => error "rlang.sml: diff.behav. in Schalk I s.88 Bsp 79a (2) [m1 = -1 * m2 * v2 / v1]";
64.215
64.216 (*----------------- Schalk I s.89 Bsp 90a(1) ------------------------*)
64.217 "Schalk I s.89 Bsp 90a (1) (f=((w+u)/(w+v))*v0)";
64.218 @@ -613,7 +613,7 @@
64.219 0,
64.220 Nundef,
64.221 "f * w + -1 * u * v0 + -1 * v0 * w + f * v = 0")) then ()
64.222 -else raise error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 90a";
64.223 +else error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 90a";
64.224 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.225 (*val nxt = Model_Problem ["degree_1","polynomial","univariate","equation"])*)
64.226 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.227 @@ -646,10 +646,10 @@
64.228 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.229 case f of Form' (FormKF (~1,EdUndef,0,Nundef,
64.230 "[v = (u * v0 + v0 * w + -1 * f * w) / f]")) => ()
64.231 - | _ => raise error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 90a (1) [v=...]";
64.232 + | _ => error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 90a (1) [v=...]";
64.233 if get_assumptions_ pt p =
64.234 [(str2term"(u * v0 + v0 * w + -1 * f * w) / f + w ~= 0",[])] then ()
64.235 -else raise error "rlang.sml: diff.behav. in I s.89 Bsp 90a (1) [v=...] asm";
64.236 +else error "rlang.sml: diff.behav. in I s.89 Bsp 90a (1) [v=...] asm";
64.237
64.238
64.239 (*----------------- Schalk I s.89 Bsp 90a(2) ------------------------*)
64.240 @@ -682,7 +682,7 @@
64.241 0,
64.242 Nundef,
64.243 "f * v + -1 * u * v0 + (f + -1 * v0) * w = 0")) then ()
64.244 -else raise error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 90a (2)";
64.245 +else error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 90a (2)";
64.246 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.247 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.248 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.249 @@ -693,12 +693,12 @@
64.250 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.251 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.252 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[w = (u * v0 + -1 * f * v) / (f + -1 * v0)]")) => ()
64.253 - | _ => raise error "rlang.sml: diff.behav. in Schalk I Bsp 90a(2)";
64.254 + | _ => error "rlang.sml: diff.behav. in Schalk I Bsp 90a(2)";
64.255 if get_assumptions_ pt p =
64.256 [(str2term"v + (u * v0 + -1 * f * v) / (f + -1 * v0) ~= 0",[]),
64.257 (str2term"f + -1 * v0 ~= 0",[])]
64.258 then writeln "asm should be simplified ???"
64.259 -else raise error "rlang.sml: diff.behav. in Schalk I Bsp 90a(2) asm";
64.260 +else error "rlang.sml: diff.behav. in Schalk I Bsp 90a(2) asm";
64.261
64.262 (*----------------- Schalk I s.89 Bsp 98a(1) ------------------------*)
64.263 "Schalk I s.89 Bsp 98a (1) (1/R=1/R1+1/R2)";
64.264 @@ -727,7 +727,7 @@
64.265 if f = Form'
64.266 (FormKF
64.267 (~1, EdUndef, 0, Nundef, "-1 * R * R2 + (R2 + -1 * R) * R1 = 0"))then()
64.268 -else raise error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 98a (1)";
64.269 +else error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 98a (1)";
64.270 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.271 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.272 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.273 @@ -738,12 +738,12 @@
64.274 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.275 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.276 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[R1 = R * R2 / (R2 + -1 * R)]")) => ()
64.277 - | _ => raise error "rlang.sml: diff.behav. in 98a(1) [R1 = ...]";
64.278 + | _ => error "rlang.sml: diff.behav. in 98a(1) [R1 = ...]";
64.279 if get_assumptions_ pt p = [(str2term"R * R2 * R2 ~= (R2 + -1 * R) * 0",[]),
64.280 (str2term"R2 + -1 * R ~= 0",[]),
64.281 (str2term"R2 + -1 * R ~= 0",[])]
64.282 then writeln "asm should be simplified"
64.283 -else raise error "rlang.sml: diff.behav. in 98a(1) asm";
64.284 +else error "rlang.sml: diff.behav. in 98a(1) asm";
64.285
64.286 (*----------------- Schalk I s.89 Bsp 104a(1) ------------------------*)
64.287 "Schalk I s.89 Bsp 104a (1) (y^^^2=2*p*x)";
64.288 @@ -772,10 +772,10 @@
64.289 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.290 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.291 case f of Form' (FormKF (_,_,0,_,"[p = y ^^^ 2 / (2 * x)]")) => ()
64.292 - | _ => raise error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 104a (1) [p = y^2/(2*x)]";
64.293 + | _ => error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 104a (1) [p = y^2/(2*x)]";
64.294 if get_assumptions_ pt p = [(str2term"-2 * x ~= 0",[])]
64.295 then writeln"should be x ~= 0\nshould be x ~= 0\nshould be x ~= 0\n"
64.296 -else raise error "rlang.sml: diff.behav. in I s.89 Bsp 104a(1) asm";
64.297 +else error "rlang.sml: diff.behav. in I s.89 Bsp 104a(1) asm";
64.298
64.299
64.300 (*----------------- Schalk I s.89 Bsp 104a(2) ------------------------*)
64.301 @@ -806,9 +806,9 @@
64.302 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.303 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.304 case f of Form' (FormKF (_,_,0,_,"[y = sqrt (2 * p * x), y = -1 * sqrt (2 * p * x)]")) => ()
64.305 -| _ => raise error "rlang.sml: diff.behav. Schalk I s.89 Bsp 104a(2) [x = ]";
64.306 +| _ => error "rlang.sml: diff.behav. Schalk I s.89 Bsp 104a(2) [x = ]";
64.307 if get_assumptions_ pt p = [(str2term"0 <= -1 * (-2 * p * x)",[]),(str2term"0 <= -1 * (-2 * p * x)",[])] then writeln "asm should be simplified\nshould be simplified"
64.308 -else raise error "rlang.sml: diff.behav. in I s.89 Bsp 104a(2) asm";
64.309 +else error "rlang.sml: diff.behav. in I s.89 Bsp 104a(2) asm";
64.310
64.311
64.312 (*----------------- Schalk I s.90 Bsp 118a (1) ------------------------*)
64.313 @@ -852,14 +852,14 @@
64.314 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;f2str f;get_asm (fst p, fst p) pt;
64.315 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;f2str f;get_asm (fst p, fst p) pt;
64.316 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = sqrt ((a ^^^ 2 * b ^^^ 2 + -1 * a ^^^ 2 * y ^^^ 2) / b ^^^ 2),\n x = -1 * sqrt ((a ^^^ 2 * b ^^^ 2 + -1 * a ^^^ 2 * y ^^^ 2) / b ^^^ 2)]")) => writeln"should be simplified MG"
64.317 -| _ => raise error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 118a(2) [x = ]";
64.318 +| _ => error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 118a(2) [x = ]";
64.319 val asms = get_assumptions_ pt p;
64.320 if asms = [(str2term"0 * b ^^^ 2 <= -1 * (a ^^^ 2 * y ^^^ 2 + -1 * a ^^^ 2 * b ^^^ 2)", []),
64.321 (str2term"b ^^^ 2 ~= 0", []),
64.322 (str2term"0 * b ^^^ 2 <= -1 * (a ^^^ 2 * y ^^^ 2 + -1 * a ^^^ 2 * b ^^^ 2)", []),
64.323 (str2term"b ^^^ 2 ~= 0", [])
64.324 ] then writeln"should be simplified MG"
64.325 -else raise error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 118a(2) asms";
64.326 +else error "rlang.sml: diff.behav. in Schalk I s.89 Bsp 118a(2) asms";
64.327
64.328 (*----------------- Schalk I s.102 Bsp 268(1) ------------------------*)
64.329 "Schalk I s.102 Bsp 268(1) (A = (1/2)*(x1*(y2-y3)+x2*(y3 - y1)+x3*(y1 - y2)))";
64.330 @@ -889,9 +889,9 @@
64.331 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.332 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.333 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x2 =\n (-2 * A + x1 * y2 + x3 * y1 + -1 * x1 * y3 + -1 * x3 * y2) /\n (y1 + -1 * y3)]")) => ()
64.334 -| _ => raise error "rlang.sml: diff.behav. Schalk I s.102 Bsp 268(1) [x2=...]";
64.335 +| _ => error "rlang.sml: diff.behav. Schalk I s.102 Bsp 268(1) [x2=...]";
64.336 if get_assumptions_ pt p = [(str2term"y1 / 2 + -1 * y3 / 2 ~= 0",[])] then ()
64.337 -else raise error "rlang.sml: diff.behav. in I s.102 Bsp 268(1) asm";
64.338 +else error "rlang.sml: diff.behav. in I s.102 Bsp 268(1) asm";
64.339
64.340 (*-------------------- Schalk II ----------------------------*)
64.341 (*-------------------- Schalk II ----------------------------*)
64.342 @@ -926,7 +926,7 @@
64.343 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.344 val (p,_,f,nxt,_,pt) = me nxt p [1] pt; f2str f;
64.345 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "-2 + x = 0")) then ()
64.346 -else raise error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 67b";
64.347 +else error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 67b";
64.348 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.349 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.350 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.351 @@ -937,7 +937,7 @@
64.352 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.353 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.354 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2]")) => ()
64.355 - | _ => raise error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 67b [x=2]";
64.356 + | _ => error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 67b [x=2]";
64.357
64.358 (*----------------- Schalk II s.56 Bsp 68a ------------------------*)
64.359 "Schalk II s.56 Bsp 68a (5*sqrt(x) - 1 = 7*sqrt(x) - 5)";
64.360 @@ -983,7 +983,7 @@
64.361 if f = Form'
64.362 (FormKF
64.363 (~1, EdUndef, 0, Nundef, "256 + -2368 * x + 576 * x ^^^ 2 = 0"))then()
64.364 -else raise error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 68a";
64.365 +else error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 68a";
64.366 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.367 get_assumptions_ pt p;
64.368 (* val nxt = ("Model_Problem", Model_Problem
64.369 @@ -1001,7 +1001,7 @@
64.370 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.371 if f = Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 4, x = 1 / 9]"))
64.372 then writeln "only [x = 4] !\nonly [x = 4] !\nonly [x = 4] !\n"
64.373 -else raise error "rlang.sml: diff.behav. in II 68a";
64.374 +else error "rlang.sml: diff.behav. in II 68a";
64.375 val asms = get_assumptions_ pt p;
64.376 if asms2str asms =
64.377 "[(0 <= (25 * (1 / 9) + -1 * (16 + 49 * (1 / 9))) * -56, []),\
64.378 @@ -1019,7 +1019,7 @@
64.379 (str2term"9 ~= 0", []),
64.380 (str2term"0 <= (25 * (1 / 9) + -1 * (16 + 49 * (1 / 9))) * -56", [])]*)
64.381 then "should get True * False!!!"
64.382 -else raise error "rlang.sml: diff.behav. in II 68a asms";
64.383 +else error "rlang.sml: diff.behav. in II 68a asms";
64.384
64.385 (*----------------- Schalk II s.56 Bsp 73b ------------------------*)
64.386 "Schalk II s.56 Bsp 73b (sqrt(x+1)+sqrt(4*x+4)=sqrt(9*x+9))";
64.387 @@ -1056,7 +1056,7 @@
64.388 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.389 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.390 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "0 = 0")) then ()
64.391 -else raise error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 73b";
64.392 +else error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 73b";
64.393 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.394 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.395 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.396 @@ -1069,7 +1069,7 @@
64.397 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.398 val asm = get_assumptions_ pt p;
64.399 if asm=[] andalso f = Form' (FormKF (~1,EdUndef,0,Nundef,"UniversalList")) andalso nxt = ("End_Proof'",End_Proof') then ()
64.400 -else raise error "rlang.sml: diff.behav. in UniversalList 2";
64.401 +else error "rlang.sml: diff.behav. in UniversalList 2";
64.402
64.403 (*----------------- Schalk II s.56 Bsp 74a ------------------------*)
64.404 "Schalk II s.56 Bsp 74a (sqrt(4*x+1) - sqrt(x+3) = sqrt(x - 2))";
64.405 @@ -1107,7 +1107,7 @@
64.406 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.407 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.408 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "-24 + 4 * x = 0")) then ()
64.409 -else raise error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 74a";
64.410 +else error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 74a";
64.411 (*-> ubproblem ("PolyEq", ["degree_1", ...]*)
64.412 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.413 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.414 @@ -1120,7 +1120,7 @@
64.415 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.416 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.417 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 6]")) => ()
64.418 - | _ => raise error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 74a [x = 6]";
64.419 + | _ => error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 74a [x = 6]";
64.420
64.421
64.422 (*----------------- Schalk II s.56 Bsp 77b ------------------------*)
64.423 @@ -1167,7 +1167,7 @@
64.424 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.425 (*val (p,_,f,nxt,_,pt) = me nxt p [1] pt; since MGs norm_Rational*)
64.426 if f = Form'(FormKF (~1, EdUndef, 0, Nundef, "451584 + -112896 * x = 0"))then()
64.427 -else raise error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 77b";
64.428 +else error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 77b";
64.429 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.430 (* val nxt = ("Model_Problem",
64.431 Model_Problem ["degree_1","polynomial","univariate","equation"])*)
64.432 @@ -1181,7 +1181,7 @@
64.433 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.434 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.435 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[]")) => ()
64.436 - | _ => raise error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 77b []";
64.437 + | _ => error "rlang.sml: diff.behav. in Schalk II s.56 Bsp 77b []";
64.438 (*added 040209 at introducing MGs norm_Rational ?!*)
64.439 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.440
64.441 @@ -1214,7 +1214,7 @@
64.442 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.443 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.444 case f of Form' (FormKF (_,_,0,_,"[x = 5, x = -5]")) => ()
64.445 - | _ => raise error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 4 []";
64.446 + | _ => error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 4 []";
64.447
64.448
64.449 (*----------------- Schalk II s.66 Bsp 8a ------------------------*)
64.450 @@ -1242,7 +1242,7 @@
64.451 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.452 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.453 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "-8 + 2 * x ^^^ 2 = 0")) then ()
64.454 -else raise error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 8a";
64.455 +else error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 8a";
64.456 (*-> Subproblem ("PolyEq", ["polynomial", ...])*)
64.457 (*
64.458 val Form' (FormKF (~1, EdUndef, 0, Nundef, str)) = f;
64.459 @@ -1257,7 +1257,7 @@
64.460 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.461 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.462 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 2, x = -2]")) => ()
64.463 - | _ => raise error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 8a [x = 2, x = -2]";
64.464 + | _ => error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 8a [x = 2, x = -2]";
64.465
64.466 (*----------------- Schalk II s.66 Bsp 10b ------------------------*)
64.467 "Schalk II s.66 Bsp 10b (1/(x^^^2 - 9)+(2*x+3)/(x+3)=(3*x+4)/(x - 3))";
64.468 @@ -1290,7 +1290,7 @@
64.469 0,
64.470 Nundef,
64.471 "60 + 28 * x + -13 * x ^^^ 2 + -1 * x ^^^ 3 = 0")) then ()
64.472 -else raise error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 10b";
64.473 +else error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 10b";
64.474 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.475 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.476 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.477 @@ -1332,7 +1332,7 @@
64.478 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.479 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.480 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "-25 + x ^^^ 2 = 0")) then ()
64.481 -else raise error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 20a";
64.482 +else error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 20a";
64.483 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.484 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.485 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.486 @@ -1345,7 +1345,7 @@
64.487 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.488 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.489 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 5, x = -5]")) => ()
64.490 - | _ => raise error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 20a [x = 5, x = -5]";
64.491 + | _ => error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 20a [x = 5, x = -5]";
64.492
64.493 (*----------------- Schalk II s.66 Bsp 23b ------------------------*)
64.494 "Schalk II s.66 Bsp 23b (2*sqrt(261 - x) - sqrt(2+2*x)=sqrt(2)*sqrt(5 - 3*x))";
64.495 @@ -1384,7 +1384,7 @@
64.496 if f = Form'
64.497 (FormKF
64.498 (~1, EdUndef, 0, Nundef, "-1064944 + 32 * x + -48 * x ^^^ 2 = 0"))then()
64.499 -else raise error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 23b";
64.500 +else error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 23b";
64.501 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.502 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.503 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.504 @@ -1393,7 +1393,7 @@
64.505 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.506 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.507 case f of Form' (FormKF (~1,EdUndef,_,Nundef,"[]")) => ()
64.508 - | _ => raise error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 23b []";
64.509 + | _ => error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 23b []";
64.510
64.511 (*----------------- Schalk II s.66 Bsp 28a ------------------------*)
64.512 "Schalk II s.66 Bsp 28a (A=(c/d)*sqrt(4*a^^^2 - c^^^2))";
64.513 @@ -1427,7 +1427,7 @@
64.514 "c ^^^ 4 / d ^^^ 2 + A ^^^ 2 * d ^^^ 2 / d ^^^ 2 +\n-4 * c ^^^ 2 / d ^^^ 2 * a ^^^ 2 =\n0")) then ()*)
64.515 if f2str f =
64.516 "c ^^^ 4 / d ^^^ 2 + A ^^^ 2 / 1 + -4 * c ^^^ 2 / d ^^^ 2 * a ^^^ 2 = 0"
64.517 -then () else raise error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 28a";
64.518 +then () else error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 28a";
64.519 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.520 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.521 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.522 @@ -1438,7 +1438,7 @@
64.523 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.524 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.525 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[a = sqrt ((c ^^^ 4 + A ^^^ 2 * d ^^^ 2) / (4 * c ^^^ 2)),\n a = -1 * sqrt ((c ^^^ 4 + A ^^^ 2 * d ^^^ 2) / (4 * c ^^^ 2))]")) => ()
64.526 -| _ => raise error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 28a [a=...]";
64.527 +| _ => error "rlang.sml: diff.behav. in Schalk II s.66 Bsp 28a [a=...]";
64.528
64.529
64.530
64.531 @@ -1479,7 +1479,7 @@
64.532 0,
64.533 Nundef,
64.534 "b * a ^^^ 2 + -1 * a * b ^^^ 2 + (a ^^^ 2 + b ^^^ 2 + -2 * a * b) * x +\n(b + -1 * a) * x ^^^ 2 =\n0")) then ()
64.535 -else raise error "rlang.sml: diff.behav. in chalk I s.87 Bsp 38b";
64.536 +else error "rlang.sml: diff.behav. in chalk I s.87 Bsp 38b";
64.537 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.538 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.539 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.540 @@ -1502,7 +1502,7 @@
64.541 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;(*1 additional for MGs norm_Rational*)
64.542 if p = ([],Res) andalso f = Form' (FormKF (~1,EdUndef,0,Nundef,
64.543 "[x =\n (2 * a * b + -1 * a ^^^ 2 + -1 * b ^^^ 2 +\n sqrt\n (a ^^^ 4 + b ^^^ 4 + -4 * a * a * b ^^^ 2 + -4 * a * b * a ^^^ 2 +\n -4 * b * b * a ^^^ 2 +\n 4 * a * a * b ^^^ 2 +\n 4 * a * b * a ^^^ 2 +\n 2 * a ^^^ 2 * b ^^^ 2)) /\n (-2 * a + 2 * b),\n x =\n (2 * a * b + -1 * a ^^^ 2 + -1 * b ^^^ 2 +\n -1 *\n sqrt\n (a ^^^ 4 + b ^^^ 4 + -4 * a * a * b ^^^ 2 + -4 * a * b * a ^^^ 2 +\n -4 * b * b * a ^^^ 2 +\n 4 * a * a * b ^^^ 2 +\n 4 * a * b * a ^^^ 2 +\n 2 * a ^^^ 2 * b ^^^ 2)) /\n (-2 * a + 2 * b)]")) andalso nxt = ("End_Proof'",End_Proof') then writeln"simplify MG"
64.544 -else raise error "rlang.sml: diff.behav. in rational-a-b";
64.545 +else error "rlang.sml: diff.behav. in rational-a-b";
64.546
64.547 (*----------------- Schalk II s.68 Bsp 56a ------------------------*)
64.548 "Schalk II s.68 Bsp 56a ((a+b*x)/(a-b*x) - (a - b*x)/(a+b*x)= (4*a*b)/(a^^^2 - b^^^2))";
64.549 @@ -1629,7 +1629,7 @@
64.550 Nundef,
64.551 (*"-4 * b ^^^ 2 + -4 * a * b + 4 * b ^^^ 2 + 8 * a * b +\n(-2 * a + -4 * a + -4 * b + 2 * a + 8 * b) * x +\n-4 * x ^^^ 2 =\n0" before MG*)
64.552 "4 * a * b + (-4 * a + 4 * b) * x + -4 * x ^^^ 2 = 0")) then ()
64.553 -else raise error "rlang.sml: diff.behav. in Schalk II s.68 Bsp 61b";
64.554 +else error "rlang.sml: diff.behav. in Schalk II s.68 Bsp 61b";
64.555 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.556 (*val nxt = ("Model_Problem", Model_Problem
64.557 ["abcFormula","degree_2","polynomial","univariate","equation"])*)
64.558 @@ -1649,7 +1649,7 @@
64.559 (*if f = Form' (FormKF (~1,EdUndef,0,Nundef, with norm_Rational before MG
64.560 "[x =\n (-2 * a + -4 * b + 6 * a +\n sqrt\n (32 * a * b + -16 * a ^^^ 2 + -48 * b ^^^ 2 + 24 * a ^^^ 2 +\n 64 * b ^^^ 2 +\n 8 * a ^^^ 2)) /\n -8,\n x =\n (-2 * a + -4 * b + 6 * a +\n -1 *\n sqrt\n (32 * a * b + -16 * a ^^^ 2 + -48 * b ^^^ 2 + 24 * a ^^^ 2 +\n 64 * b ^^^ 2 +\n 8 * a ^^^ 2)) /\n -8]")) then writeln"simplify MG"*)
64.561 if f = Form' (FormKF (~1,EdUndef,0,Nundef,"[x =\n (-4 * b + 4 * a + sqrt (32 * a * b + 16 * a ^^^ 2 + 16 * b ^^^ 2)) / -8,\n x =\n (-4 * b + 4 * a + -1 * sqrt (32 * a * b + 16 * a ^^^ 2 + 16 * b ^^^ 2)) /\n -8]")) then ()
64.562 -else raise error "rlang.sml: diff.behav. Bsp 61b";
64.563 +else error "rlang.sml: diff.behav. Bsp 61b";
64.564 (*WN.18.12.03: extreme run-time !!!*)
64.565
64.566
64.567 @@ -1681,7 +1681,7 @@
64.568 0,
64.569 Nundef,
64.570 "-4 * a * b + (-4 * b + 2 * a) * x + 2 * x ^^^ 2 = 0")) then ()
64.571 -else raise error "rlang.sml: diff.behav. in Schalk II s.68 Bsp 62b";
64.572 +else error "rlang.sml: diff.behav. in Schalk II s.68 Bsp 62b";
64.573 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.574 (*val nxt = ("Model_Problem", Model_Problem
64.575 ["abcFormula","degree_2","polynomial","univariate","equation"])*)
64.576 @@ -1699,7 +1699,7 @@
64.577 (*val (p,_,f,nxt,_,pt) = me nxt p [1] pt;introduc.MGs norm_Rational*)
64.578 if f = Form' (FormKF (~1,EdUndef,0,Nundef,
64.579 "[x = (-2 * a + 4 * b + sqrt (16 * a * b + 16 * b ^^^ 2 + 4 * a ^^^ 2)) / 4,\n x =\n (-2 * a + 4 * b + -1 * sqrt (16 * a * b + 16 * b ^^^ 2 + 4 * a ^^^ 2)) / 4]")) then writeln "simplify MG"
64.580 -else raise error "rlang.sml: diff.behav. in II 62b [x=...]";
64.581 +else error "rlang.sml: diff.behav. in II 62b [x=...]";
64.582 val asms = get_assumptions_ pt p;
64.583 if asms = [(str2term"0 <= ((-2 * a + 4 * b + sqrt (16 * a * b + 16 * b ^^^ 2 + 4 * a ^^^ 2)) / 4 + a) ^^^ 2 + ((-2 * a + 4 * b + sqrt (16 * a * b + 16 * b ^^^ 2 + 4 * a ^^^ 2)) / 4 - 2 * b) ^^^ 2", []),
64.584 (str2term"0 <= a + 2 * b", []),
64.585 @@ -1710,7 +1710,7 @@
64.586 (str2term"8 * (-4 * a * b) <= (-4 * b + 2 * a) ^^^ 2", []),
64.587 (str2term"8 * (-4 * a * b) <= (-4 * b + 2 * a) ^^^ 2", [])]
64.588 then writeln "should be simplified MG"
64.589 -else raise error "rlang.sml: diff.behav. in II 62b asms";
64.590 +else error "rlang.sml: diff.behav. in II 62b asms";
64.591
64.592 "------ WN.TEST---------------------------------";
64.593 "------ WN.TEST---------------------------------";
64.594 @@ -1732,7 +1732,7 @@
64.595 val subst = [(str2term "bdv", str2term "x")];
64.596 val SOME (t',_) = rewrite_set_inst_ thy false subst make_ratpoly_in t;
64.597 if term2str t' = "x ^^^ 2 + 2 * x ^^^ 3 = 0" then ()
64.598 -else raise error "rlang.sml: 7";
64.599 +else error "rlang.sml: 7";
64.600 *)
64.601 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.602 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.603 @@ -1746,7 +1746,7 @@
64.604 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.605 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
64.606 if f = Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 0, x = 0, x = -1 / 2]")) then()
64.607 -else raise error "rlang.sml WN.TEST new behaviour";
64.608 +else error "rlang.sml WN.TEST new behaviour";
64.609
64.610 "------ rlang.sml end---------------------------------";
64.611
64.612 @@ -1798,7 +1798,7 @@
64.613 if f = Form' (FormKF (~1,EdUndef,0,Nundef,
64.614 "[a = sqrt ((-1 * b ^^^ 2 + 4 * r ^^^ 2) / 1),\n a = -1 * sqrt ((-1 * b ^^^ 2 + 4 * r ^^^ 2) / 1)]")) andalso nxt = ("End_Proof'",End_Proof')
64.615 then writeln"simplify result\nsimplify result\nsimplify result"
64.616 -else raise error "rlang.sml: diff.behav. in Pythagoras";
64.617 +else error "rlang.sml: diff.behav. in Pythagoras";
64.618 val asms = get_assumptions_ pt p;
64.619 (*if asms = [(str2term"0 <= -4 * (b ^^^ 2 / 4 + -4 * r ^^^ 2 / 4)", []),
64.620 (str2term"0 <= -4 * (b ^^^ 2 / 4 + -4 * r ^^^ 2 / 4)", [])]*)
64.621 @@ -1806,7 +1806,7 @@
64.622 "[(0 <= -4 * (b ^^^ 2 / 4 + -1 * r ^^^ 2 / 1), []),\
64.623 \(0 <= -4 * (b ^^^ 2 / 4 + -1 * r ^^^ 2 / 1), [])]"
64.624 then writeln"simplify result\nsimplify result\nsimplify result"
64.625 -else raise error "rlang.sml: diff.behav. in Pythagoras asms";
64.626 +else error "rlang.sml: diff.behav. in Pythagoras asms";
64.627
64.628
64.629 "-------------------- WN.15.5.03: equation within the maximum example ------";
64.630 @@ -1864,7 +1864,7 @@
64.631 0,
64.632 Nundef,
64.633 "-16 * r ^^^ 4 + 8 * r ^^^ 2 * u ^^^ 2 = 0")) then ()
64.634 -else raise error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 38b";
64.635 +else error "rlang.sml: diff.behav. in Schalk I s.87 Bsp 38b";
64.636 val (p,_,f,nxt,_,pt) = me nxt p c pt;
64.637 (*val nxt = Model_Problem ["sq_only","degree_2","polynomial","univariate","equation"]) *)
64.638 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
64.639 @@ -1880,4 +1880,4 @@
64.640 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
64.641 val (p,_,f,nxt,_,pt) = me nxt p c pt;
64.642 if f = Form' (FormKF (~1,EdUndef,0,Nundef,"[u = sqrt (2 * r ^^^ 2 / 1), u = -1 * sqrt (2 * r ^^^ 2 / 1)]")) then()
64.643 -else raise error "rlang.sml WN.TEST new behaviour in max-rooteq";
64.644 +else error "rlang.sml WN.TEST new behaviour in max-rooteq";
65.1 --- a/test/Tools/isac/Knowledge/root.sml Tue Sep 28 08:58:06 2010 +0200
65.2 +++ b/test/Tools/isac/Knowledge/root.sml Tue Sep 28 09:06:56 2010 +0200
65.3 @@ -5,11 +5,11 @@
65.4
65.5 val t = str2term "sqrt 1";
65.6 val SOME (t',_) = rewrite_set_ thy false Root_erls t;
65.7 -if term2str t' = "1" then () else raise error "root.sml: diff.behav. sqrt 1";
65.8 +if term2str t' = "1" then () else error "root.sml: diff.behav. sqrt 1";
65.9 val t = str2term "sqrt -1";
65.10 val NONE = rewrite_set_ thy false Root_erls t;
65.11
65.12 val t = str2term "sqrt 0";
65.13 val SOME (t',_) = rewrite_set_ thy false Root_erls t;
65.14 term2str t';
65.15 -if term2str t' = "0" then () else raise error "root.sml: diff.behav. sqrt 1";
65.16 +if term2str t' = "0" then () else error "root.sml: diff.behav. sqrt 1";
66.1 --- a/test/Tools/isac/Knowledge/rooteq.sml Tue Sep 28 08:58:06 2010 +0200
66.2 +++ b/test/Tools/isac/Knowledge/rooteq.sml Tue Sep 28 09:06:56 2010 +0200
66.3 @@ -18,72 +18,72 @@
66.4 val t = (term_of o the o (parse RootEq.thy)) "(sqrt(2+x+3)) is_rootTerm_in x";
66.5 val SOME(t_, _) = rewrite_set_ RootEq.thy false RootEq_prls t;
66.6 val result = term2str t_;
66.7 -if result <> "True" then raise error "rooteq.sml: new behaviour:" else ();
66.8 +if result <> "True" then error "rooteq.sml: new behaviour:" else ();
66.9
66.10 val t = (term_of o the o (parse RootEq.thy)) "(sqrt(2+x+3)) is_rootTerm_in x";
66.11 val SOME(t_, _) = rewrite_set_ RootEq.thy false RootEq_prls t;
66.12 val result = term2str t_;
66.13 -if result <> "True" then raise error "rooteq.sml: new behaviour:" else ();
66.14 +if result <> "True" then error "rooteq.sml: new behaviour:" else ();
66.15
66.16 val t = (term_of o the o (parse RootEq.thy)) "(nroot 5 (x+4)) is_rootTerm_in x";
66.17 val SOME(t_, _) = rewrite_set_ RootEq.thy false RootEq_prls t;
66.18 val result = term2str t_;
66.19 -if result <> "True" then raise error "rooteq.sml: new behaviour:" else ();
66.20 +if result <> "True" then error "rooteq.sml: new behaviour:" else ();
66.21
66.22 val t = (term_of o the o (parse RootEq.thy)) "(sqrt(2+x+3)) is_sqrtTerm_in x";
66.23 val SOME(t_, _) = rewrite_set_ RootEq.thy false RootEq_prls t;
66.24 val result = term2str t_;
66.25 -if result <> "True" then raise error "rooteq.sml: new behaviour:" else ();
66.26 +if result <> "True" then error "rooteq.sml: new behaviour:" else ();
66.27
66.28 val t = (term_of o the o (parse RootEq.thy)) "(sqrt(25)) is_sqrtTerm_in x";
66.29 val SOME(t_, _) = rewrite_set_ RootEq.thy false RootEq_prls t;
66.30 val result = term2str t_;
66.31 -if result <> "False" then raise error "rooteq.sml: new behaviour:" else ();
66.32 +if result <> "False" then error "rooteq.sml: new behaviour:" else ();
66.33
66.34 val t = (term_of o the o (parse RootEq.thy)) "sqrt(1 + x) is_normSqrtTerm_in x";
66.35 val SOME(t_, _) = rewrite_set_ RootEq.thy false RootEq_prls t;
66.36 val result = term2str t_;
66.37 -if result <> "True" then raise error "rooteq.sml: new behaviour:" else ();
66.38 +if result <> "True" then error "rooteq.sml: new behaviour:" else ();
66.39
66.40 val t = (term_of o the o (parse RootEq.thy)) "(3+3*sqrt(x)) is_normSqrtTerm_in x";
66.41 val SOME(t_, _) = rewrite_set_ RootEq.thy false RootEq_prls t;
66.42 val result = term2str t_;
66.43 -if result <> "True" then raise error "rooteq.sml: new behaviour:" else ();
66.44 +if result <> "True" then error "rooteq.sml: new behaviour:" else ();
66.45
66.46 val t = (term_of o the o (parse RootEq.thy)) "(sqrt(x+1)+1) is_normSqrtTerm_in x";
66.47 val SOME(t_, _) = rewrite_set_ RootEq.thy false RootEq_prls t;
66.48 val result = term2str t_;
66.49 -if result <> "False" then raise error "rooteq.sml: new behaviour:" else ();
66.50 +if result <> "False" then error "rooteq.sml: new behaviour:" else ();
66.51
66.52 val t = (term_of o the o (parse RootEq.thy)) "(1 - u/(sqrt(r - u))) is_normSqrtTerm_in u";
66.53 val SOME(t_, _) = rewrite_set_ RootEq.thy false RootEq_prls t;
66.54 val result = term2str t_;
66.55 -if result <> "False" then raise error "rooteq.sml: new behaviour:" else ();
66.56 +if result <> "False" then error "rooteq.sml: new behaviour:" else ();
66.57
66.58 val t = (term_of o the o (parse RootEq.thy)) "(x*(1+x)/(sqrt(x+1))) is_normSqrtTerm_in x";
66.59 val SOME(t_, _) = rewrite_set_ RootEq.thy false RootEq_prls t;
66.60 val result = term2str t_;
66.61 -if result <> "True" then raise error "rooteq.sml: new behaviour:" else ();
66.62 +if result <> "True" then error "rooteq.sml: new behaviour:" else ();
66.63
66.64 val t = (term_of o the o (parse RootEq.thy)) "(1 - (sqrt(2+x+3)^^^3)) is_normSqrtTerm_in x";
66.65 val SOME(t_, _) = rewrite_set_ RootEq.thy false RootEq_prls t;
66.66 val result = term2str t_;
66.67 -if result <> "False" then raise error "rooteq.sml: new behaviour:" else ();
66.68 +if result <> "False" then error "rooteq.sml: new behaviour:" else ();
66.69
66.70 val t = (term_of o the o (parse RootEq.thy)) "(1 + (sqrt(2+x+3)^^^3)) is_normSqrtTerm_in x";
66.71 val SOME(t_, _) = rewrite_set_ RootEq.thy false RootEq_prls t;
66.72 val result = term2str t_;
66.73 -if result <> "True" then raise error "rooteq.sml: new behaviour:" else ();
66.74 +if result <> "True" then error "rooteq.sml: new behaviour:" else ();
66.75
66.76
66.77
66.78 val result = match_pbl ["equality (sqrt(x)=1)","solveFor x","solutions L"]
66.79 (get_pbt ["root'","univariate","equation"]);
66.80 -case result of Matches' _ => () | _ => raise error "rooteq.sml: new behaviour:";
66.81 +case result of Matches' _ => () | _ => error "rooteq.sml: new behaviour:";
66.82
66.83 val result = match_pbl ["equality (sqrt(25)=1)","solveFor x","solutions L"]
66.84 (get_pbt ["root'","univariate","equation"]);
66.85 -case result of NoMatch' _ => () | _ => raise error "rooteq.sml: new behaviour:";
66.86 +case result of NoMatch' _ => () | _ => error "rooteq.sml: new behaviour:";
66.87
66.88 (*---------rooteq---- 23.8.02 ---------------------*)
66.89 "---------(1/sqrt(x)=5)---------------------";
66.90 @@ -112,7 +112,7 @@
66.91 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.92 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.93 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "1 + -25 * x = 0")) then ()
66.94 -else raise error "rooteq.sml: diff.behav.poly in (1/sqrt(x)=5)";
66.95 +else error "rooteq.sml: diff.behav.poly in (1/sqrt(x)=5)";
66.96 (*-> Subproblem ("PolyEq", ["polynomial", ...])*)
66.97 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.98 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.99 @@ -126,14 +126,14 @@
66.100 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.101 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.102 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1 / 25]")) => ()
66.103 - | _ => raise error "rooteq.sml: diff.behav. [x = 1 / 25]";
66.104 + | _ => error "rooteq.sml: diff.behav. [x = 1 / 25]";
66.105 if asms2str (get_assumptions_ pt p) = "[(0 <= 1 / 25, [])]"
66.106 (*WN050916 before correction 'rewrite__set_ called with 'Erls' for ..:
66.107 [(str2term"25 ~= 0",[])] *)
66.108 then writeln "should be True\n\
66.109 \should be True\n\
66.110 \should be True\n"
66.111 -else raise error "rooteq.sml: diff.behav. with 25 ~= 0";
66.112 +else error "rooteq.sml: diff.behav. with 25 ~= 0";
66.113
66.114 "---------(sqrt(x+1)=5)---------------------";
66.115 val fmz = ["equality (sqrt(x+1)=5)","solveFor x","solutions L"];
66.116 @@ -157,7 +157,7 @@
66.117 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.118 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.119 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "-24 + x = 0")) then ()
66.120 -else raise error "rooteq.sml: diff.behav.poly in sqrt(x+1)=5";
66.121 +else error "rooteq.sml: diff.behav.poly in sqrt(x+1)=5";
66.122 (*-> Subproblem ("PolyEq", ["polynomial", ...])*)
66.123 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.124 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.125 @@ -169,7 +169,7 @@
66.126 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.127 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.128 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 24]")) => ()
66.129 - | _ => raise error "rooteq.sml: diff.behav. [x = 24]";
66.130 + | _ => error "rooteq.sml: diff.behav. [x = 24]";
66.131
66.132 "-------------(4*sqrt(4*x+2)=3*sqrt(2*x+24))-----------------";
66.133 val fmz = ["equality (4*sqrt(4*x+2)=3*sqrt(2*x+24))","solveFor x","solutions L"];
66.134 @@ -188,7 +188,7 @@
66.135 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.136 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.137 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "-184 + 46 * x = 0")) then ()
66.138 -else raise error "rooteq.sml: diff.behav.poly in 4*sqrt(4*x+2)=3*sqrt(2*x+24)";
66.139 +else error "rooteq.sml: diff.behav.poly in 4*sqrt(4*x+2)=3*sqrt(2*x+24)";
66.140 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.141 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.142 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.143 @@ -199,11 +199,11 @@
66.144 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.145 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
66.146 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 4]")) => ()
66.147 - | _ => raise error "rooteq.sml: diff.behav. [x = 4]";
66.148 + | _ => error "rooteq.sml: diff.behav. [x = 4]";
66.149 if get_assumptions_ pt p = [(str2term"0 <= 12 * sqrt 2 * 4",[])]
66.150 then writeln "should be True\nshould be True\nshould be True\n\
66.151 \should be True\nshould be True\nshould be True\n"
66.152 -else raise error "rooteq.sml: diff.behav. with 0 <= 12 * sqrt 2 * 4";
66.153 +else error "rooteq.sml: diff.behav. with 0 <= 12 * sqrt 2 * 4";
66.154
66.155 "--------------(sqrt(x+1)+sqrt(4*x+4)=sqrt(9*x+9))----------------";
66.156 val fmz = ["equality (sqrt(x+1)+sqrt(4*x+4)=sqrt(9*x+9))","solveFor x","solutions L"];
66.157 @@ -238,7 +238,7 @@
66.158 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.159 val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.160 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "0 = 0")) then ()
66.161 -else raise error "rooteq.sml: diff.behav.poly in (sqrt(x+1)+sqrt(4*x+4)=sqr..";
66.162 +else error "rooteq.sml: diff.behav.poly in (sqrt(x+1)+sqrt(4*x+4)=sqr..";
66.163 (*-> Subproblem ("PolyEq", ["degree_0", ...])*)
66.164 val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.165 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.166 @@ -252,7 +252,7 @@
66.167 val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.168 val asm = get_assumptions_ pt p;
66.169 if f = Form' (FormKF (~1,EdUndef,0,Nundef,"UniversalList")) andalso asm = []
66.170 -then () else raise error "rooteq.sml: diff.behav. in UniversalList 1";
66.171 +then () else error "rooteq.sml: diff.behav. in UniversalList 1";
66.172
66.173
66.174
66.175 @@ -285,7 +285,7 @@
66.176 (*val p = ([6,2],Res) val f = Form' (FormKF (~1,EdUndef,2,Nundef,"0 = 0"))
66.177 val nxt = Subproblem ("PolyEq",["polynomial","univariate","equation"]))*)
66.178 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "0 = 0")) then ()
66.179 -else raise error "rooteq.sml: diff.behav.poly in sqrt(x+1)+sqrt(4*x+4)=sqrt..";
66.180 +else error "rooteq.sml: diff.behav.poly in sqrt(x+1)+sqrt(4*x+4)=sqrt..";
66.181 val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.182 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.183 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.184 @@ -303,7 +303,7 @@
66.185 val nxt = Check_Postcond ["normalize","polynomial","univariate","equation"])*)
66.186 val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.187 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "UniversalList")) then ()
66.188 -else raise error "rooteq.sml: diff.behav.poly in sqrt(x+1)+sqrt(4*x+4)=sqrt..";
66.189 +else error "rooteq.sml: diff.behav.poly in sqrt(x+1)+sqrt(4*x+4)=sqrt..";
66.190 (* val Form' (FormKF (~1, EdUndef, 0, Nundef, str)) = f;
66.191 *)
66.192
66.193 @@ -337,7 +337,7 @@
66.194 (*val p = ([3,2],Res)val f = Form' (FormKF (~1,EdUndef,2,Nundef,"-1 + x = 0"))
66.195 val nxt = Subproblem ("PolyEq",["polynomial","univariate","equation"]))*)
66.196 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "-1 + x = 0")) then ()
66.197 -else raise error "rooteq.sml: diff.behav.poly in sqrt(x+1)+sqrt(4*x+4)=sqrt..";
66.198 +else error "rooteq.sml: diff.behav.poly in sqrt(x+1)+sqrt(4*x+4)=sqrt..";
66.199 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.200 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.201 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.202 @@ -366,7 +366,7 @@
66.203 val nxt = Check_Postcond ["sq","root'","univariate","equation"]) *)
66.204 val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.205 if p = ([],Res) andalso f = Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1]"))
66.206 -then () else raise error "diff.behav. in rooteq.sml: sqrt(x) = 1";
66.207 +then () else error "diff.behav. in rooteq.sml: sqrt(x) = 1";
66.208
66.209
66.210 "--------------(sqrt(x+1)+sqrt(4*x+4)=sqrt(9*x+9))---------- SHORTEST.1.----\
66.211 @@ -394,7 +394,7 @@
66.212 (*val p = ([2,2],Res) val f = Form' (FormKF (~1,EdUndef,2,Nundef,"0 = 0"))
66.213 val nxt = Subproblem ("PolyEq",["polynomial","univariate","equation"]))*)
66.214 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "0 = 0")) then ()
66.215 -else raise error "rooteq.sml: diff.behav.poly in sqrt(x+1)+sqrt(4*x+4)=sqrt..";
66.216 +else error "rooteq.sml: diff.behav.poly in sqrt(x+1)+sqrt(4*x+4)=sqrt..";
66.217 val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.218 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.219 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.220 @@ -415,7 +415,7 @@
66.221 val nxt = Check_Postcond ["sq","root'","univariate","equation"]) *)
66.222 val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.223 if p = ([],Res) andalso f = Form'(FormKF (~1,EdUndef,0,Nundef,"UniversalList"))
66.224 -then () else raise error "new behav. in rooteq.sml: sqrt x = sqrt x";
66.225 +then () else error "new behav. in rooteq.sml: sqrt x = sqrt x";
66.226
66.227
66.228 "--------------(3*sqrt(x+3)+sqrt(x+6)=sqrt(4*x+33))----------------";
66.229 @@ -450,7 +450,7 @@
66.230 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.231 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.232 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "-648 + -324 * x = 0")) then ()
66.233 -else raise error "rooteq.sml: diff.behav.poly in 3*sqrt(x+3)+sqrt(x+6)=sqrt..";
66.234 +else error "rooteq.sml: diff.behav.poly in 3*sqrt(x+3)+sqrt(x+6)=sqrt..";
66.235 (*-> Subproblem ("PolyEq", ["degree_1", ...])*)
66.236 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.237 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.238 @@ -463,7 +463,7 @@
66.239 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.240 val (p,_,f,nxt,_,pt) = me nxt p c pt;
66.241 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = -2]")) => ()
66.242 - | _ => raise error "rooteq.sml: diff.behav. [x = -2]";
66.243 + | _ => error "rooteq.sml: diff.behav. [x = -2]";
66.244
66.245 "----------- rooteq.sml end--------";
66.246
67.1 --- a/test/Tools/isac/Knowledge/rootrateq.sml Tue Sep 28 08:58:06 2010 +0200
67.2 +++ b/test/Tools/isac/Knowledge/rootrateq.sml Tue Sep 28 09:06:56 2010 +0200
67.3 @@ -15,37 +15,37 @@
67.4 val t1 = (term_of o the o (parse thy)) "(-8 - sqrt(x) + x^^^2) is_rootRatAddTerm_in x";
67.5 val SOME (t,_) = rewrite_set_ RootRatEq.thy false RootRatEq_prls t1;
67.6 if (term2str t) = "False" then ()
67.7 - else raise error "rootrateq.sml: diff.behav. 1 in is_rootRatAddTerm_in";
67.8 + else error "rootrateq.sml: diff.behav. 1 in is_rootRatAddTerm_in";
67.9
67.10 val t1 = (term_of o the o (parse thy)) "(1/x) is_rootRatAddTerm_in x";
67.11 val SOME (t,_) = rewrite_set_ RootRatEq.thy false RootRatEq_prls t1;
67.12 if (term2str t) = "False" then ()
67.13 - else raise error "rootrateq.sml: diff.behav. 2 in is_rootRatAddTerm_in";
67.14 + else error "rootrateq.sml: diff.behav. 2 in is_rootRatAddTerm_in";
67.15
67.16 val t1 = (term_of o the o (parse thy)) "(1/sqrt(x)) is_rootRatAddTerm_in x";
67.17 val SOME (t,_) = rewrite_set_ RootRatEq.thy false RootRatEq_prls t1;
67.18 if (term2str t) = "False" then ()
67.19 - else raise error "rootrateq.sml: diff.behav. 3 in is_rootRatAddTerm_in";
67.20 + else error "rootrateq.sml: diff.behav. 3 in is_rootRatAddTerm_in";
67.21
67.22 val t1 = (term_of o the o (parse thy)) "(1/(sqrt(x)+1)) is_rootRatAddTerm_in x";
67.23 val SOME (t,_) = rewrite_set_ RootRatEq.thy false RootRatEq_prls t1;
67.24 if (term2str t) = "True" then ()
67.25 - else raise error "rootrateq.sml: diff.behav. 4 in is_rootRatAddTerm_in";
67.26 + else error "rootrateq.sml: diff.behav. 4 in is_rootRatAddTerm_in";
67.27
67.28 val t1 = (term_of o the o (parse thy)) "(3 + 1/(1+sqrt(x))) is_rootRatAddTerm_in x";
67.29 val SOME (t,_) = rewrite_set_ RootRatEq.thy false RootRatEq_prls t1;
67.30 if (term2str t) = "True" then ()
67.31 - else raise error "rootrateq.sml: diff.behav. 5 in is_rootRatAddTerm_in";
67.32 + else error "rootrateq.sml: diff.behav. 5 in is_rootRatAddTerm_in";
67.33
67.34 val t1 = (term_of o the o (parse thy)) "(1/(1+sqrt(y)) + 3 + 1/(1+sqrt(x))) is_rootRatAddTerm_in x";
67.35 val SOME (t,_) = rewrite_set_ RootRatEq.thy false RootRatEq_prls t1;
67.36 if (term2str t) = "True" then ()
67.37 - else raise error "rootrateq.sml: diff.behav. 6 in is_rootRatAddTerm_in";
67.38 + else error "rootrateq.sml: diff.behav. 6 in is_rootRatAddTerm_in";
67.39
67.40 val t1 = (term_of o the o (parse thy)) "(1/(1+sqrt(x)) + 3 + 1/(1+sqrt(y))) is_rootRatAddTerm_in x";
67.41 val SOME (t,_) = rewrite_set_ RootRatEq.thy false RootRatEq_prls t1;
67.42 if (term2str t) = "True" then ()
67.43 - else raise error "rootrateq.sml: diff.behav. 7 in is_rootRatAddTerm_in";
67.44 + else error "rootrateq.sml: diff.behav. 7 in is_rootRatAddTerm_in";
67.45
67.46
67.47 "--------------------- test thm rootrat_equation_left_1 ---------------------";
67.48 @@ -81,7 +81,7 @@
67.49 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.50 val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.51 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "1 + -4 * x = 0")) then ()
67.52 -else raise error "rootrateq.sml: diff.behav. in rootrat_equation_left_1";
67.53 +else error "rootrateq.sml: diff.behav. in rootrat_equation_left_1";
67.54 (*-> Subproblem ("RootEq", ["polynomial", ...])*)
67.55 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.56 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.57 @@ -94,7 +94,7 @@
67.58 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.59 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.60 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1 / 4]")) => ()
67.61 - | _ => raise error "rootrateq.sml: diff.behav. in -2 + 1/(1 - sqrt(x))= 0 -> [x = 1/4]";
67.62 + | _ => error "rootrateq.sml: diff.behav. in -2 + 1/(1 - sqrt(x))= 0 -> [x = 1/4]";
67.63
67.64 "--------------------- test thm rootrat_equation_left_2 ---------------------";
67.65 val fmz = ["equality (3/(1+sqrt(x))= 1)", "solveFor x","solutions L"];
67.66 @@ -128,7 +128,7 @@
67.67 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.68 val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.69 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "4 + -1 * x = 0")) then ()
67.70 -else raise error "rootrateq.sml: diff.behav. in rootrat_equation_left_2";
67.71 +else error "rootrateq.sml: diff.behav. in rootrat_equation_left_2";
67.72 (*-> Subproblem ("PolyEq", ["polynomial", ...])*)
67.73 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.74 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.75 @@ -141,7 +141,7 @@
67.76 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.77 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.78 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 4]")) => ()
67.79 - | _ => raise error "rootrateq.sml: diff.behav. in 3/(1+sqrt(x))= 1 -> [x = 4]";
67.80 + | _ => error "rootrateq.sml: diff.behav. in 3/(1+sqrt(x))= 1 -> [x = 4]";
67.81
67.82 "--------------------- test thm rootrat_equation_right_1 ---------------";
67.83 val fmz = ["equality ( 0= -2 + 1/(1 - sqrt(x)))", "solveFor x","solutions L"];
67.84 @@ -171,7 +171,7 @@
67.85 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.86 val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.87 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "-1 + 4 * x = 0")) then ()
67.88 -else raise error "rootrateq.sml: diff.behav.ppoly in rootrat_equation_right_1";
67.89 +else error "rootrateq.sml: diff.behav.ppoly in rootrat_equation_right_1";
67.90 val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.91 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.92 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.93 @@ -184,7 +184,7 @@
67.94 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.95 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.96 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 1 / 4]")) => ()
67.97 - | _ => raise error "rootrateq.sml: diff.behav. in -2 + 1/(1 - sqrt(x))= 0 -> [x = 1/4]";
67.98 + | _ => error "rootrateq.sml: diff.behav. in -2 + 1/(1 - sqrt(x))= 0 -> [x = 1/4]";
67.99
67.100 "--------------------- test thm rootrat_equation_right_2 --------------------";
67.101 val fmz = ["equality (1 = 3/(1+sqrt(x)))", "solveFor x","solutions L"];
67.102 @@ -213,7 +213,7 @@
67.103 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.104 val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.105 if f = Form' (FormKF (~1, EdUndef, 0, Nundef, "-4 + x = 0")) then ()
67.106 -else raise error "rootrateq.sml: diff.behav. in rootrat_equation_right_2";
67.107 +else error "rootrateq.sml: diff.behav. in rootrat_equation_right_2";
67.108 val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.109 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.110 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.111 @@ -226,4 +226,4 @@
67.112 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.113 val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;
67.114 case f of Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 4]")) => ()
67.115 - | _ => raise error "rootrateq.sml: diff.behav. in 3/(1+sqrt(x))= 1 -> [x = 4]";
67.116 + | _ => error "rootrateq.sml: diff.behav. in 3/(1+sqrt(x))= 1 -> [x = 4]";
68.1 --- a/test/Tools/isac/Knowledge/simplify.sml Tue Sep 28 08:58:06 2010 +0200
68.2 +++ b/test/Tools/isac/Knowledge/simplify.sml Tue Sep 28 09:06:56 2010 +0200
68.3 @@ -33,7 +33,7 @@
68.4 val Form res = (#1 o pt_extract) (pt, ([],Res));
68.5 show_pt pt;
68.6 if p = ([], Res) andalso term2str res = "5 * a" then ()
68.7 -else raise error "simplify.sml: diff.behav. CAScmd: Simplify (2*a + 3*a)";
68.8 +else error "simplify.sml: diff.behav. CAScmd: Simplify (2*a + 3*a)";
68.9
68.10
68.11 "----------- append inform with final result ---------------------";
68.12 @@ -54,4 +54,4 @@
68.13 val ((pt,p),_) = get_calc 1; show_pt pt;
68.14 val Form res = (#1 o pt_extract) (pt, ([],Res));
68.15 if p = ([], Res) andalso term2str res = "14" then ()
68.16 -else raise error "simplify.sml: append inform with final result ?!?";
68.17 +else error "simplify.sml: append inform with final result ?!?";
69.1 --- a/test/Tools/isac/Knowledge/system.sml Tue Sep 28 08:58:06 2010 +0200
69.2 +++ b/test/Tools/isac/Knowledge/system.sml Tue Sep 28 09:06:56 2010 +0200
69.3 @@ -24,21 +24,21 @@
69.4 val SOME (t,_) = rewrite_set_ thy false norm_Poly t;
69.5 if term2str t =
69.6 "[0 = -1 * q_0 * (0 / 2) + c_2, 0 = L * c + -1 * q_0 * (L ^^^ 2 / 2) + c_2]"
69.7 -then () else raise error "system.sml, diff.behav. in norm_Poly";
69.8 +then () else error "system.sml, diff.behav. in norm_Poly";
69.9
69.10 val t = str2term "[0 = c*0 + -1*q_0*(0^^^2 / 2) + c_2,\
69.11 \ 0 = c*L + -1*q_0*(L^^^2 / 2) + c_2]";
69.12 val SOME (t,_) = rewrite_set_ thy false norm_Rational t;
69.13 if term2str t =
69.14 "[0 = c_2, 0 = (2 * c_2 + 2 * L * c + -1 * L ^^^ 2 * q_0) / 2]"
69.15 -then () else raise error "system.sml, diff.behav. in norm_Rational";
69.16 +then () else error "system.sml, diff.behav. in norm_Rational";
69.17
69.18
69.19 val t = str2term "nth_ 1 [0 = c*0 + -1*q_0*(0^^^2 / 2) + c_2,\
69.20 \ 0 = c*L + -1*q_0*(L^^^2 / 2) + c_2]";
69.21 val SOME (t,_) = rewrite_set_ thy false list_rls t;
69.22 if term2str t = "0 = c * 0 + -1 * q_0 * (0 ^^^ 2 / 2) + c_2"
69.23 -then () else raise error "system.sml, list_rls";
69.24 +then () else error "system.sml, list_rls";
69.25
69.26
69.27 "----------- me --------------------------------------------------";
69.28 @@ -55,12 +55,12 @@
69.29 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
69.30 val (p,_,f,nxt,_,pt) = me nxt p c pt;
69.31 case nxt of (_, Specify_Theory "Biegelinie") => ()
69.32 - | _ => raise error "system.sml diff.behav.in me --1";
69.33 + | _ => error "system.sml diff.behav.in me --1";
69.34 val (p,_,f,nxt,_,pt) = me nxt p c pt;
69.35 val (p,_,f,nxt,_,pt) = me nxt p c pt;
69.36 val (p,_,f,nxt,_,pt) = me nxt p c pt;
69.37 case nxt of (_, Apply_Method ["EqSystem", "normalize", "2x2"]) => ()
69.38 - | _ => raise error "system.sml diff.behav.in me --2";
69.39 + | _ => error "system.sml diff.behav.in me --2";
69.40 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
69.41 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
69.42 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
69.43 @@ -69,18 +69,18 @@
69.44
69.45 case nxt of (_, Subproblem ("Biegelinie", ["triangular", "2x2",
69.46 "linear", "system"])) => ()
69.47 - | _ => raise error "system.sml diff.behav.in me --3";
69.48 + | _ => error "system.sml diff.behav.in me --3";
69.49 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
69.50 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
69.51 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
69.52 val (p,_,f,nxt,_,pt) = me nxt p c pt;
69.53 case nxt of (_, Specify_Theory "Biegelinie") => ()
69.54 - | _ => raise error "system.sml diff.behav.in me --1";
69.55 + | _ => error "system.sml diff.behav.in me --1";
69.56 val (p,_,f,nxt,_,pt) = me nxt p c pt;
69.57 val (p,_,f,nxt,_,pt) = me nxt p c pt;
69.58 val (p,_,f,nxt,_,pt) = me nxt p c pt;
69.59 case nxt of (_, Apply_Method ["EqSystem", "normalize", "2x2"]) => ()
69.60 - | _ => raise error "system.sml diff.behav.in me --2";
69.61 + | _ => error "system.sml diff.behav.in me --2";
69.62 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
69.63 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
69.64 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
69.65 @@ -92,9 +92,9 @@
69.66 WN060421 stopped as soon as exp_IsacCore_Equ_Sys_Lin_No-1.xml worked ...
69.67
69.68 if f2str f = "" then ()
69.69 -else raise error "system.sml diff.behav.in me --99";
69.70 +else error "system.sml diff.behav.in me --99";
69.71 case nxt of ("End_Proof'", End_Proof') => ()
69.72 - | _ => raise error "system.sml diff.behav.in me --99";
69.73 + | _ => error "system.sml diff.behav.in me --99";
69.74
69.75 print_depth 11;nxt;print_depth 3;
69.76 ---*)
70.1 --- a/test/Tools/isac/Knowledge/termorder.sml Tue Sep 28 08:58:06 2010 +0200
70.2 +++ b/test/Tools/isac/Knowledge/termorder.sml Tue Sep 28 09:06:56 2010 +0200
70.3 @@ -20,13 +20,13 @@
70.4 val x4 = (term_of o the o (parse thy)) "x + a + b";
70.5
70.6 if ord_make_polynomial_in true thy substx (x1,x2) = true(*LESS *) then ()
70.7 -else raise error "termorder.sml diff.behav ord_make_polynomial_in #1";
70.8 +else error "termorder.sml diff.behav ord_make_polynomial_in #1";
70.9
70.10 if ord_make_polynomial_in true thy substa (x1,x2) = true(*LESS *) then ()
70.11 -else raise error "termorder.sml diff.behav ord_make_polynomial_in #2";
70.12 +else error "termorder.sml diff.behav ord_make_polynomial_in #2";
70.13
70.14 if ord_make_polynomial_in true thy substb (x1,x2) = false(*GREATER*) then ()
70.15 -else raise error "termorder.sml diff.behav ord_make_polynomial_in #3";
70.16 +else error "termorder.sml diff.behav ord_make_polynomial_in #3";
70.17
70.18 val aa = (term_of o the o (parse thy)) "-1 * a * x";
70.19 val bb = (term_of o the o (parse thy)) "x^^^3";
70.20 @@ -47,7 +47,7 @@
70.21 val SOME (t',_) =
70.22 rewrite_set_inst_ thy false [(bdv,a)] make_polynomial_in x2;
70.23 if term2str t' = "b + x + a" then ()
70.24 -else raise error "termorder.sml diff.behav ord_make_polynomial_in #11";
70.25 +else error "termorder.sml diff.behav ord_make_polynomial_in #11";
70.26
70.27 val NONE =
70.28 rewrite_set_inst_ thy false [(bdv,b)] make_polynomial_in x2;
70.29 @@ -57,7 +57,7 @@
70.30 val SOME (t',_) =
70.31 rewrite_set_inst_ thy false [(bdv,x)] make_polynomial_in x2;
70.32 if term2str t' = "a + b + x" then ()
70.33 -else raise error "termorder.sml diff.behav ord_make_polynomial_in #13";
70.34 +else error "termorder.sml diff.behav ord_make_polynomial_in #13";
70.35
70.36
70.37
70.38 @@ -69,26 +69,26 @@
70.39 term2str t';
70.40 "(-6) + (-5 * x + (-15 * x ^^^ 2))";*)
70.41 if term2str t' = "-6 + -5 * x + -15 * x ^^^ 2 + 0" then ()
70.42 -else raise error "termorder.sml diff.behav ord_make_polynomial_in #14";
70.43 +else error "termorder.sml diff.behav ord_make_polynomial_in #14";
70.44
70.45 val SOME (t',_) =
70.46 rewrite_set_inst "Isac"false [("bdv","x")] "make_polynomial_in" ppp';
70.47 (*MG 2003...
70.48 "(-6) + (-5 * x + (-15) * x ^^^ 2)";*)
70.49 if t' = "-6 + -5 * x + -15 * x ^^^ 2 + 0" then ()
70.50 -else raise error "termorder.sml diff.behav ord_make_polynomial_in #15";
70.51 +else error "termorder.sml diff.behav ord_make_polynomial_in #15";
70.52
70.53 val ttt' = "(3*x + 5)/18";
70.54 val ttt = (term_of o the o (parse thy)) ttt';
70.55 val SOME (uuu,_) =
70.56 rewrite_set_inst_ thy false [(bdv,x)] make_polynomial_in ttt;
70.57 if term2str uuu = "(5 + 3 * x) / 18" then ()
70.58 -else raise error "termorder.sml diff.behav ord_make_polynomial_in #16";
70.59 +else error "termorder.sml diff.behav ord_make_polynomial_in #16";
70.60
70.61 val SOME (uuu,_) =
70.62 rewrite_set_ thy false make_polynomial ttt;
70.63 if term2str uuu = "(5 + 3 * x) / 18" then ()
70.64 -else raise error "termorder.sml diff.behav ord_make_polynomial_in #16";
70.65 +else error "termorder.sml diff.behav ord_make_polynomial_in #16";
70.66
70.67
70.68
71.1 --- a/test/Tools/isac/OLDTESTS/modspec.sml Tue Sep 28 08:58:06 2010 +0200
71.2 +++ b/test/Tools/isac/OLDTESTS/modspec.sml Tue Sep 28 09:06:56 2010 +0200
71.3 @@ -31,10 +31,10 @@
71.4 [([], Pbl), ([1], Frm),([1], Res), ([2], Res), ([3], Pbl), ([3, 1], Frm),
71.5 ([3, 1], Res), ([3, 2, 1], Frm), ([3, 2, 1], Res), ([3, 2, 2], Res),
71.6 ([3, 2], Res)] then () else
71.7 -raise error "modspec.sml: diff.behav. get_interval after replace} other 2 a";
71.8 +error "modspec.sml: diff.behav. get_interval after replace} other 2 a";
71.9
71.10 print_depth 99;map fst (get_interval ([3, 2, 1], Res) ([],Res) 9999 pt);
71.11 print_depth 3;
71.12 if map fst (get_interval ([3, 2, 1], Res) ([],Res) 9999 pt) =
71.13 [([3, 2, 1], Res), ([3, 2, 2], Res), ([3, 2], Res)] then () else
71.14 -raise error "modspec.sml: diff.behav. get_interval after replace} other 2 b";
71.15 +error "modspec.sml: diff.behav. get_interval after replace} other 2 b";
72.1 --- a/test/Tools/isac/OLDTESTS/root-equ.sml Tue Sep 28 08:58:06 2010 +0200
72.2 +++ b/test/Tools/isac/OLDTESTS/root-equ.sml Tue Sep 28 09:06:56 2010 +0200
72.3 @@ -77,7 +77,7 @@
72.4 (*"x = (0 + -1 * -36) // -15"*)
72.5 val rls = ("Test_simplify");
72.6 val (ct,_) = the (rewrite_set thy' false rls ct);
72.7 -if ct<>"x = -12 / 5"then raise error "new behaviour in testexample"else ();
72.8 +if ct<>"x = -12 / 5"then error "new behaviour in testexample"else ();
72.9
72.10 (*
72.11 val ct = "x = (-12) / 5" : cterm'
72.12 @@ -203,7 +203,7 @@
72.13 val (t,_) = the (rewrite_set_ thy false rls t);
72.14 val t' = term2str t;
72.15 if t' = "x = 4" then ()
72.16 -else raise error "root-equ.sml: new behav. in rewrite_ x+4";
72.17 +else error "root-equ.sml: new behav. in rewrite_ x+4";
72.18
72.19 " _________________ rewrite x=4_________________ ";
72.20 " _________________ rewrite x=4_________________ ";
72.21 @@ -249,7 +249,7 @@
72.22 "x = 0 + -1 * -4";
72.23 (*11*)val rls = "Test_simplify";
72.24 val (ct,_) = the (rewrite_set thy' false rls ct);
72.25 -if ct="x = 4" then () else raise error "new behaviour in test-example";
72.26 +if ct="x = 4" then () else error "new behaviour in test-example";
72.27
72.28
72.29
72.30 @@ -629,7 +629,7 @@
72.31 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
72.32 (* val nxt = ("End_Proof'",End_Proof');*)
72.33 if f <> (Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 4]")))
72.34 -then raise error "root-equ.sml: diff.behav. in me + tacs input"
72.35 +then error "root-equ.sml: diff.behav. in me + tacs input"
72.36 else ();
72.37
72.38 writeln (pr_ptree pr_short pt);
73.1 --- a/test/Tools/isac/OLDTESTS/script.sml Tue Sep 28 08:58:06 2010 +0200
73.2 +++ b/test/Tools/isac/OLDTESTS/script.sml Tue Sep 28 09:06:56 2010 +0200
73.3 @@ -237,7 +237,7 @@
73.4 (FormKF
73.5 (~1,EdUndef,1,Nundef,
73.6 "9 + 4 * x = 5 + 2 * x + 2 * sqrt (x ^^^ 2 + 5 * x)"))
73.7 -then () else raise error "behaviour in root-expl. Free_Solve changed";
73.8 +then () else error "behaviour in root-expl. Free_Solve changed";
73.9 writeln (pr_ptree pr_short pt);
73.10 ---------------------------------meNEW raises exception with not-locatable*)
73.11
73.12 @@ -317,29 +317,29 @@
73.13
73.14 val tacs = sel_rules pt ([],Pbl);
73.15 if tacs = [Apply_Method ["Test", "squ-equ-test-subpbl1"]] then ()
73.16 - else raise error "script.sml: diff.behav. in sel_rules ([],Pbl)";
73.17 + else error "script.sml: diff.behav. in sel_rules ([],Pbl)";
73.18
73.19 val tacs = sel_rules pt ([1],Res);
73.20 if tacs = [Rewrite_Set "norm_equation", Rewrite_Set "Test_simplify",
73.21 Subproblem ("Test.thy", ["linear", "univariate", "equation", "test"]),
73.22 Check_elementwise "Assumptions"] then ()
73.23 - else raise error "script.sml: diff.behav. in sel_rules ([1],Res)";
73.24 + else error "script.sml: diff.behav. in sel_rules ([1],Res)";
73.25
73.26 val tacs = sel_rules pt ([3],Pbl);
73.27 if tacs = [Apply_Method ["Test", "solve_linear"]] then ()
73.28 - else raise error "script.sml: diff.behav. in sel_rules ([3],Pbl)";
73.29 + else error "script.sml: diff.behav. in sel_rules ([3],Pbl)";
73.30
73.31 val tacs = sel_rules pt ([3,1],Res);
73.32 if tacs = [Rewrite_Set_Inst (["(bdv, x)"], "isolate_bdv"),
73.33 Rewrite_Set "Test_simplify"] then ()
73.34 - else raise error "script.sml: diff.behav. in sel_rules ([3,1],Res)";
73.35 + else error "script.sml: diff.behav. in sel_rules ([3,1],Res)";
73.36
73.37 val tacs = sel_rules pt ([3],Res);
73.38 if tacs = [Rewrite_Set "norm_equation", Rewrite_Set "Test_simplify",
73.39 Subproblem ("Test.thy", ["linear", "univariate", "equation", "test"]),
73.40 Check_elementwise "Assumptions"] then ()
73.41 - else raise error "script.sml: diff.behav. in sel_rules ([3],Res)";
73.42 + else error "script.sml: diff.behav. in sel_rules ([3],Res)";
73.43
73.44 val tacs = (sel_rules pt ([],Res)) handle PTREE str => [Tac str];
73.45 if tacs = [Tac "no tactics applicable at the end of a calculation"] then ()
73.46 - else raise error "script.sml: diff.behav. in sel_rules ([],Res)";
73.47 + else error "script.sml: diff.behav. in sel_rules ([],Res)";
74.1 --- a/test/Tools/isac/OLDTESTS/script_if.sml Tue Sep 28 08:58:06 2010 +0200
74.2 +++ b/test/Tools/isac/OLDTESTS/script_if.sml Tue Sep 28 09:06:56 2010 +0200
74.3 @@ -130,7 +130,7 @@
74.4 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
74.5 if f = Form' (FormKF (~1,EdUndef,0,Nundef,"[x = -1 / 2]"))
74.6 andalso nxt = ("End_Proof'",End_Proof') then ()
74.7 -else raise error "new behaviour in testexample rationals2.sml 1+2*x=0";
74.8 +else error "new behaviour in testexample rationals2.sml 1+2*x=0";
74.9
74.10 (*---------------------------------*)
74.11 "-------------- is_rootequ_in - SubProblem -------------------------";
74.12 @@ -166,4 +166,4 @@
74.13 if p = ([1,1],Frm) andalso
74.14 f = Form' (FormKF (~1,EdUndef,2,Nundef,"sqrt x - 1 = 0")) andalso
74.15 nxt = ("Empty_Tac",Empty_Tac) (*script ist noch 'helpless'*) then ()
74.16 -else raise error "new behaviour in testexample rationals2.sml sqrt(x) - 1 = 0";
74.17 +else error "new behaviour in testexample rationals2.sml sqrt(x) - 1 = 0";
75.1 --- a/test/Tools/isac/OLDTESTS/scriptnew.sml Tue Sep 28 08:58:06 2010 +0200
75.2 +++ b/test/Tools/isac/OLDTESTS/scriptnew.sml Tue Sep 28 09:06:56 2010 +0200
75.3 @@ -77,12 +77,12 @@
75.4 val (p,_,f,nxt,_,pt) = me nxt p c pt;
75.5 (*"#0"*)
75.6 if p=([4],Res) then ()
75.7 -else raise error ("new behaviour in 30.4.02 Testterm: p="^(pos'2str p));
75.8 +else error ("new behaviour in 30.4.02 Testterm: p="^(pos'2str p));
75.9 (*----script 666 ------------------------------------------------*)
75.10 val (p,_,f,nxt,_,pt) = me nxt p c pt;
75.11 (*"#0"*)
75.12 if nxt=("End_Proof'",End_Proof') then ()
75.13 -else raise error "new behaviour in 30.4.02 Testterm: End_Proof";
75.14 +else error "new behaviour in 30.4.02 Testterm: End_Proof";
75.15
75.16
75.17
75.18 @@ -149,7 +149,7 @@
75.19 val (p,_,f,nxt,_,pt) = me nxt p c pt;
75.20 if f=(Form' (FormKF (~1,EdUndef,0,Nundef,"a = 0 ^^^ 2"))) andalso
75.21 nxt=("End_Proof'",End_Proof') then ()
75.22 -else raise error "different behaviour test 9.5.02 Testeq: While Try Repeat @@";
75.23 +else error "different behaviour test 9.5.02 Testeq: While Try Repeat @@";
75.24
75.25
75.26
75.27 @@ -198,7 +198,7 @@
75.28 val (p,_,f,nxt,_,pt) = (me nxt p c pt) handle e => print_exn e;
75.29 if f=(Form' (FormKF (~1,EdUndef,0,Nundef,"[a = 0 ^^^ 2]"))) andalso
75.30 nxt=("End_Proof'",End_Proof') then ()
75.31 -else raise error "different behaviour in test 11.5.02 Testeq: let e_e =... in [e_]";
75.32 +else error "different behaviour in test 11.5.02 Testeq: let e_e =... in [e_]";
75.33
75.34
75.35
75.36 @@ -290,7 +290,7 @@
75.37 (* nxt = ("Check_Postcond",Check_Postcond ("Test.thy","sqrt-equ-test"));*)
75.38 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
75.39 if f<>(Form' (FormKF (~1,EdUndef,0,Nundef,"[x = 4]")))
75.40 -then raise error "scriptnew.sml 1: me + tacs from script: new behaviour"
75.41 +then error "scriptnew.sml 1: me + tacs from script: new behaviour"
75.42 else ();
75.43 "--- 15<> ---";
75.44 (* val nxt = ("End_Proof'",End_Proof');*)
75.45 @@ -375,7 +375,7 @@
75.46
75.47 (*FIXXXXXXXXXXXXXXXXXXXXXXXME reestablish check:
75.48 if f= Form'(FormKF(~1,EdUndef,1,Nundef,"sqrt (9 + 4 * x) = sqrt x + sqrt (5 + x)"))
75.49 -then() else raise error "new behaviour in test-example 1.norm sqrt-equ-test";
75.50 +then() else error "new behaviour in test-example 1.norm sqrt-equ-test";
75.51 #################################################*)
75.52
75.53 (* use"../tests/scriptnew.sml";
75.54 @@ -411,7 +411,7 @@
75.55 if asms = [(str2term "0 <= 9 + 4 * x",[1]),
75.56 (str2term "0 <= x",[1]),
75.57 (str2term "0 <= -3 + x",[1])] then ()
75.58 -else raise error "scriptnew.sml diff.behav. in sqrt assumptions 1";
75.59 +else error "scriptnew.sml diff.behav. in sqrt assumptions 1";
75.60
75.61 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
75.62 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
75.63 @@ -425,7 +425,7 @@
75.64 (str2term "0 <= -3 + x",[1]),
75.65 (str2term "0 <= x ^^^ 2 + -3 * x",[6]),
75.66 (str2term "0 <= 6 + x",[6])] then ()
75.67 -else raise error "scriptnew.sml diff.behav. in sqrt assumptions 2";
75.68 +else error "scriptnew.sml diff.behav. in sqrt assumptions 2";
75.69
75.70 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
75.71 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
75.72 @@ -442,7 +442,7 @@
75.73 ("Check_Postcond",Check_Postcond ["linear","univariate","equation","test"])*)
75.74 val asms = get_assumptions_ pt p;
75.75 if asms = [] then ()
75.76 -else raise error "scriptnew.sml diff.behav. in sqrt assumptions 3";
75.77 +else error "scriptnew.sml diff.behav. in sqrt assumptions 3";
75.78 val (p,_,f,nxt,_,pt) = me nxt p c pt;
75.79 (*val nxt = ("Check_elementwise",Check_elementwise "Assumptions")*)
75.80
75.81 @@ -468,7 +468,7 @@
75.82 val Form' (FormKF (_,_,_,_,ff)) = f;
75.83 if ff="[x = -12 / 5]"
75.84 then writeln("there should be L = []\nthere should be L = []\nthere should be L = []\nthere should be L = []\nthere should be L = []\n")
75.85 -else raise error "diff.behav. in scriptnew.sml; root-eq: L = []";
75.86 +else error "diff.behav. in scriptnew.sml; root-eq: L = []";
75.87
75.88 val asms = get_assumptions_ pt p;
75.89 if asms = [(str2term "0 <= 9 + 4 * (-12 / 5)",[]),
75.90 @@ -476,7 +476,7 @@
75.91 (str2term "0 <= -3 + -12 / 5", []),
75.92 (str2term "0 <= (-12 / 5) ^^^ 2 + -3 * (-12 / 5)", []),
75.93 (str2term "0 <= 6 + -12 / 5", [])] then ()
75.94 -else raise error "scriptnew.sml diff.behav. in sqrt assumptions 4";
75.95 +else error "scriptnew.sml diff.behav. in sqrt assumptions 4";
75.96
75.97
75.98 "------------------ script with Map, Subst (biquadr.equ.)---------";
76.1 --- a/test/Tools/isac/OLDTESTS/subp-rooteq.sml Tue Sep 28 08:58:06 2010 +0200
76.2 +++ b/test/Tools/isac/OLDTESTS/subp-rooteq.sml Tue Sep 28 09:06:56 2010 +0200
76.3 @@ -134,7 +134,7 @@
76.4 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
76.5 val Form' (FormKF (_,EdUndef,0,Nundef,res)) = f;
76.6 if (snd nxt)=End_Proof' andalso res="[x = 1]" then ()
76.7 -else raise error "subp-rooteq.sml: new.behav. in miniscript with mini-subpbl";
76.8 +else error "subp-rooteq.sml: new.behav. in miniscript with mini-subpbl";
76.9
76.10
76.11 "---------------- solve_linear as rootpbl -----------------";
76.12 @@ -177,7 +177,7 @@
76.13 val nxt = ("End_Proof'",End_Proof') : string * tac*)
76.14 val Form' (FormKF (_,EdUndef,0,Nundef,res)) = f;
76.15 if (snd nxt)=End_Proof' andalso res="[x = 1]" then ()
76.16 -else raise error "subp-rooteq.sml: new.behav. in solve_linear as rootpbl";
76.17 +else error "subp-rooteq.sml: new.behav. in solve_linear as rootpbl";
76.18
76.19
76.20 "---------------- solve_plain_square as rootpbl -----------";
76.21 @@ -210,7 +210,7 @@
76.22 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
76.23 val Form' (FormKF (~1,EdUndef,0,Nundef,res)) = f;
76.24 if snd nxt=End_Proof' andalso res="[x = -3, x = 3]" then ()
76.25 -else raise error "subp-rooteq.sml: new.behav. in solve_plain_square as rootpbl";
76.26 +else error "subp-rooteq.sml: new.behav. in solve_plain_square as rootpbl";
76.27
76.28
76.29
76.30 @@ -283,7 +283,7 @@
76.31 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
76.32 val Form' (FormKF (~1,EdUndef,0,Nundef,res)) = f;
76.33 if (snd nxt)=End_Proof' andalso res="[x = 4]" then ()
76.34 -else raise error "subp-rooteq.sml: new.behav. in root-eq + subpbl: solve_linear";
76.35 +else error "subp-rooteq.sml: new.behav. in root-eq + subpbl: solve_linear";
76.36
76.37
76.38
76.39 @@ -357,7 +357,7 @@
76.40 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
76.41 val Form' (FormKF (~1,EdUndef,0,Nundef,res)) = f;
76.42 if (snd nxt)=End_Proof' andalso res="[x = -3, x = 3]" then ()
76.43 -else raise error "subp-rooteq.sml: new.behav. in root-eq + subpbl: solve_plain_square";
76.44 +else error "subp-rooteq.sml: new.behav. in root-eq + subpbl: solve_plain_square";
76.45
76.46
76.47 writeln (pr_ptree pr_short pt);
76.48 @@ -420,12 +420,12 @@
76.49 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
76.50 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
76.51 if p = ([13],Res) then ()
76.52 -else raise error ("subp-rooteq.sml: new.behav. in \
76.53 +else error ("subp-rooteq.sml: new.behav. in \
76.54 \root-eq + subpbl: solve_linear, p ="^(pos'2str p));
76.55 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
76.56 val Form' (FormKF (~1,EdUndef,0,Nundef,res)) = f;
76.57 if (snd nxt)=End_Proof' andalso res="[x = 4]" then ()
76.58 -else raise error "subp-rooteq.sml: new.behav. in root-eq + subpbl: solve_plain_square";
76.59 +else error "subp-rooteq.sml: new.behav. in root-eq + subpbl: solve_plain_square";
76.60
76.61
76.62
76.63 @@ -485,7 +485,7 @@
76.64 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
76.65 val Form' (FormKF (~1,EdUndef,0,Nundef,res)) = f;
76.66 if (snd nxt)=End_Proof' andalso res="[x = -3, x = 3]" then ()
76.67 -else raise error "subp-rooteq.sml: new.behav. in root-eq + subpbl: no_met: square";
76.68 +else error "subp-rooteq.sml: new.behav. in root-eq + subpbl: no_met: square";
76.69
76.70
76.71
76.72 @@ -533,7 +533,7 @@
76.73 val (p,_,Form' (FormKF (_,_,_,_,f)),nxt,_,_) =
76.74 me nxt p c pt;
76.75 if f="[x = 5]" andalso nxt=("End_Proof'",End_Proof') then ()
76.76 -else raise error "subp-rooteq.sml: new.behav. in no_met in rootpbl -> linear ---";
76.77 +else error "subp-rooteq.sml: new.behav. in no_met in rootpbl -> linear ---";
76.78
76.79
76.80 refine fmz ["univariate","equation","test"];
77.1 --- a/test/Tools/isac/OLDTESTS/tacis.sml Tue Sep 28 08:58:06 2010 +0200
77.2 +++ b/test/Tools/isac/OLDTESTS/tacis.sml Tue Sep 28 09:06:56 2010 +0200
77.3 @@ -76,7 +76,7 @@
77.4 val ip = get_pos 1 1;
77.5 val (Form f, tac, asms) = pt_extract (pt, p);
77.6 if term2str f = "[x = 1]"andalso p = ([],Res) andalso ip = ([],Res)then()else
77.7 - raise error "tacis.sml: diff.behav. in fetchProposedTactic autoCalculate";
77.8 + error "tacis.sml: diff.behav. in fetchProposedTactic autoCalculate";
77.9
77.10
77.11
77.12 @@ -95,7 +95,7 @@
77.13 setNextTactic 1 (Rewrite_Set "norm_equation");
77.14 val (_, tacis) = get_calc 1;
77.15 case tacis of [(Rewrite_Set "norm_equation",_,(([1], Res), _))] => () | _ =>
77.16 - raise error "tacis.sml: diff.behav. in setNextTactic -> autoCalculate (1)";
77.17 + error "tacis.sml: diff.behav. in setNextTactic -> autoCalculate (1)";
77.18 autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1) (*x + 1 + -1 * 2 = 0*);
77.19
77.20 setNextTactic 1 (Rewrite_Set "Test_simplify");
77.21 @@ -124,7 +124,7 @@
77.22 val (_, tacis) = get_calc 1;
77.23 case tacis of
77.24 [((Apply_Method ["Test","solve_linear"],_,(([3,1], Frm), _)))] =>() | _ =>
77.25 - raise error "tacis.sml: diff.behav. in setNextTactic -> autoCalculate (2)";
77.26 + error "tacis.sml: diff.behav. in setNextTactic -> autoCalculate (2)";
77.27 (*#######################################################################*)
77.28 autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1) (*-1 + x = 0*);
77.29
77.30 @@ -149,7 +149,7 @@
77.31
77.32 (*case tacis of 040609 suddenly ???!
77.33 [((Check_Postcond _, _,(([], Res), _)))] =>() | _ =>
77.34 - raise error "tacis.sml: diff.behav. in setNextTactic -> autoCalculate (3)";
77.35 + error "tacis.sml: diff.behav. in setNextTactic -> autoCalculate (3)";
77.36 #######################################################################*)
77.37 autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1) (*[x = 1]*);
77.38
77.39 @@ -157,7 +157,7 @@
77.40 val ip = get_pos 1 1;
77.41 val (Form f, tac, asms) = pt_extract (pt, p);
77.42 if term2str f = "[x = 1]"andalso p = ([],Res) andalso ip = ([],Res)then()else
77.43 - raise error "tacis.sml: diff.behav. in setNextTactic -> autoCalculate (4)";
77.44 + error "tacis.sml: diff.behav. in setNextTactic -> autoCalculate (4)";
77.45
77.46
77.47
78.1 --- a/test/Tools/isac/ProgLang/calculate.sml Tue Sep 28 08:58:06 2010 +0200
78.2 +++ b/test/Tools/isac/ProgLang/calculate.sml Tue Sep 28 09:06:56 2010 +0200
78.3 @@ -33,7 +33,7 @@
78.4 val SOME (thmID, thm) = get_calculation_ thy cal t;
78.5 (HOLogic.dest_Trueprop (prop_of thm); writeln "all thms wrapped by Trueprop")
78.6 handle TERM _ =>
78.7 - raise error "calculate.sml: get_calculation_ must return Trueprop";
78.8 + error "calculate.sml: get_calculation_ must return Trueprop";
78.9
78.10
78.11
78.12 @@ -66,7 +66,7 @@
78.13 val Some (t,_) = rewrite_ thy tless_true tval_rls true thm t;
78.14 Sign.string_of_term (sign_of thy) t;
78.15 (*val it = "#16" : string*)
78.16 -if it <> "16" then raise error "calculate.sml: new behaviour in calculate_"
78.17 +if it <> "16" then error "calculate.sml: new behaviour in calculate_"
78.18 else ();
78.19
78.20 " ================= calculate.sml: aus script ======================== ";
78.21 @@ -140,7 +140,7 @@
78.22 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
78.23 (*nxt = ("End_Proof'",End_Proof')*)
78.24 if f = Form' (FormKF (~1,EdUndef,0,Nundef,"16")) then ()
78.25 -else raise error "calculate.sml: script test_calculate changed behaviour";
78.26 +else error "calculate.sml: script test_calculate changed behaviour";
78.27
78.28
78.29
78.30 @@ -421,7 +421,7 @@
78.31 val Some (t,_) = rewrite_ thy tless_true tval_rls true thm t;
78.32 Sign.string_of_term (sign_of thy) t;
78.33 "16";
78.34 - if it <> "16" then raise error "calculate.sml: new behaviour in calculate_"
78.35 + if it <> "16" then error "calculate.sml: new behaviour in calculate_"
78.36 else ();
78.37
78.38 (*13.9.02 *** calc: operator = pow not defined*)
78.39 @@ -458,7 +458,7 @@
78.40 val Some (str, simpl) = get_pair thy op_ ef arg;
78.41 if str =
78.42 "[] from_ [c, c_2, c_3, c_4] occur_exactly_in -1 * (q_0 * L ^^^ 2) / 2 = True"
78.43 -then () else raise error "calculate.sml get_pair with 3 args:occur_exactly_in";
78.44 +then () else error "calculate.sml get_pair with 3 args:occur_exactly_in";
78.45
78.46
78.47
79.1 --- a/test/Tools/isac/ProgLang/listg.sml Tue Sep 28 08:58:06 2010 +0200
79.2 +++ b/test/Tools/isac/ProgLang/listg.sml Tue Sep 28 09:06:56 2010 +0200
79.3 @@ -16,7 +16,7 @@
79.4 atomty thm;
79.5 val SOME (t',_) = rewrite_ thy dummy_ord Poly_erls false (num_str @{thm nth_Cons_}) t;
79.6 if term2str t' = "nth_ (3 + - 1) [b, c, d, e]" then ()
79.7 -else raise error "list_rls.sml, nth_ (3 + - 1) [b, c, d, e]";
79.8 +else error "list_rls.sml, nth_ (3 + - 1) [b, c, d, e]";
79.9
79.10 val t = str2term "nth_ 1 [a,b,c,d,e]";
79.11 atomty t;
79.12 @@ -54,20 +54,20 @@
79.13 val thm = ("length_Nil_","");
79.14 val (ct,asm) = the (rewrite thy' "tless_true" ("tval_rls") false thm ct);
79.15 if ct="1 + (1 + (1 + 0))"then()
79.16 -else raise error ("list_rls.sml 1: behaviour of test-expl changed: "^ct);
79.17 +else error ("list_rls.sml 1: behaviour of test-expl changed: "^ct);
79.18
79.19
79.20 val ct = "length_ [1,1,1]";
79.21 val rls = "list_rls";
79.22 val (ct,asm) = the (rewrite_set thy' false rls ct);
79.23 if ct="3"then()
79.24 -else raise error ("list_rls.sml 2: behaviour of test-expl changed: "^ct);
79.25 +else error ("list_rls.sml 2: behaviour of test-expl changed: "^ct);
79.26
79.27
79.28 val ct = "length_ [1,1,1]";
79.29 val t = (term_of o the o (parse ListG.thy)) ct;
79.30 val t = eval_listexpr_ ListG.thy list_rls t;
79.31 case t of Free ("3",_) => ()
79.32 -| _ => raise error ("list-rls.sml 3: behaviour of test-expl changed: "^ct);
79.33 +| _ => error ("list-rls.sml 3: behaviour of test-expl changed: "^ct);
79.34
79.35
80.1 --- a/test/Tools/isac/ProgLang/rewrite.sml Tue Sep 28 08:58:06 2010 +0200
80.2 +++ b/test/Tools/isac/ProgLang/rewrite.sml Tue Sep 28 09:06:56 2010 +0200
80.3 @@ -203,21 +203,21 @@
80.4 val SOME (t', _) = rewrite_terms_ thy dummy_ord Erls equs t;
80.5 writeln "----------- rewrite_terms_ 1---------------------------";
80.6 if term2str t' = "M_b 0 = -1 * q_0 * 0 ^^^ 2 / 2 + 0 * c + c_2" then ()
80.7 -else raise error "rewrite.sml rewrite_terms_ [x = 0]";
80.8 +else error "rewrite.sml rewrite_terms_ [x = 0]";
80.9
80.10 val equs = [str2term "M_b 0 = 0"];
80.11 val t = str2term "M_b 0 = -1 * q_0 * 0 ^^^ 2 / 2 + 0 * c + c_2";
80.12 val SOME (t', _) = rewrite_terms_ thy dummy_ord Erls equs t;
80.13 writeln "----------- rewrite_terms_ 2---------------------------";
80.14 if term2str t' = "0 = -1 * q_0 * 0 ^^^ 2 / 2 + 0 * c + c_2" then ()
80.15 -else raise error "rewrite.sml rewrite_terms_ [M_b 0 = 0]";
80.16 +else error "rewrite.sml rewrite_terms_ [M_b 0 = 0]";
80.17
80.18 val equs = [str2term "x = 0", str2term"M_b 0 = 0"];
80.19 val t = str2term "M_b x = -1 * q_0 * x ^^^ 2 / 2 + x * c + c_2";
80.20 val SOME (t', _) = rewrite_terms_ thy dummy_ord Erls equs t;
80.21 writeln "----------- rewrite_terms_ 3---------------------------";
80.22 if term2str t' = "0 = -1 * q_0 * 0 ^^^ 2 / 2 + 0 * c + c_2" then ()
80.23 -else raise error "rewrite.sml rewrite_terms_ [x = 0, M_b 0 = 0]";
80.24 +else error "rewrite.sml rewrite_terms_ [x = 0, M_b 0 = 0]";
80.25
80.26
80.27 "----------- rewrite_inst_ bdvs -------------------------";
80.28 @@ -240,7 +240,7 @@
80.29 false bdvs (num_str @{separate_bdvs_add) t;
80.30 (writeln o term2str) t;
80.31 if term2str t = "L * c_3 + c_4 = 0 + -1 * (-1 * (q_0 * L ^^^ 2) / 2)"
80.32 -then () else raise error "rewrite.sml rewrite_inst_ bdvs";
80.33 +then () else error "rewrite.sml rewrite_inst_ bdvs";
80.34 trace_rewrite:=true;
80.35 trace_rewrite:=false;--------------------------------------------*)
80.36
81.1 --- a/test/Tools/isac/ProgLang/scrtools.sml Tue Sep 28 08:58:06 2010 +0200
81.2 +++ b/test/Tools/isac/ProgLang/scrtools.sml Tue Sep 28 09:06:56 2010 +0200
81.3 @@ -83,7 +83,7 @@
81.4
81.5 val ((pt,p),_) = get_calc 1; show_pt pt;
81.6 if existpt' ([1], Frm) pt then ()
81.7 -else raise error "scrtools.sml: test-script test_interSteps_1 doesnt work";
81.8 +else error "scrtools.sml: test-script test_interSteps_1 doesnt work";
81.9
81.10
81.11 "-------- test the same called by interSteps norm_Poly -----------";
81.12 @@ -108,7 +108,7 @@
81.13 interSteps 1 ([1], Res);
81.14 val ((pt,p),_) = get_calc 1; show_pt pt;
81.15 if existpt' ([1,4], Res) pt then ()
81.16 -else raise error "scrtools.sml: auto-generated norm_Poly doesnt work";
81.17 +else error "scrtools.sml: auto-generated norm_Poly doesnt work";
81.18
81.19
81.20
81.21 @@ -174,7 +174,7 @@
81.22 val (Form form, SOME tac, asm) = pt_extract (pt, ([2], Res));
81.23 case (term2str form, tac, terms2strs asm) of
81.24 ("a", Check_Postcond ["polynomial", "simplification"], []) => ()
81.25 - | _ => raise error "scrtools.sml: auto-generated norm_Rational doesnt work";
81.26 + | _ => error "scrtools.sml: auto-generated norm_Rational doesnt work";
81.27
81.28
81.29
81.30 @@ -186,7 +186,7 @@
81.31 writeln(term2str auto_script);
81.32
81.33 if contain_bdv (get_rules rls) then ()
81.34 -else raise error "scrtools.sml: contain_bdv doesnt work for 'integration'";
81.35 +else error "scrtools.sml: contain_bdv doesnt work for 'integration'";
81.36
81.37 two_scr_arg auto_script;
81.38 init_istate (Rewrite_Set_Inst (["(bdv, x)"], "integration_rules"))
82.1 --- a/test/Tools/isac/ProgLang/termC.sml Tue Sep 28 08:58:06 2010 +0200
82.2 +++ b/test/Tools/isac/ProgLang/termC.sml Tue Sep 28 09:06:56 2010 +0200
82.3 @@ -21,17 +21,17 @@
82.4 "----------- inst_bdv -----------------------------------";
82.5 if (term2str o prop_of o num_str) @{thm d1_isolate_add2} =
82.6 "~ ?bdv occurs_in ?a ==> (?a + ?bdv = 0) = (?bdv = -1 * ?a)" then ()
82.7 -else raise error "termC.sml d1_isolate_add2";
82.8 +else error "termC.sml d1_isolate_add2";
82.9 val subst = [(str2term "bdv", str2term "x")];
82.10 val t = (norm o #prop o rep_thm) (num_str @{thm d1_isolate_add2});
82.11 val t' = inst_bdv subst t;
82.12 if term2str t' = "~ x occurs_in ?a ==> (?a + x = 0) = (x = -1 * ?a)" then ()
82.13 -else raise error "termC.sml inst_bdv 1";
82.14 +else error "termC.sml inst_bdv 1";
82.15
82.16 if string_of_thm (num_str @{thm separate_bdvs_add}) =
82.17 "\"[] from_ [?bdv_1.0, ?bdv_2.0, ?bdv_3.0, ?bdv_4.0] occur_exactly_in ?a\n\
82.18 \ ==> (?a + ?b = ?c) = (?b = ?c + -1 * ?a)\"" then ()
82.19 -else raise error "termC.sml separate_bdvs_add";
82.20 +else error "termC.sml separate_bdvs_add";
82.21 val subst = [(str2term"bdv_1",str2term"c"),
82.22 (str2term"bdv_2",str2term"c_2"),
82.23 (str2term"bdv_3",str2term"c_3"),
82.24 @@ -40,7 +40,7 @@
82.25 val t' = inst_bdv subst t;
82.26 if term2str t' = "[] from_ [c, c_2, c_3, c_4] occur_exactly_in ?a\n\
82.27 \==> (?a + ?b = ?c) = (?b = ?c + -1 * ?a)" then ()
82.28 -else raise error "termC.sml inst_bdv 2";
82.29 +else error "termC.sml inst_bdv 2";
82.30
82.31
82.32 "----------- subst_atomic_all ---------------------------";
82.33 @@ -52,13 +52,13 @@
82.34 val (all_Free_subst, t') = subst_atomic_all env t;
82.35 if all_Free_subst andalso
82.36 term2str t' = "tl [c, c_2] from_ [c, c_2] occur_exactly_in nth_ 1 [c_2 = 0, c + c_2 = 1]" then ()
82.37 -else raise error "termC.sml subst_atomic_all should be 'true'";
82.38 +else error "termC.sml subst_atomic_all should be 'true'";
82.39
82.40
82.41 val (all_Free_subst, t') = subst_atomic_all (tl env) t;
82.42 if not all_Free_subst andalso
82.43 term2str t' = "tl vs_ from_ vs_ occur_exactly_in nth_ 1 [c_2 = 0, c + c_2 = 1]" then ()
82.44 -else raise error "termC.sml subst_atomic_all should be 'false'";
82.45 +else error "termC.sml subst_atomic_all should be 'false'";
82.46 ===== inhibit exn ============================================================*)
82.47
82.48
83.1 --- a/test/Tools/isac/ProgLang/tools.sml Tue Sep 28 08:58:06 2010 +0200
83.2 +++ b/test/Tools/isac/ProgLang/tools.sml Tue Sep 28 09:06:56 2010 +0200
83.3 @@ -21,7 +21,7 @@
83.4 "----------- fun matchsub ----------------------------------------";
83.5 "----------- fun matchsub ----------------------------------------";
83.6 if matchsub thy (str2term "(a + (b + c))") (str2term "?x + (?y + ?z)")
83.7 -then () else raise error "tools.sml matchsub a + (b + c)";
83.8 +then () else error "tools.sml matchsub a + (b + c)";
83.9
83.10 if matchsub thy (str2term "(a + (b + c)) + d") (str2term "?x + (?y + ?z)")
83.11 -then () else raise error "tools.sml matchsub (a + (b + c)) + d";
83.12 +then () else error "tools.sml matchsub (a + (b + c)) + d";
84.1 --- a/test/Tools/isac/xmlsrc/mathml.sml Tue Sep 28 08:58:06 2010 +0200
84.2 +++ b/test/Tools/isac/xmlsrc/mathml.sml Tue Sep 28 09:06:56 2010 +0200
84.3 @@ -31,7 +31,7 @@
84.4 "--------- encode ^^^ -> ^ ---------------------------------------";
84.5 val str = "a^^^2+b^^^2=c^^^2";
84.6 if decode str = "a^2+b^2=c^2" then ()
84.7 -else raise error "mathml.sml: diff.behav. in encode ^^^ -> ^";
84.8 +else error "mathml.sml: diff.behav. in encode ^^^ -> ^";
84.9
84.10 "--------- encode < -> < and > -> > --------------------------";
84.11 "--------- encode < -> < and > -> > --------------------------";
84.12 @@ -39,7 +39,7 @@
84.13 val str = "?bdv occurs_in ?b; 0 < ?n |] ==> ?a / ?b ^ ?n = ?a * ?b ^ - ?n";
84.14 if decode str =
84.15 "?bdv occurs_in ?b; 0 < ?n |] ==> ?a / ?b ^ ?n = ?a * ?b ^ - ?n"
84.16 -then () else raise error "mathml.sml: diff.behav. in encode '<' and '>'";
84.17 +then () else error "mathml.sml: diff.behav. in encode '<' and '>'";
84.18
84.19 "----- check 'manually' the xml-output of calling functions ------";
84.20 formula2xml 1 (str2term )
85.1 --- a/test/Tools/isac/xmlsrc/thy-hierarchy.sml Tue Sep 28 08:58:06 2010 +0200
85.2 +++ b/test/Tools/isac/xmlsrc/thy-hierarchy.sml Tue Sep 28 09:06:56 2010 +0200
85.3 @@ -134,7 +134,7 @@
85.4 case get_the ["IsacKnowledge", "Test", "Rulesets", "Test_simplify"] of
85.5 Hrls {guh = "thy_Test-rls-Test_simplify",thy_rls = ("Test", _),
85.6 mathauthors = _,coursedesign = _} => ()
85.7 - | _ => raise error "thy-hierarchy.sml: [IsacKnowledge,Test,Rulesets]";
85.8 + | _ => error "thy-hierarchy.sml: [IsacKnowledge,Test,Rulesets]";
85.9 *)
85.10
85.11
85.12 @@ -194,12 +194,12 @@
85.13 case get_the ["IsacKnowledge", "Biegelinie", "Theorems"] of
85.14 Html {mathauthors =
85.15 ["Walther Neuper 2005 supported by a grant from NMI Austria"],...}=>()
85.16 - | _ => raise error "thy-hierarchy.sml: store_isa overwritten";
85.17 + | _ => error "thy-hierarchy.sml: store_isa overwritten";
85.18
85.19 case get_the ["IsacKnowledge","Biegelinie","Theorems","Belastung_Querkraft"] of
85.20 Hthm {mathauthors =
85.21 ["Walther Neuper 2005 supported by a grant from NMI Austria"],...}=>()
85.22 - | _ => raise error "thy-hierarchy.sml: store_isa overwritten";
85.23 + | _ => error "thy-hierarchy.sml: store_isa overwritten";
85.24
85.25 (*
85.26 print_depth 7;