intermed. usecase Diophant: change usecase inttype
found only one working '= me' in test/../calculate.sml
and adjusted usecase to this test.
Test_Isac.thy worked !before! build
1.1 --- a/src/Tools/isac/Knowledge/Test.thy Fri Mar 18 09:26:03 2011 +0100
1.2 +++ b/src/Tools/isac/Knowledge/Test.thy Fri Mar 18 12:33:12 2011 +0100
1.3 @@ -879,10 +879,23 @@
1.4 (*
1.5 (#ppc o get_pbt) ["sqroot-test","univariate","equation"];
1.6 *)
1.7 +
1.8 +store_pbt
1.9 + (prep_pbt thy "pbl_test_intsimp" [] e_pblID
1.10 + (["inttype","test"],
1.11 + [("#Given" ,["intTestGiven t_t"]),
1.12 + ("#Where" ,[]),
1.13 + ("#Find" ,["intTestFind s_s"])
1.14 + ],
1.15 + e_rls, None, [["Test","intsimp"]]));
1.16 +(*
1.17 +show_ptyps();
1.18 +get_pbt ["inttype","test"];
1.19 +*)
1.20 +
1.21 *}
1.22 +
1.23 ML {*
1.24 -
1.25 -
1.26 store_met
1.27 (prep_met thy "met_test_sqrt" [] e_metID
1.28 (*root-equation, version for tests before 8.01.01*)
1.29 @@ -1167,12 +1180,26 @@
1.30 " [no_met]) [BOOL e_e, REAL v_v]))"
1.31 ));
1.32
1.33 +(*17.9.02 aus SqRoot.ML------------------------------^^^---*)
1.34
1.35 +store_met
1.36 +(prep_met thy "met_test_intsimp" [] e_metID
1.37 + (["Test","intsimp"]:metID,
1.38 + [("#Given" ,["intTestGiven t_t"]),
1.39 + ("#Where" ,[]),
1.40 + ("#Find" ,["intTestFind s_s"])
1.41 + ],
1.42 + {rew_ord' = "e_rew_ord", rls' = tval_rls, srls = e_rls,
1.43 + prls = e_rls, calc = [], crls = tval_rls, nrls = Test_simplify},
1.44 + "Script STest_simplify (t_t::int) = " ^
1.45 + "(Repeat " ^
1.46 + " ((Try (Calculate PLUS)) @@ " ^
1.47 + " (Try (Calculate TIMES))) e_e::bool)"
1.48 + ));
1.49
1.50 -(*17.9.02 aus SqRoot.ML------------------------------^^^---*)
1.51 *}
1.52 +
1.53 ML {*
1.54 -
1.55 (*8.4.03 aus Poly.ML--------------------------------vvv---
1.56 make_polynomial ---> make_poly
1.57 ^-- for user ^-- for systest _ONLY_*)
2.1 --- a/src/Tools/isac/Test_Isac.thy Fri Mar 18 09:26:03 2011 +0100
2.2 +++ b/src/Tools/isac/Test_Isac.thy Fri Mar 18 12:33:12 2011 +0100
2.3 @@ -40,7 +40,11 @@
2.4 cd"smltest/Scripts";
2.5 *)
2.6 use"../../../test/Tools/isac/ProgLang/termC.sml" (*part.*)
2.7 +ML {*print_depth 9*}
2.8 use"../../../test/Tools/isac/ProgLang/calculate.sml" (*part.*)
2.9 +
2.10 +ML {*store_met*}
2.11 +
2.12 use"../../../test/Tools/isac/ProgLang/rewrite.sml" (*GOON*)
2.13 (*
2.14 use"listg.sml";
2.15 @@ -131,7 +135,6 @@
2.16 *)
2.17 use "../../../test/Tools/isac/Knowledge/diophanteq.sml" (**)
2.18 ML {*
2.19 -is_known;
2.20 print_depth 999;
2.21 nxt;
2.22 *}
2.23 @@ -187,12 +190,12 @@
2.24 ===== inhibit exn ?===========================================================*)
2.25
2.26
2.27 -(*========== inhibit exn 110317 ================================================
2.28 +(*========== inhibit exn ML110317 ==============================================
2.29
2.30 "########### testcode inserted vvv ###########################################";
2.31 "########### testcode inserted ^^^ ###########################################";
2.32
2.33 -============ inhibit exn 110317 ==============================================*)
2.34 +============ inhibit exn ML110317 ============================================*)
2.35
2.36
2.37 (*-.-.-.-.-.-isolate response.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
3.1 --- a/src/Tools/isac/Test_Some.thy Fri Mar 18 09:26:03 2011 +0100
3.2 +++ b/src/Tools/isac/Test_Some.thy Fri Mar 18 12:33:12 2011 +0100
3.3 @@ -17,7 +17,7 @@
3.4 (*..............................................########......................*)
3.5 *}
3.6
3.7 -ML {*pos_2str*}
3.8 +ML {*parseNEW*}
3.9
3.10 use"../../../test/Tools/isac/Knowledge/diophanteq.sml";
3.11
4.1 --- a/test/Tools/isac/Knowledge/diophanteq.sml Fri Mar 18 09:26:03 2011 +0100
4.2 +++ b/test/Tools/isac/Knowledge/diophanteq.sml Fri Mar 18 12:33:12 2011 +0100
4.3 @@ -4,6 +4,7 @@
4.4 12345678901234567890123456789012345678901234567890123456789012345678901234567890
4.5 10 20 30 40 50 60 70 80
4.6 *)
4.7 +(*-.-.-.-.-.-isolate response.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
4.8 "--------------------------------------------------------";
4.9 "table of contents --------------------------------------";
4.10 "--------------------------------------------------------";
4.11 @@ -39,15 +40,15 @@
4.12 "----------- mathengine with usecase1 -------------------";
4.13 "----------- mathengine with usecase1 -------------------";
4.14 "----------- mathengine with usecase1 -------------------";
4.15 -val p = e_pos'; val c = [];
4.16 -val (p,_,f,nxt,_,pt) =
4.17 - CalcTreeTEST
4.18 - [(["boolTestGiven (xxx + 111 = abc + (123::int))", "intTestGiven (xxx::int)", "boolTestFind sss"],
4.19 - (Context.theory_name thy,
4.20 - ["diophantine","equation"], ["Test","solve_diophant"]))];
4.21 -"----- step 1: returns nxt = Add_Given \"functionTerm (x ^^^ 2 + 1)\" ---";
4.22 +-.-.-.-.-.-.-isolate response.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.*)
4.23 +(*-.-.-.-.-.-isolate response.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
4.24 +val p = e_pos'; val c = [];
4.25 +val (fmz, (thy, pbl, met)) =
4.26 + (["intTestGiven (xxx + abc + -1 * 111 + (123::int))", "intTestFind sss"],
4.27 + (Context.theory_name thy, ["diophantine", "equation"],
4.28 + ["Test", "solve_diophant"]));
4.29 +val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (thy, pbl, met))];
4.30 val (p,_,f,nxt,_,pt) = me nxt p c pt;
4.31 -(*-.-.-.-.-.-isolate response.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
4.32 val (p,_,f,nxt,_,pt) = me nxt p c pt;
4.33 val (p,_,f,nxt,_,pt) = me nxt p c pt;
4.34 val (p,_,f,nxt,_,pt) = me nxt p c pt;
5.1 --- a/test/Tools/isac/ProgLang/calculate.sml Fri Mar 18 09:26:03 2011 +0100
5.2 +++ b/test/Tools/isac/ProgLang/calculate.sml Fri Mar 18 12:33:12 2011 +0100
5.3 @@ -5,6 +5,7 @@
5.4 12345678901234567890123456789012345678901234567890123456789012345678901234567890
5.5 10 20 30 40 50 60 70 80
5.6 *)
5.7 +(*-.-.-.-.-.-isolate response.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
5.8
5.9 "--------------------------------------------------------";
5.10 "table of contents --------------------------------------";
5.11 @@ -16,8 +17,8 @@
5.12 "----------- calculate from script ----------------------";
5.13 "----------- calculate check test-root-equ --------------";
5.14 "----------- check calculate bottom up ------------------";
5.15 -" ================= calculate.sml:10.8.02 2002:///->/ ======== ";
5.16 -" ================= calculate.sml: calculate_ 2002 =================== ";
5.17 +" ================= calculate.sml:10.8.02 2002:///->/ ===";
5.18 +" ================= calculate.sml: calculate_ 2002 ======";
5.19 "----------- get_pair with 3 args -----------------------";
5.20 "----------- calculate (2 * x is_const) -----------------";
5.21 "--------------------------------------------------------";
5.22 @@ -73,6 +74,7 @@
5.23 "----------- calculate from script ----------------------";
5.24 "----------- calculate from script ----------------------";
5.25 "----------- calculate from script ----------------------";
5.26 +-.-.-.-.-.-.-isolate response.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.*)
5.27 store_pbt
5.28 (prep_pbt (@{theory "Test"}) "pbl_ttest" [] e_pblID
5.29 (["test"],
5.30 @@ -111,10 +113,6 @@
5.31 val (dI',pI',mI') =
5.32 ("Test",["calculate","test"],["Test","test_calculate"]);
5.33
5.34 -
5.35 -(*===== inhibit exn ?===========================================================
5.36 -GOON after rewriting works in Oct.10
5.37 -
5.38 val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
5.39 val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
5.40 (*nxt =("Add_Given",Add_Given "realTestGiven (((#1 + #2) * #4 // #3) ^^^#2)")*)
5.41 @@ -145,7 +143,7 @@
5.42 else error "calculate.sml: script test_calculate changed behaviour";
5.43
5.44
5.45 -
5.46 +(*===== inhibit exn ?===========================================================
5.47 "----------- calculate check test-root-equ --------------";
5.48 "----------- calculate check test-root-equ --------------";
5.49 "----------- calculate check test-root-equ --------------";