#include "sokoban.h"
#include "coord.h"
-#include "object.h"
#define DPRINT(fmt, as...) if(VERBOSE) fprintf(stderr, fmt, ## as);
#define REPORT(s, end, start) DPRINT(s, ((double)(end-start))/CLOCKS_PER_SEC);
"\t%s [opts] [FILE]\n"
"\n"
"Options:\n"
-// "\t-l LURD lURD verification strategy\n"
-// "\t-r show all positions that are a valid solution\n"
- "\n"
+ "\t-l LURD initial LURD\n"
"\t-v enable verbose output\n"
"\t-h show this help\n"
"\n"
return new;
}
-int solve(FILE *inputstream)
+int solve(FILE *inputstream, char *lurd)
{
clock_t time_start_read, time_end_read, time_start_scr, time_end_scr,
time_start_goal, time_end_goal, time_start_rel, time_end_rel,
//Read screen
time_start_read = clock();
- sokoban_screen *screen = parse_screen(inputstream, false);
+ sokoban_screen *screen = parse_screen(inputstream, true);
if (screen == NULL) {
printf("Something went wrong encoding the screen\n");
return 2;
time_start_solve = clock();
BDD old = sylvan_false;
BDD new = init->bdd;
+ //Do lurd
+ while(*lurd != '\0'){
+ switch(*lurd){
+ case 'l':
+ new = subsolve(rls->rell, new);
+ break;
+ case 'u':
+ new = subsolve(rls->relu, new);
+ break;
+ case 'r':
+ new = subsolve(rls->relr, new);
+ break;
+ case 'd':
+ new = subsolve(rls->reld, new);
+ break;
+ default:
+ printf("Unknown character in lurd: '%c'\n", *lurd);
+ exit(2);
+ }
+ lurd++;
+ }
int iteration = 0;
+
bool found = false;
+
while(new != old){
DPRINT("Iteration %d\n", iteration++);
old = new;
new = subsolve(rls->relr, new);
new = subsolve(rls->reld, new);
}
+
time_end_solve = clock();
//Free and print stats
REPORT("Goal encoding: %fs\n", time_end_goal, time_start_goal);
REPORT("Relation encoding: %fs\n", time_end_rel, time_start_rel);
REPORT("Solving encoding: %fs\n", time_end_solve, time_start_solve);
+ DPRINT("Iterations needed: %d\n", iteration);
if(!found){
printf("no solution\n");
return 1;
}
+ DPRINT("Solution found\n");
return 0;
}
int main(int argc, char **argv)
{
int optchar;
+ char *lurd = "";
- while((optchar = getopt(argc, argv, "vh")) != -1){
+ while((optchar = getopt(argc, argv, "vhl:")) != -1){
switch(optchar){
+ case 'l':
+ DPRINT("Lurd detected: `%s'\n", optarg);
+ lurd = optarg;
+ break;
case 'v':
VERBOSE = true;
DPRINT("Debug enabled\n");
if(optind == argc){
DPRINT("You have not specified a file, reading from stdin\n");
- return solve(stdin);
+ return solve(stdin, lurd);
} else {
DPRINT("Processing: %s\n", argv[optind]);
- DPRINT("Thus skipping the other %d files\n", argc-optind);
FILE *currentfile = fopen(argv[optind], "r");
DPRINT("Opening file\n");
- return solve(currentfile);
+ return solve(currentfile, lurd);
DPRINT("Closing file\n");
fclose(currentfile);
}