X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fagar%2Fagar.h;h=f65b4e371f456d7b6bca8208dd5e7f53260874c2;hb=9d2d2c49f053018724bcc6e37029da10b7c3d60d;hp=495ef7c3bdf548b354234e365c9d7b50bd0b5ead;hpb=c2966d1879c825cfaf0e7d6848a5da052ee4a038;p=ccan

diff --git a/ccan/agar/agar.h b/ccan/agar/agar.h
index 495ef7c3..f65b4e37 100644
--- a/ccan/agar/agar.h
+++ b/ccan/agar/agar.h
@@ -9,6 +9,7 @@
 
 struct agar_edge_info {
 	const void *to;
+	aga_icost_t icost; /* integer edge cost */
 };
 
 struct agar_graph;
@@ -30,6 +31,9 @@ struct agar_graph {
 	agar_next_edge_fn next_edge;
 };
 
+#define AGAR_INIT_GRAPH(fe, ne, ei) \
+	{ (ei), (fe), (ne), }
+
 void agar_init_graph(struct agar_graph *gr,
 		     agar_first_edge_fn first_edge,
 		     agar_next_edge_fn next_edge,
@@ -70,4 +74,28 @@ bool agar_bfs_explore(struct agar_state *sr, const void *nr,
 #define agar_bfs(_nr, _sr, _startr)					\
 	for ((_nr) = (_startr); agar_bfs_explore((_sr), (_nr), &(_nr)); )
 
+/*
+ * Dijkstra's algorithm
+ */
+
+struct agar_state *agar_dijkstra_new(void *ctx, struct agar_graph *gr,
+				     const void *nr);
+bool agar_dijkstra_step(struct agar_state *sr, const void **nextr);
+bool agar_dijkstra_path(struct agar_state *sr, const void *destr,
+			aga_icost_t *total_cost,
+			const void **prevr, const void **prevedge);
+void agar_dijkstra_complete(struct agar_state *sr);
+
+/*
+ * Bellman-Ford algorithm
+ */
+
+struct agar_state *agar_bellman_ford_new(void *ctx, struct agar_graph *gr,
+					 const void *nr);
+
+bool agar_bellman_ford_path(struct agar_state *sr, const void *destr,
+			    aga_icost_t *total_cost,
+			    const void **prevr, const void **prevedge);
+void agar_bellman_ford_complete(struct agar_state *sr);
+
 #endif /* CCAN_AGAR_H */