From bc3e8933e1005e93e4a97b9a207cb40db454a2a8 Mon Sep 17 00:00:00 2001 From: Nathanael Sensfelder Date: Wed, 20 Sep 2017 17:19:42 +0200 Subject: Solves the missing solutions bug. Starts PropDeps. --- instr-to-kodkod/src/Main.java | 11 +++++++++++ instr-to-kodkod/src/VariableManager.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'instr-to-kodkod/src') diff --git a/instr-to-kodkod/src/Main.java b/instr-to-kodkod/src/Main.java index 11a357a..be5cb21 100644 --- a/instr-to-kodkod/src/Main.java +++ b/instr-to-kodkod/src/Main.java @@ -355,10 +355,21 @@ public class Main solver = new Solver(); solver.options().setSkolemDepth(-1); + solver.options().setSymmetryBreaking(0); solver.options().setSolver(SATFactory.DefaultSAT4J); if (PARAMETERS.be_verbose()) { + System.out.println(bounds); + System.out.println + ( + "Final formula:" + + + property.and + ( + VARIABLE_MANAGER.generate_tagged_variable_constraints() + ).toString() + ); solver.options().setReporter(new ConsoleReporter()); } diff --git a/instr-to-kodkod/src/VariableManager.java b/instr-to-kodkod/src/VariableManager.java index 249b183..fee499e 100644 --- a/instr-to-kodkod/src/VariableManager.java +++ b/instr-to-kodkod/src/VariableManager.java @@ -144,7 +144,7 @@ public class VariableManager for (final TaggedVariable tg: tagged_variables.values()) { - result = result.and(tg.as_relation.one()); + result = result.and(tg.as_relation.one()); } return result; -- cgit v1.2.3-70-g09d2