From 76ce3682dc4e7480b0e77ea189c05f17d2435d70 Mon Sep 17 00:00:00 2001 From: Nathanael Sensfelder Date: Wed, 19 Jul 2017 14:46:24 +0200 Subject: The formula seems correct, which is worrisome. --- instr-to-kodkod/src/Main.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'instr-to-kodkod/src/Main.java') 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 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()); + } } } -- cgit v1.2.3-70-g09d2