X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fagar%2Ftest%2Fapi-dijkstra.c;h=a5de2ea6b31b9e4074d871749293be4405151408;hb=fd96a212810bff1574b047c9079e3e050feb8a28;hp=5edccd7032bbcfd23ae3ca5da4d34c5f597b4356;hpb=a2eaae42b58a44d6f88f5e20e4a7d7cdbde9edae;p=ccan

diff --git a/ccan/agar/test/api-dijkstra.c b/ccan/agar/test/api-dijkstra.c
index 5edccd70..a5de2ea6 100644
--- a/ccan/agar/test/api-dijkstra.c
+++ b/ccan/agar/test/api-dijkstra.c
@@ -14,14 +14,11 @@
 
 static void test_trivial(void)
 {
-	struct trivial_graphr tgr;
 	struct agar_state *sr;
 	aga_icost_t cost;
 	const void *node;
 
-	trivial_graphr_init(&tgr);
-
-	ok1(sr = agar_dijkstra_new(NULL, &tgr.gr, int2ptr(1)));
+	ok1(sr = agar_dijkstra_new(NULL, &trivial_graphr.gr, int2ptr(1)));
 	ok1(agar_dijkstra_step(sr, &node));
 	ok1(ptr2int(node) == 1);
 	ok1(!agar_dijkstra_step(sr, &node));
@@ -131,13 +128,10 @@ static void test_chain(void)
 
 static void test_error(void)
 {
-	struct error_graphr egr;
 	struct agar_state *sr;
 	aga_icost_t cost;
 
-	error_graphr_init(&egr);
-
-	ok1(sr = agar_dijkstra_new(NULL, &egr.gr, int2ptr(1)));
+	ok1(sr = agar_dijkstra_new(NULL, &error_graphr.gr, int2ptr(1)));
 	ok1(agar_dijkstra_path(sr, int2ptr(1), &cost, NULL, NULL));
 	ok1(cost == 0);
 	ok1(agar_dijkstra_path(sr, int2ptr(2), &cost, NULL, NULL));
@@ -146,7 +140,7 @@ static void test_error(void)
 	ok1(!agar_dijkstra_path(sr, int2ptr(4), &cost, NULL, NULL));
 	tal_free(sr);
 
-	ok1(sr = agar_dijkstra_new(NULL, &egr.gr, int2ptr(3)));
+	ok1(sr = agar_dijkstra_new(NULL, &error_graphr.gr, int2ptr(3)));
 	ok1(agar_dijkstra_path(sr, int2ptr(3), &cost, NULL, NULL));
 	ok1(cost == 0);
 	ok1(!agar_dijkstra_path(sr, int2ptr(4), &cost, NULL, NULL));
@@ -156,15 +150,12 @@ static void test_error(void)
 
 static void test_traversal1(void)
 {
-	struct traversal1_graphr t1gr;
 	struct agar_state *sr;
 	aga_icost_t cost;
 
 	/* This is mostly about testing we correctly handle
 	 * non-reachable nodes */
-	traversal1_graphr_init(&t1gr);
-
-	ok1(sr = agar_dijkstra_new(NULL, &t1gr.gr, int2ptr(1)));
+	ok1(sr = agar_dijkstra_new(NULL, &traversal1_graphr.gr, int2ptr(1)));
 	ok1(agar_dijkstra_path(sr, int2ptr(1),
 			      &cost, NULL, NULL));
 	ok1(cost == 0);
@@ -191,7 +182,7 @@ static void test_traversal1(void)
 			       NULL, NULL, NULL));
 	tal_free(sr);
 
-	ok1(sr = agar_dijkstra_new(NULL, &t1gr.gr, int2ptr(9)));
+	ok1(sr = agar_dijkstra_new(NULL, &traversal1_graphr.gr, int2ptr(9)));
 	ok1(agar_dijkstra_path(sr, int2ptr(9),
 			      &cost, NULL, NULL));
 	ok1(cost == 0);
@@ -219,12 +210,38 @@ static void test_traversal1(void)
 	tal_free(sr);
 }
 
+static void test_shortcut1(void)
+{
+	struct agar_state *sr;
+	aga_icost_t cost;
+	const void *node;
+
+	ok1(sr = agar_dijkstra_new(NULL, &shortcut1_graphr.gr, int2ptr(1)));
+	ok1(agar_dijkstra_path(sr, int2ptr(3), &cost, &node, NULL));
+	ok1(cost == 2);
+	ok1(node == int2ptr(2));
+	ok1(agar_dijkstra_path(sr, int2ptr(2), &cost, &node, NULL));
+	ok1(cost == 1);
+	ok1(node == int2ptr(1));
+	tal_free(sr);
+}
+
+static void test_shortcut2(void)
+{
+	struct agar_state *sr;
+
+	ok1(sr = agar_dijkstra_new(NULL, &shortcut2_graphr.gr, int2ptr(1)));
+	agar_dijkstra_complete(sr);
+	ok1(agar_error(sr) == AGA_ERR_NEGATIVE_COST);
+	tal_free(sr);
+}
+
 int main(void)
 {
 	plan_tests(6 + 23
 		   + FULL_LEN * (FULL_LEN*4 - 1)
 		   + CHAIN_LEN * (1 + CHAIN_LEN*2)
-		   + 12 + 32);
+		   + 12 + 32 + 7 + 2);
 
 	test_trivial();
 	test_parallel();
@@ -232,6 +249,8 @@ int main(void)
 	test_chain();
 	test_error();
 	test_traversal1();
+	test_shortcut1();
+	test_shortcut2();
 	
 	return exit_status();
 }