diff -r 24609758d219 -r 028442673981 test/Tools/isac/Knowledge/eqsystem.sml --- a/test/Tools/isac/Knowledge/eqsystem.sml Wed Sep 08 16:45:27 2010 +0200 +++ b/test/Tools/isac/Knowledge/eqsystem.sml Wed Sep 08 16:47:22 2010 +0200 @@ -865,7 +865,7 @@ \0 = -1 * q_0 * L ^^^ 2 / 2 + L * c + c_2]", "solveForVars [c, c_2]", "solution L"]; val (dI',pI',mI') = - ("Biegelinie.thy",["normalize", "2x2", "linear", "system"], + ("Biegelinie",["normalize", "2x2", "linear", "system"], ["EqSystem","normalize","2x2"]); val p = e_pos'; val c = []; val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))]; @@ -883,7 +883,7 @@ val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f; val (p,_,f,nxt,_,pt) = me nxt p c pt;f2str f; case nxt of - (_, Subproblem ("Biegelinie.thy", ["triangular", "2x2", "linear",_])) => () + (_, Subproblem ("Biegelinie", ["triangular", "2x2", "linear",_])) => () | _ => raise error "eqsystem.sml me [EqSystem,normalize,2x2] SubProblem"; val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt; @@ -933,7 +933,7 @@ \ -1 * q_0 / 24 * L ^^^ 4)]", "solveForVars [c, c_2]", "solution L"]; val (dI',pI',mI') = - ("Biegelinie.thy",["linear", "system"], ["no_met"]); + ("Biegelinie",["linear", "system"], ["no_met"]); val p = e_pos'; val c = []; val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))]; val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt; @@ -952,7 +952,7 @@ "[c_2 = 0, L * c + c_2 = -1 * q_0 * L ^^^ 4 / (24 * EI)]" then () else raise error "eqsystem.sml me simpl. before SubProblem b"; case nxt of - (_, Subproblem ("Biegelinie.thy", ["triangular", "2x2", "linear",_])) => () + (_, Subproblem ("Biegelinie", ["triangular", "2x2", "linear",_])) => () | _ => raise error "eqsystem.sml me [linear,system] SubProblem b"; val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt; @@ -1004,7 +1004,7 @@ CalcTree [(["Traegerlaenge L","Streckenlast q_0","Biegelinie y", "Randbedingungen [y 0 = 0, y L = 0, M_b 0 = 0, M_b L = 0]", "FunktionsVariable x"], - ("Biegelinie.thy", ["Biegelinien"], + ("Biegelinie", ["Biegelinien"], ["IntegrierenUndKonstanteBestimmen2"]))]; moveActiveRoot 1; (* @@ -1045,7 +1045,7 @@ "Biegelinie y", "Randbedingungen [y L = 0, y' L = 0]", "FunktionsVariable x"], - ("Biegelinie.thy", ["vonMomentenlinieZu","Biegelinien"], + ("Biegelinie", ["vonMomentenlinieZu","Biegelinien"], ["Biegelinien", "AusMomentenlinie"]))]; moveActiveRoot 1; (* @@ -1057,7 +1057,7 @@ CalcTree [(["Traegerlaenge L","Streckenlast q_0","Biegelinie y", "Randbedingungen [y 0 = 0, y L = 0, y' 0 = 0, y' L = 0]", "FunktionsVariable x"], - ("Biegelinie.thy", ["Biegelinien"], + ("Biegelinie", ["Biegelinien"], ["IntegrierenUndKonstanteBestimmen2"] ))]; moveActiveRoot 1; (* @@ -1077,7 +1077,7 @@ CalcTree [(["Traegerlaenge L","Streckenlast q_0","Biegelinie y", "Randbedingungen [Q 0 = q_0 * L, M_b L = 0, y 0 = 0, y' 0 = 0]", "FunktionsVariable x"], - ("Biegelinie.thy", ["Biegelinien"], + ("Biegelinie", ["Biegelinien"], ["IntegrierenUndKonstanteBestimmen2"] ))]; moveActiveRoot 1; (* @@ -1125,7 +1125,7 @@ \ 0 = c_3]", "solveForVars [c, c_2, c_3, c_4]", "solution L"]; val (dI',pI',mI') = - ("Biegelinie.thy",["linear", "system"],["no_met"]); + ("Biegelinie",["linear", "system"],["no_met"]); val p = e_pos'; val c = []; val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))]; val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt; @@ -1303,7 +1303,7 @@ \[c = L * q_0, L * c + c_2 = q_0 * L ^^^ 2 / 2, c_3 = 0, c_4 = 0]", "solveForVars [c, c_2, c_3, c_4]", "solution L"]; val (dI',pI',mI') = - ("Biegelinie.thy",["linear", "system"],["no_met"]); + ("Biegelinie",["linear", "system"],["no_met"]); val p = e_pos'; val c = []; val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))]; val (p,_,f,nxt,_,pt) = me nxt p c pt;val (p,_,f,nxt,_,pt) = me nxt p c pt; @@ -1328,7 +1328,7 @@ CalcTree [(["Traegerlaenge L","Streckenlast q_0","Biegelinie y", "Randbedingungen [M_b L = 0, y 0 = 0, y L = 0, y' 0 = 0]", "FunktionsVariable x"], - ("Biegelinie.thy", ["Biegelinien"], + ("Biegelinie", ["Biegelinien"], ["IntegrierenUndKonstanteBestimmen2"] ))]; moveActiveRoot 1; (* @@ -1350,7 +1350,7 @@ "Biegelinie y", "Randbedingungen [y 0 = 0, y L = 0]", "FunktionsVariable x"], - ("Biegelinie.thy", ["vonMomentenlinieZu","Biegelinien"], + ("Biegelinie", ["vonMomentenlinieZu","Biegelinien"], ["Biegelinien", "AusMomentenlinie"]))]; moveActiveRoot 1; (* @@ -1362,7 +1362,7 @@ CalcTree [(["Traegerlaenge L","Streckenlast (q_0 / L * x)","Biegelinie y", "Randbedingungen [M_b 0 = 0, M_b L = 0, y 0 = 0, y L = 0]", "FunktionsVariable x"], - ("Biegelinie.thy", ["Biegelinien"], + ("Biegelinie", ["Biegelinien"], ["IntegrierenUndKonstanteBestimmen2"] ))]; moveActiveRoot 1; (* @@ -1383,7 +1383,7 @@ "Biegelinie y", "Randbedingungen [y L = 0, y' L = 0]", "FunktionsVariable x"], - ("Biegelinie.thy", ["vonMomentenlinieZu","Biegelinien"], + ("Biegelinie", ["vonMomentenlinieZu","Biegelinien"], ["Biegelinien", "AusMomentenlinie"]))]; moveActiveRoot 1; (* @@ -1403,7 +1403,7 @@ \ 0 = (2 * c_2 + 2 * L * c + -1 * L ^^^ 2 * q_0) / 2]", "solveForVars [c, c_2, c_3, c_4]", "solution L"]; val (dI',pI',mI') = - ("Biegelinie.thy",["normalize", "4x4", "linear", "system"], + ("Biegelinie",["normalize", "4x4", "linear", "system"], ["EqSystem","normalize","4x4"]); val p = e_pos'; val c = []; val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];