X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=modelchecker%2Fmain.c;h=7940dc94d65aceab344e5f156e1e11a0e0e8e208;hb=03c6e2f515f6516448ec39aa40a439b9fc20c4c8;hp=1fd9e93f4c9f5b5eaea7ff21ca206a22f7062c25;hpb=2be3ea1fc484406a2865426c9b02ad7e9ff703ba;p=mc1516pa.git

diff --git a/modelchecker/main.c b/modelchecker/main.c
index 1fd9e93..7940dc9 100644
--- a/modelchecker/main.c
+++ b/modelchecker/main.c
@@ -7,6 +7,8 @@
 #include <sylvan.h>
 
 #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);
@@ -46,33 +48,35 @@ 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_free(screen);
-
+	//sokoban_print(screen);
 	time_end_read = clock();
+
 	time_start_encode = clock();
-	
+
 	lace_init(0, 1000000);
 	lace_startup(0, NULL, NULL);
 	LACE_ME;
     sylvan_init_package(1LL<<21, 1LL<<27, 1LL<<20, 1LL<<26);
     sylvan_init_bdd(6);
-	
-	//ENCODE???
 	switch(strat){
 		case COORD:
 			DPRINT("Encoding coordinate based\n");
+			encode_screen(screen);
+			//test_relprod();
 			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???