X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=modelchecker%2Fcoord.c;h=4bb49100c48f7b9779b70e77107d4427ddece3b0;hb=2b563274d5be82064d132314c31775119fdeeb9c;hp=586095fb08384998567433b89a9b17612b5dba7e;hpb=3350e67ad7c96bf9b821c0d691a58eb141a13e17;p=mc1516pa.git

diff --git a/modelchecker/coord.c b/modelchecker/coord.c
index 586095f..4bb4910 100644
--- a/modelchecker/coord.c
+++ b/modelchecker/coord.c
@@ -17,6 +17,163 @@
 #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;
+
+typedef struct {
+	BDD *rell;
+	BDD *relu;
+	BDD *relr;
+	BDD *reld;
+} rels;
+
+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;
+}
+
+int check_xy_exists(int x, int y, bimap *bm)
+{
+	int res = 0;
+	if (getxy(x, y, bm->f) != NULL) res = 1;
+	return res;
+}
+
+int check_space(int x, int y, direction d, int delta, bimap *bm)
+{
+	switch(d){
+	case LEFT: x = x - delta; break;
+	case UP: y = y - delta; break;
+	case RIGHT: x = x + delta; break;
+	case DOWN: y = y + delta; break;
+	}
+	return check_xy_exists(x, y, bm);
+}
 
 /*
  * Each coordinate has three related boolean variables. The combination of those boolean variables
@@ -34,167 +191,237 @@
  * directly in transition relations.
  */
 
-BDD encode_screen(sokoban_screen *screen)
+state *encode_screen(sokoban_screen *screen)
 {
-	BDD state = sylvan_false;
+	LACE_ME;
+
+	BDDVAR vars[HASH_COUNT(screen) * 3];
+	for (uint8_t i = 0; i < HASH_COUNT(screen) * 3; i++){
+		vars[i] = i * 2;
+	}
+
+	uint8_t st_enc[HASH_COUNT(screen) * 3];
+
+	BDDSET varset = sylvan_set_fromarray(vars, HASH_COUNT(screen) * 3);
+	BDD s;
+	state *fullState = NULL;
+	fullState = (state *)malloc(sizeof(state));
+	fullState->vars.varset = varset;
+	fullState->vars.size = HASH_COUNT(screen) * 3;
 	int tile_index = 0;
 	sokoban_screen *r;
-	LACE_ME;
 	for(r=screen; r != NULL; r = (sokoban_screen *)(r->hh.next)){
 		switch(r->tile){
-		case FREE:
-			if (state == sylvan_false){
-				state = sylvan_not(sylvan_ithvar(tile_index));
-				tile_index++;
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-				state = sylvan_and(state, sylvan_ithvar(tile_index));
-				tile_index++;
-			}
-			else {
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-				state = sylvan_and(state, sylvan_ithvar(tile_index));
-				tile_index++;
-			}
+		case FREE: //001
+			st_enc[tile_index] = 0;
+			tile_index++;
+			st_enc[tile_index] = 0;
+			tile_index++;
+			st_enc[tile_index] = 1;
+			tile_index++;
 			break;
-		case WALL:
-			if (state == sylvan_false){
-				state = sylvan_not(sylvan_ithvar(tile_index));
-				tile_index++;
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-			}
-			else {
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-			}
+		case WALL: //000
+			st_enc[tile_index] = 0;
+			tile_index++;
+			st_enc[tile_index] = 0;
+			tile_index++;
+			st_enc[tile_index] = 0;
+			tile_index++;
 			break;
-		case BOX:
-			if (state == sylvan_false){
-				state = sylvan_not(sylvan_ithvar(tile_index));
-				tile_index++;
-				state = sylvan_and(state, sylvan_ithvar(tile_index));
-				tile_index++;
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-			}
-			else {
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-				state = sylvan_and(state, sylvan_ithvar(tile_index));
-				tile_index++;
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-			}
+		case BOX: //010
+			st_enc[tile_index] = 0;
+			tile_index++;
+			st_enc[tile_index] = 1;
+			tile_index++;
+			st_enc[tile_index] = 0;
+			tile_index++;
 			break;
-		case TARGET:
-			if (state == sylvan_false){
-				state = sylvan_not(sylvan_ithvar(tile_index));
-				tile_index++;
-				state = sylvan_and(state, sylvan_ithvar(tile_index));
-				tile_index++;
-				state = sylvan_and(state, sylvan_ithvar(tile_index));
-				tile_index++;
-			}
-			else {
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-				state = sylvan_and(state, sylvan_ithvar(tile_index));
-				tile_index++;
-				state = sylvan_and(state, sylvan_ithvar(tile_index));
-				tile_index++;
-			}
+		case TARGET: //011
+			st_enc[tile_index] = 0;
+			tile_index++;
+			st_enc[tile_index] = 1;
+			tile_index++;
+			st_enc[tile_index] = 1;
+			tile_index++;
 			break;
-		case AGENT:
-			if (state == sylvan_false){
-				state = sylvan_ithvar(tile_index);
-				tile_index++;
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-				state = sylvan_and(state, sylvan_ithvar(tile_index));
-				tile_index++;
-			}
-			else {
-				state = sylvan_and(state, sylvan_ithvar(tile_index));
-				tile_index++;
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-				state = sylvan_and(state, sylvan_ithvar(tile_index));
-				tile_index++;
-			}
+		case AGENT: //101
+			st_enc[tile_index] = 1;
+			tile_index++;
+			st_enc[tile_index] = 0;
+			tile_index++;
+			st_enc[tile_index] = 1;
+			tile_index++;
 			break;
-		case TARGAGENT:
-			if (state == sylvan_false){
-				state = sylvan_ithvar(tile_index);
-				tile_index++;
-				state = sylvan_and(state, sylvan_ithvar(tile_index));
-				tile_index++;
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-			}
-			else {
-				state = sylvan_and(state, sylvan_ithvar(tile_index));
-				tile_index++;
-				state = sylvan_and(state, sylvan_ithvar(tile_index));
-				tile_index++;
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-			}
+		case TARGAGENT: //110
+			st_enc[tile_index] = 1;
+			tile_index++;
+			st_enc[tile_index] = 1;
+			tile_index++;
+			st_enc[tile_index] = 0;
+			tile_index++;
 			break;
-		case TARGBOX:
-			if (state == sylvan_false){
-				state = sylvan_ithvar(tile_index);
-				tile_index++;
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-			}
-			else {
-				state = sylvan_and(state, sylvan_ithvar(tile_index));
-				tile_index++;
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-				state = sylvan_and(state, sylvan_not(sylvan_ithvar(tile_index)));
-				tile_index++;
-			}
+		case TARGBOX: //100
+			st_enc[tile_index] = 1;
+			tile_index++;
+			st_enc[tile_index] = 0;
+			tile_index++;
+			st_enc[tile_index] = 0;
+			tile_index++;
 			break;
 		}
 	}
-	printf("%d tiles were encoded\n", tile_index);
-	return state;
+	s = sylvan_cube(varset, st_enc);
+	fullState->bdd = s;
+	printf("Initial state encoded\n");
+	return fullState;
 }
 
