From: Alexander Fedotov Date: Wed, 13 Apr 2016 17:49:41 +0000 (+0200) Subject: some more trans var corrections X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=d5d879b4e6dff962b6d31be06b8e555e72819963;p=mc1516pa.git some more trans var corrections --- diff --git a/modelchecker/coord.c b/modelchecker/coord.c index 1caff39..3cd3a9a 100644 --- a/modelchecker/coord.c +++ b/modelchecker/coord.c @@ -352,7 +352,7 @@ trans_t *create_single_rel(sokoban_screen *screen, direction dir) trs_current->next_rel = trs; trs = trs_current; - //REPAIR! Must be: Free Targagent -> Agent Target + //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; @@ -564,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); @@ -575,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; @@ -592,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)); @@ -608,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; @@ -625,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)); @@ -641,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; @@ -674,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; @@ -696,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; @@ -721,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; @@ -741,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; @@ -766,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; @@ -786,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; @@ -812,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; @@ -858,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; @@ -905,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; @@ -952,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; @@ -999,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; @@ -1046,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; @@ -1093,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; @@ -1140,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; @@ -1187,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;