1.1 --- a/test/Tools/isac/Knowledge/biegelinie.sml Tue Oct 18 12:05:03 2016 +0200
1.2 +++ b/test/Tools/isac/Knowledge/biegelinie.sml Thu Oct 20 10:26:29 2016 +0200
1.3 @@ -429,8 +429,8 @@
1.4 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.5 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.6 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.7 -if nxt = ("Apply_Method", Apply_Method ["Biegelinien", "ausBelastung"])
1.8 -then () else error "biegelinie.sml met2 b";
1.9 +case nxt of ("Apply_Method", Apply_Method ["Biegelinien", "ausBelastung"]) => ()
1.10 +| _ => error "biegelinie.sml met2 b";
1.11
1.12 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "q_ x = q_0";
1.13 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f = "- q_ x = - q_0";
1.14 @@ -487,9 +487,11 @@
1.15 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f =
1.16 "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)";
1.17 val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.18 -if nxt = ("End_Proof'", End_Proof') andalso f2str f =
1.19 - "[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 ()
1.20 -else error "biegelinie.sml met2 e";
1.21 +if f2str f =
1.22 + "[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)]"
1.23 +then case nxt of ("End_Proof'", End_Proof') => ()
1.24 + | _ => error "biegelinie.sml met2 e 1"
1.25 +else error "biegelinie.sml met2 e 2";
1.26
1.27 "----------- SubProblem (_,[setzeRandbedingungen,Biegelinien] ----";
1.28 "----------- SubProblem (_,[setzeRandbedingungen,Biegelinien] ----";
1.29 @@ -514,11 +516,11 @@
1.30 "0 = c_2 + c * L + -1 * q_0 / 2 * L ^^^ 2";
1.31 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
1.32 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
1.33 -if nxt = ("End_Proof'", End_Proof') andalso
1.34 -(* f2str f = "0 = c_2 + L * c + -1 * q_0 / 2 * L ^^^ 2"
1.35 -CHANGE NOT considered, already on leave*)
1.36 +if (* f2str f = "0 = c_2 + L * c + -1 * q_0 / 2 * L ^^^ 2" CHANGE NOT considered, already on leave*)
1.37 f2str f = "0 = (2 * c_2 + 2 * L * c + -1 * L ^^^ 2 * q_0) / 2"
1.38 -then () else error "biegelinie.sml: SubProblem (_,[setzeRandbed";
1.39 +then case nxt of ("End_Proof'", End_Proof') => ()
1.40 + | _ => error "biegelinie.sml: SubProblem (_,[setzeRandbed 1"
1.41 +else error "biegelinie.sml: SubProblem (_,[setzeRandbed 2";
1.42
1.43
1.44 "----------- method [Biegelinien,setzeRandbedingungenEin] + exec -";