Improves parameters handling

1 files changed, 16 insertions, 5 deletions

diff --git a/instr-to-kodkod/Makefile b/instr-to-kodkod/Makefile
index fb2662a..6db785e 100644
--- a/instr-to-kodkod/Makefile
+++ b/instr-to-kodkod/Makefile
@@ -1,20 +1,31 @@
+## Target(s) Configuration #####################################################
+MODEL_FILE = "../data/instructions/example_1.sl"
+LEVEL_DIR = "../data/level/"
+## Executables #################################################################
 JAVAC = javac
 JAVA = java
-SOURCES = $(wildcard src/*.java)
-CLASSES = $(SOURCES:.java=.class)
-CLASSPATH = "kodkod.jar:./src/:org.sat4j.core.jar"
-TEST_FILE = "./system_minus_fun.sl"
 DOWNLOADER = wget
+
+## Java Config #################################################################
+CLASSPATH = "kodkod.jar:./src/:org.sat4j.core.jar"
+
+## Dependencies ################################################################
 JAR_SOURCE = https://noot-noot.org/onera_2017/jar/
 REQUIRED_JARS = kodkod.jar org.sat4j.core.jar
 
+## Makefile Magic ##############################################################
+SOURCES = $(wildcard src/*.java)
+CLASSES = $(SOURCES:.java=.class)
+
+## Makefile Rules ##############################################################
+
 all: $(CLASSES)
 
 clean:
 	rm -f $(CLASSES)
 
 run: $(CLASSES) $(REQUIRED_JARS)
-	$(JAVA) -cp $(CLASSPATH) Main $(TEST_FILE)
+	$(JAVA) -cp $(CLASSPATH) Main $(LEVEL_DIR) $(MODEL_FILE)
 
 %.class: %.java $(REQUIRED_JARS)
 	$(JAVAC) -cp $(CLASSPATH) $<