X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=modelchecker%2Fcoord.c;h=c74c2fe80916988cfdb646a61aa2041a9b69d87a;hb=d0ee02a16e9266da088b78ab8d2982f1c215fa1b;hp=bf165a7082133c8f362751b8a8b2398878d14faf;hpb=d1d4ef8e109fe6a6e70836e7d9e59ace07e3814d;p=mc1516pa.git

diff --git a/modelchecker/coord.c b/modelchecker/coord.c
index bf165a7..c74c2fe 100644
--- a/modelchecker/coord.c
+++ b/modelchecker/coord.c
@@ -17,6 +17,136 @@
 #include "coord.h"
 #include "sokoban.h"
 
+/*
+ * Global TODOs for now:
+ * - update the helper maps so it is a single bimap
+ * - make a data structure for relations
+ * - encode relations as a set of four relations for each move
+ */
+
+typedef struct {
+	int x;
+	int y;
+} xy;
+
+typedef struct {
+	int var[3];
+} bddvar;
+
+typedef struct {
+	xy key;
+	bddvar value;
+	UT_hash_handle hh;
+} xy_bddvar_map;
+
+typedef struct {
+	int key;
+	xy value;
+	UT_hash_handle hh;
+} bddvar_xy_map;
+
+typedef struct {
+	xy_bddvar_map *f;
+	bddvar_xy_map *t;
+} bimap;
+
+xy_bddvar_map *getxy(int x, int y, xy_bddvar_map *map)
+{
+	xy_bddvar_map k, *r = NULL;
+	memset(&k, 0, sizeof(xy_bddvar_map));
+	k.key.x = x;
+	k.key.y = y;
+	HASH_FIND(hh, map, &k.key, sizeof(xy), r);
+	return r;
+}
+
+bddvar_xy_map *getbdd(int key, bddvar_xy_map *map)
+{
+	bddvar_xy_map k, *r = NULL;
+	memset(&k, 0, sizeof(bddvar_xy_map));
+	k.key = key;
+	HASH_FIND(hh, map, &k.key, sizeof(int), r);
+	return r;
+}
+
+xy_bddvar_map *create_xy_bddvar_map(sokoban_screen *screen)
+{
+	int varcount = 0;
+	sokoban_screen *r;
+	xy_bddvar_map *xybdd = NULL;
+	for(r=screen; r != NULL; r = (sokoban_screen *)(r->hh.next)){
+		xy_bddvar_map *f = NULL;
+		//bddvar_xy_map *t = NULL;
+
+		f = (xy_bddvar_map *)malloc(sizeof(xy_bddvar_map));
+		memset(f, 0, sizeof(xy_bddvar_map));
+		f->key.x = r->coord.x;
+		f->key.y = r->coord.y;
+		f->value.var[0] = varcount;
+		f->value.var[1] = varcount + 1;
+		f->value.var[2] = varcount + 2;
+		HASH_ADD(hh, xybdd, key, sizeof(xy), f);
+		varcount = varcount + 3;
+	}
+	return xybdd;
+}
+
+bddvar_xy_map *create_bddvar_xy_map(sokoban_screen *screen)
+{
+	int varcount = 0;
+	sokoban_screen *r;
+	bddvar_xy_map *bddxy = NULL;
+	for(r=screen; r != NULL; r = (sokoban_screen *)(r->hh.next)){
+		for (int i = 0; i <3; i++){
+			bddvar_xy_map *f = NULL;
+			//bddvar_xy_map *t = NULL;
+
+			f = (bddvar_xy_map *)malloc(sizeof(bddvar_xy_map));
+			memset(f, 0, sizeof(bddvar_xy_map));
+			f->key = varcount + i;
+			f->value.x = r->coord.x;
+			f->value.y = r->coord.y;
+			HASH_ADD(hh, bddxy, key, sizeof(int), f);
+		}
+		varcount = varcount + 3;
+	}
+	return bddxy;
+}
+
+bimap *create_bimap_helper(sokoban_screen *screen)
+{
+	int varcount = 0;
+	sokoban_screen *r;
+	xy_bddvar_map *xybdd = NULL;
+	bddvar_xy_map *bddxy = NULL;
+	for(r=screen; r != NULL; r = (sokoban_screen *)(r->hh.next)){
+		xy_bddvar_map *f = NULL;
+		f = (xy_bddvar_map *)malloc(sizeof(xy_bddvar_map));
+		memset(f, 0, sizeof(xy_bddvar_map));
+		f->key.x = r->coord.x;
+		f->key.y = r->coord.y;
+		f->value.var[0] = varcount;
+		f->value.var[1] = varcount + 1;
+		f->value.var[2] = varcount + 2;
+		HASH_ADD(hh, xybdd, key, sizeof(xy), f);
+
+		for (int i = 0; i <3; i++){
+			bddvar_xy_map *t = NULL;
+			t = (bddvar_xy_map *)malloc(sizeof(bddvar_xy_map));
+			memset(t, 0, sizeof(bddvar_xy_map));
+			t->key = varcount + i;
+			t->value.x = r->coord.x;
+			t->value.y = r->coord.y;
+			HASH_ADD(hh, bddxy, key, sizeof(int), t);
+		}
+		varcount = varcount + 3;
+	}
+	bimap *bm = NULL;
+	bm = (bimap *)malloc(sizeof(bimap));
+	bm->f = xybdd;
+	bm->t = bddxy;
+	return bm;
+}
 
 /*
  * Each coordinate has three related boolean variables. The combination of those boolean variables
@@ -59,7 +189,6 @@ BDD encode_screen(sokoban_screen *screen)
 				state = sylvan_and(state, sylvan_ithvar(tile_index));
 				tile_index++;
 			}
-			printf("x = %d y = %d FREE\n", r->coord.x, r->coord.y);
 			break;
 		case WALL:
 			if (state == sylvan_false){
@@ -78,7 +207,6 @@ BDD encode_screen(sokoban_screen *screen)
 				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
 				tile_index++;
 			}
-			printf("x = %d y = %d WALL\n", r->coord.x, r->coord.y);
 			break;
 		case BOX:
 			if (state == sylvan_false){
@@ -97,7 +225,6 @@ BDD encode_screen(sokoban_screen *screen)
 				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
 				tile_index++;
 			}
-			printf("x = %d y = %d BOX\n", r->coord.x, r->coord.y);
 			break;
 		case TARGET:
 			if (state == sylvan_false){
@@ -116,7 +243,6 @@ BDD encode_screen(sokoban_screen *screen)
 				state = sylvan_and(state, sylvan_ithvar(tile_index));
 				tile_index++;
 			}
-			printf("x = %d y = %d TARGET\n", r->coord.x, r->coord.y);
 			break;
 		case AGENT:
 			if (state == sylvan_false){
@@ -135,7 +261,6 @@ BDD encode_screen(sokoban_screen *screen)
 				state = sylvan_and(state, sylvan_ithvar(tile_index));
 				tile_index++;
 			}
-			printf("x = %d y = %d AGENT\n", r->coord.x, r->coord.y);
 			break;
 		case TARGAGENT:
 			if (state == sylvan_false){
@@ -154,7 +279,6 @@ BDD encode_screen(sokoban_screen *screen)
 				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
 				tile_index++;
 			}
-			printf("x = %d y = %d TARGAGENT\n", r->coord.x, r->coord.y);
 			break;
 		case TARGBOX:
 			if (state == sylvan_false){
@@ -173,10 +297,29 @@ BDD encode_screen(sokoban_screen *screen)
 				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
 				tile_index++;
 			}
-			printf("x = %d y = %d TARGBOX\n", r->coord.x, r->coord.y);
 			break;
 		}
 	}
+	/*
+	xy_bddvar_map *map = NULL;
+	map = create_xy_bddvar_map(screen);
+	xy_bddvar_map *m = getxy(1, 1, map);
+	bddvar_xy_map *map2 = NULL;
+	map2 = create_bddvar_xy_map(screen);
+	bddvar_xy_map *m2 = getbdd(2, map2);
+	printf("Test1: %d %d\n", m->value.var[0], m->value.var[1]);
+	printf("Test2: %d %d\n", m2->value.x, m2->value.y);
+	*/
+	/*
+	bimap *bm = NULL;
+	bm = create_bimap_helper(screen);
+	xy_bddvar_map *m = getxy(1, 1, bm->f);
+	bddvar_xy_map *m2 = getbdd(2, bm->t);
+	printf("Test1: %d %d\n", m->value.var[0], m->value.var[1]);
+	printf("Test2: %d %d\n", m2->value.x, m2->value.y);
+	printf("%d tiles were encoded\n", tile_index);
+	if (bm != NULL) printf ("WORKS!\n");
+	*/
 	return state;
 }