[dbs-leipzig#1200] unified graph head handling

galpha · Apr 12, 2019 · 6ae9503 · 6ae9503
1 parent 06d2709
commit 6ae9503
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/...flink/src/main/java/org/gradoop/flink/model/impl/operators/sampling/PageRankSampling.java b/...flink/src/main/java/org/gradoop/flink/model/impl/operators/sampling/PageRankSampling.java
@@ -142,8 +142,7 @@ public LogicalGraph sample(LogicalGraph graph) {
       .where(new TargetId<>()).equalTo(new Id<>())
       .with(new LeftSide<>());
 
-    graph = graph.getConfig().getLogicalGraphFactory().fromDataSets(
-      graph.getGraphHead(), scaledVertices, newEdges);
+    graph = graph.getConfig().getLogicalGraphFactory().fromDataSets(scaledVertices, newEdges);
 
     return graph;
   }

diff --git a/...ink/src/main/java/org/gradoop/flink/model/impl/operators/sampling/RandomEdgeSampling.java b/...ink/src/main/java/org/gradoop/flink/model/impl/operators/sampling/RandomEdgeSampling.java
@@ -79,6 +79,7 @@ public LogicalGraph sample(LogicalGraph graph) {
       .distinct(new Id<>());
 
     DataSet<Vertex> newVertices = newSourceVertices.union(newTargetVertices).distinct(new Id<>());
-    return graph.getConfig().getLogicalGraphFactory().fromDataSets(newVertices, newEdges);
+
+    return graph.getFactory().fromDataSets(newVertices, newEdges);
   }
 }
diff --git a/...va/org/gradoop/flink/model/impl/operators/sampling/RandomLimitedDegreeVertexSampling.java b/...va/org/gradoop/flink/model/impl/operators/sampling/RandomLimitedDegreeVertexSampling.java
@@ -136,8 +136,7 @@ public LogicalGraph sample(LogicalGraph graph) {
       .where(new TargetId<>()).equalTo(new Id<>())
       .with(new LeftSide<>());
 
-    return graph.getConfig().getLogicalGraphFactory()
-      .fromDataSets(graph.getGraphHead(), newVertices, newEdges);
+    return graph.getFactory().fromDataSets(newVertices, newEdges);
   }
 
 }
diff --git a/.../java/org/gradoop/flink/model/impl/operators/sampling/RandomNonUniformVertexSampling.java b/.../java/org/gradoop/flink/model/impl/operators/sampling/RandomNonUniformVertexSampling.java
@@ -107,7 +107,6 @@ public LogicalGraph sample(LogicalGraph graph) {
       .where(new TargetId<>()).equalTo(new Id<>())
       .with(new LeftSide<>());
 
-    return graph.getConfig().getLogicalGraphFactory()
-      .fromDataSets(graph.getGraphHead(), newVertices, newEdges);
+    return graph.getFactory().fromDataSets(newVertices, newEdges);
   }
 }
diff --git a/...k/src/main/java/org/gradoop/flink/model/impl/operators/sampling/RandomVertexSampling.java b/...k/src/main/java/org/gradoop/flink/model/impl/operators/sampling/RandomVertexSampling.java
@@ -76,6 +76,6 @@ public LogicalGraph sample(LogicalGraph graph) {
       .where(new TargetId<>()).equalTo(new Id<>())
       .with(new LeftSide<>());
 
-    return graph.getConfig().getLogicalGraphFactory().fromDataSets(newVertices, newEdges);
+    return graph.getFactory().fromDataSets(newVertices, newEdges);
   }
 }