Commit 1240daac authored by gsavin's avatar gsavin

Change edge-vertex-connectivity computation to use EdmondsKarp algorithm.

parent a9eddb21
...@@ -38,7 +38,7 @@ import java.util.LinkedList; ...@@ -38,7 +38,7 @@ import java.util.LinkedList;
import org.graphstream.algorithm.Algorithm; import org.graphstream.algorithm.Algorithm;
import org.graphstream.algorithm.DynamicAlgorithm; import org.graphstream.algorithm.DynamicAlgorithm;
import org.graphstream.algorithm.flow.FordFulkersonAlgorithm; import org.graphstream.algorithm.flow.EdmondsKarpAlgorithm;
import org.graphstream.graph.Edge; import org.graphstream.graph.Edge;
import org.graphstream.graph.Graph; import org.graphstream.graph.Graph;
import org.graphstream.graph.Node; import org.graphstream.graph.Node;
...@@ -115,7 +115,7 @@ public class ConnectivityMeasure { ...@@ -115,7 +115,7 @@ public class ConnectivityMeasure {
*/ */
public static int getEdgeConnectivity(Graph g) { public static int getEdgeConnectivity(Graph g) {
int k = Integer.MAX_VALUE; int k = Integer.MAX_VALUE;
FordFulkersonAlgorithm flow = new FordFulkersonAlgorithm(); EdmondsKarpAlgorithm flow = new EdmondsKarpAlgorithm();
for (int u = 0; u < g.getNodeCount() - 1; u++) { for (int u = 0; u < g.getNodeCount() - 1; u++) {
for (int v = u + 1; v < g.getNodeCount(); v++) { for (int v = u + 1; v < g.getNodeCount(); v++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment