From: Mart Lubbers Date: Wed, 23 Mar 2016 18:05:39 +0000 (+0100) Subject: improved even more X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=87a49a20bdeb4fe199dd9a61468d653417b14ae8;hp=3fc66581b10fbfc3f9abeba0ffc6fa8d0a099b24;p=mc1516pa.git improved even more --- diff --git a/modelchecker/Makefile b/modelchecker/Makefile index 80fb895..97496e7 100644 --- a/modelchecker/Makefile +++ b/modelchecker/Makefile @@ -4,7 +4,6 @@ OBJS:=sokoban.o mc.o CFLAGS=-O3 -Wextra -Wall -Werror -fno-strict-aliasing -std=gnu11 \ -I./sylvan/src -# We combine all the object files into one executable $(PROGRAM): $(PROGRAM).o $(OBJS) $(CC) $< $(OBJS) -o $@ diff --git a/modelchecker/main.c b/modelchecker/main.c index e2e330b..16dd229 100644 --- a/modelchecker/main.c +++ b/modelchecker/main.c @@ -4,13 +4,10 @@ #include #include + #include "mc.h" #include "sokoban.h" -//#include -//#include -//#include - //Global variables bool DEBUG = false; strategy strat = HYBRID; @@ -48,14 +45,19 @@ void solve(FILE *inputstream){ time_start_encode = clock(); switch(strat){ case COORD: + if(DEBUG) fprintf(stderr, "Encoding coordinate based\n"); + break; case OBJECT: + if(DEBUG) fprintf(stderr, "Encoding object based\n"); + break; case HYBRID: + if(DEBUG) fprintf(stderr, "Encoding hybrid based\n"); + break; default: fprintf(stderr, "Huh?"); exit(2); } time_end_encode = clock(); - // Future: SMC fprintf(stderr, "Reading: %fs\n", @@ -108,7 +110,6 @@ int main(int argc, char **argv){ for(int filepathindex = optind; filepathindex < argc; filepathindex++){ char *currentfilepath = argv[filepathindex]; fprintf(stderr, "Processing: %s\n", currentfilepath); - if(DEBUG) fprintf(stderr, "Strategy: %d\n", strat); FILE *currentfile = fopen(currentfilepath, "r"); if(DEBUG) fprintf(stderr, "Opening file\n"); solve(currentfile);