ONOS-745 Refactoring topology to compute only broadcast tree and not pre-compute paths.
ONOS-744 Refactoring graph search to allow requesting max number of paths.
Change-Id: I28467246b92df32ebb3155c45774ecc051fdd3dd
diff --git a/utils/misc/src/main/java/org/onlab/graph/DepthFirstSearch.java b/utils/misc/src/main/java/org/onlab/graph/DepthFirstSearch.java
index e61a9c1..f839fff 100644
--- a/utils/misc/src/main/java/org/onlab/graph/DepthFirstSearch.java
+++ b/utils/misc/src/main/java/org/onlab/graph/DepthFirstSearch.java
@@ -36,11 +36,11 @@
@Override
public SpanningTreeResult search(Graph<V, E> graph, V src, V dst,
- EdgeWeight<V, E> weight) {
+ EdgeWeight<V, E> weight, int maxPaths) {
checkArguments(graph, src, dst);
// Prepare the search result.
- SpanningTreeResult result = new SpanningTreeResult(src, dst);
+ SpanningTreeResult result = new SpanningTreeResult(src, dst, maxPaths);
// The source vertex has cost 0, of course.
result.updateVertex(src, null, 0.0, true);
@@ -141,11 +141,12 @@
/**
* Creates a new spanning tree result.
*
- * @param src search source
- * @param dst optional search destination
+ * @param src search source
+ * @param dst optional search destination
+ * @param maxPaths limit on the number of paths
*/
- public SpanningTreeResult(V src, V dst) {
- super(src, dst);
+ public SpanningTreeResult(V src, V dst, int maxPaths) {
+ super(src, dst, maxPaths);
}
/**