X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=t%2Fastar.c;h=5a447da42155a252c2cb8f61584571860f3766a5;hb=06868ef42497f1cbc480831029f5f69b395dfdd2;hp=af88268d4212af1c23484843108e5aeeb4144d81;hpb=5c48a06bc8649958e69013c53e925b83398ebc74;p=hexagon

diff --git a/t/astar.c b/t/astar.c
index af88268..5a447da 100644
--- a/t/astar.c
+++ b/t/astar.c
@@ -1,16 +1,17 @@
 #include <stdio.h>
 
-#include "hexmap.h"
+#include "hexagon.h"
 
-#include "tap.h"
+#include "ctap.h"
 
 void pcheck(struct HL_astar *p, int x1, int y1, int x2, int y2, int expect) {
-	int from, to, dist;
+	struct HL_hex from, to;
+	int dist;
 
-	from = HL_cantor_xy(x1,y1);
-	to = HL_cantor_xy(x2,y2);
+	from = HL_hex_xy(x1,y1);
+	to = HL_hex_xy(x2,y2);
 
-	HL_astar_clear(p);
+//	HL_astar_clear(p);
 
 	p->start = from;
 	p->goal = to;
@@ -24,22 +25,27 @@ void pcheck(struct HL_astar *p, int x1, int y1, int x2, int y2, int expect) {
 }
 
 /* make hex 55 missing */
-int neighbor55(int hex, int dir) {
-	int neighbor;
+int neighbor55(struct HL_hex hex, int dir, struct HL_hex *n) {
+	int valid;
+	struct HL_hex nh;
 
-	neighbor = HL_adjacent_hex(hex, dir);
-	if (neighbor == HL_cantor_xy(5,5)) {
-		return -1;
+	valid = HL_adjhexp(hex, dir, &nh);
+	if (valid && nh.x == 5 && nh.y == 5) {
+		valid = 0;
 	}
+       	if (valid && n) {
+		*n = nh;
+	}
+	
+	return valid;
 
-	return neighbor;
+	return 1;
 }
 
 int main(void) {
 	struct HL_astar *p;
-	int length;
 
-	plan_tests(17);
+	plan(16);
 
 	p = HL_astar_init(0);
 	ok(p != NULL, "allocated astar struct");
@@ -47,23 +53,22 @@ 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);
+	HL_astar_init(p);
 	pcheck(p, 1,1, 2,1, 1);
+	HL_astar_init(p);
 	pcheck(p, 1,1, 2,2, 2);
+	HL_astar_init(p);
 	pcheck(p, 1,1, 3,1, 2);
+	HL_astar_init(p);
 	pcheck(p, 1,1, 4,7, 8);
 
-	HL_astar_clear(p);
+	//HL_astar_clear(p);
+	HL_astar_init(p);
 	p->neighbor = neighbor55;
 	pcheck(p,5,4,5,6,3);
 
 	HL_astar_free(p);
 
-	return exit_status();
+	return 0;
 }