summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2017-07-19 14:46:24 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2017-07-19 14:46:24 +0200
commit76ce3682dc4e7480b0e77ea189c05f17d2435d70 (patch)
tree95221de8481f23694b3036da962d296bc431b4e5
parent126fb20387caffaa8e05e2a5fee1be78ab1cb1ff (diff)
The formula seems correct, which is worrisome.
-rw-r--r--instr-to-kodkod/src/Main.java19
1 files changed, 15 insertions, 4 deletions
diff --git a/instr-to-kodkod/src/Main.java b/instr-to-kodkod/src/Main.java
index 0719679..e6b5750 100644
--- a/instr-to-kodkod/src/Main.java
+++ b/instr-to-kodkod/src/Main.java
@@ -8,6 +8,7 @@ import kodkod.engine.satlab.*;
import kodkod.instance.*;
import java.io.IOException;
+import java.util.Iterator;
public class Main
{
@@ -125,9 +126,8 @@ public class Main
final Universe univ;
final TupleFactory tf;
final Bounds bounds;
-
+ final Iterator<Solution> solutions;
final Solver solver;
- final Solution sol;
final Formula property;
PARAMETERS = new Parameters(args);
@@ -155,6 +155,14 @@ public class Main
{
return;
}
+ else
+ {
+ System.out.println
+ (
+ "Solving property:\n"
+ + property.toString()
+ );
+ }
/* 3/ Generate complementary model according to used predicates. */
/* TODO */
@@ -176,8 +184,11 @@ public class Main
solver.options().setSolver(SATFactory.DefaultSAT4J);
solver.options().setReporter(new ConsoleReporter());
- sol = solver.solve(property, bounds);
+ solutions = solver.solveAll(property, bounds);
- System.out.println(sol);
+ while (solutions.hasNext())
+ {
+ System.out.println(solutions.next());
+ }
}
}