X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=modelchecker%2Fmain.c;h=240e3c743b7c5da009dde333de67fb6fdc67499a;hb=476b70d5c7cb978fec97c99fe462402eb38405de;hp=409f5060053438a89512c23af53d7fc536913cb3;hpb=bfe9ddb4ffe22c1d8bdd16c39905b226cf122dd9;p=mc1516pa.git

diff --git a/modelchecker/main.c b/modelchecker/main.c
index 409f506..240e3c7 100644
--- a/modelchecker/main.c
+++ b/modelchecker/main.c
@@ -7,12 +7,14 @@
 
 #include "mc.h"
 #include "sokoban.h"
+#include "uthash.h"
 
 //Global variables
 bool DEBUG = false;
 strategy strat = HYBRID;
 
-void usage(char *prg){
+void usage(char *prg)
+{
 	fprintf(stderr,
 		"Usage:\n"
 		"\t%s [opts] [FILE [FILE [...]]]\n"
@@ -33,24 +35,15 @@ 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);
-        while(screen != NULL){
-            switch(screen->tile){
-            case FREE: printf("x = %d y = %d tile = %s\n", screen->x, screen->y, "FREE");break;
-            case WALL: printf("x = %d y = %d tile = %s\n", screen->x, screen->y, "WALL");break;
-            case BOX: printf("x = %d y = %d tile = %s\n", screen->x, screen->y, "BOX");break;
-            case TARGET: printf("x = %d y = %d tile = %s\n", screen->x, screen->y, "TARGET");break;
-            case AGENT: printf("x = %d y = %d tile = %s\n", screen->x, screen->y, "AGENT");break;
-            case TARGAGENT: printf("x = %d y = %d tile = %s\n", screen->x, screen->y, "TARGAGENT");break;
-            case TARGBOX: printf("x = %d y = %d tile = %s\n", screen->x, screen->y, "TARGBOX");break;
-            }
-            screen = screen->next;
-            }
+	sokoban_screen *screen = parse_screen(inputstream);
+	if (screen == NULL) printf("Something went wrong...\n");
+	sokoban_print(screen);
 	//parse_screen(inputstream);
 	time_end_read = clock();
 
@@ -78,7 +71,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){