Updated statistics

org.sat4j.core/src/main/java/org/sat4j/minisat/core/Solver.java

@@ -1881,10 +1881,9 @@ public class Solver<D extends DataStructureFactory>
                 count.inc();
             }
         }
-        out.print(prefix);
-        out.println("learnt constraints type ");
         for (Map.Entry<String, Counter> entry : learntTypes.entrySet()) {
-            out.println(prefix + entry.getKey() + " => " + entry.getValue());
+            out.println(prefix + "learnt constraints type " + entry.getKey()
+                    + "\t: " + entry.getValue());
         }
     }
 

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

@@ -328,6 +328,7 @@ public class ConflictMap extends MapPb implements IConflict {
 
         }
 
+        stats.numberOfDerivationSteps++;
         assert slackConflict().signum() < 0;
         assert this.degree.signum() >= 0;
 

org.sat4j.pb/src/main/java/org/sat4j/pb/core/PBSolverStats.java

@@ -62,6 +62,8 @@ public class PBSolverStats extends SolverStats {
 
     public long numberOfInternalSkipping;
 
+    public long numberOfDerivationSteps;
+
     @Override
     public void reset() {
         super.reset();
@@ -75,6 +77,7 @@ public class PBSolverStats extends SolverStats {
         this.numberOfReductionsByGCD = 0;
         this.numberOfEndingSkipping = 0;
         this.numberOfInternalSkipping = 0;
+        this.numberOfDerivationSteps = 0;
     }
 
     @Override
@@ -108,6 +111,11 @@ public class PBSolverStats extends SolverStats {
                 + this.numberOfEndingSkipping);
         out.println(prefix + "number of internal skipping \t: "
                 + this.numberOfInternalSkipping);
+        out.println(prefix + "number of derivation steps \t: "
+                + this.numberOfDerivationSteps);
+        out.println(prefix + "number of skipped derivation steps \t: "
+                + (this.numberOfInternalSkipping
+                        + this.numberOfEndingSkipping));
     }
 
 }