1.1 --- a/test/Tools/isac/OLDTESTS/script.sml Thu Nov 29 18:09:44 2018 +0100
1.2 +++ b/test/Tools/isac/OLDTESTS/script.sml Fri Nov 30 12:27:18 2018 +0100
1.3 @@ -43,13 +43,13 @@
1.4 \ (v_::real) (itv_::real set) (err_::bool) = \
1.5 \ (let e_e = (hd o (filterVar m_)) rs_; \
1.6 \ t_ = (if 1 < length_ rs_ \
1.7 - \ then (SubProblem (Reals_,[make,function],[no_met])\
1.8 + \ then (SubProblem (Reals_s,[make,function],[no_met])\
1.9 \ [REAL m_, REAL v_v, BOOL_LIST rs_])\
1.10 \ else (hd rs_)); \
1.11 - \ (mx_::real) = SubProblem (Reals_,[on_interval,max_of,function], \
1.12 + \ (mx_::real) = SubProblem (Reals_s,[on_interval,max_of,function], \
1.13 \ [Isac,maximum_on_interval])\
1.14 \ [BOOL t_, REAL v_v, REAL_SET itv_]\
1.15 - \ in ((SubProblem (Reals_,[find_values,tool],[Isac,find_values]) \
1.16 + \ in ((SubProblem (Reals_s,[find_values,tool],[Isac,find_values]) \
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 @@ -68,9 +68,9 @@
1.21 \ v_2 = nth_ 2 vs_; \
1.22 \ e_1 = (hd o (filterVar v_1)) es_; \
1.23 \ e_2 = (hd o (filterVar v_2)) es_; \
1.24 - \ (s_1::bool list) = (SubProblem (Reals_,[univar,equation],[no_met])\
1.25 + \ (s_1::bool list) = (SubProblem (Reals_s,[univar,equation],[no_met])\
1.26 \ [BOOL e_1, REAL v_1]);\
1.27 - \ (s_2::bool list) = (SubProblem (Reals_,[univar,equation],[no_met])\
1.28 + \ (s_2::bool list) = (SubProblem (Reals_s,[univar,equation],[no_met])\
1.29 \ [BOOL e_2, REAL v_2])\
1.30 \in Substitute [(v_1 = (rhs o hd) s_1),(v_2 = (rhs o hd) s_2)] h_)";
1.31
1.32 @@ -148,7 +148,7 @@
1.33 \ e_1 = hd (dropWhile (ident h_) eqs_); \
1.34 \ vs_ = dropWhile (ident f_) (Vars h_); \
1.35 \ v_1 = hd (dropWhile (ident v_v) vs_); \
1.36 - \ (s_1::bool list)=(SubProblem(Reals_,[univar,equation],[no_met])\
1.37 + \ (s_1::bool list)=(SubProblem(Reals_s,[univar,equation],[no_met])\
1.38 \ [BOOL e_1, REAL v_1])\
1.39 \ in Substitute [(v_1 = (rhs o hd) s_1)] h_)";
1.40