Added a sort function to decide the order of theorems to try in the tactic "auto".

[helm.git] / helm / ocaml / tactics / variousTactics.ml

diff --git a/helm/ocaml/tactics/variousTactics.ml b/helm/ocaml/tactics/variousTactics.ml
index 0df44420c99ef25f52511d5a4ba46c1927afc2c8..daf461c5ba78ade83739de5cb180c79fccf9cc85 100644 (file)
--- a/helm/ocaml/tactics/variousTactics.ml
+++ b/helm/ocaml/tactics/variousTactics.ml
@@ -106,18 +106,7 @@ else
       Some (ey, ty) ->
         prerr_endline ("CURRENT GOAL = " ^ (CicPp.ppterm ty));
         prerr_endline ("CURRENT HYP = " ^ (fst (print_context ey)));
-        (*
-        let time1 = Unix.gettimeofday() in
-       let _, all_paths = NewConstraints.prefixes 5 ty in
-        let time2 = Unix.gettimeofday() in
-        prerr_endline 
-         (Printf.sprintf "TEMPO DI CALCOLO = %1.3f" (time2 -. time1) );
-       prerr_endline 
-         ("ALL PATHS: n = " ^ string_of_int 
-            (List.length all_paths));
-       prerr_endline (NewConstraints.pp_prefixes all_paths); 
-        *)
-       (* if the goal does not have a sort Prop we return the
+        (* if the goal does not have a sort Prop we return the
           current proof and a list containing the goal *)
        let ty_sort = CicTypeChecker.type_of_aux' metasenv ey ty in
          if CicReduction.are_convertible 
@@ -196,7 +185,9 @@ let rec auto_new mqi_handle = function
             Some (ey, ty)
         with _ -> None) in
        match meta_inf with
-           Some _ ->
+           Some (ey, ty) ->
+              prerr_endline ("CURRENT GOAL = " ^ (CicPp.ppterm ty));
+               prerr_endline ("CURRENT HYP = " ^ (fst (print_context ey)));
              let local_choices =
                new_search_theorems 
                  search_theorems_in_context proof goal (depth-1) gtl in
@@ -206,7 +197,15 @@ let rec auto_new mqi_handle = function
                  proof goal (depth-1) gtl in
              let all_choices =
                local_choices@global_choices@tl in
-             let reorder = all_choices in
+             let sorting_list (_,g1) (_,g2) =
+               let l1 = List.length g1 in
+               let l2 = List.length g2 in
+               if (l1 = l2 && not(l1 = 0)) then
+               (snd(List.nth g2 0)) - (snd(List.nth g1 0))
+               else l1 - l2 in
+             let reorder = 
+               List.stable_sort sorting_list all_choices
+             in
                auto_new mqi_handle reorder
          | None -> auto_new mqi_handle ((proof,gtl)::tl)
 ;;