First attempt for refined goal selection strategy

[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 43b57b6cd0b8da83f116eda2b4c6fc6a827782ec..435c95024416b3f232ce280855605de6e0cc1fb1 100644 (file)
--- a/helm/software/components/ng_paramodulation/paramod.ml
+++ b/helm/software/components/ng_paramodulation/paramod.ml
@@ -45,6 +45,12 @@ module Paramod (B : Terms.Blob) = struct
     WeightPassiveSet.add cl passives_w, AgePassiveSet.add cl passives_a
   ;;
 
+  let add_passive_goal ?(no_weight=false) (passives_w,passives_a) g =
+    let g = if no_weight then (0,g)
+    else Utils.mk_passive_goal g in
+    WeightPassiveSet.add g passives_w, AgePassiveSet.add g passives_a
+  ;;
+
   let remove_passive_clause (passives_w,passives_a) cl =
     let passives_w = WeightPassiveSet.remove cl passives_w in
     let passives_a = AgePassiveSet.remove cl passives_a in
@@ -61,6 +67,16 @@ module Paramod (B : Terms.Blob) = struct
        AgePassiveSet.union new_clauses_a passives_a)
   ;;
 
+  let add_passive_goals ?(no_weight=false)
+      (passives_w,passives_a) new_clauses =
+    let new_clauses_w,new_clauses_a =
+      List.fold_left (add_passive_goal ~no_weight)
+      (WeightPassiveSet.empty,AgePassiveSet.empty) new_clauses
+    in
+      (WeightPassiveSet.union new_clauses_w passives_w,
+       AgePassiveSet.union new_clauses_a passives_a)
+  ;;
+
   let is_passive_set_empty (passives_w,passives_a) =
     if (WeightPassiveSet.is_empty passives_w) then begin
       assert (AgePassiveSet.is_empty passives_a); true
@@ -117,7 +133,7 @@ module Paramod (B : Terms.Blob) = struct
       in
         debug "Performed infer_left step";
         bag, maxvar, actives, passives, g_current::g_actives,
-    (add_passive_clauses g_passives new_goals)
+    (add_passive_goals g_passives new_goals)
   ;;
 
   let forward_infer_step bag maxvar actives passives g_actives
@@ -159,7 +175,7 @@ module Paramod (B : Terms.Blob) = struct
       in
     bag, maxvar, actives,
     add_passive_clauses passives new_clauses, g_actives,
-    add_passive_clauses g_passives new_goals
+    add_passive_goals g_passives new_goals
   ;;
  
   let rec given_clause ~noinfer 
@@ -293,7 +309,7 @@ module Paramod (B : Terms.Blob) = struct
       add_passive_clauses ~no_weight:true passive_empty_set passives
     in
     let g_passives =
-      add_passive_clauses ~no_weight:true passive_empty_set g_passives
+      add_passive_goals ~no_weight:true passive_empty_set g_passives
     in
     let g_actives = [] in
     let actives = [], IDX.DT.empty in