X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fparamodulation%2Fsaturate_main.ml;h=bec597645233737b35d3b1d5c6ba81a9fb8b05aa;hb=727d6939c3f3ff1769ac1d11cad11d2e06433295;hp=a2a4e1f079e6957bd3074d82ac7813175d07e631;hpb=d622a1ce338d9db774ddc8b98fa58cdcec7b22e5;p=helm.git

diff --git a/helm/ocaml/paramodulation/saturate_main.ml b/helm/ocaml/paramodulation/saturate_main.ml
index a2a4e1f07..bec597645 100644
--- a/helm/ocaml/paramodulation/saturate_main.ml
+++ b/helm/ocaml/paramodulation/saturate_main.ml
@@ -1,8 +1,79 @@
+(* Copyright (C) 2005, HELM Team.
+ * 
+ * This file is part of HELM, an Hypertextual, Electronic
+ * Library of Mathematics, developed at the Computer Science
+ * Department, University of Bologna, Italy.
+ * 
+ * HELM is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * HELM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HELM; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * For details, see the HELM World-Wide-Web page,
+ * http://cs.unibo.it/helm/.
+ *)
+
+(* $Id$ *)
+
+module Trivial_disambiguate:
+sig
+  exception Ambiguous_term of string Lazy.t
+  (** disambiguate an _unanmbiguous_ term using dummy callbacks which fail if a
+    * choice from the user is needed to disambiguate the term
+    * @raise Ambiguous_term for ambiguous term *)
+  val disambiguate_string:
+    dbd:HMysql.dbd ->
+    ?context:Cic.context ->
+    ?metasenv:Cic.metasenv ->
+    ?initial_ugraph:CicUniv.universe_graph -> 
+    ?aliases:DisambiguateTypes.environment ->(* previous interpretation status*)
+    string ->
+    ((DisambiguateTypes.domain_item * DisambiguateTypes.codomain_item) list *
+     Cic.metasenv *                 (* new metasenv *)
+     Cic.term *
+     CicUniv.universe_graph) list   (* disambiguated term *)
+end
+=
+struct
+  exception Ambiguous_term of string Lazy.t
+  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 =
+            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
+  module Disambiguator = Disambiguate.Make (Callbacks)
+  let disambiguate_string ~dbd ?(context = []) ?(metasenv = []) ?initial_ugraph
+    ?(aliases = DisambiguateTypes.Environment.empty) term
+  =
+    let ast =
+      CicNotationParser.parse_level2_ast (Ulexing.from_utf8_string term)
+    in
+    try
+      fst (Disambiguator.disambiguate_term ~dbd ~context ~metasenv ast
+        ?initial_ugraph ~aliases ~universe:None)
+    with Exit -> raise (Ambiguous_term (lazy term))
+end
+
 let configuration_file = ref "../../matita/matita.conf.xml";;
 
 let core_notation_script = "../../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
     | "" -> []
@@ -10,14 +81,20 @@ let get_from_user ~(dbd:Mysql.dbd) =
   in
   let term_string = String.concat "\n" (get ()) in
   let env, metasenv, term, ugraph =
-    List.nth (Disambiguate.Trivial.disambiguate_string dbd term_string) 0
+    List.nth (Trivial_disambiguate.disambiguate_string dbd term_string) 0
   in
   term, metasenv, ugraph
 ;;
 
+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+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 =
@@ -25,11 +102,18 @@ 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
+  and set_width w = S.maxwidth := w
+  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";
     "-f", Arg.Bool set_fullred,
     "Enable/disable full-reduction strategy (default: enabled)";
     
@@ -42,21 +126,36 @@ 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;
+
+    "-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.moo";
-let dbd = Mysql.quick_connect
+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")
   ~database:(Helm_registry.get "db.database")
   ()
 in
 let term, metasenv, ugraph = get_from_user ~dbd in
-Saturation.main dbd term metasenv ugraph;;
+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
+;;