Commit a08d35c0 authored by Jonas Bollgrün's avatar Jonas Bollgrün
Browse files

correctly set up my main file so that jars run that

parent 826615d4
Pipeline #10305 failed with stages
in 1 minute and 3 seconds
......@@ -22,7 +22,7 @@ Export-Package: org.sat4j;version="9.9.9.token",
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Built-By: Daniel Le Berre
Main-Class: org.sat4j.BasicLauncher
Main-Class: org.sat4j.mymain.DynamicBackboneTest
Specification-Title: SAT4J
Specification-Version: NA
Specification-Vendor: Daniel Le Berre
......
Manifest-Version: 1.0
Main-Class: org.sat4j.mymain.DynamicBackboneTest
package org.sat4j.core;
package org.sat4j.mymain;
import org.sat4j.minisat.SolverFactory;
import org.sat4j.minisat.core.Solver;
......@@ -60,8 +60,12 @@ public class DynamicBackboneTest
//ProblemGenerator probgen = new ProblemGenerator.IndustrialProbGen(1);
Calendar now = Calendar.getInstance();
String serializationFilename =
"/home/apoth/IdeaProjects/sat4j/benchmarkResults/" +
String serializationFilename = "/home/apoth/IdeaProjects/sat4j/benchmarkResults/";
if (doNullRun)
{
serializationFilename += "null_";
}
serializationFilename +=
now.get(Calendar.DAY_OF_MONTH) + "." +
(now.get(Calendar.MONTH)+1) + "._" +
now.get(Calendar.HOUR_OF_DAY) + ":" + now.get(Calendar.MINUTE) + "_" +
......
package org.sat4j.core;
package org.sat4j.mymain;
import org.sat4j.core.VecInt;
import org.sat4j.minisat.SolverFactory;
import org.sat4j.minisat.core.Solver;
import org.sat4j.reader.DimacsReader;
import org.sat4j.reader.ParseFormatException;
import org.sat4j.reader.Reader;
import org.sat4j.specs.ContradictionException;
import org.sat4j.specs.IVecInt;
import org.sat4j.tools.Backbone;
import java.io.IOException;
......@@ -30,7 +30,12 @@ public abstract class ProblemGenerator
public abstract String getGeneratorName();
protected int probIdx = 0;
protected int probIncrement = 1;
public final int probIncrement;
protected ProblemGenerator(int probInc)
{
this.probIncrement = probInc;
}
private static final String testFolderAdr = "/home/apoth/IdeaProjects/sat4j/tests/";
......@@ -89,6 +94,16 @@ public abstract class ProblemGenerator
"fla-qhid-380-4.cnf","fla-qhid-400-1.cnf","fla-qhid-400-2.cnf",
"fla-qhid-400-3.cnf","fla-qhid-400-4.cnf","fla-qhid-400-5.cnf"
};
public AcademicProbGen()
{
this(1);
}
private AcademicProbGen(int probInc)
{
super(probInc);
}
public int getNumProbs()
{
return this.probFiles.length;
......@@ -184,9 +199,10 @@ public abstract class ProblemGenerator
public static class IndustrialProbGen extends ProblemGenerator
{
private final int maxProbIdx = 948;
public IndustrialProbGen(int increment){
public IndustrialProbGen(int increment)
{
super(increment);
super.probIdx = 1;
super.probIncrement = increment;
}
public int getNumProbs()
......
......@@ -5,6 +5,7 @@ import org.junit.Test;
import org.junit.runners.MethodSorters;
import org.sat4j.minisat.SolverFactory;
import org.sat4j.minisat.core.Solver;
import org.sat4j.mymain.ProblemGenerator;
import org.sat4j.reader.DimacsReader;
import org.sat4j.reader.ParseFormatException;
import org.sat4j.reader.Reader;
......
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