1.1 --- a/test/Tools/isac/OLDTESTS/script.sml Mon Sep 06 16:56:22 2010 +0200
1.2 +++ b/test/Tools/isac/OLDTESTS/script.sml Mon Sep 06 17:07:28 2010 +0200
1.3 @@ -44,14 +44,14 @@
1.4 \ (let e_e = (hd o (filterVar m_)) rs_; \
1.5 \ t_ = (if 1 < length_ rs_ \
1.6 \ then (SubProblem (Reals_,[make,function],[no_met])\
1.7 - \ [real_ m_, real_ v_v, bool_list_ rs_])\
1.8 + \ [REAL m_, REAL v_v, BOOL_LIST rs_])\
1.9 \ else (hd rs_)); \
1.10 \ (mx_::real) = SubProblem (Reals_,[on_interval,max_of,function], \
1.11 \ [Isac,maximum_on_interval])\
1.12 - \ [bool_ t_, real_ v_v, real_set_ itv_]\
1.13 + \ [BOOL t_, REAL v_v, REAL_SET itv_]\
1.14 \ in ((SubProblem (Reals_,[find_values,tool],[Isac,find_values]) \
1.15 - \ [real_ mx_, real_ (Rhs t_), real_ v_v, real_ m_, \
1.16 - \ bool_list_ (dropWhile (ident e_e) rs_)])::bool list))";
1.17 + \ [REAL mx_, REAL (Rhs t_), REAL v_v, REAL m_, \
1.18 + \ BOOL_LIST (dropWhile (ident e_e) rs_)])::bool list))";
1.19
1.20
1.21 "################################################### 6.5.03";
1.22 @@ -69,9 +69,9 @@
1.23 \ e_1 = (hd o (filterVar v_1)) es_; \
1.24 \ e_2 = (hd o (filterVar v_2)) es_; \
1.25 \ (s_1::bool list) = (SubProblem (Reals_,[univar,equation],[no_met])\
1.26 - \ [bool_ e_1, real_ v_1]);\
1.27 + \ [BOOL e_1, REAL v_1]);\
1.28 \ (s_2::bool list) = (SubProblem (Reals_,[univar,equation],[no_met])\
1.29 - \ [bool_ e_2, real_ v_2])\
1.30 + \ [BOOL e_2, REAL v_2])\
1.31 \in Substitute [(v_1 = (rhs o hd) s_1),(v_2 = (rhs o hd) s_2)] h_)";
1.32
1.33 val ags = map (term_of o the o (parse DiffApp.thy))
1.34 @@ -149,7 +149,7 @@
1.35 \ vs_ = dropWhile (ident f_) (Vars h_); \
1.36 \ v_1 = hd (dropWhile (ident v_v) vs_); \
1.37 \ (s_1::bool list)=(SubProblem(Reals_,[univar,equation],[no_met])\
1.38 - \ [bool_ e_1, real_ v_1])\
1.39 + \ [BOOL e_1, REAL v_1])\
1.40 \ in Substitute [(v_1 = (rhs o hd) s_1)] h_)";
1.41
1.42