X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=modelchecker%2Fmain.c;h=d8d7e2323f285f52652872c1f1e1e9e4c3136fcd;hb=59b2b66a7c7b6585ebd30e8c530b9f826bcc70e9;hp=16dd229239efe1eafa8d9bc2cd4ad7dfea611e2a;hpb=87a49a20bdeb4fe199dd9a61468d653417b14ae8;p=mc1516pa.git

diff --git a/modelchecker/main.c b/modelchecker/main.c
index 16dd229..d8d7e23 100644
--- a/modelchecker/main.c
+++ b/modelchecker/main.c
@@ -7,13 +7,15 @@
 
 #include "mc.h"
 #include "sokoban.h"
+#include "uthash.h"
 
 //Global variables
 bool DEBUG = false;
 strategy strat = HYBRID;
 
-void usage(char *prg){
-	fprintf(stderr, 
+void usage(char *prg)
+{
+	fprintf(stderr,
 		"Usage:\n"
 		"\t%s [opts] [FILE [FILE [...]]]\n"
 		"\n"
@@ -33,13 +35,17 @@ void usage(char *prg){
 		"\t         when no file is specified stdin will be used\n", prg);
 }
 
-void solve(FILE *inputstream){
+void solve(FILE *inputstream)
+{
 	clock_t time_start_read, time_end_read;
 	clock_t time_start_encode, time_end_encode;
 
 	time_start_read = clock();
-	//struct sokoban_screen *screen = parse_screen(inputstream);
-	parse_screen(inputstream);
+	sokoban_screen *screen = parse_screen(inputstream);
+	if (screen == NULL) printf("Something went wrong...\n");
+	sokoban_print(screen);
+	sokoban_free(screen);
+	//parse_screen(inputstream);
 	time_end_read = clock();
 
 	time_start_encode = clock();
@@ -58,7 +64,7 @@ void solve(FILE *inputstream){
 		exit(2);
 	}
 	time_end_encode = clock();
-	
+
 	// Future: SMC
 	fprintf(stderr, "Reading: %fs\n",
 		((double) (time_end_read-time_start_read))/CLOCKS_PER_SEC);
@@ -66,7 +72,8 @@ void solve(FILE *inputstream){
 		((double) (time_end_encode-time_start_encode))/CLOCKS_PER_SEC);
 }
 
-int main(int argc, char **argv){
+int main(int argc, char **argv)
+{
 	int optchar;
 
 	while((optchar = getopt(argc, argv, "cdhoy")) != -1){