Independence: consider also counted log vars

2012-11-07 21:21:42 +00:00
parent d2ae171bb5
commit 6db4d37684
3 changed files with 56 additions and 24 deletions
--- a/packages/CLPBN/horus/LiftedCircuit.cpp
+++ b/packages/CLPBN/horus/LiftedCircuit.cpp
@@ -655,10 +655,8 @@ LiftedCircuit::isIndependentClause (
    Clause& clause,
    Clauses& otherClauses) const
 {
-  // TODO consider counted log vars
-  TinySet<LiteralId> lidSet = clause.lidSet();
  for (size_t i = 0; i < otherClauses.size(); i++) {
-    if ((lidSet & otherClauses[i].lidSet()).empty() == false) {
+    if (Clause::independentClauses (clause, otherClauses[i]) == false) {
      return false;
    }
  }
@@ -667,7 +665,6 @@ LiftedCircuit::isIndependentClause (



-
 LitLvTypesSet
 LiftedCircuit::smoothCircuit (CircuitNode* node)
 {