#include "hexagon.h"
-#include "tap.h"
+#include "ctap.h"
void dcheck(int x1, int y1, int x2, int y2, int expect) {
- int from, to, dist;
- from = HL_cantor_xy(x1,y1);
- to = HL_cantor_xy(x2,y2);
+ int dist;
+ struct HL_hex from, to;
+
+ from.x = x1;
+ from.y = y1;
+ to.x = x2;
+ to.y = y2;
+
dist = HL_distance(from,to);
- ok(dist == expect,
- "distance from (%02d, %02d) to (%02d, %02d) = %d (expect %d)",
- x1, y1, x2, y2, dist, expect);
+ is_int(expect, dist,
+ "distance from (%02d, %02d) to (%02d, %02d)",
+ x1, y1, x2, y2);
}
int main(void) {
- plan_tests(8);
+ plan(8);
dcheck(1,1,2,1,1);
dcheck(1,1,2,2,2);
dcheck(-1,-1,1,2,4);
dcheck(-1,-1,-1,-2,1);
- return exit_status();
+ return 0;
}