-BDD encode_rel(sokoban_screen *screen)
+int
+test_relprod()
 {
-	int num_tiles;
-	num_tiles = HASH_COUNT(screen);
-	printf("Number of tiles: %d\n", num_tiles);
-	return sylvan_true;
+    LACE_ME;
+
+    BDDVAR vars[] = {0,2,4};
+    BDDVAR all_vars[] = {4,5};
+
+    BDDSET vars_set = sylvan_set_fromarray(vars, 3);
+    BDDSET all_vars_set = sylvan_set_fromarray(all_vars, 2);
+
+    BDD s, t, next, prev;
+    BDD zeroes, ones;
+
+    // transition relation: 000 --> 111 and !000 --> 000
+    t = sylvan_false;
+    //t = sylvan_union_cube(t, all_vars_set, ((uint8_t[]){0,1,0,1,0,1}));
+    //t = sylvan_union_cube(t, all_vars_set, ((uint8_t[]){1,0,2,0,2,0}));
+    //t = sylvan_union_cube(t, all_vars_set, ((uint8_t[]){2,0,1,0,2,0}));
+    t = sylvan_union_cube(t, all_vars_set, ((uint8_t[]){1,0}));
+
+    s = sylvan_cube(vars_set, (uint8_t[]){0,0,1});
+    zeroes = sylvan_cube(vars_set, (uint8_t[]){0,0,0});
+    ones = sylvan_cube(vars_set, (uint8_t[]){0,0,1});
+
+    next = sylvan_relnext(s, t, all_vars_set);
+    prev = sylvan_relprev(t, next, all_vars_set);
+    if (next == zeroes) printf("Pass 1\n");
+    if (prev == ones || prev == zeroes) printf("Pass 2\n");
+
+    return 0;
 }
 
