better precedence handling, should remove useless parens

[helm.git] / helm / ocaml / paramodulation / saturate_main.ml

diff --git a/helm/ocaml/paramodulation/saturate_main.ml b/helm/ocaml/paramodulation/saturate_main.ml
index a2a4e1f079e6957bd3074d82ac7813175d07e631..bf9ec689726298a62fafbf366edc36e5f9be62e5 100644 (file)
--- a/helm/ocaml/paramodulation/saturate_main.ml
+++ b/helm/ocaml/paramodulation/saturate_main.ml
@@ -1,8 +1,8 @@
-let configuration_file = ref "../../matita/matita.conf.xml";;
+let configuration_file = ref "../helm/matita/matita.conf.xml";;
 
-let core_notation_script = "../../matita/core_notation.moo";;
+let core_notation_script = "../helm/matita/core_notation.moo";;
 
-let get_from_user ~(dbd:Mysql.dbd) =
+let get_from_user ~(dbd:HMysql.dbd) =
   let rec get () =
     match read_line () with
     | "" -> []
@@ -17,7 +17,7 @@ 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_ordering o =
@@ -28,6 +28,8 @@ let _ =
     | 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
+  and set_width w = S.maxwidth := w
+  and set_depth d = S.maxdepth := d
   in
   Arg.parse [
     "-f", Arg.Bool set_fullred,
@@ -42,17 +44,23 @@ let _ =
 
     "-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" ^
+      "\tkbo: Knuth-Bendix ordering\n" ^
+      "\tnr-kbo: Non-recursive variant of kbo (default)\n" ^
       "\tlpo: Lexicographic path ordering";
 
     "-l", Arg.Int set_time_limit, "Time limit in seconds (default: no limit)";
+    
+    "-w", Arg.Int set_width,
+    Printf.sprintf "Maximal width (default: %d)" !Saturation.maxwidth;
+    
+    "-d", Arg.Int set_depth,
+    Printf.sprintf "Maximal depth (default: %d)" !Saturation.maxdepth;
   ] (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
+CicNotation.load_notation "../helm/matita/coq.ma";
+let dbd = HMysql.quick_connect
   ~host:(Helm_registry.get "db.host")
   ~user:(Helm_registry.get "db.user")
   ~database:(Helm_registry.get "db.database")