Can now detect learned unit clause.

org.sat4j.core/src/main/java/org/sat4j/minisat/constraints/MixedDataStructureDanielHT.java

@@ -97,7 +97,7 @@ public class MixedDataStructureDanielHT extends AbstractDataStructureFactory {
 
     public Constr createUnregisteredClause(IVecInt literals) {
         if (literals.size() == 1) {
-            return new UnitClause(literals.last());
+            return new UnitClause(literals.last(), true);
         }
         if (literals.size() == 2) {
             return new LearntBinaryClause(literals, getVocabulary());

org.sat4j.core/src/main/java/org/sat4j/minisat/constraints/MixedDataStructureDanielWL.java

@@ -95,7 +95,7 @@ public class MixedDataStructureDanielWL extends AbstractDataStructureFactory {
 
     public Constr createUnregisteredClause(IVecInt literals) {
         if (literals.size() == 1) {
-            return new UnitClause(literals.last());
+            return new UnitClause(literals.last(), true);
         }
         if (literals.size() == 2) {
             return new LearntBinaryClause(literals, getVocabulary());

org.sat4j.core/src/main/java/org/sat4j/minisat/constraints/MixedDataStructureDanielWLConciseBinary.java

@@ -46,8 +46,8 @@ import org.sat4j.specs.IVecInt;
  * @author leberre
  * @since 2.1
  */
-public class MixedDataStructureDanielWLConciseBinary extends
-        AbstractDataStructureFactory {
+public class MixedDataStructureDanielWLConciseBinary
+        extends AbstractDataStructureFactory {
 
     private BinaryClauses[] binaryClauses;
 
@@ -126,7 +126,7 @@ public class MixedDataStructureDanielWLConciseBinary extends
 
     public Constr createUnregisteredClause(IVecInt literals) {
         if (literals.size() == 1) {
-            return new UnitClause(literals.last());
+            return new UnitClause(literals.last(), true);
         }
         if (literals.size() == 2) {
             return new LearntBinaryClause(literals, getVocabulary());

org.sat4j.core/src/main/java/org/sat4j/minisat/constraints/cnf/UnitClause.java

@@ -49,8 +49,15 @@ public class UnitClause implements Constr {
     protected final int literal;
     protected double activity;
 
+    private boolean learnt;
+
     public UnitClause(int value) {
+        this(value, false);
+    }
+
+    public UnitClause(int value, boolean learnt) {
         this.literal = value;
+        this.learnt = learnt;
     }
 
     public void assertConstraint(UnitPropagationListener s) {
@@ -100,7 +107,7 @@ public class UnitClause implements Constr {
     }
 
     public void setLearnt() {
-        throw new UnsupportedOperationException();
+        learnt = true;
     }
 
     public boolean simplify() {
@@ -119,7 +126,7 @@ public class UnitClause implements Constr {
     }
 
     public boolean learnt() {
-        return false;
+        return learnt;
     }
 
     public int size() {

org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/AbstractPBDataStructureFactory.java

@@ -189,7 +189,7 @@ public abstract class AbstractPBDataStructureFactory
 
     public Constr createUnregisteredClause(IVecInt literals) {
         if (literals.size() == 1) {
-            return new UnitClause(literals.last());
+            return new UnitClause(literals.last(), true);
         }
         if (literals.size() == 2) {
             return new LearntBinaryClause(literals, getVocabulary());

org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/UnitBinaryHTClauseConstructor.java

@@ -58,7 +58,7 @@ public class UnitBinaryHTClauseConstructor implements IClauseConstructor {
 
     public Constr constructLearntClause(ILits voc, IVecInt literals) {
         if (literals.size() == 1) {
-            return new UnitClause(literals.last());
+            return new UnitClause(literals.last(), true);
         }
         if (literals.size() == 2) {
             return new LearntBinaryClause(literals, voc);

org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/UnitBinaryHTClausePBConstructor.java

@@ -58,7 +58,7 @@ public class UnitBinaryHTClausePBConstructor implements IClauseConstructor {
 
     public Constr constructLearntClause(ILits voc, IVecInt literals) {
         if (literals.size() == 1) {
-            return new UnitClausePB(literals.last(), voc);
+            return new UnitClausePB(literals.last(), true, voc);
         }
         if (literals.size() == 2) {
             return new LearntBinaryClausePB(literals, voc);

org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/UnitBinaryWLClauseConstructor.java

@@ -58,7 +58,7 @@ public class UnitBinaryWLClauseConstructor implements IClauseConstructor {
 
     public Constr constructLearntClause(ILits voc, IVecInt literals) {
         if (literals.size() == 1) {
-            return new UnitClause(literals.last());
+            return new UnitClause(literals.last(), true);
         }
         if (literals.size() == 2) {
             return new LearntBinaryClause(literals, voc);

org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/UnitConciseBinaryWLClauseConstructor.java

@@ -39,7 +39,8 @@ import org.sat4j.specs.Constr;
 import org.sat4j.specs.IVecInt;
 import org.sat4j.specs.UnitPropagationListener;
 
-public class UnitConciseBinaryWLClauseConstructor implements IClauseConstructor {
+public class UnitConciseBinaryWLClauseConstructor
+        implements IClauseConstructor {
 
     private BinaryClauses[] binaryClauses;
 
@@ -64,7 +65,8 @@ public class UnitConciseBinaryWLClauseConstructor implements IClauseConstructor
         if (binaryClauses == null) {
             binaryClauses = new BinaryClauses[voc.nVars() * 2 + 2];
         } else if (binaryClauses.length < voc.nVars() * 2 + 1) {
-            BinaryClauses[] newBinaryClauses = new BinaryClauses[voc.nVars() * 2 + 2];
+            BinaryClauses[] newBinaryClauses = new BinaryClauses[voc.nVars() * 2
+                    + 2];
             System.arraycopy(binaryClauses, 0, newBinaryClauses, 0,
                     binaryClauses.length);
             binaryClauses = newBinaryClauses;
@@ -90,7 +92,7 @@ public class UnitConciseBinaryWLClauseConstructor implements IClauseConstructor
 
     public Constr constructLearntClause(ILits voc, IVecInt literals) {
         if (literals.size() == 1) {
-            return new UnitClause(literals.last());
+            return new UnitClause(literals.last(), true);
         }
         if (literals.size() == 2) {
             return new LearntBinaryClause(literals, voc);

org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/pb/UnitClausePB.java

@@ -45,6 +45,11 @@ public final class UnitClausePB extends UnitClause implements PBConstr {
         this.voc = voc;
     }
 
+    public UnitClausePB(int value, boolean learnt, ILits voc) {
+        super(value, learnt);
+        this.voc = voc;
+    }
+
     /**
      * 
      */