proof patching!

[helm.git] / helm / software / components / ng_paramodulation / paramod.ml

diff --git a/helm/software/components/ng_paramodulation/paramod.ml b/helm/software/components/ng_paramodulation/paramod.ml
index 8903ec02fc1c24082fe54d53ddbb32006ec761c4..b80bfc5001f12aa41b0d9a5d2dfde04be9aee7ad 100644 (file)
--- a/helm/software/components/ng_paramodulation/paramod.ml
+++ b/helm/software/components/ng_paramodulation/paramod.ml
@@ -4,7 +4,7 @@ let debug s =
 
 let nparamod rdb metasenv subst context t table =
   let nb_iter = ref 200 in
-  prerr_endline "========================================";
+  let amount_of_time = 20.0 in
   let module C = struct
     let metasenv = metasenv
     let subst = subst
@@ -30,6 +30,7 @@ let nparamod rdb metasenv subst context t table =
   let add_passive_clause passives cl =
     PassiveSet.add (Utils.mk_passive_clause cl) passives
   in
+  let timeout = Unix.gettimeofday () +. amount_of_time in 
     (* TODO : fairness condition *)
   let select passives =
     if PassiveSet.is_empty passives then None
@@ -44,7 +45,9 @@ let nparamod rdb metasenv subst context t table =
       prerr_endline "Active table :"; 
        (List.iter (fun x -> prerr_endline (Pp.pp_unit_clause x))
          (fst actives));*)
-    raise (Failure "Timeout !");
+      raise (Failure "No iterations left !");
+    if Unix.gettimeofday () > timeout then
+      raise (Failure "Timeout !");
 
 
       
@@ -67,10 +70,10 @@ let nparamod rdb metasenv subst context t table =
           bag, maxvar, g_current::g_actives,
          (PassiveSet.union new_goals g_passives)
     in
-      prerr_endline
+      debug
        (Printf.sprintf "Number of active goals : %d"
           (List.length g_actives));
-      prerr_endline
+      debug
        (Printf.sprintf "Number of passive goals : %d"
           (PassiveSet.cardinal g_passives));
   
@@ -91,8 +94,8 @@ let nparamod rdb metasenv subst context t table =
          | None -> assert false
          | Some (current, passives) -> 
              debug ("Selected fact : " ^ Pp.pp_unit_clause current);
-              match Sup.keep_simplified current actives bag with
-             (* match Sup.one_pass_simplification current actives bag with *)
+(*               match Sup.keep_simplified current actives bag maxvar with *)
+               match Sup.one_pass_simplification current actives bag maxvar with 
                | None -> aux_simplify passives
                | Some x -> x,passives
       in
@@ -129,9 +132,9 @@ let nparamod rdb metasenv subst context t table =
       PassiveSet.union new_clauses passives,
       PassiveSet.union new_goals g_passives
     in
-      prerr_endline
+      debug
        (Printf.sprintf "Number of actives : %d" (List.length (fst actives)));
-      prerr_endline
+      debug
        (Printf.sprintf "Number of passives : %d"
           (PassiveSet.cardinal passives));
       given_clause bag maxvar actives passives g_actives g_passives
@@ -165,27 +168,56 @@ let nparamod rdb metasenv subst context t table =
           Set.Make(struct type t=int let compare=Pervasives.compare end)
         in
         let all id = 
-          let rec traverse acc i =
+          let rec traverse ongoal (accg,acce) i =
             match Terms.M.find i bag with
-            | (_,_,_,Terms.Exact _) -> acc
+            | (_,_,_,Terms.Exact _) -> accg, acce
             | (_,_,_,Terms.Step (_,i1,i2,_,_,_)) -> 
-               traverse (traverse (C.add i1 (C.add i2 acc)) i1) i2    
+               let accg, acce = 
+                 if ongoal then C.add i1 accg, acce
+                 else accg, C.add i1 acce
+               in
+               let acce = C.add i2 acce in
+                 traverse false (traverse ongoal (accg,acce) i1) i2    
           in
-           C.elements (traverse C.empty id)
+            traverse true (C.empty,C.empty) id
         in
-        S.topological_sort (all i) all
+        let esteps = 
+          S.topological_sort (C.elements (snd (all i))) 
+           (fun i -> C.elements (C.union (snd (all i)) (fst (all i)) ))
+        in
+        let gsteps = 
+          S.topological_sort (C.elements (fst (all i))) 
+           (fun i -> C.elements (fst (all i)))
+        in
+        let gsteps = List.rev gsteps in
+        esteps@(i::gsteps)
       in
       prerr_endline "YES!";
+      prerr_endline ("Meeting point : " ^ (string_of_int i));
       prerr_endline "Proof:"; 
-      List.iter (fun x -> 
+      List.iter (fun x -> prerr_endline (string_of_int x);
               prerr_endline (Pp.pp_unit_clause (Terms.M.find x bag))) l;
-      let proofterm = B.mk_proof bag l in
+      let proofterm = B.mk_proof bag i l in
+      let metasenv, proofterm = 
+        let rec aux k metasenv = function
+          | NCic.Meta _ as t -> metasenv, t
+          | NCic.Implicit _ -> 
+              let metasenv,i,_,_=NCicMetaSubst.mk_meta metasenv context `Term in
+              metasenv, NCic.Meta (i,(k,NCic.Irl (List.length context)))
+          | t -> NCicUntrusted.map_term_fold_a 
+                  (fun _ k -> k+1) k aux metasenv t                 
+        in
+         aux 0 metasenv proofterm
+      in
       prerr_endline
-       (NCicPp.ppterm ~metasenv:C.metasenv ~subst:C.subst ~context:C.context
-         proofterm); 
-      let _metasenv, _subst, _proofterm, _prooftype = 
-        NCicRefiner.typeof rdb C.metasenv C.subst C.context proofterm None
+        ("prova generata: " ^ NCicPp.ppterm 
+           ~metasenv ~subst ~context proofterm);
+      let metasenv, subst, proofterm, _prooftype = 
+        NCicRefiner.typeof 
+          (rdb#set_coerc_db NCicCoercion.empty_db) 
+          metasenv subst context proofterm None
       in
-      ()
-  | Failure _ -> prerr_endline "FAILURE";
+      prerr_endline "prova raffinata";
+      proofterm, metasenv, subst
+  | Failure _ -> prerr_endline "FAILURE"; assert false
 ;;