Commit 37d33137 authored by leberre's avatar leberre
Browse files

removed some spurious output

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@2533 ba638df5-4473-46d1-82f8-c3ae2a17a6e1
parent adcf3806
......@@ -49,7 +49,6 @@ final class MemoryBasedConflictTimer extends ConflictTimerAdapter {
@Override
public void run() {
long freemem = Runtime.getRuntime().freeMemory();
// System.out.println("c Free memory "+freemem);
if (freemem < getMemoryBound()) {
// Reduce the set of learnt clauses
getSolver().setNeedToReduceDB(true);
......
......@@ -186,8 +186,8 @@ public final class MaxWatchPbLong extends WatchPbLong {
public boolean propagate(UnitPropagationListener s, int p) {
this.voc.watch(p, this);
assert this.watchCumul >= computeLeftSide() : "" + this.watchCumul
+ "/" + computeLeftSide() + ":" + this.learnt;
assert this.watchCumul >= computeLeftSide() : "" + this.watchCumul + "/"
+ computeLeftSide() + ":" + this.learnt;
// compute the new value for watchCumul
long coefP;
......@@ -273,7 +273,8 @@ public final class MaxWatchPbLong extends WatchPbLong {
if (this.litToCoeffs == null) {
// finding the index for p in the array of literals
int indiceP = 0;
while (indiceP < this.lits.length && (this.lits[indiceP] ^ 1) != p) {
while (indiceP < this.lits.length
&& (this.lits[indiceP] ^ 1) != p) {
indiceP++;
}
// compute the new value for watchCumul
......@@ -394,8 +395,6 @@ public final class MaxWatchPbLong extends WatchPbLong {
this);
IConflict cm = ConflictMap.createConflict(decorator, decisionLevel,
false);
int backtrackDL = cm.getBacktrackLevel(decisionLevel);
System.out.println("btdl=" + backtrackDL);
Set<Integer> litsSet = new HashSet<Integer>();
for (Integer i : this.lits)
litsSet.add(i);
......@@ -554,7 +553,8 @@ public final class MaxWatchPbLong extends WatchPbLong {
return cstr.toConstraint();
}
public void calcReasonOnTheFly(int p, IVecInt trail, IVecInt outReason) {
public void calcReasonOnTheFly(int p, IVecInt trail,
IVecInt outReason) {
cstr.calcReasonOnTheFly(p, trail, outReason);
}
......
......@@ -356,8 +356,8 @@ public class OPBReader2005 extends Reader implements Serializable {
* @throws IOException
* @throws ParseFormatException
*/
protected boolean readIdentifier(StringBuffer s) throws IOException,
ParseFormatException {
protected boolean readIdentifier(StringBuffer s)
throws IOException, ParseFormatException {
char c;
s.setLength(0);
......@@ -535,8 +535,8 @@ public class OPBReader2005 extends Reader implements Serializable {
* @throws IOException
* @throws ParseFormatException
*/
protected void readVariablesExplanation() throws IOException,
ParseFormatException {
protected void readVariablesExplanation()
throws IOException, ParseFormatException {
char c = get();
String s;
while (c == '*') {
......@@ -550,7 +550,6 @@ public class OPBReader2005 extends Reader implements Serializable {
if ("endMapping".equals(s)) {
// this.in.readLine();
get();
System.out.println(mapping);
return;
}
String[] values = s.split("=");
......@@ -590,14 +589,14 @@ public class OPBReader2005 extends Reader implements Serializable {
// no objective line
putback(c);
if (solver.isVerbose()) {
System.out.println(solver.getLogPrefix()
+ " no objective function found");
System.out.println(
solver.getLogPrefix() + " no objective function found");
}
return;
}
if (solver.isVerbose()) {
System.out.println(solver.getLogPrefix()
+ " objective function found");
System.out.println(
solver.getLogPrefix() + " objective function found");
}
this.hasObjFunc = true;
if (get() == 'i' && get() == 'n' && get() == ':') {
......@@ -605,7 +604,8 @@ public class OPBReader2005 extends Reader implements Serializable {
while (!eof()) {
readTerm(coeff, var);
constraintTerm(new BigInteger(coeff.toString()), var.toString()); // callback
constraintTerm(new BigInteger(coeff.toString()),
var.toString()); // callback
skipSpaces();
c = get();
......@@ -633,8 +633,8 @@ public class OPBReader2005 extends Reader implements Serializable {
* @throws IOException
* @throws ContradictionException
*/
protected void readConstraint() throws IOException, ParseFormatException,
ContradictionException {
protected void readConstraint()
throws IOException, ParseFormatException, ContradictionException {
StringBuffer var = new StringBuffer();
StringBuffer coeff = new StringBuffer();
char c;
......@@ -698,8 +698,8 @@ public class OPBReader2005 extends Reader implements Serializable {
* @throws ParseException
* @throws ContradictionException
*/
public void parse() throws IOException, ParseFormatException,
ContradictionException {
public void parse()
throws IOException, ParseFormatException, ContradictionException {
mapping = null;
readMetaData();
......@@ -761,8 +761,7 @@ public class OPBReader2005 extends Reader implements Serializable {
throw ce;
} catch (ParseFormatException pfe) {
throw new ParseFormatException(" line "
+ (input.getLineNumber() + 1)
+ ", "
+ (input.getLineNumber() + 1) + ", "
+ pfe.getMessage().substring(
ParseFormatException.PARSING_ERROR.length()));
} catch (Exception e) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment