[FLINK-1201] [gelly] filterOnVertices and filterOnEdges implemented a…

…nd tested
apache · Feb 11, 2015 · f4d2dda · f4d2dda
1 parent ecb425d
commit f4d2dda
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/Graph.java b/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/Graph.java
@@ -155,7 +155,7 @@ public Graph<K, VV, EV> subgraph(FilterFunction<VV> vertexFilter, FilterFunction
 	 * @param vertexFilter
 	 * @return
 	 */
-	public Graph<K, VV, EV> subgraphVertexPredicate(FilterFunction<VV> vertexFilter) {
+	public Graph<K, VV, EV> filterOnVertices(FilterFunction<VV> vertexFilter) {
 
 		DataSet<Tuple2<K, VV>> filteredVertices = this.vertices.filter(
 				new ApplyVertexFilter<K, VV>(vertexFilter));
@@ -176,7 +176,7 @@ public Graph<K, VV, EV> subgraphVertexPredicate(FilterFunction<VV> vertexFilter)
 	 * @param edgeFilter
 	 * @return
 	 */
-	public Graph<K, VV, EV> subgraphEdgePredicate(FilterFunction<EV> edgeFilter) {
+	public Graph<K, VV, EV> filterOnEdges(FilterFunction<EV> edgeFilter) {
 		DataSet<Tuple3<K, K, EV>> filteredEdges = this.edges.filter(
 				new ApplyEdgeFilter<K, EV>(edgeFilter));
 

diff --git a/flink-staging/flink-gelly/src/test/java/org/apache/flink/graph/test/TestGraphOperations.java b/flink-staging/flink-gelly/src/test/java/org/apache/flink/graph/test/TestGraphOperations.java
@@ -123,7 +123,7 @@ public static String runProgram(int progId, String resultPath) throws Exception
 				}
 				case 4: {
 				/*
-				 * Test subgraph(vertexFilter, edgeFilter):
+				 * Test subgraph:
 				 */
 					final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
@@ -146,13 +146,13 @@ public boolean filter(Long value) throws Exception {
 				}
 				case 5: {
 				/*
-				 * Test subgraph(vertexFilter):
+				 * Test filterOnVertices:
 				 */
 					final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 					Graph<Long, Long, Long> graph = Graph.create(TestGraphUtils.getLongLongVertexData(env),
 							TestGraphUtils.getLongLongEdgeData(env), env);
-					graph.subgraphVertexPredicate(new FilterFunction<Long>() {
+					graph.filterOnVertices(new FilterFunction<Long>() {
 						public boolean filter(Long value) throws Exception {
 							return (value > 2);
 						}
@@ -165,13 +165,13 @@ public boolean filter(Long value) throws Exception {
 				}
 				case 6: {
 				/*
-				 * Test subgraph(edgeFilter):
+				 * Test filterOnEdges:
 				 */
 					final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
 					Graph<Long, Long, Long> graph = Graph.create(TestGraphUtils.getLongLongVertexData(env),
 							TestGraphUtils.getLongLongEdgeData(env), env);
-					graph.subgraphEdgePredicate(new FilterFunction<Long>() {
+					graph.filterOnEdges(new FilterFunction<Long>() {
 						public boolean filter(Long value) throws Exception {
 							return (value > 34);
 						}