From 912f8d90efef2912bd9aac7c0b44d05fd90d6803 Mon Sep 17 00:00:00 2001 From: vasia Date: Tue, 19 May 2015 22:06:11 +0200 Subject: [PATCH] [gelly] renamed IncrementalSSSPExample -> IncrementalSSSP to match the new examples naming scheme --- ...rementalSSSPExample.java => IncrementalSSSP.java} | 4 ++-- .../graph/test/example/IncrementalSSSPITCase.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) rename flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/example/{IncrementalSSSPExample.java => IncrementalSSSP.java} (98%) diff --git a/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/example/IncrementalSSSPExample.java b/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/example/IncrementalSSSP.java similarity index 98% rename from flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/example/IncrementalSSSPExample.java rename to flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/example/IncrementalSSSP.java index 365518c1c68..2bbc64b11eb 100644 --- a/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/example/IncrementalSSSPExample.java +++ b/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/example/IncrementalSSSP.java @@ -60,14 +60,14 @@ import org.apache.flink.graph.utils.Tuple3ToEdgeMap; * The propagation stops when a vertex with an alternative shortest path is reached * or when we reach a vertex with no SP-in-neighbors. * - * Usage IncrementalSSSPExample <vertex path> <edge path> <edges in SSSP> + * Usage IncrementalSSSP <vertex path> <edge path> <edges in SSSP> * <src id edge to be removed> <trg id edge to be removed> <val edge to be removed> * <result path> <number of iterations>
* If no parameters are provided, the program is run with default data from * {@link org.apache.flink.graph.example.utils.IncrementalSSSPData} */ @SuppressWarnings("serial") -public class IncrementalSSSPExample implements ProgramDescription { +public class IncrementalSSSP implements ProgramDescription { public static void main(String [] args) throws Exception { diff --git a/flink-staging/flink-gelly/src/test/java/org/apache/flink/graph/test/example/IncrementalSSSPITCase.java b/flink-staging/flink-gelly/src/test/java/org/apache/flink/graph/test/example/IncrementalSSSPITCase.java index a0042a8ba13..c19411b9980 100644 --- a/flink-staging/flink-gelly/src/test/java/org/apache/flink/graph/test/example/IncrementalSSSPITCase.java +++ b/flink-staging/flink-gelly/src/test/java/org/apache/flink/graph/test/example/IncrementalSSSPITCase.java @@ -26,7 +26,7 @@ import org.apache.flink.graph.Edge; import org.apache.flink.graph.EdgeDirection; import org.apache.flink.graph.Graph; import org.apache.flink.graph.Vertex; -import org.apache.flink.graph.example.IncrementalSSSPExample; +import org.apache.flink.graph.example.IncrementalSSSP; import org.apache.flink.graph.example.utils.IncrementalSSSPData; import org.apache.flink.graph.spargel.VertexCentricConfiguration; import org.apache.flink.test.util.MultipleProgramsTestBase; @@ -78,8 +78,8 @@ public class IncrementalSSSPITCase extends MultipleProgramsTestBase { } @Test - public void testIncrementalSSSPExample() throws Exception { - IncrementalSSSPExample.main(new String[]{verticesPath, edgesPath, edgesInSSSPPath, + public void testIncrementalSSSP() throws Exception { + IncrementalSSSP.main(new String[]{verticesPath, edgesPath, edgesInSSSPPath, IncrementalSSSPData.SRC_EDGE_TO_BE_REMOVED, IncrementalSSSPData.TRG_EDGE_TO_BE_REMOVED, IncrementalSSSPData.VAL_EDGE_TO_BE_REMOVED,resultPath, IncrementalSSSPData.NUM_VERTICES + ""}); expected = IncrementalSSSPData.RESULTED_VERTICES; @@ -103,15 +103,15 @@ public class IncrementalSSSPITCase extends MultipleProgramsTestBase { // configure the iteration VertexCentricConfiguration parameters = new VertexCentricConfiguration(); - if(IncrementalSSSPExample.isInSSSP(edgeToBeRemoved, edgesInSSSP)) { + if(IncrementalSSSP.isInSSSP(edgeToBeRemoved, edgesInSSSP)) { parameters.setDirection(EdgeDirection.IN); parameters.setOptDegrees(true); // run the vertex centric iteration to propagate info Graph result = ssspGraph.runVertexCentricIteration( - new IncrementalSSSPExample.VertexDistanceUpdater(), - new IncrementalSSSPExample.InvalidateMessenger(edgeToBeRemoved), + new IncrementalSSSP.VertexDistanceUpdater(), + new IncrementalSSSP.InvalidateMessenger(edgeToBeRemoved), IncrementalSSSPData.NUM_VERTICES, parameters); DataSet> resultedVertices = result.getVertices(); -- GitLab