New age selection

[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 0dafc864e215df8985e938b8edf4958de74e29b3..983dd53e84bd28e567904e2c51c74fe8209db52a 100644 (file)
--- a/helm/software/components/ng_paramodulation/paramod.ml
+++ b/helm/software/components/ng_paramodulation/paramod.ml
@@ -29,6 +29,7 @@ module Paramod (B : Terms.Blob) = struct
   module IDX = Index.Index(B) 
   module Sup = Superposition.Superposition(B) 
   module Utils = FoUtils.Utils(B) 
+  module Order = Orderings.Orderings(B)
   module WeightOrderedPassives =
       struct
         type t = B.t Terms.passive_clause
@@ -136,19 +137,20 @@ module Paramod (B : Terms.Blob) = struct
   ;;
 
   let backward_infer_step bag maxvar actives passives
-                          g_actives g_passives g_current =
+                          g_actives g_passives g_current iterno =
     (* superposition left, simplifications on goals *)
       debug "infer_left step...";
       let bag, maxvar, new_goals = 
         Sup.infer_left bag maxvar g_current actives 
       in
         debug "Performed infer_left step";
+       let bag = Terms.replace_in_bag (g_current,false,iterno) bag in
         bag, maxvar, actives, passives, g_current::g_actives,
     (add_passive_goals g_passives new_goals)
   ;;
 
   let forward_infer_step bag maxvar actives passives g_actives
-                         g_passives current =
+                         g_passives current iterno =
     (* forward step *)
     
     (* e = select P           *
@@ -172,7 +174,7 @@ module Paramod (B : Terms.Blob) = struct
                Sup.simplify_goal ~no_demod:false maxvar (snd actives) bag acc c
              with
                | None -> bag, acc
-               | Some (bag,c) -> bag,c::acc)
+               | Some (bag,c1) -> bag,if c==c1 then c::acc else c::c1::acc)
           (bag,[]) g_actives 
       in
       let ctable = IDX.index_unit_clause IDX.DT.empty current in
@@ -183,13 +185,14 @@ module Paramod (B : Terms.Blob) = struct
                bag,m,ng@acc) 
           (bag,maxvar,[]) g_actives 
       in
+      let bag = Terms.replace_in_bag (current,false,iterno) bag in
     bag, maxvar, actives,
     add_passive_clauses passives new_clauses, g_actives,
     add_passive_goals g_passives new_goals
   ;;
  
   let rec given_clause ~noinfer 
-    bag maxvar iterno max_steps timeout 
+    bag maxvar iterno weight_picks max_steps timeout 
     actives passives g_actives g_passives 
   =
     let iterno = iterno + 1 in
@@ -219,18 +222,20 @@ module Paramod (B : Terms.Blob) = struct
         else if false then (* activates last chance strategy *)
           begin
            debug("Last chance: "^string_of_float (Unix.gettimeofday()));
-           given_clause ~noinfer:true bag maxvar iterno max_steps 
+           given_clause ~noinfer:true bag maxvar iterno weight_picks max_steps 
              (Some (Unix.gettimeofday () +. 20.))
              actives passives g_actives g_passives;
            raise (Stop (Timeout (maxvar,bag)));
           end
         else raise (Stop (Timeout (maxvar,bag)));
 
-    let use_age = iterno mod 5 = 0 in
+    let use_age = weight_picks = (iterno / 10 + 1) in
+    let weight_picks = if use_age then 0 else weight_picks+1
+    in
 
     let rec aux_select bag passives g_passives =
       let backward,(weight,current),passives,g_passives =
-        select ~use_age:false passives g_passives
+        select ~use_age passives g_passives
       in
        if use_age && weight > monster then
          let bag,cl = Terms.add_to_bag current bag in
@@ -239,6 +244,7 @@ module Paramod (B : Terms.Blob) = struct
            else
              aux_select bag (add_passive_clause passives cl) g_passives
        else
+         let bag = Terms.replace_in_bag (current,false,iterno) bag in
         if backward then
           let _ = debug ("Selected goal : " ^ Pp.pp_unit_clause current) in
          match 
