1.1 --- a/test/Tools/isac/Knowledge/biegelinie.sml Wed Sep 08 16:45:27 2010 +0200
1.2 +++ b/test/Tools/isac/Knowledge/biegelinie.sml Wed Sep 08 16:47:22 2010 +0200
1.3 @@ -54,7 +54,7 @@
1.4 "----------- Script [IntegrierenUndKonstanteBestimmen] -----------";
1.5 val str =
1.6 "Script BiegelinieScript \
1.7 -\(l_::real) (q__::real) (v_::real) (b_::real=>real) \
1.8 +\(l_::real) (q__::real) (v_v::real) (b_::real=>real) \
1.9 \(rb_::bool list) (rm_::bool list) = \
1.10 \ (let q___ = Take (q_ v_v = q__); \
1.11 \ q___ = ((Rewrite sym_real_minus_eq_cancel True) @@ \
1.12 @@ -181,7 +181,7 @@
1.13 "RandbedingungenMoment [M_b 0 = 0, M_b L = 0]",
1.14 "FunktionsVariable x"];
1.15 val (dI',pI',mI') =
1.16 - ("Biegelinie.thy",["MomentBestimmte","Biegelinien"],
1.17 + ("Biegelinie",["MomentBestimmte","Biegelinien"],
1.18 ["IntegrierenUndKonstanteBestimmen"]);
1.19 val p = e_pos'; val c = [];
1.20 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.21 @@ -213,7 +213,7 @@
1.22 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
1.23
1.24 case nxt of
1.25 - (_,Subproblem ("Biegelinie.thy", ["named", "integrate", "function"])) => ()
1.26 + (_,Subproblem ("Biegelinie", ["named", "integrate", "function"])) => ()
1.27 | _ => raise error "biegelinie.sml: Bsp 7.27 #4c";
1.28 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.29 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.30 @@ -231,7 +231,7 @@
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 case nxt of
1.34 - (_, Subproblem ("Biegelinie.thy", ["named", "integrate", "function"]))=>()
1.35 + (_, Subproblem ("Biegelinie", ["named", "integrate", "function"]))=>()
1.36 | _ => raise error "biegelinie.sml: Bsp 7.27 #5b";
1.37
1.38 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.39 @@ -259,7 +259,7 @@
1.40 if f2str f = "0 = c_2 + c * L + -1 * q_0 / 2 * L ^^^ 2" then ()
1.41 else raise error "biegelinie.sml: Bsp 7.27 #9";
1.42
1.43 -(*val nxt = (+, Subproblem ("Biegelinie.thy", ["normalize", ..lin..sys]))*)
1.44 +(*val nxt = (+, Subproblem ("Biegelinie", ["normalize", ..lin..sys]))*)
1.45 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.46 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.47 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.48 @@ -299,7 +299,7 @@
1.49 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
1.50 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
1.51 case nxt of
1.52 - (_, Subproblem ("Biegelinie.thy", ["named", "integrate", "function"]))=>()
1.53 + (_, Subproblem ("Biegelinie", ["named", "integrate", "function"]))=>()
1.54 | _ => raise error "biegelinie.sml: Bsp 7.27 #13";
1.55
1.56 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.57 @@ -321,7 +321,7 @@
1.58 "y' x = c + 1 / (-1 * EI) * (L * q_0 / 4 * x ^^^ 2 + -1 * q_0 / 6 * x ^^^ 3)"
1.59 then () else raise error "biegelinie.sml: Bsp 7.27 #16 f";
1.60 case nxt of
1.61 - (_, Subproblem ("Biegelinie.thy", ["named", "integrate", "function"]))=>()
1.62 + (_, Subproblem ("Biegelinie", ["named", "integrate", "function"]))=>()
1.63 | _ => raise error "biegelinie.sml: Bsp 7.27 #16";
1.64
1.65 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.66 @@ -349,7 +349,7 @@
1.67 val (p,_,f,nxt,_,pt) = me nxt p c pt; f2str f;
1.68 case nxt of
1.69 (_, Subproblem
1.70 - ("Biegelinie.thy", ["normalize", "2x2", "linear", "system"])) => ()
1.71 + ("Biegelinie", ["normalize", "2x2", "linear", "system"])) => ()
1.72 | _ => raise error "biegelinie.sml: Bsp 7.27 #19";
1.73 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.74 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.75 @@ -367,7 +367,7 @@
1.76 else raise error "biegelinie.sml: Bsp 7.27 #21 f";
1.77 case nxt of
1.78 (_, Subproblem
1.79 - ("Biegelinie.thy", ["triangular", "2x2", "linear", "system"])) =>()
1.80 + ("Biegelinie", ["triangular", "2x2", "linear", "system"])) =>()
1.81 | _ => raise error "biegelinie.sml: Bsp 7.27 #21";
1.82 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.83 val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt;
1.84 @@ -454,7 +454,7 @@
1.85 "RandbedingungenBiegung [y 0 = 0, y L = 0]",
1.86 "RandbedingungenMoment [M_b 0 = 0, M_b L = 0]",
1.87 "FunktionsVariable x"],
1.88 - ("Biegelinie.thy",
1.89 + ("Biegelinie",
1.90 ["MomentBestimmte","Biegelinien"],
1.91 ["IntegrierenUndKonstanteBestimmen"]))];
1.92 moveActiveRoot 1;
1.93 @@ -500,7 +500,7 @@
1.94 \M_b x = c_2 + c * x + -1 * q_0 / 2 * x ^^^ 2,\
1.95 \ y' x = c_3 + 1 / (-1 * EI) * (c_2 * x + c / 2 * x ^^^ 2 + -1 * q_0 / 6 * x ^^^ 3),\
1.96 \ y x = c_4 + c_3 * x + 1 / (-1 * EI) * (c_2 / 2 * x ^^^ 2 + c / 6 * x ^^^ 3 + -1 * q_0 / 24 * x ^^^ 4)]"];
1.97 -val (dI',pI',mI') = ("Biegelinie.thy", ["vonBelastungZu","Biegelinien"],
1.98 +val (dI',pI',mI') = ("Biegelinie", ["vonBelastungZu","Biegelinien"],
1.99 ["Biegelinien","ausBelastung"]);
1.100 val p = e_pos'; val c = [];
1.101 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.102 @@ -618,7 +618,7 @@
1.103 val fmz = ["functionEq (M_b x = c_2 + c * x + -1 * q_0 / 2 * x ^^^ 2)",
1.104 "substitution (M_b L = 0)",
1.105 "equality equ___"];
1.106 -val (dI',pI',mI') = ("Biegelinie.thy", ["makeFunctionTo","equation"],
1.107 +val (dI',pI',mI') = ("Biegelinie", ["makeFunctionTo","equation"],
1.108 ["Equation","fromFunction"]);
1.109 val p = e_pos'; val c = [];
1.110 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.111 @@ -764,7 +764,7 @@
1.112 \y x = c_4 + c_3 * x + 1 / (-1 * EI) * (c_2 / 2 * x ^^^ 2 + c / 6 * x ^^^ 3 + -1 * q_0 / 24 * x ^^^ 4)]",
1.113 "Randbedingungen [y 0 = 0, y L = 0, M_b 0 = 0, M_b L = 0]",
1.114 "Gleichungen equs___"];
1.115 -val (dI',pI',mI') = ("Biegelinie.thy", ["setzeRandbedingungen","Biegelinien"],
1.116 +val (dI',pI',mI') = ("Biegelinie", ["setzeRandbedingungen","Biegelinien"],
1.117 ["Biegelinien","setzeRandbedingungenEin"]);
1.118 val p = e_pos'; val c = [];
1.119 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.120 @@ -920,7 +920,7 @@
1.121 "----------- IntegrierenUndKonstanteBestimmen2: Bsp.7.70. --------";
1.122 "----- script ";
1.123 val str =
1.124 -"Script Belastung2BiegelScript (q__::real) (v_::real) = \
1.125 +"Script Belastung2BiegelScript (q__::real) (v_v::real) = \
1.126 \ (let q___ = Take (q_ v_v = q__); \
1.127 \ q___ = ((Rewrite sym_real_minus_eq_cancel True) @@ \
1.128 \ (Rewrite Belastung_Querkraft True)) q___; \
1.129 @@ -954,7 +954,7 @@
1.130 val fmz = ["Traegerlaenge L","Streckenlast q_0","Biegelinie y",
1.131 "Randbedingungen [y 0 = 0, y L = 0, M_b 0 = 0, M_b L = 0]",
1.132 "FunktionsVariable x"];
1.133 -val (dI',pI',mI') = ("Biegelinie.thy", ["Biegelinien"],
1.134 +val (dI',pI',mI') = ("Biegelinie", ["Biegelinien"],
1.135 ["IntegrierenUndKonstanteBestimmen2"]);
1.136 val p = e_pos'; val c = [];
1.137 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
1.138 @@ -975,7 +975,7 @@
1.139
1.140 #b# prep_met ... (["Biegelinien","ausBelastung"],
1.141 ... ("#Given" ,["Streckenlast q__","FunktionsVariable v_v"]),
1.142 - "Script Belastung2BiegelScript (q__::real) (v_::real) = \
1.143 + "Script Belastung2BiegelScript (q__::real) (v_v::real) = \
1.144
1.145 #a#b# BOTH HAVE 2 ARGUMENTS q__ and v_v ...OK
1.146 ##########################################################################
1.147 @@ -989,7 +989,7 @@
1.148 CalcTree [(["Traegerlaenge L","Streckenlast q_0","Biegelinie y",
1.149 "Randbedingungen [Q 0 = q_0 * L, M_b L = 0, y 0 = 0, y' 0 = 0]",
1.150 "FunktionsVariable x"],
1.151 - ("Biegelinie.thy", ["Biegelinien"],
1.152 + ("Biegelinie", ["Biegelinien"],
1.153 ["IntegrierenUndKonstanteBestimmen2"]))];
1.154 moveActiveRoot 1;
1.155 autoCalculate 1 CompleteCalc;