equal
deleted
inserted
replaced
817 end |
817 end |
818 val s12 = merge s1 s2 |
818 val s12 = merge s1 s2 |
819 val t1 = try_metis s1 s0 () |
819 val t1 = try_metis s1 s0 () |
820 val t2 = try_metis s2 (SOME s1) () |
820 val t2 = try_metis s2 (SOME s1) () |
821 val timeout = |
821 val timeout = |
822 t1 + t2 |> Time.toReal |> curry Real.* merge_timeout_slack |
822 Time.+ (t1, t2) |> Time.toReal |> curry Real.* merge_timeout_slack |
823 |> Time.fromReal |
823 |> Time.fromReal |
824 in |
824 in |
825 (TimeLimit.timeLimit timeout (try_metis s12 s0) (); |
825 (TimeLimit.timeLimit timeout (try_metis s12 s0) (); |
826 SOME (front @ (the_list s0 @ s12 :: tail))) |
826 SOME (front @ (the_list s0 @ s12 :: tail))) |
827 handle _ => NONE |
827 handle _ => NONE |