X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fparamodulation%2Fsaturate_main.ml;h=6f1ea3f2b7011017b61a7f3b02241efaae6d9c13;hb=33a02e0b639217093eb63f30169aaa6ac8c78907;hp=05d2cd047e1ee683f3bb1e02ed8f4f1820b9fde2;hpb=575fd8b6044d87cd7116b0dc3cd695e790f7b152;p=helm.git

diff --git a/helm/ocaml/paramodulation/saturate_main.ml b/helm/ocaml/paramodulation/saturate_main.ml
index 05d2cd047..6f1ea3f2b 100644
--- a/helm/ocaml/paramodulation/saturate_main.ml
+++ b/helm/ocaml/paramodulation/saturate_main.ml
@@ -1,6 +1,6 @@
 let configuration_file = ref "../../matita/matita.conf.xml";;
 
-let core_notation_script = "../../matita/core_notation.ma";;
+let core_notation_script = "../../matita/core_notation.moo";;
 
 let get_from_user ~(dbd:Mysql.dbd) =
   let rec get () =
@@ -17,11 +17,15 @@ let get_from_user ~(dbd:Mysql.dbd) =
 
 let _ =
   let module S = Saturation in
-  let set_ratio v = S.weight_age_ratio := (v+1); S.weight_age_counter := (v+1)
+  let set_ratio v = S.weight_age_ratio := v; S.weight_age_counter := v
   and set_sel v = S.symbols_ratio := v; S.symbols_counter := v;
   and set_conf f = configuration_file := f
-  and set_lpo () = Utils.compare_terms := Utils.lpo
-  and set_kbo () = Utils.compare_terms := Utils.nonrec_kbo
+  and set_ordering o =
+    match o with
+    | "lpo" -> Utils.compare_terms := Utils.lpo
+    | "kbo" -> Utils.compare_terms := Utils.kbo
+    | "nr-kbo" -> Utils.compare_terms := Utils.nonrec_kbo
+    | 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
   in
@@ -29,22 +33,25 @@ let _ =
     "-f", Arg.Bool set_fullred,
     "Enable/disable full-reduction strategy (default: enabled)";
     
-    "-r", Arg.Int set_ratio, "Weight-Age equality selection ratio (default: 3)";
+    "-r", Arg.Int set_ratio, "Weight-Age equality selection ratio (default: 4)";
 
     "-s", Arg.Int set_sel,
-    "symbols-based selection ratio (relative to the weight ratio, default: 2)";
+    "symbols-based selection ratio (relative to the weight ratio, default: 0)";
 
     "-c", Arg.String set_conf, "Configuration file (for the db connection)";
 
-    "-lpo", Arg.Unit set_lpo, "Use lpo term ordering";
+    "-o", Arg.String set_ordering,
+    "Term ordering. Possible values are:\n" ^
+      "\tkbo: Knuth-Bendix ordering (default)\n" ^
+      "\tnr-kbo: Non-recursive variant of kbo\n" ^
+      "\tlpo: Lexicographic path ordering";
 
-    "-kbo", Arg.Unit set_kbo, "Use (non-recursive) kbo term ordering (default)";
-
-    "-l", Arg.Int set_time_limit, "Time limit (in seconds)";
+    "-l", Arg.Int set_time_limit, "Time limit in seconds (default: no limit)";
   ] (fun a -> ()) "Usage:"
 in
 Helm_registry.load_from !configuration_file;
 CicNotation.load_notation core_notation_script;
+CicNotation.load_notation "../../matita/coq.moo";
 let dbd = Mysql.quick_connect
   ~host:(Helm_registry.get "db.host")
   ~user:(Helm_registry.get "db.user")