1.1 --- a/test/Tools/isac/Minisubpbl/150a-add-given-Maximum.sml	Fri Nov 24 15:34:07 2023 +0100
     1.2 +++ b/test/Tools/isac/Minisubpbl/150a-add-given-Maximum.sml	Sat Nov 25 15:33:14 2023 +0100
     1.3 @@ -287,9 +287,9 @@
     1.4  "~~~~~ fun fill_from_o , args:"; val (o_model, (i, vnts, bool, m_field, (feedb, pos))) =
     1.5    (o_vnts, i_to_select);
     1.6      val (m_field, all_value as [Free ("A", _)]) =
     1.7 -      case find_first (fn (_, _, _, descr', _) => Pre_Conds.descriptor_exists descr' feedb) o_model of
     1.8 +      case find_first (fn (_, _, _, descr', _) => Model_Def.descriptor_exists descr' feedb) o_model of
     1.9          SOME (_, _, m_field, _, ts) =>  (m_field, ts)
    1.10 -    val descr = Pre_Conds.get_dscr'' feedb (*i_single has been filtered appropriately*)
    1.11 +    val descr = Model_Def.get_descr feedb (*i_single has been filtered appropriately*)
    1.12    (*in*)
    1.13  val false =
    1.14      (*if*) Model_Def.is_list_descr descr (*else*);
    1.15 @@ -714,13 +714,13 @@
    1.16  
    1.17  val (_, vnts1, _, _, (feedb1, _)) = (i2, [], bool2, m_field2, (Sup_TEST (descr2, ts2), pos2))
    1.18  val SOME (descr1 as (Const ("Input_Descript.FunctionVariable", _)) ) =
    1.19 -      get_dscr' feedb1
    1.20 +      get_dscr_opt feedb1
    1.21  val true =
    1.22          descr1 = descr2
    1.23  val true =
    1.24            Model_Def.member_vnt vnts1 max_vnt
    1.25  val NONE =
    1.26 -    find_first (fn (_, vnts1, _, _, (feedb1, _)) => case get_dscr' feedb1 of
    1.27 +    find_first (fn (_, vnts1, _, _, (feedb1, _)) => case get_dscr_opt feedb1 of
    1.28            NONE => false
    1.29          | SOME descr1 => descr1 = descr2 andalso Model_Def.member_vnt vnts1 max_vnt) i1_model
    1.30  
    1.31 @@ -861,9 +861,9 @@
    1.32  "~~~~~ fun fill_from_o , args:"; val (o_model, (i, vnts, bool, _, (feedb, pos))) =
    1.33    (o_vnts, (hd i_to_select));
    1.34      val (m_field, all_value) =
    1.35 -      case find_first (fn (_, _, _, descr', _) => Pre_Conds.descriptor_exists descr' feedb) o_model of
    1.36 +      case find_first (fn (_, _, _, descr', _) => Model_Def.descriptor_exists descr' feedb) o_model of
    1.37          SOME (_, _, m_field, _, ts) =>  (m_field, ts)
    1.38 -    val descr = Pre_Conds.get_dscr'' feedb (*i_single has been filtered appropriately*)
    1.39 +    val descr = Model_Def.get_descr feedb (*i_single has been filtered appropriately*)
    1.40  val false =
    1.41      (*if*) Model_Def.is_list_descr descr (*else*);
    1.42  val return_fill_from_o_STEP = SOME (i, vnts, bool, m_field, (Cor_TEST (descr, all_value), pos))