[dbs-leipzig#1310]

* addressed pr comments

gradoop-common/src/main/java/org/gradoop/common/model/api/entities/GraphHeadFactory.java

@@ -21,7 +21,7 @@
 /**
  * Initializes {@link GraphHead} objects of a given type.
  *
- * @param <G> EPGM graph head type
+ * @param <G> graph head type
  */
 public interface GraphHeadFactory<G extends GraphHead> extends ElementFactory<G> {
 

gradoop-common/src/main/java/org/gradoop/common/model/api/entities/VertexFactory.java

@@ -22,7 +22,7 @@
 /**
  * Initializes {@link Vertex} objects of a given type.
  *
- * @param <V> EPGM vertex type
+ * @param <V> vertex type
  */
 public interface VertexFactory<V extends Vertex> extends ElementFactory<V> {
 

gradoop-common/src/main/java/org/gradoop/common/model/impl/comparators/EPGMIdentifiableComparator.java → gradoop-common/src/main/java/org/gradoop/common/model/impl/comparators/IdentifiableComparator.java

@@ -23,7 +23,7 @@
 /**
  * Id based EPGM element comparator.
  */
-public class EPGMIdentifiableComparator implements Comparator<Identifiable>, Serializable {
+public class IdentifiableComparator implements Comparator<Identifiable>, Serializable {
 
   @Override
   public int compare(Identifiable a, Identifiable b) {

gradoop-common/src/test/java/org/gradoop/common/GradoopTestUtils.java

@@ -27,7 +27,7 @@
 import org.gradoop.common.model.api.entities.Element;
 import org.gradoop.common.model.api.entities.GraphElement;
 import org.gradoop.common.model.api.entities.Identifiable;
-import org.gradoop.common.model.impl.comparators.EPGMIdentifiableComparator;
+import org.gradoop.common.model.impl.comparators.IdentifiableComparator;
 import org.gradoop.common.model.impl.id.GradoopId;
 import org.gradoop.common.model.impl.pojo.EPGMEdge;
 import org.gradoop.common.model.impl.pojo.EPGMGraphHead;
@@ -101,7 +101,7 @@ public class GradoopTestUtils {
   public static final short               SHORT_VAL_e               = (short) 23;
   public static final Set<PropertyValue>  SET_VAL_f                 = new HashSet<>();
 
-  private static Comparator<Identifiable> ID_COMPARATOR = new EPGMIdentifiableComparator();
+  private static Comparator<Identifiable> ID_COMPARATOR = new IdentifiableComparator();
 
   static {
     MAP_VAL_9.put(PropertyValue.create(KEY_0), PropertyValue.create(NULL_VAL_0));
@@ -232,7 +232,7 @@ public static void validateIdInequality(
    * @param collection1 first collection
    * @param collection2 second collection
    */
-  public static void validateEPGMElementCollections(
+  public static void validateElementCollections(
     Collection<? extends Element> collection1,
     Collection<? extends Element> collection2) {
     assertNotNull("first collection was null", collection1);
@@ -251,7 +251,7 @@ public static void validateEPGMElementCollections(
     Iterator<? extends Element> it2 = list2.iterator();
 
     while (it1.hasNext()) {
-      validateEPGMElements(
+      validateElements(
         it1.next(),
         it2.next());
     }
@@ -266,7 +266,7 @@ public static void validateEPGMElementCollections(
    * @param collection1 first collection
    * @param collection2 second collection
    */
-  public static void validateEPGMGraphElementCollections(
+  public static void validateGraphElementCollections(
     Collection<? extends GraphElement> collection1,
     Collection<? extends GraphElement> collection2) {
     assertNotNull("first collection was null", collection1);
@@ -282,7 +282,7 @@ public static void validateEPGMGraphElementCollections(
     Iterator<? extends GraphElement> it2 = list2.iterator();
 
     while (it1.hasNext()) {
-      validateEPGMGraphElements(it1.next(), it2.next());
+      validateGraphElements(it1.next(), it2.next());
     }
     assertFalse("too many elements in first collection", it1.hasNext());
     assertFalse("too many elements in second collection", it2.hasNext());
@@ -295,7 +295,7 @@ public static void validateEPGMGraphElementCollections(
    * @param element1 first element
    * @param element2 second element
    */
-  public static void validateEPGMElements(
+  public static void validateElements(
     Element element1, Element element2) {
     assertNotNull("first element was null", element1);
     assertNotNull("second element was null", element2);
@@ -336,7 +336,7 @@ public static void validateEPGMElements(
    * @param element1 first element
    * @param element2 second element
    */
-  public static void validateEPGMGraphElements(
+  public static void validateGraphElements(
     GraphElement element1, GraphElement element2) {
 
     assertNotNull("first element was null", element1);

gradoop-data-integration/src/test/java/org/gradoop/dataintegration/transformation/PropagatePropertyToNeighborTest.java

@@ -53,7 +53,7 @@ public class PropagatePropertyToNeighborTest extends GradoopFlinkTestBase {
       "(s2)-[e22:edge2]->(t2)" +
       "]" +
       "input2:test [" +
-      "(v:EPGMVertex {t: 1})-->(v)" +
+      "(v:Vertex {t: 1})-->(v)" +
       "]");
 
   /**
@@ -156,7 +156,7 @@ public void testPropagateToCertainVerticesAlongCertainEdges() throws Exception {
   @Test
   public void testPropagateInLoops() throws Exception {
     LogicalGraph input = loader.getLogicalGraphByVariable("input2");
-    UnaryGraphToGraphOperator operator = new PropagatePropertyToNeighbor("EPGMVertex", "t", "t");
+    UnaryGraphToGraphOperator operator = new PropagatePropertyToNeighbor("Vertex", "t", "t");
     LogicalGraph expected = input.transformVertices((v, c) -> {
       v.setProperty("t", Collections.singletonList(PropertyValue.create(1L)));
       return v;

gradoop-flink/src/main/java/org/gradoop/flink/algorithms/btgs/functions/NewBtgGraphHead.java

@@ -25,7 +25,7 @@
 import org.gradoop.common.model.impl.id.GradoopId;
 
 /**
- * Creates an EPGM graph head representing a business transaction graphs.
+ * Creates an graph head representing a business transaction graphs.
  * @param <G> graph head type
  */
 public class NewBtgGraphHead<G extends GraphHead>

gradoop-flink/src/main/java/org/gradoop/flink/algorithms/fsm/dimspan/DIMSpan.java

@@ -58,7 +58,7 @@
 import org.gradoop.flink.model.impl.tuples.WithCount;
 
 /**
- * abstract superclass of different implementations of the gSpan frequent
+ * Abstract superclass of different implementations of the gSpan frequent
  * subgraph mining algorithm as Gradoop operator
  */
 public class DIMSpan {
@@ -90,12 +90,12 @@ public class DIMSpan {
   protected final GSpanLogic gSpan;
 
   /**
-   * EPGMVertex label dictionary for dictionary coding.
+   * Vertex label dictionary for dictionary coding.
    */
   private DataSet<String[]> vertexDictionary;
 
   /**
-   * EPGMEdge label dictionary for dictionary coding.
+   * Edge label dictionary for dictionary coding.
    */
   private DataSet<String[]> edgeDictionary;
 

gradoop-flink/src/main/java/org/gradoop/flink/algorithms/fsm/dimspan/config/DIMSpanConstants.java

@@ -31,12 +31,12 @@ public class DIMSpanConstants {
   public static final String MIN_FREQUENCY = "fmin";
 
   /**
-   * EPGMVertex label dictionary.
+   * Vertex label dictionary.
    */
   public static final String VERTEX_DICTIONARY = "vld";
 
   /**
-   * EPGMEdge label Dictionary
+   * Edge label Dictionary
    */
   public static final String EDGE_DICTIONARY = "eld";
 

gradoop-flink/src/main/java/org/gradoop/flink/algorithms/gelly/randomjump/functions/VCIComputeFunction.java

@@ -31,7 +31,7 @@
 import java.util.concurrent.ThreadLocalRandom;
 
 /**
- * Compute function for {@link KRandomJumpGellyVCI}. EPGMVertex values are of type
+ * Compute function for {@link KRandomJumpGellyVCI}. Vertex values are of type
  * {@link VCIVertexValue}, with fields:
  * <p><ul>
  * <li>f0: {@code Boolean} set to {@code true} if the vertex was visited, to {@code false}

gradoop-flink/src/main/java/org/gradoop/flink/algorithms/gelly/vertexdegrees/DistinctVertexDegrees.java

@@ -55,7 +55,7 @@ public class DistinctVertexDegrees extends GradoopGellyAlgorithm<NullValue, Null
   private final boolean includeZeroDegreeVertices;
 
   /**
-   * Constructor for EPGMVertex Degree with in- and out-degree and total of degrees of a graph.
+   * Constructor for vertex degree with in- and out-degree and total of degrees of a graph.
    *
    * @param propertyKey Property key to store the sum of in- and out-degrees in.
    * @param propertyKeyIn Property key to store the in-degree in.
@@ -66,7 +66,7 @@ public DistinctVertexDegrees(String propertyKey, String propertyKeyIn, String pr
   }
 
   /**
-   * Constructor for EPGMVertex Degree with fixed set of whether to output
+   * Constructor for vertex degree with fixed set of whether to output
    * vertices with an in-degree of zero.
    *
    * @param propertyKey Property key to store the sum of in- and out-degrees in.

gradoop-flink/src/main/java/org/gradoop/flink/algorithms/gelly/vertexdegrees/package-info.java

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 /**
- * Contains functions related to the Distinct EPGMVertex Degrees algorithm.
+ * Contains functions related to the distinct vertex degrees algorithm.
  */
 package org.gradoop.flink.algorithms.gelly.vertexdegrees;

gradoop-flink/src/main/java/org/gradoop/flink/model/api/epgm/BaseGraphCollectionFactory.java

@@ -56,18 +56,18 @@ public interface BaseGraphCollectionFactory<
   /**
    * Creates a collection from the given datasets.
    *
-   * @param graphHeads  EPGMGraphHead DataSet
-   * @param vertices    EPGMVertex DataSet
+   * @param graphHeads  GraphHead DataSet
+   * @param vertices    Vertex DataSet
    * @return Graph collection
    */
   GC fromDataSets(DataSet<G> graphHeads, DataSet<V> vertices);
 
   /**
    * Creates a collection layout from the given datasets.
    *
-   * @param graphHeads  EPGMGraphHead DataSet
-   * @param vertices    EPGMVertex DataSet
-   * @param edges       EPGMEdge DataSet
+   * @param graphHeads  GraphHead DataSet
+   * @param vertices    Vertex DataSet
+   * @param edges       Edge DataSet
    * @return Graph collection
    */
   GC fromDataSets(DataSet<G> graphHeads, DataSet<V> vertices, DataSet<E> edges);
@@ -88,8 +88,8 @@ GC fromIndexedDataSets(Map<String, DataSet<G>> graphHeads, Map<String, DataSet<V
    * Creates a collection layout from the given collections.
    *
    * @param graphHeads  Graph Head collection
-   * @param vertices    EPGMVertex collection
-   * @param edges       EPGMEdge collection
+   * @param vertices    Vertex collection
+   * @param edges       Edge collection
    * @return Graph collection
    */
   GC fromCollections(Collection<G> graphHeads, Collection<V> vertices, Collection<E> edges);

gradoop-flink/src/main/java/org/gradoop/flink/model/api/epgm/BaseGraphFactory.java

@@ -63,8 +63,8 @@ public interface BaseGraphFactory<
    * The method creates a new graph head element and assigns the vertices and
    * edges to that graph.
    *
-   * @param vertices EPGMVertex DataSet
-   * @param edges    EPGMEdge DataSet
+   * @param vertices Vertex DataSet
+   * @param edges    Edge DataSet
    * @return Logical graph
    */
   LG fromDataSets(DataSet<V> vertices, DataSet<E> edges);
@@ -76,8 +76,8 @@ public interface BaseGraphFactory<
    * to the given graph head.
    *
    * @param graphHead   1-element EPGMGraphHead DataSet
-   * @param vertices    EPGMVertex DataSet
-   * @param edges       EPGMEdge DataSet
+   * @param vertices    Vertex DataSet
+   * @param edges       Edge DataSet
    * @return Logical graph
    */
   LG fromDataSets(DataSet<G> graphHead, DataSet<V> vertices, DataSet<E> edges);
@@ -109,8 +109,8 @@ LG fromIndexedDataSets(Map<String, DataSet<G>> graphHead,
    * Creates a logical graph from the given single graph head, vertex and edge collections.
    *
    * @param graphHead Graph head associated with the logical graph
-   * @param vertices  EPGMVertex collection
-   * @param edges     EPGMEdge collection
+   * @param vertices  Vertex collection
+   * @param edges     Edge collection
    * @return Logical graph
    */
   LG fromCollections(G graphHead, Collection<V> vertices, Collection<E> edges);
@@ -119,8 +119,8 @@ LG fromIndexedDataSets(Map<String, DataSet<G>> graphHead,
    * Creates a logical graph from the given vertex and edge collections. A new graph head is
    * created and all vertices and edges are assigned to that graph.
    *
-   * @param vertices    EPGMVertex collection
-   * @param edges       EPGMEdge collection
+   * @param vertices    Vertex collection
+   * @param edges       Edge collection
    * @return Logical graph
    */
   LG fromCollections(Collection<V> vertices, Collection<E> edges);

gradoop-flink/src/main/java/org/gradoop/flink/model/api/epgm/LogicalGraphOperators.java

@@ -485,7 +485,7 @@ GraphCollection groupEdgesByRollUp(
 
   /**
    * Creates a new logical graph by combining the vertex and edge sets of
-   * this graph and the given graph. EPGMVertex and edge equality is based on their
+   * this graph and the given graph. Vertex and edge equality is based on their
    * identifiers.
    *
    * @param otherGraph logical graph to combine this graph with
@@ -496,7 +496,7 @@ GraphCollection groupEdgesByRollUp(
 
   /**
    * Creates a new logical graph containing the overlapping vertex and edge
-   * sets of this graph and the given graph. EPGMVertex and edge equality is
+   * sets of this graph and the given graph. Vertex and edge equality is
    * based on their identifiers.
    *
    * @param otherGraph logical graph to compute overlap with
@@ -507,7 +507,7 @@ GraphCollection groupEdgesByRollUp(
 
   /**
    * Creates a new logical graph containing only vertices and edges that
-   * exist in that graph but not in the other graph. EPGMVertex and edge equality
+   * exist in that graph but not in the other graph. Vertex and edge equality
    * is based on their identifiers.
    *
    * @param otherGraph logical graph to exclude from that graph

gradoop-flink/src/main/java/org/gradoop/flink/model/api/functions/TransformationFunction.java

@@ -24,7 +24,7 @@
  * A serializable function that is applied on an EPGM element (i.e. graph head,
  * vertex and edge) to transform its data, but not its identity.
  *
- * @param <EL> EPGM attributed / labeled element
+ * @param <EL> attributed / labeled element
  */
 public interface TransformationFunction<EL extends Attributed & Labeled>
   extends Serializable {
@@ -46,7 +46,7 @@ public interface TransformationFunction<EL extends Attributed & Labeled>
   /**
    * Returns the unmodified element.
    *
-   * @param <EL> EPGM attributed / labeled element
+   * @param <EL> attributed / labeled element
    * @return a function that always returns the current element
    */
   static <EL extends Attributed & Labeled> TransformationFunction<EL>

gradoop-flink/src/main/java/org/gradoop/flink/model/api/layouts/GraphCollectionLayoutFactory.java

@@ -39,18 +39,18 @@ public interface GraphCollectionLayoutFactory<
   /**
    * Creates a collection layout from the given datasets.
    *
-   * @param graphHeads EPGMGraphHead DataSet
-   * @param vertices EPGMVertex DataSet
+   * @param graphHeads GraphHead DataSet
+   * @param vertices Vertex DataSet
    * @return Graph collection layout
    */
   GraphCollectionLayout<G, V, E> fromDataSets(DataSet<G> graphHeads, DataSet<V> vertices);
 
   /**
    * Creates a collection layout from the given datasets.
    *
-   * @param graphHeads EPGMGraphHead DataSet
-   * @param vertices EPGMVertex DataSet
-   * @param edges EPGMEdge DataSet
+   * @param graphHeads GraphHead DataSet
+   * @param vertices Vertex DataSet
+   * @param edges Edge DataSet
    * @return Graph collection layout
    */
   GraphCollectionLayout<G, V, E> fromDataSets(DataSet<G> graphHeads, DataSet<V> vertices,
@@ -71,8 +71,8 @@ GraphCollectionLayout<G, V, E> fromIndexedDataSets(Map<String, DataSet<G>> graph
    * Creates a collection layout from the given collections.
    *
    * @param graphHeads Graph Head collection
-   * @param vertices EPGMVertex collection
-   * @param edges EPGMEdge collection
+   * @param vertices Vertex collection
+   * @param edges Edge collection
    * @return Graph collection layout
    */
   GraphCollectionLayout<G, V, E> fromCollections(Collection<G> graphHeads,