X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=modelchecker%2Fmain.c;h=e954c073f79fedc82ca930a780b3d836172df3a7;hb=d0ee02a16e9266da088b78ab8d2982f1c215fa1b;hp=45831e7d2cbadddfbf0995db630f35066226d2bf;hpb=363cf737b04fbeab89362b6252b97db10d25ca02;p=mc1516pa.git

diff --git a/modelchecker/main.c b/modelchecker/main.c
index 45831e7..e954c07 100644
--- a/modelchecker/main.c
+++ b/modelchecker/main.c
@@ -8,6 +8,7 @@
 
 #include "sokoban.h"
 #include "coord.h"
+#include "object.h"
 
 #define ERRPRINT(fmt, as...) fprintf(stderr, fmt, ## as);
 #define DPRINT(fmt, as...) if(DEBUG) ERRPRINT(fmt, ## as);
@@ -47,9 +48,9 @@ void solve(FILE *inputstream)
 	time_start_read = clock();
 	sokoban_screen *screen = parse_screen(inputstream);
 	if (screen == NULL) printf("Something went wrong...\n");
-	sokoban_print(screen);
-
+	//sokoban_print(screen);
 	time_end_read = clock();
+
 	time_start_encode = clock();
 
 	lace_init(0, 1000000);
@@ -57,25 +58,24 @@ void solve(FILE *inputstream)
 	LACE_ME;
     sylvan_init_package(1LL<<21, 1LL<<27, 1LL<<20, 1LL<<26);
     sylvan_init_bdd(6);
-
-	encode_screen(screen);
-
-	sokoban_free(screen);
-
 	switch(strat){
 		case COORD:
 			DPRINT("Encoding coordinate based\n");
+			encode_screen(screen);
 			break;
 		case OBJECT:
 			DPRINT("Encoding object based\n");
+			solve_object(screen);
 			break;
 		case HYBRID:
 			DPRINT("Encoding hybrid based\n");
+			DPRINT("Not implemented yet...\n");
 			break;
 		default:
 			ERRPRINT("Huh?");
 			exit(2);
 	}
+	sokoban_free(screen);
 	time_end_encode = clock();
 
 	//SOLVE???