diff -r 4afbcd008799 -r 6c53fe2519e5 test/Tools/isac/IsacKnowledge/biegelinie.sml --- a/test/Tools/isac/IsacKnowledge/biegelinie.sml Tue Aug 17 09:05:51 2010 +0200 +++ b/test/Tools/isac/IsacKnowledge/biegelinie.sml Wed Aug 18 13:40:09 2010 +0200 @@ -30,20 +30,20 @@ "----------- the rules -------------------------------------------"; "----------- the rules -------------------------------------------"; "----------- the rules -------------------------------------------"; -fun str2t str = (term_of o the o (parse Biegelinie.thy)) str; +fun str2term str = (term_of o the o (parse Biegelinie.thy)) str; fun term2s t = Sign.string_of_term (sign_of Biegelinie.thy) t; fun rewrit thm str = fst (the (rewrite_ Biegelinie.thy tless_true e_rls true thm str)); -val t = rewrit Belastung_Querkraft (str2t "- q_ x = - q_0"); term2s t; +val t = rewrit Belastung_Querkraft (str2term "- q_ x = - q_0"); term2s t; if term2s t = "Q' x = - q_0" then () else raise error "/biegelinie.sml: Belastung_Querkraft"; -val t = rewrit Querkraft_Moment (str2t "Q x = - q_0 * x + c"); term2s t; +val t = rewrit Querkraft_Moment (str2term "Q x = - q_0 * x + c"); term2s t; if term2s t = "M_b' x = - q_0 * x + c" then () else raise error "/biegelinie.sml: Querkraft_Moment"; -val t = rewrit Moment_Neigung (str2t "M_b x = -q_0 * x^^^2/2 + q_0/2 *L*x"); +val t = rewrit Moment_Neigung (str2term "M_b x = -q_0 * x^^^2/2 + q_0/2 *L*x"); term2s t; if term2s t = "- EI * y'' x = - q_0 * x ^^^ 2 / 2 + q_0 / 2 * L * x" then () else raise error "biegelinie.sml: Moment_Neigung"; @@ -125,7 +125,7 @@ "----------- IntegrierenUndKonstanteBestimmen by rewriting -------"; "----------- IntegrierenUndKonstanteBestimmen by rewriting -------"; "----------- IntegrierenUndKonstanteBestimmen by rewriting -------"; -val t = str2t "M_b x = L * q_0 * x / 2 + -1 * q_0 * x ^^^ 2 / 2"; +val t = str2term "M_b x = L * q_0 * x / 2 + -1 * q_0 * x ^^^ 2 / 2"; val t = rewrit Moment_Neigung t; term2s t; (*was "EI * ?y'' x = L * q_0 * x / 2 + -1 * q_0 * x ^^^ 2 / 2" ### before declaring "y''" as a constant *) @@ -191,18 +191,18 @@ val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt; val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt; -val pits = get_obj g_pbl pt (fst p);writeln (itms2str thy pits); -(*if itms2str thy pits = ... all 5 model-items*) -val mits = get_obj g_met pt (fst p); writeln (itms2str thy mits); -if itms2str thy mits = "[]" then () +val pits = get_obj g_pbl pt (fst p);writeln (itms2str_ ctxt pits); +(*if itms2str_ ctxt pits = ... all 5 model-items*) +val mits = get_obj g_met pt (fst p); writeln (itms2str_ ctxt mits); +if itms2str_ ctxt mits = "[]" then () else raise error "biegelinie.sml: Bsp 7.27 #2"; val (p,_,f,nxt,_,pt) = me nxt p c pt; case nxt of (_,Add_Given "FunktionsVariable x") => () | _ => raise error "biegelinie.sml: Bsp 7.27 #4a"; val (p,_,f,nxt,_,pt) = me nxt p c pt; -val mits = get_obj g_met pt (fst p);writeln (itms2str thy mits); -(*if itms2str thy mits = ... all 6 guard-items*) +val mits = get_obj g_met pt (fst p);writeln (itms2str_ ctxt mits); +(*if itms2str_ ctxt mits = ... all 6 guard-items*) case nxt of (_, Apply_Method ["IntegrierenUndKonstanteBestimmen"]) => () | _ => raise error "biegelinie.sml: Bsp 7.27 #4b";