X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fparamodulation%2Fsaturate_main.ml;h=bec597645233737b35d3b1d5c6ba81a9fb8b05aa;hb=4c2a5e7da43e15d9a5f35d65f6bd6eda9a117d93;hp=69d50e3a0cd7264ea84685d06417f9792bea4fb8;hpb=d065a590ca5c4aec5ab505f2cf9e295e6c900942;p=helm.git

diff --git a/helm/ocaml/paramodulation/saturate_main.ml b/helm/ocaml/paramodulation/saturate_main.ml
index 69d50e3a0..bec597645 100644
--- a/helm/ocaml/paramodulation/saturate_main.ml
+++ b/helm/ocaml/paramodulation/saturate_main.ml
@@ -23,6 +23,8 @@
  * http://cs.unibo.it/helm/.
  *)
 
+(* $Id$ *)
+
 module Trivial_disambiguate:
 sig
   exception Ambiguous_term of string Lazy.t
@@ -47,9 +49,10 @@ struct
   exception Exit
   module Callbacks =
   struct
+    let non p x = not (p x)
     let interactive_user_uri_choice ~selection_mode ?ok
           ?(enable_button_for_non_vars = true) ~title ~msg ~id uris =
-              raise Exit
+            List.filter (non UriManager.uri_is_var) uris
     let interactive_interpretation_choice interp = raise Exit
     let input_or_locate_uri ~(title:string) ?id = raise Exit
   end
@@ -87,6 +90,8 @@ let full = ref false;;
 
 let retrieve_only = ref false;;
 
+let demod_equalities = ref false;;
+
 let _ =
   let module S = Saturation in
   let set_ratio v = S.weight_age_ratio := v; S.weight_age_counter := v
@@ -97,6 +102,7 @@ let _ =
     | "lpo" -> Utils.compare_terms := Utils.lpo
     | "kbo" -> Utils.compare_terms := Utils.kbo
     | "nr-kbo" -> Utils.compare_terms := Utils.nonrec_kbo
+    | "ao" -> Utils.compare_terms := Utils.ao
     | o -> raise (Arg.Bad ("Unknown term ordering: " ^ o))
   and set_fullred b = S.use_fullred := b
   and set_time_limit v = S.time_limit := float_of_int v
@@ -104,6 +110,7 @@ let _ =
   and set_depth d = S.maxdepth := d
   and set_full () = full := true
   and set_retrieve () = retrieve_only := true
+  and set_demod_equalities () = demod_equalities := true
   in
   Arg.parse [
     "-full", Arg.Unit set_full, "Enable full mode";
@@ -132,11 +139,12 @@ let _ =
     Printf.sprintf "Maximal depth (default: %d)" !Saturation.maxdepth;
 
     "-retrieve", Arg.Unit set_retrieve, "retrieve only";
+    "-demod-equalities", Arg.Unit set_demod_equalities, "demod equalities";
   ] (fun a -> ()) "Usage:"
 in
 Helm_registry.load_from !configuration_file;
-CicNotation.load_notation core_notation_script;
-CicNotation.load_notation "../../matita/coq.ma";
+ignore (CicNotation2.load_notation [] core_notation_script);
+ignore (CicNotation2.load_notation [] "../../matita/coq.ma");
 let dbd = HMysql.quick_connect
   ~host:(Helm_registry.get "db.host")
   ~user:(Helm_registry.get "db.user")
@@ -146,6 +154,8 @@ in
 let term, metasenv, ugraph = get_from_user ~dbd in
 if !retrieve_only then
   Saturation.retrieve_and_print dbd term metasenv ugraph
+else if !demod_equalities then
+  Saturation.main_demod_equalities dbd term metasenv ugraph
 else
   Saturation.main dbd !full term metasenv ugraph
 ;;