diff --git a/jastadd-mquat-solver-random/src/main/java/de/tudresden/inf/st/mquat/solving/random/RandomSolver.java b/jastadd-mquat-solver-random/src/main/java/de/tudresden/inf/st/mquat/solving/random/RandomSolver.java index 476d6b5698ac174bbd8c2e2895f521f9913b2bd1..a90785ccc21a071e34f9a420483c673732ca126b 100644 --- a/jastadd-mquat-solver-random/src/main/java/de/tudresden/inf/st/mquat/solving/random/RandomSolver.java +++ b/jastadd-mquat-solver-random/src/main/java/de/tudresden/inf/st/mquat/solving/random/RandomSolver.java @@ -27,12 +27,11 @@ public class RandomSolver implements BenchmarkableSolver { private long maxSolvingTime; private boolean timedOut; - public RandomSolver() { - this(Long.MAX_VALUE); - } + private final Random random; - public RandomSolver(long maxSolvingTime) { + public RandomSolver(long maxSolvingTime, long seed) { this.maxSolvingTime = maxSolvingTime; + this.random = new Random(seed); reset(); } @@ -50,8 +49,6 @@ public class RandomSolver implements BenchmarkableSolver { List<Solution> solutions = new ArrayList<>(); - Random random = new Random(); - do { numTotalSoftwareSolutions++; diff --git a/jastadd-mquat-solver-random/src/test/java/de/tudresden/inf/st/mquat/solving/RandomHandwrittenTest.java b/jastadd-mquat-solver-random/src/test/java/de/tudresden/inf/st/mquat/solving/RandomHandwrittenTest.java index 6641db6740f23a5f97863198a9016c4d2314455b..83e5927a7361d9e690e665db45202e081030c4ff 100644 --- a/jastadd-mquat-solver-random/src/test/java/de/tudresden/inf/st/mquat/solving/RandomHandwrittenTest.java +++ b/jastadd-mquat-solver-random/src/test/java/de/tudresden/inf/st/mquat/solving/RandomHandwrittenTest.java @@ -6,6 +6,6 @@ public class RandomHandwrittenTest extends HandwrittenTestSuite { @Override protected Solver getSolver() { - return new RandomSolver(60000); + return new RandomSolver(5000, 0); } } diff --git a/jastadd-mquat-solver-random/src/test/java/de/tudresden/inf/st/mquat/solving/RandomSolverTest.java b/jastadd-mquat-solver-random/src/test/java/de/tudresden/inf/st/mquat/solving/RandomSolverTest.java index 32c5722a2cf3489e603cd6c828fad4ca3d037d16..9722756df4342f97a590ed27cbeaa02297cde1f6 100644 --- a/jastadd-mquat-solver-random/src/test/java/de/tudresden/inf/st/mquat/solving/RandomSolverTest.java +++ b/jastadd-mquat-solver-random/src/test/java/de/tudresden/inf/st/mquat/solving/RandomSolverTest.java @@ -42,7 +42,7 @@ public class RandomSolverTest { ScenarioGenerator generator = new ScenarioGenerator(new ScenarioDescription(tlc, iac, isd, cac, csd, dep, imp, res, req, cpu, seed)); Root model = generator.generate(); - RandomSolver solver = new RandomSolver(5000); + RandomSolver solver = new RandomSolver(5000, 1337); Solution solution = solver.solve(model);