1.1 --- a/src/sml/IsacKnowledge/Biegelinie.ML	Fri Sep 01 09:25:35 2006 +0200
     1.2 +++ b/src/sml/IsacKnowledge/Biegelinie.ML	Fri Sep 01 10:15:43 2006 +0200
     1.3 @@ -99,12 +99,21 @@
     1.4  store_pbt
     1.5   (prep_pbt Biegelinie.thy "pbl_bieg_randbed" [] e_pblID
     1.6   (["setzeRandbedingungen","Biegelinien"],
     1.7 -  [("#Given" ,["Funktionen funs_","FunktionsVariable v_"]),
     1.8 +  [("#Given" ,["Funktionen funs_","Randbedingungen rb_"]),
     1.9     ("#Find"  ,["Gleichungen equs___"])],
    1.10    append_rls "e_rls" e_rls [], 
    1.11    None, 
    1.12    [["Biegelinien","setzeRandbedingungenEin"]]));
    1.13  
    1.14 +store_pbt
    1.15 + (prep_pbt Biegelinie.thy "pbl_equ_fromfun" [] e_pblID
    1.16 + (["makeFunctionTo","equation"],
    1.17 +  [("#Given" ,["functionEq funs_","substitution subs_"]),
    1.18 +   ("#Find"  ,["equality equ___"])],
    1.19 +  append_rls "e_rls" e_rls [], 
    1.20 +  None, 
    1.21 +  [(*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*)["",""]]));
    1.22 +
    1.23  
    1.24  
    1.25  (** methods **)
    1.26 @@ -235,7 +244,7 @@
    1.27  \      (equs_::bool list) =                                               \
    1.28  \             (SubProblem (Biegelinie_,[setzeRandbedingungen,Biegelinien],\
    1.29  \                          [Biegelinien,setzeRandbedingungenEin])         \
    1.30 -\                          [booll_ funs_, real_ v_]);                     \
    1.31 +\                          [booll_ funs_, booll_ rb_]);                     \
    1.32  \      (cons_::bool list) =                                               \
    1.33  \             (SubProblem (Biegelinie_,[linear,system],[no_met])          \
    1.34  \                          [booll_ equs_, reall [c,c_2,c_3,c_4]]);        \
    1.35 @@ -332,8 +341,8 @@
    1.36  store_met
    1.37      (prep_met Biegelinie.thy "met_biege_setzrand" [] e_metID
    1.38  	      (["Biegelinien","setzeRandbedingungenEin"],
    1.39 -	       [("#Given" ,["Funktionen funs_","FunktionsVariable v_"]),
    1.40 -		("#Find"  ,["Gleichungen equs_"])],
    1.41 +	       [("#Given" ,["Funktionen funs_","Randbedingungen rb_"]),
    1.42 +		("#Find"  ,["Gleichungen equs___"])],
    1.43  	       {rew_ord'="tless_true", rls'=Erls, calc = [], 
    1.44  		srls = e_rls, 
    1.45  		prls=e_rls,

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/src/sml/IsacKnowledge/Equation.thy	Fri Sep 01 10:15:43 2006 +0200
     2.3 @@ -0,0 +1,24 @@
     2.4 +(* equations and functions; functions NOT as lambda-terms
     2.5 +   author: Walther Neuper 2005, 2006
     2.6 +   (c) due to copyright terms
     2.7 +
     2.8 +remove_thy"Equation";
     2.9 +use_thy"IsacKnowledge/Equation";
    2.10 +use_thy_only"IsacKnowledge/Equation";
    2.11 +
    2.12 +remove_thy"Equation";
    2.13 +use_thy"IsacKnowledge/Isac";
    2.14 +*)
    2.15 +
    2.16 +Equation = Atools +
    2.17 +
    2.18 +consts
    2.19 +
    2.20 +  (*descriptions in the related problems TODOshift here from Descriptions.thy*)
    2.21 +  substitution :: bool => una
    2.22 +
    2.23 +  (*the CAS-commands*)
    2.24 +  solve     :: "[bool * 'a] => bool list" (* solve (x+1=2, x) *)
    2.25 +  solveTest :: "[bool * 'a] => bool list" (* for test collection *)
    2.26 +  
    2.27 +end
    2.28 \ No newline at end of file

     3.1 --- a/src/smltest/IsacKnowledge/biegelinie.sml	Fri Sep 01 09:25:35 2006 +0200
     3.2 +++ b/src/smltest/IsacKnowledge/biegelinie.sml	Fri Sep 01 10:15:43 2006 +0200
     3.3 @@ -16,6 +16,7 @@
     3.4  "----------- simplify_leaf for this script -----------------------";
     3.5  "----------- Bsp 7.27 me -----------------------------------------";
     3.6  "----------- Bsp 7.27 autoCalculate ------------------------------";
     3.7 +"----------- SubProblem (_,[setzeRandbedingungen,Biegelinien] ----";
     3.8  "----------- IntegrierenUndKonstanteBestimmen2 -------------------";
     3.9  "-----------------------------------------------------------------";
    3.10  "-----------------------------------------------------------------";
    3.11 @@ -466,6 +467,14 @@
    3.12   getTactic 1 ([8],Res) (* ---"---                      ["M_b L = 0"]*);
    3.13  
    3.14  
    3.15 +"----------- SubProblem (_,[setzeRandbedingungen,Biegelinien] ----";
    3.16 +"----------- SubProblem (_,[setzeRandbedingungen,Biegelinien] ----";
    3.17 +"----------- SubProblem (_,[setzeRandbedingungen,Biegelinien] ----";
    3.18 +
    3.19 +
    3.20 +
    3.21 +
    3.22 +
    3.23  "----------- IntegrierenUndKonstanteBestimmen2 -------------------";
    3.24  "----------- IntegrierenUndKonstanteBestimmen2 -------------------";
    3.25  "----------- IntegrierenUndKonstanteBestimmen2 -------------------";