1.1 --- a/test/Tools/isac/Knowledge/eqsystem.sml Wed Feb 14 06:06:27 2018 +0100
1.2 +++ b/test/Tools/isac/Knowledge/eqsystem.sml Wed Feb 14 08:05:37 2018 +0100
1.3 @@ -179,19 +179,19 @@
1.4 \ 0 = c_2 + c * L + 1 / EI * (L * q_0 / 12 * L ^^^ 3 + \
1.5 \ -1 * q_0 / 24 * L ^^^ 4)]";
1.6 val SOME (t,_) = rewrite_set_ thy true norm_Rational t;
1.7 -if term2str t="[0 = c_2, 0 = c_2 + L * c + L ^^^ 4 * q_0 / (EI * 24)]"
1.8 +if term2str t="[0 = c_2 + 0 / EI, 0 = c_2 + L * c + L ^^^ 4 * q_0 / (EI * 24)]"
1.9 then () else error "eqsystem.sml rewrite in 2x2 simplify_System_par.0b";
1.10
1.11 val SOME(t,_)= rewrite_set_inst_ thy true bdvs simplify_System_parenthesized t;
1.12 -if term2str t = "[0 = c_2, 0 = q_0 * L ^^^ 4 / (24 * EI) + (L * c + c_2)]"
1.13 +if term2str t = "[0 = 0 / EI + c_2, 0 = q_0 * L ^^^ 4 / (24 * EI) + (L * c + c_2)]"
1.14 then () else error "eqsystem.sml rewrite in 2x2 simplify_System_par.1b";
1.15
1.16 val SOME (t,_) = rewrite_set_inst_ thy true bdvs isolate_bdvs t;
1.17 -if term2str t = "[c_2 = 0, L * c + c_2 = 0 + -1 * (q_0 * L ^^^ 4 / (24 * EI))]"
1.18 +if term2str t = "[c_2 = 0 + -1 * (0 / EI),\n L * c + c_2 = 0 + -1 * (q_0 * L ^^^ 4 / (24 * EI))]"
1.19 then () else error "eqsystem.sml rewrite in 2x2 isolate_bdvs b";
1.20
1.21 val SOME(t,_)= rewrite_set_inst_ thy true bdvs simplify_System t;
1.22 -if term2str t = "[c_2 = 0, L * c + c_2 = -1 * q_0 * L ^^^ 4 / (24 * EI)]"
1.23 +if term2str t = "[c_2 = 0 / EI, L * c + c_2 = -1 * q_0 * L ^^^ 4 / (24 * EI)]"
1.24 then () else error "eqsystem.sml rewrite in 2x2 simplify_System.2b";
1.25
1.26 val xxx = rewrite_set_ thy true order_system t;
1.27 @@ -594,7 +594,7 @@
1.28 val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f;
1.29 val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f;
1.30 if f2str f =
1.31 -"[c_2 = 0, L * c + c_2 = -1 * q_0 * L ^^^ 4 / (24 * EI)]"
1.32 +"[c_2 = 0 / EI, L * c + c_2 = -1 * q_0 * L ^^^ 4 / (24 * EI)]"
1.33 then () else error "eqsystem.sml me simpl. before SubProblem b";
1.34 case nxt of
1.35 (_, Subproblem ("Biegelinie", ["triangular", "2x2", "LINEAR",_])) => ()
1.36 @@ -630,7 +630,7 @@
1.37 val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f;
1.38 val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f;
1.39 if f2str f =
1.40 -"[c = -1 * q_0 * L ^^^ 4 / (24 * EI * L), c_2 = 0]"
1.41 +"[c = (0 / EI + -1 * q_0 * L ^^^ 4 / (24 * EI)) / L, c_2 = 0 / EI]"
1.42 then () else error "eqsystem.sml me [EqSys...2x2] finished f2str f b";
1.43 case nxt of
1.44 (_, End_Proof') => ()