@@ -255,7 +261,7 @@ module Paramod (B : Terms.Blob) = struct
                  bag,maxvar,actives,passives,g_actives,g_passives
                else
                  backward_infer_step bag maxvar actives passives
-                   g_actives g_passives g_current
+                   g_actives g_passives g_current iterno
         else
           let _ = debug ("Selected fact : " ^ Pp.pp_unit_clause current) in
          (*let is_orphan = Sup.orphan_murder bag (fst actives) current in*)
@@ -265,7 +271,7 @@ module Paramod (B : Terms.Blob) = struct
               else  bag, Some (current,actives)
             else if Sup.orphan_murder bag (fst actives) current then
              let _ = debug "Orphan murdered" in
-              let bag = Terms.replace_in_bag (current,true) bag in
+              let bag = Terms.replace_in_bag (current,true,iterno) bag in
                 bag, None
             else Sup.keep_simplified current actives bag maxvar
           with
@@ -291,7 +297,7 @@ module Paramod (B : Terms.Blob) = struct
                     bag,maxvar,actives,passives,g_actives,g_passives
                   else
                     forward_infer_step bag maxvar actives passives
-                      g_actives g_passives current
+                      g_actives g_passives current iterno
     in
     
 
@@ -314,7 +320,7 @@ module Paramod (B : Terms.Blob) = struct
         (Printf.sprintf "Number of passives : %d"
            (passive_set_cardinal passives));
       given_clause ~noinfer
-        bag maxvar iterno max_steps timeout 
+        bag maxvar iterno weight_picks max_steps timeout 
         actives passives g_actives g_passives
   ;;
 
@@ -330,16 +336,16 @@ module Paramod (B : Terms.Blob) = struct
     let actives = [], IDX.DT.empty in
     try 
      given_clause ~noinfer:false
-      bag maxvar 0 max_steps timeout actives passives g_actives g_passives
+      bag maxvar 0  0 max_steps timeout actives passives g_actives g_passives
     with 
     | Sup.Success (bag, _, (i,_,_,_)) ->
         let l =
           let rec traverse ongoal (accg,acce) i =
             match Terms.get_from_bag i bag with
-              | (id,_,_,Terms.Exact _),_ ->
+              | (id,_,_,Terms.Exact _),_,_ ->
                   if ongoal then [i],acce else
                     if (List.mem i acce) then accg,acce else accg,acce@[i]
-              | (_,_,_,Terms.Step (_,i1,i2,_,_,_)),_ ->
+              | (_,_,_,Terms.Step (_,i1,i2,_,_,_)),_,_ ->
                   if (not ongoal) && (List.mem i acce) then accg,acce
                   else
                     let accg,acce = 
@@ -350,9 +356,23 @@ module Paramod (B : Terms.Blob) = struct
           let gsteps,esteps = traverse true ([],[]) i in
             (List.rev esteps)@gsteps
         in
-(*       List.iter (fun id -> let (cl,d) =
-                      Terms.M.find id bag in 
-                   if d then prerr_endline (Pp.pp_unit_clause cl)) l;*)
+       let max_w = List.fold_left (fun acc i ->
+                   let (cl,_,_) = Terms.get_from_bag i bag in
+                   max acc (Order.compute_unit_clause_weight cl)) 0 l in
+         prerr_endline "Statistics :";
+         prerr_endline ("Max weight : " ^ (string_of_int max_w));
+(*       List.iter (fun id -> let ((_,lit,_,proof as cl),d,it) =
+           Terms.get_from_bag id bag in
+             if d then
+               prerr_endline
+               (Printf.sprintf "Id : %d, selected at %d, weight %d,disc, by %s"
+                  id it (Order.compute_unit_clause_weight cl) 
+                  (Pp.pp_proof_step proof))
+             else
+              prerr_endline
+               (Printf.sprintf "Id : %d, selected at %d, weight %d by %s"
+                  id it (Order.compute_unit_clause_weight cl) 
+                  (Pp.pp_proof_step proof))) l;*)
         prerr_endline 
           (Printf.sprintf "Found proof, %fs" 
             (Unix.gettimeofday() -. initial_timestamp));