summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2017-07-19 15:31:05 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2017-07-19 15:31:05 +0200
commit35bce44858fcd7b0dab398cbce72d13057d3a501 (patch)
treec11c3637e3510d9cfc51c260db73ac6e1b7506fc /instr-to-kodkod
parent76ce3682dc4e7480b0e77ea189c05f17d2435d70 (diff)
forgot to use cfg-to-path. Still broken though.
Diffstat (limited to 'instr-to-kodkod')
-rw-r--r--instr-to-kodkod/Makefile4
-rw-r--r--instr-to-kodkod/src/Main.java9
2 files changed, 10 insertions, 3 deletions
diff --git a/instr-to-kodkod/Makefile b/instr-to-kodkod/Makefile
index 3e69ba5..fe40d91 100644
--- a/instr-to-kodkod/Makefile
+++ b/instr-to-kodkod/Makefile
@@ -1,9 +1,9 @@
## Target(s) Configuration #####################################################
#MODEL_FILES = $(wildcard ../data/instructions/*.mod)
-MODEL_FILES = ../instr-scripts/structural.mod $(wildcard ../instr-scripts/pfp_*.mod)
+MODEL_FILES = ../instr-scripts/structural.mod $(wildcard ../instr-scripts/pfp_*.mod) $(wildcard ../cfg-to-paths/pfp_*.mod)
LEVEL_DIR = $(wildcard ../data/level/*.lvl)
#PROPERTY_FILE = ../data/property/unread_waveforms.pro
-PROPERTY_FILE = ../data/property/combinational_processes.pro
+PROPERTY_FILE = ../data/property/impossible_processes.pro
VAR_PREFIX = "_anon_"
## Executables #################################################################
diff --git a/instr-to-kodkod/src/Main.java b/instr-to-kodkod/src/Main.java
index e6b5750..5b0e9b5 100644
--- a/instr-to-kodkod/src/Main.java
+++ b/instr-to-kodkod/src/Main.java
@@ -188,7 +188,14 @@ public class Main
while (solutions.hasNext())
{
- System.out.println(solutions.next());
+ final Solution sol;
+
+ sol = solutions.next();
+
+ if (sol.sat())
+ {
+ System.out.println(sol);
+ }
}
}
}