some more trans var corrections

[mc1516pa.git] / modelchecker / coord.c

diff --git a/modelchecker/coord.c b/modelchecker/coord.c
index e54fe56..3cd3a9a 100644 (file)
--- a/modelchecker/coord.c
+++ b/modelchecker/coord.c
@@ -264,6 +264,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                y = bddxy->value.y;
                if (check_space(x, y, dir, 1, bm) == 0){
 
+            //Agent -> 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);
@@ -276,6 +277,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
+            //Targagent -> Targagent
                        //1 1 1 1 0 0 (1 1 0 -> 1 1 0)
                        relvars[0] = i * 3;
                        relvars[1] = i * 3 + 1;
@@ -304,6 +306,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        xy_bddvar_map *bddvar = getxy(x + xdelta, y + ydelta, bm->f);
                        int deltai = bddvar->value.var[0];
 
+            //Free Agent -> Agent Free
                        //(0 1 0 0 1 1 1 0 0 0 1 1)
                        BDDVAR relvars[12]  = {deltai*3, deltai*3+1, deltai*3+2, deltai*3+3, deltai*3+4, deltai*3+5, i*3, i*3+1, i*3+2, i*3+3, i*3+4, i*3+5};
                        BDDSET relvarset = sylvan_set_fromarray(relvars, 12);
@@ -315,7 +318,8 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
-                       //(0 1 1 0 1 1 1 0 0 1 1 1)
+            //Target Agent -> Targagent Free
+                       //(0 1 1 1 1 0 1 0 0 0 1 1)
                        relvars[0] = deltai*3;
                        relvars[1] = deltai*3+1;
                        relvars[2] = deltai*3+2;
@@ -332,13 +336,13 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        rel_enc[0] = 0;
                        rel_enc[1] = 1;
                        rel_enc[2] = 1;
-                       rel_enc[3] = 0;
+                       rel_enc[3] = 1;
                        rel_enc[4] = 1;
-                       rel_enc[5] = 1;
+                       rel_enc[5] = 0;
                        rel_enc[6] = 1;
                        rel_enc[7] = 0;
                        rel_enc[8] = 0;
-                       rel_enc[9] = 1;
+                       rel_enc[9] = 0;
                        rel_enc[10] = 1;
                        rel_enc[11] = 1;
                        trs_current = (trans_t *)malloc(sizeof(trans_t));
@@ -348,7 +352,8 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
-                       //(0 1 0 1 1 0 1 0 1 0 0 1)
+            //Must be: Free Targagent -> Agent Target
+                       //(0 1 0 0 1 1 1 0 1 1 0 1)
                        relvars[0] = deltai*3;
                        relvars[1] = deltai*3+1;
                        relvars[2] = deltai*3+2;
@@ -365,13 +370,13 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        rel_enc[0] = 0;
                        rel_enc[1] = 1;
                        rel_enc[2] = 0;
-                       rel_enc[3] = 1;
+                       rel_enc[3] = 0;
                        rel_enc[4] = 1;
-                       rel_enc[5] = 0;
+                       rel_enc[5] = 1;
                        rel_enc[6] = 1;
                        rel_enc[7] = 0;
                        rel_enc[8] = 1;
-                       rel_enc[9] = 0;
+                       rel_enc[9] = 1;
                        rel_enc[10] = 0;
                        rel_enc[11] = 1;
                        trs_current = (trans_t *)malloc(sizeof(trans_t));
@@ -381,6 +386,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
+            //Target Targagent -> Targagent Target
                        //(0 1 1 1 1 0 1 0 1 1 0 1)
                        relvars[0] = deltai*3;
                        relvars[1] = deltai*3+1;
@@ -414,6 +420,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
+            //Box Agent -> Box Agent
                        //(0 0 1 1 0 0 1 1 0 0 1 1)
                        relvars[0] = deltai*3;
                        relvars[1] = deltai*3+1;
@@ -447,6 +454,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
+            //Targbox Agent -> Targbox Agent
                        //(1 1 0 0 0 0 1 1 0 0 1 1)
                        relvars[0] = deltai*3;
                        relvars[1] = deltai*3+1;
@@ -480,6 +488,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
+            //Box Targagent -> Box Targagent
                        //(0 0 1 1 0 0 1 1 1 1 0 0)
                        relvars[0] = deltai*3;
                        relvars[1] = deltai*3+1;
@@ -513,6 +522,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
+            //Targbox Targagent -> Targbox Targagent
                        //(1 1 0 0 0 0 1 1 1 1 0 0)
                        relvars[0] = deltai*3;
                        relvars[1] = deltai*3+1;
@@ -554,6 +564,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        bddvar = getxy(x + xgamma, y + ygamma, bm->f);
                        int gammai = bddvar->value.var[0];
 
+            //Free Agent -> 1 0 1 0 0 1 Agent Free
                        //(0 1 0 0 1 1 1 0 0 0 1 1)
                        BDDVAR relvars[12]  = {deltai*3, deltai*3+1, deltai*3+2, deltai*3+3, deltai*3+4, deltai*3+5, i*3, i*3+1, i*3+2, i*3+3, i*3+4, i*3+5};
                        BDDSET relvarset = sylvan_set_fromarray(relvars, 12);
@@ -565,7 +576,8 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
-                       //(0 1 1 0 1 1 1 0 0 1 1 1)
+            //Target Agent -> Targagent Free
+                       //(0 1 1 1 1 0 1 0 0 0 1 1)
                        relvars[0] = deltai*3;
                        relvars[1] = deltai*3+1;
                        relvars[2] = deltai*3+2;
@@ -582,13 +594,13 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        rel_enc[0] = 0;
                        rel_enc[1] = 1;
                        rel_enc[2] = 1;
-                       rel_enc[3] = 0;
+                       rel_enc[3] = 1;
                        rel_enc[4] = 1;
-                       rel_enc[5] = 1;
+                       rel_enc[5] = 0;
                        rel_enc[6] = 1;
                        rel_enc[7] = 0;
                        rel_enc[8] = 0;
-                       rel_enc[9] = 1;
+                       rel_enc[9] = 0;
                        rel_enc[10] = 1;
                        rel_enc[11] = 1;
                        trs_current = (trans_t *)malloc(sizeof(trans_t));
@@ -598,7 +610,8 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
-                       //(0 1 0 1 1 0 1 0 1 0 0 1)
+            //Free Targagent -> Agent Target
+                       //(0 1 0 0 1 1 1 0 1 1 0 1)
                        relvars[0] = deltai*3;
                        relvars[1] = deltai*3+1;
                        relvars[2] = deltai*3+2;
@@ -615,13 +628,13 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        rel_enc[0] = 0;
                        rel_enc[1] = 1;
                        rel_enc[2] = 0;
-                       rel_enc[3] = 1;
+                       rel_enc[3] = 0;
                        rel_enc[4] = 1;
-                       rel_enc[5] = 0;
+                       rel_enc[5] = 1;
                        rel_enc[6] = 1;
                        rel_enc[7] = 0;
                        rel_enc[8] = 1;
-                       rel_enc[9] = 0;
+                       rel_enc[9] = 1;
                        rel_enc[10] = 0;
                        rel_enc[11] = 1;
                        trs_current = (trans_t *)malloc(sizeof(trans_t));
@@ -631,6 +644,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
+            //Target Targagent -> Targagent Target
                        //(0 1 1 1 1 0 1 0 1 1 0 1)
                        relvars[0] = deltai*3;
                        relvars[1] = deltai*3+1;
@@ -664,6 +678,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
+            //Box Box Agent -> Box Box Agent
                        //(0 0 1 1 0 0 0 0 1 1 0 0 1 1 0 0 1 1)
                        BDDVAR relvars1[18]  = {gammai*3, gammai*3+1, gammai*3+2, gammai*3+3, gammai*3+4, gammai*3+5, deltai*3, deltai*3+1, deltai*3+2, deltai*3+3, deltai*3+4, deltai*3+5, i*3, i*3+1, i*3+2, i*3+3, i*3+4, i*3+5};
                        relvars1[0] = gammai*3;
@@ -686,6 +701,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        relvars1[17] = i*3+5;
                        BDD relvarset1 = sylvan_set_fromarray(relvars1, 18);
                        uint8_t rel_enc1[18];
+                       //(0 0 1 1 0 0 0 0 1 1 0 0 1 1 0 0 1 1)
                        rel_enc1[0] = 0;
                        rel_enc1[1] = 0;
                        rel_enc1[2] = 1;
@@ -711,6 +727,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
+            //Targbox Box Agent -> Targbox Box Agent
                        //(1 1 0 0 0 0 0 0 1 1 0 0 1 1 0 0 1 1)
                        relvars1[0] = gammai*3;
                        relvars1[1] = gammai*3+1;
@@ -731,6 +748,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        relvars1[16] = i*3+4;
                        relvars1[17] = i*3+5;
                        relvarset1 = sylvan_set_fromarray(relvars1, 18);
+                       //(1 1 0 0 0 0 0 0 1 1 0 0 1 1 0 0 1 1)
                        rel_enc1[0] = 1;
                        rel_enc1[1] = 1;
                        rel_enc1[2] = 0;
@@ -756,6 +774,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
+            //Box Box Targagent -> Box Box Targagent
                        //(0 0 1 1 0 0 0 0 1 1 0 0 1 1 1 1 0 0)
                        relvars1[0] = gammai*3;
                        relvars1[1] = gammai*3+1;
@@ -776,7 +795,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        relvars1[16] = i*3+4;
                        relvars1[17] = i*3+5;
                        relvarset1 = sylvan_set_fromarray(relvars1, 18);
-                       //(0 0 1 1 0 0 0 0 1 1 0 0 1 1 1 1 0 0)
+                       //(0 0 1 1 0 0 0 0 1 1 0 0 1 1 1 1 0 0)
                        rel_enc1[0] = 0;
                        rel_enc1[1] = 0;
                        rel_enc1[2] = 1;
@@ -802,6 +821,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
+            //Targbox Box Targagent -> Targbox Box Targagent
                        //(1 1 0 0 0 0 0 0 1 1 0 0 1 1 1 1 0 0)
                        relvars1[0] = gammai*3;
                        relvars1[1] = gammai*3+1;
@@ -848,7 +868,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
-                       //free box agent -> box agent free
+                       //Free Box Agent -> Box Agent Free
                        //(0 0 0 1 1 0 0 1 1 0 0 1 1 0 0 0 1 1)
                        relvars1[0] = gammai*3;
                        relvars1[1] = gammai*3+1;
@@ -895,7 +915,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
-                       //(free targbox agent -> box targagent free)
+                       //Free Targbox Agent -> Box Targagent Free
                        //(0 0 0 1 1 0 1 1 0 1 0 0 1 0 0 0 1 1)
                        relvars1[0] = gammai*3;
                        relvars1[1] = gammai*3+1;
@@ -942,7 +962,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
-                       //(target box agent -> targbox agent free)
+                       //Target Box Agent -> Targbox Agent Free
                        //(0 1 1 0 1 0 0 1 1 0 0 1 1 0 0 0 1 1)
                        relvars1[0] = gammai*3;
                        relvars1[1] = gammai*3+1;
@@ -989,7 +1009,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
-                       //(target targbox agent -> targbox targagent free)
+                       //Target Targbox Agent -> Targbox Targagent Free
                        //(0 1 1 0 1 0 1 1 0 1 0 0 1 0 0 0 1 1)
                        relvars1[0] = gammai*3;
                        relvars1[1] = gammai*3+1;
@@ -1036,7 +1056,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
-                       //(free box targagent -> box agent target)
+                       //Free Box Targagent -> Box Agent Target
                        //(0 0 0 1 1 0 0 1 1 0 0 1 1 0 1 1 0 1)
                        relvars1[0] = gammai*3;
                        relvars1[1] = gammai*3+1;
@@ -1083,7 +1103,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
-                       //(free targbox targagent -> box targagent target)
+                       //Free Targbox Targagent -> Box Targagent Target
                        //(0 0 0 1 1 0 1 1 0 1 0 0 1 0 1 1 0 1)
                        relvars1[0] = gammai*3;
                        relvars1[1] = gammai*3+1;
@@ -1130,7 +1150,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
-                       //(target box targagent -> targbox agent target)
+                       //Target Box Targagent -> Targbox Agent Target
                        //(0 1 1 0 1 0 0 1 1 0 0 1 1 0 1 1 0 1)
                        relvars1[0] = gammai*3;
                        relvars1[1] = gammai*3+1;
@@ -1177,7 +1197,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir)
                        trs_current->next_rel = trs;
                        trs = trs_current;
 
-                       //(target targbox targagent -> targbox targagent target)
+                       //Target Targbox Targagent -> Targbox Targagent Target
                        //(0 1 1 0 1 0 1 1 0 1 0 0 1 0 1 1 0 1)
                        relvars1[0] = gammai*3;
                        relvars1[1] = gammai*3+1;