From c2a6c2d47bed3664ce9ee7af6f60b496b8341442 Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Sat, 16 Feb 2019 16:58:29 -0600
Subject: [PATCH] refactor(propagate): make propagation clause lazy

---
 src/core/Internal.ml    | 28 ++++++++++++++++++----------
 src/core/Msat.ml        |  2 +-
 src/core/Solver_intf.ml |  2 +-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/core/Internal.ml b/src/core/Internal.ml
index e6f73f72..9ad1838d 100644
--- a/src/core/Internal.ml
+++ b/src/core/Internal.ml
@@ -68,6 +68,7 @@ module Make(Plugin : PLUGIN)
   and reason =
     | Decision
     | Bcp of clause
+    | Bcp_lazy of clause lazy_t
     | Semantic
 
   (* TODO: remove, replace with user-provided proof trackng device?
@@ -282,6 +283,8 @@ module Make(Plugin : PLUGIN)
         Format.fprintf fmt "@@%d" n
       | n, Some Bcp c ->
         Format.fprintf fmt "->%d/%s" n (name_of_clause c)
+      | n, Some (Bcp_lazy _) ->
+        Format.fprintf fmt "->%d/<lazy>" n
       | n, Some Semantic ->
         Format.fprintf fmt "::%d" n
 
@@ -1061,7 +1064,7 @@ module Make(Plugin : PLUGIN)
           let l = a.var.v_level in
           if l = 0 then (
             match a.var.reason with
-            | Some (Bcp cl) ->
+            | Some (Bcp cl | Bcp_lazy (lazy cl)) ->
               partition_aux trues unassigned falses (cl :: history) (i + 1)
             (* A var false at level 0 can be eliminated from the clause,
                but we need to kepp in mind that we used another clause to simplify it. *)
@@ -1699,21 +1702,26 @@ module Make(Plugin : PLUGIN)
     | Solver_intf.Eval l ->
       let a = mk_atom st f in
       enqueue_semantic st a l
-    | Solver_intf.Consequence (causes, proof) ->
-      let l = List.rev_map (fun f -> Atom.neg @@ mk_atom st f) causes in
-      if List.exists Atom.is_true l then (
-        invalid_argf "slice.acts_propagate: Consequence should contain only true literals"
-      );
+    | Solver_intf.Consequence mk_expl ->
       let p = mk_atom st f in
       if Atom.is_true p then ()
       else if Atom.is_false p then (
+        let lits, proof = mk_expl() in
+        let l = List.rev_map (fun f -> Atom.neg @@ mk_atom st f) lits in
+        if List.exists Atom.is_true l then (
+          invalid_argf "slice.acts_propagate: Consequence should contain only true literals"
+        );
         let c = Clause.make_removable (p :: l) (Lemma proof) in
         raise_notrace (Th_conflict c)
       ) else (
         insert_var_order st p.var;
-        let level = List.fold_left (fun acc a -> max acc a.var.v_level) 0 l in
-        let c = Clause.make_removable (p :: l) (Lemma proof) in
-        enqueue_bool st p ~level (Bcp c)
+        let c = lazy (
+          let lits, proof = mk_expl () in
+          let l = List.rev_map (fun f -> Atom.neg @@ mk_atom st f) lits in
+          Clause.make_removable (p :: l) (Lemma proof)
+        ) in
+        let level = decision_level st in
+        enqueue_bool st p ~level (Bcp_lazy c)
       )
 
   let[@specialise] acts_iter st ~full head f : unit =
@@ -2107,7 +2115,7 @@ module Make(Plugin : PLUGIN)
           assert (Atom.equal first @@ List.hd core);
           let proof_of (a:atom) = match Atom.reason a with
             | Some (Decision | Semantic) -> Clause.make_removable [a] Local
-            | Some (Bcp c) -> c
+            | Some (Bcp c | Bcp_lazy (lazy c)) -> c
             | None -> assert false
           in
           let other_lits = List.filter (fun a -> not (Atom.equal a first)) core in
diff --git a/src/core/Msat.ml b/src/core/Msat.ml
index 156da28e..0aee8e57 100644
--- a/src/core/Msat.ml
+++ b/src/core/Msat.ml
@@ -39,7 +39,7 @@ type ('term, 'formula, 'value) assumption = ('term, 'formula, 'value) Solver_int
 
 type ('term, 'formula, 'proof) reason = ('term, 'formula, 'proof) Solver_intf.reason =
   | Eval of 'term list
-  | Consequence of 'formula list * 'proof
+  | Consequence of (unit -> 'formula list * 'proof)
 
 type ('term, 'formula, 'value, 'proof) acts = ('term, 'formula, 'value, 'proof) Solver_intf.acts = {
   acts_iter_assumptions: (('term,'formula,'value) assumption -> unit) -> unit;
diff --git a/src/core/Solver_intf.ml b/src/core/Solver_intf.ml
index 8ed3d9f1..e7d48900 100644
--- a/src/core/Solver_intf.ml
+++ b/src/core/Solver_intf.ml
@@ -76,7 +76,7 @@ type ('term, 'formula, 'value) assumption =
 type ('term, 'formula, 'proof) reason =
   | Eval of 'term list
   (** The formula can be evalutaed using the terms in the list *)
-  | Consequence of 'formula list * 'proof
+  | Consequence of (unit -> 'formula list * 'proof)
   (** [Consequence (l, p)] means that the formulas in [l] imply the propagated
       formula [f]. The proof should be a proof of the clause "[l] implies [f]".
   *)