minor cleanup and refactor

[hexagon] / t / astar.c

diff --git a/t/astar.c b/t/astar.c
index bab342d0301826f4d1ee5a2bacb79ddce60b68a6..cb7f0434711c71dd59947a3fbc8e8d94d59351ee 100644 (file)
--- a/t/astar.c
+++ b/t/astar.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#include "hexmap.h"
+#include "hexagon.h"
 
 #include "tap.h"
 
@@ -10,7 +10,7 @@ void pcheck(struct HL_astar *p, int x1, int y1, int x2, int y2, int expect) {
        from = HL_cantor_xy(x1,y1);
        to = HL_cantor_xy(x2,y2);
 
-       HL_astar_init(p);
+       HL_astar_clear(p);
 
        p->start = from;
        p->goal = to;
@@ -19,15 +19,25 @@ void pcheck(struct HL_astar *p, int x1, int y1, int x2, int y2, int expect) {
        ok(p->error == 0, "found path from (%02d, %02d) to (%02d, %02d) with no error",
                x1, y1, x2, y2);
        ok(dist == expect,
-                       "found path from (%02d, %02d) to (%02d, %02d) path length = %d (expect %d)\n",
+                       "found path from (%02d, %02d) to (%02d, %02d) path length = %d (expect %d)",
                x1, y1, x2, y2, dist, expect);
 }
 
+/* make hex 55 missing */
+int neighbor55(int hex, int dir) {
+       int neighbor;
+
+       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(15);
+       plan_tests(16);
 
        p = HL_astar_init(0);
        ok(p != NULL, "allocated astar struct");
@@ -35,18 +45,16 @@ 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);
        pcheck(p, 1,1, 3,1, 2);
        pcheck(p, 1,1, 4,7, 8);
 
+       HL_astar_clear(p);
+       p->neighbor = neighbor55;
+       pcheck(p,5,4,5,6,3);
+
        HL_astar_free(p);
 
        return exit_status();