X-Git-Url: https://pd.if.org/git/?p=hexagon;a=blobdiff_plain;f=t%2Fastar.c;h=cb7f0434711c71dd59947a3fbc8e8d94d59351ee;hp=af88268d4212af1c23484843108e5aeeb4144d81;hb=f4de9d8b5cc2646e133d8c387fa1de5814cfb453;hpb=5c48a06bc8649958e69013c53e925b83398ebc74 diff --git a/t/astar.c b/t/astar.c index af88268..cb7f043 100644 --- a/t/astar.c +++ b/t/astar.c @@ -1,6 +1,6 @@ #include -#include "hexmap.h" +#include "hexagon.h" #include "tap.h" @@ -27,19 +27,17 @@ void pcheck(struct HL_astar *p, int x1, int y1, int x2, int y2, int expect) { int neighbor55(int hex, int dir) { int neighbor; - neighbor = HL_adjacent_hex(hex, dir); - if (neighbor == HL_cantor_xy(5,5)) { - return -1; - } + do { + neighbor = HL_adjacent_hex(hex, dir++); + } while (neighbor == HL_cantor_xy(5,5)); return neighbor; } int main(void) { struct HL_astar *p; - int length; - plan_tests(17); + plan_tests(16); p = HL_astar_init(0); ok(p != NULL, "allocated astar struct"); @@ -47,12 +45,6 @@ int main(void) { ok(p->open == NULL, "initial open list empty"); ok(p->closed == NULL, "initial closed list empty"); - p->start = HL_cantor_xy(1, 1); - p->goal = HL_cantor_xy(1, 2); - - length = HL_findpath(p, 0); - ok(p->error == 0, "path finding returns no error"); - pcheck(p, 1,1, 1,3, 2); pcheck(p, 1,1, 2,1, 1); pcheck(p, 1,1, 2,2, 2);