-void test()
+BDD encode_rel(sokoban_screen *screen)
 {
+	LACE_ME;
+	//	int tile_count = 0;
+	BDD t = sylvan_false;
+	//BDDVAR relvars[];
+	//BDDSET relvarset;
+	//uint8_t rel_enc[];
+
+	bimap *bm = create_bimap_helper(screen);
+	int x = 0;
+	int y = 0;
+	bddvar_xy_map *bddxy = NULL;
 
-	printf("Test!\n");
-	BDD a = sylvan_true;
-	BDD b = sylvan_not(a);
-	if (b == sylvan_false){
-		printf("BDD works!\n");
-	} else {
-		printf("BDD does not work!\n");
+	//left relation
+	for (unsigned int i = 0; i < HASH_COUNT(screen); i++){
+		printf("i:%d\n", i);
+		bddxy = getbdd(i*3, bm->t);
+		x = bddxy->value.x;
+		y = bddxy->value.y;
+		if (check_space(x, y, LEFT, 1, bm) == 0){
+			sokoban_screen *tmp_scr = get_coord(x, y, screen);
+			if (tmp_scr->tile == AGENT){
+				//1 1 0 0 1 1 (1 0 1 -> 1 0 1)
+				BDDVAR relvars[6]  = {i * 3, i * 3 + 1, i * 3 + 2, i * 3 + 3, i * 3 + 4, i * 3 + 5};
+				BDDSET relvarset = sylvan_set_fromarray(relvars, 6);
+				uint8_t rel_enc[6] = {1, 1, 0, 0, 1, 1};
+				t = sylvan_union_cube(t, relvarset, rel_enc);
+			}
+			if (tmp_scr->tile == TARGAGENT){
+				//1 1 1 1 0 0 (1 1 0 -> 1 1 0)
+				//relvars[6] = {i * 3, i * 3 + 1, i * 3 + 2, i * 3 + 3, i * 3 + 4, i * 3 + 5};
+				//rel_enc[6] = {1, 1, 1, 1, 0, 0};
+				//relvarset = sylvan_union_cube(t, relvarset, rel_enc);
+			}
+		}
+		else if (check_space(x, y, LEFT, 1, bm) == 1 && check_space(x, y, LEFT, 2, bm) == 0){
+			sokoban_screen *tmp_scr = get_coord(x, y, screen);
+			sokoban_screen *tmp_scr_d = get_coord(x - 1, y, screen);
+			if (tmp_scr->tile == AGENT && tmp_scr_d->tile == FREE){
+				//can move
+			}
+			if (tmp_scr->tile == AGENT && tmp_scr_d->tile == TARGET){
+				//can move
+			}
+			if (tmp_scr->tile == TARGAGENT && tmp_scr_d->tile == FREE){
+				//can move
+			}
+			if (tmp_scr->tile == TARGAGENT && tmp_scr_d->tile == TARGET){
+				//can move
+			}
+			if (tmp_scr->tile == AGENT && (tmp_scr_d->tile == BOX || tmp_scr_d->tile == TARGBOX)){
+				//can't move
+			}
+			if (tmp_scr->tile == TARGAGENT && (tmp_scr_d->tile == BOX || tmp_scr_d->tile == TARGBOX)){
+				//can't move
+			}
+		}
+		else if (check_space(x, y, LEFT, 1, bm) == 1 && check_space(x, y, LEFT, 2, bm) == 1){
+			sokoban_screen *tmp_scr = get_coord(x, y, screen);
+			sokoban_screen *tmp_scr_d = get_coord(x - 1, y, screen);
+			sokoban_screen *tmp_scr_g = get_coord(x - 2, y, screen);
+			if (tmp_scr->tile == AGENT && tmp_scr_d->tile == FREE){
+				//can move
+			}
+			if (tmp_scr->tile == AGENT && tmp_scr_d->tile == TARGET){
+				//can move
+			}
+			if (tmp_scr->tile == TARGAGENT && tmp_scr_d->tile == FREE){
+				//can move
+			}
+			if (tmp_scr->tile == TARGAGENT && tmp_scr_d->tile == TARGET){
+				//can move
+			}
+			if (tmp_scr->tile == AGENT && tmp_scr_d-> tile == BOX && (tmp_scr_g->tile == BOX || tmp_scr_g->tile == TARGBOX)){
+				//can't move
+			}
+			if (tmp_scr->tile == TARGAGENT && tmp_scr_d-> tile == BOX && (tmp_scr_g->tile == BOX || tmp_scr_g->tile == TARGBOX)){
+				//can't move
+			}
+			if (tmp_scr->tile == AGENT && tmp_scr_d->tile == BOX && tmp_scr_g->tile == FREE){
+				//can move
+			}
+			if (tmp_scr->tile == AGENT && tmp_scr_d->tile == TARGBOX && tmp_scr_g->tile == FREE){
+				//can move
+			}
+			if (tmp_scr->tile == AGENT && tmp_scr_d->tile == BOX && tmp_scr_g->tile == TARGET){
+				//can move
+			}
+			if (tmp_scr->tile == AGENT && tmp_scr_d->tile == TARGBOX && tmp_scr_g->tile == TARGET){
+				//can move
+			}
+			if (tmp_scr->tile == TARGAGENT && tmp_scr_d->tile == BOX && tmp_scr_g->tile == FREE){
+				//can move
+			}
+			if (tmp_scr->tile == TARGAGENT && tmp_scr_d->tile == TARGBOX && tmp_scr_g->tile == FREE){
+				//can move
+			}
+			if (tmp_scr->tile == TARGAGENT && tmp_scr_d->tile == BOX && tmp_scr_g->tile == TARGET){
+				//can move
+			}
+			if (tmp_scr->tile == TARGAGENT && tmp_scr_d->tile == TARGBOX && tmp_scr_g->tile == TARGET){
+				//can move
+			}
+		}
+		printf("x:%d y:%d\n", x, y);
 	}
-	LACE_ME;
-	BDD c = sylvan_ithvar(1);
-	if (sylvan_high(c) == sylvan_true && sylvan_low(c) == sylvan_false) printf("VAR works 1\n");
-	if (sylvan_var(c) == 1) printf("Var works 2\n");
+
+	//up relation
+
+	//right relation
+
+	//down relation
+
+	return sylvan_true;
 }