You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/05/26 19:16:21 UTC
[12/15] flink git commit: [FLINK-6709] [gelly] Activate strict
checkstyle for flink-gellies
[FLINK-6709] [gelly] Activate strict checkstyle for flink-gellies
This closes #3997.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d313ac76
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d313ac76
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d313ac76
Branch: refs/heads/master
Commit: d313ac765e81f1b41f0eded45dfe23e1622be47a
Parents: 81798e6
Author: Greg Hogan <co...@greghogan.com>
Authored: Wed May 24 15:10:33 2017 -0400
Committer: zentol <ch...@apache.org>
Committed: Fri May 26 19:17:55 2017 +0200
----------------------------------------------------------------------
flink-libraries/flink-gelly-examples/pom.xml | 35 ++
.../java/org/apache/flink/graph/Runner.java | 11 +-
.../apache/flink/graph/drivers/AdamicAdar.java | 5 +-
.../graph/drivers/ClusteringCoefficient.java | 5 +-
.../graph/drivers/ConnectedComponents.java | 2 +-
.../org/apache/flink/graph/drivers/Driver.java | 4 +-
.../flink/graph/drivers/GraphMetrics.java | 3 +-
.../org/apache/flink/graph/drivers/HITS.java | 11 +-
.../flink/graph/drivers/JaccardIndex.java | 5 +-
.../apache/flink/graph/drivers/PageRank.java | 9 +-
.../flink/graph/drivers/SimpleDriver.java | 6 +-
.../flink/graph/drivers/TriangleListing.java | 5 +-
.../apache/flink/graph/drivers/input/CSV.java | 3 +-
.../graph/drivers/input/CirculantGraph.java | 2 +-
.../graph/drivers/input/GeneratedGraph.java | 17 +-
.../flink/graph/drivers/input/GridGraph.java | 4 +-
.../flink/graph/drivers/input/RMatGraph.java | 3 +-
.../drivers/parameter/ChoiceParameter.java | 5 +-
.../drivers/parameter/IterationConvergence.java | 2 +-
.../graph/drivers/parameter/Parameter.java | 4 +-
.../drivers/parameter/ParameterizedBase.java | 3 +-
.../flink/graph/drivers/parameter/Simplify.java | 5 +-
.../graph/examples/EuclideanGraphWeighing.java | 13 +-
.../flink/graph/examples/GSAPageRank.java | 10 +-
.../examples/GSASingleSourceShortestPaths.java | 22 +-
.../flink/graph/examples/IncrementalSSSP.java | 49 +-
.../flink/graph/examples/MusicProfiles.java | 28 +-
.../apache/flink/graph/examples/PageRank.java | 6 +-
.../apache/flink/graph/examples/PregelSSSP.java | 26 +-
.../examples/SingleSourceShortestPaths.java | 18 +-
.../examples/data/CommunityDetectionData.java | 2 +-
.../data/ConnectedComponentsDefaultData.java | 2 +-
.../graph/examples/data/EuclideanGraphData.java | 2 +-
.../examples/data/IncrementalSSSPData.java | 2 +-
.../examples/data/LabelPropagationData.java | 42 +-
.../graph/examples/data/MusicProfilesData.java | 18 +-
.../flink/graph/examples/data/PageRankData.java | 14 +-
.../data/SingleSourceShortestPathsData.java | 8 +-
.../graph/examples/data/SummarizationData.java | 24 +-
.../graph/examples/data/TriangleCountData.java | 10 +-
.../src/main/resources/logback.xml | 2 +-
.../scala/examples/ConnectedComponents.scala | 9 +-
.../examples/GSASingleSourceShortestPaths.scala | 2 +-
.../examples/SingleSourceShortestPaths.scala | 11 +-
.../org/apache/flink/graph/RunnerITCase.java | 4 +
.../flink/graph/drivers/AdamicAdarITCase.java | 6 +-
.../drivers/ClusteringCoefficientITCase.java | 44 +-
.../drivers/ConnectedComponentsITCase.java | 4 +
.../flink/graph/drivers/DriverBaseITCase.java | 10 +-
.../flink/graph/drivers/EdgeListITCase.java | 6 +-
.../flink/graph/drivers/GraphMetricsITCase.java | 4 +
.../apache/flink/graph/drivers/HITSITCase.java | 4 +
.../flink/graph/drivers/JaccardIndexITCase.java | 6 +-
.../flink/graph/drivers/PageRankITCase.java | 4 +
.../graph/drivers/TriangleListingITCase.java | 8 +-
.../graph/drivers/input/GeneratedGraphTest.java | 34 +-
.../drivers/parameter/BooleanParameterTest.java | 4 +
.../drivers/parameter/ChoiceParameterTest.java | 4 +
.../drivers/parameter/DoubleParameterTest.java | 4 +
.../parameter/IterationConvergenceTest.java | 4 +
.../drivers/parameter/LongParameterTest.java | 4 +
.../drivers/parameter/ParameterTestBase.java | 7 +-
.../graph/drivers/parameter/SimplifyTest.java | 4 +
.../drivers/parameter/StringParameterTest.java | 4 +
.../graph/library/CommunityDetectionITCase.java | 4 +
.../graph/library/LabelPropagationITCase.java | 4 +
.../graph/library/SummarizationITCase.java | 4 +
.../graph/library/TriangleEnumeratorITCase.java | 8 +-
.../flink/graph/test/GatherSumApplyITCase.java | 4 +
.../examples/EuclideanGraphWeighingITCase.java | 8 +-
.../test/examples/IncrementalSSSPITCase.java | 10 +-
.../test/examples/MusicProfilesITCase.java | 9 +-
.../graph/test/examples/PageRankITCase.java | 4 +
.../SingleSourceShortestPathsITCase.java | 11 +-
.../test/GellyScalaAPICompletenessTest.scala | 6 +-
.../test/operations/GraphMutationsITCase.scala | 2 +-
.../test/operations/GraphOperationsITCase.scala | 3 +-
.../test/operations/JoinWithEdgesITCase.scala | 2 +-
flink-libraries/flink-gelly/pom.xml | 40 ++
.../flink/graph/AbstractGraphAnalytic.java | 59 --
.../org/apache/flink/graph/AnalyticHelper.java | 2 +-
.../apache/flink/graph/EdgeJoinFunction.java | 6 +-
.../java/org/apache/flink/graph/EdgeOrder.java | 2 +-
.../org/apache/flink/graph/EdgesFunction.java | 14 +-
.../graph/EdgesFunctionWithVertexValue.java | 14 +-
.../main/java/org/apache/flink/graph/Graph.java | 224 +++----
.../org/apache/flink/graph/GraphAnalytic.java | 2 +-
.../apache/flink/graph/GraphAnalyticBase.java | 59 ++
.../org/apache/flink/graph/GraphCsvReader.java | 29 +-
.../flink/graph/IterationConfiguration.java | 42 +-
.../apache/flink/graph/NeighborsFunction.java | 14 +-
.../graph/NeighborsFunctionWithVertexValue.java | 14 +-
.../apache/flink/graph/ReduceEdgesFunction.java | 2 +-
.../flink/graph/ReduceNeighborsFunction.java | 2 +-
.../java/org/apache/flink/graph/Triplet.java | 2 +-
.../apache/flink/graph/VertexJoinFunction.java | 2 +-
.../asm/dataset/AbstractDataSetAnalytic.java | 58 --
.../graph/asm/dataset/ChecksumHashCode.java | 23 +-
.../apache/flink/graph/asm/dataset/Collect.java | 2 +-
.../apache/flink/graph/asm/dataset/Count.java | 2 +-
.../graph/asm/dataset/DataSetAnalytic.java | 2 +-
.../graph/asm/dataset/DataSetAnalyticBase.java | 58 ++
.../annotate/DegreeAnnotationFunctions.java | 5 +
.../annotate/directed/EdgeDegreesPair.java | 2 +-
.../annotate/directed/EdgeSourceDegrees.java | 2 +-
.../annotate/directed/EdgeTargetDegrees.java | 2 +-
.../degree/annotate/directed/VertexDegrees.java | 6 +-
.../annotate/directed/VertexInDegree.java | 2 +-
.../annotate/directed/VertexOutDegree.java | 2 +-
.../annotate/undirected/EdgeDegreePair.java | 2 +-
.../annotate/undirected/EdgeSourceDegree.java | 2 +-
.../annotate/undirected/EdgeTargetDegree.java | 2 +-
.../annotate/undirected/VertexDegree.java | 6 +-
.../degree/filter/undirected/MaximumDegree.java | 2 +-
.../graph/asm/simple/directed/Simplify.java | 2 +-
.../graph/asm/simple/undirected/Simplify.java | 4 +-
.../flink/graph/asm/translate/Translate.java | 8 +-
.../asm/translate/TranslateEdgeValues.java | 2 +-
.../graph/asm/translate/TranslateFunction.java | 4 +-
.../graph/asm/translate/TranslateGraphIds.java | 6 +-
.../asm/translate/TranslateVertexValues.java | 2 +-
.../translators/LongValueAddOffset.java | 2 +-
.../translators/LongValueToSignedIntValue.java | 2 +-
.../LongValueToUnsignedIntValue.java | 2 +-
.../flink/graph/bipartite/BipartiteGraph.java | 16 +-
.../flink/graph/bipartite/Projection.java | 2 +-
.../graph/generator/AbstractGraphGenerator.java | 35 --
.../flink/graph/generator/CirculantGraph.java | 8 +-
.../flink/graph/generator/CompleteGraph.java | 2 +-
.../flink/graph/generator/CycleGraph.java | 2 +-
.../apache/flink/graph/generator/EchoGraph.java | 6 +-
.../flink/graph/generator/EmptyGraph.java | 4 +-
.../flink/graph/generator/GraphGenerator.java | 8 +-
.../graph/generator/GraphGeneratorBase.java | 42 ++
.../graph/generator/GraphGeneratorUtils.java | 7 +-
.../apache/flink/graph/generator/GridGraph.java | 2 +-
.../flink/graph/generator/HypercubeGraph.java | 2 +-
.../apache/flink/graph/generator/PathGraph.java | 6 +-
.../apache/flink/graph/generator/RMatGraph.java | 61 +-
.../graph/generator/SingletonEdgeGraph.java | 2 +-
.../apache/flink/graph/generator/StarGraph.java | 14 +-
.../random/AbstractGeneratorFactory.java | 72 ---
.../generator/random/GeneratorFactoryBase.java | 72 +++
.../random/JDKRandomGeneratorFactory.java | 2 +-
.../random/MersenneTwisterFactory.java | 2 +-
.../graph/generator/random/RandomGenerable.java | 2 +-
.../apache/flink/graph/gsa/ApplyFunction.java | 6 +-
.../flink/graph/gsa/GSAConfiguration.java | 12 +-
.../apache/flink/graph/gsa/GatherFunction.java | 8 +-
.../graph/gsa/GatherSumApplyIteration.java | 6 +-
.../org/apache/flink/graph/gsa/Neighbor.java | 5 +-
.../org/apache/flink/graph/gsa/SumFunction.java | 4 +-
.../flink/graph/library/CommunityDetection.java | 28 +-
.../graph/library/ConnectedComponents.java | 12 +-
.../graph/library/GSAConnectedComponents.java | 10 +-
.../library/GSASingleSourceShortestPaths.java | 6 +-
.../flink/graph/library/LabelPropagation.java | 10 +-
.../library/SingleSourceShortestPaths.java | 6 +-
.../flink/graph/library/Summarization.java | 89 +--
.../flink/graph/library/TriangleEnumerator.java | 29 +-
.../directed/AverageClusteringCoefficient.java | 25 +-
.../directed/GlobalClusteringCoefficient.java | 29 +-
.../directed/LocalClusteringCoefficient.java | 19 +-
.../clustering/directed/TriadicCensus.java | 65 ++-
.../clustering/directed/TriangleListing.java | 38 +-
.../AverageClusteringCoefficient.java | 25 +-
.../undirected/GlobalClusteringCoefficient.java | 29 +-
.../undirected/LocalClusteringCoefficient.java | 18 +-
.../clustering/undirected/TriadicCensus.java | 35 +-
.../clustering/undirected/TriangleListing.java | 37 +-
.../graph/library/link_analysis/Functions.java | 45 --
.../flink/graph/library/link_analysis/HITS.java | 582 -------------------
.../graph/library/link_analysis/PageRank.java | 544 -----------------
.../graph/library/linkanalysis/Functions.java | 45 ++
.../flink/graph/library/linkanalysis/HITS.java | 582 +++++++++++++++++++
.../graph/library/linkanalysis/PageRank.java | 544 +++++++++++++++++
.../graph/library/metric/ChecksumHashCode.java | 4 +-
.../library/metric/directed/EdgeMetrics.java | 37 +-
.../library/metric/directed/VertexMetrics.java | 35 +-
.../library/metric/undirected/EdgeMetrics.java | 31 +-
.../metric/undirected/VertexMetrics.java | 35 +-
.../graph/library/similarity/AdamicAdar.java | 32 +-
.../graph/library/similarity/JaccardIndex.java | 44 +-
.../flink/graph/pregel/ComputeFunction.java | 73 +--
.../flink/graph/pregel/MessageCombiner.java | 6 +-
.../flink/graph/pregel/MessageIterator.java | 22 +-
.../pregel/VertexCentricConfiguration.java | 4 +-
.../graph/pregel/VertexCentricIteration.java | 82 ++-
.../flink/graph/spargel/GatherFunction.java | 28 +-
.../flink/graph/spargel/MessageIterator.java | 19 +-
.../flink/graph/spargel/ScatterFunction.java | 58 +-
.../spargel/ScatterGatherConfiguration.java | 10 +-
.../graph/spargel/ScatterGatherIteration.java | 72 ++-
.../graph/types/valuearray/IntValueArray.java | 18 +-
.../valuearray/IntValueArrayComparator.java | 2 +-
.../graph/types/valuearray/LongValueArray.java | 18 +-
.../valuearray/LongValueArrayComparator.java | 2 +-
.../graph/types/valuearray/NullValueArray.java | 2 +-
.../valuearray/NullValueArrayComparator.java | 2 +-
.../types/valuearray/StringValueArray.java | 20 +-
.../valuearray/StringValueArrayComparator.java | 2 +-
.../graph/types/valuearray/ValueArray.java | 6 +-
.../types/valuearray/ValueArrayFactory.java | 2 +-
.../flink/graph/utils/EdgeToTuple2Map.java | 2 +-
.../flink/graph/utils/EdgeToTuple3Map.java | 2 +-
.../apache/flink/graph/utils/GraphUtils.java | 9 +-
.../apache/flink/graph/utils/Murmur3_32.java | 129 ----
.../apache/flink/graph/utils/MurmurHash.java | 129 ++++
.../flink/graph/utils/Tuple2ToEdgeMap.java | 2 +-
.../flink/graph/utils/Tuple2ToVertexMap.java | 2 +-
.../flink/graph/utils/Tuple3ToEdgeMap.java | 2 +-
.../flink/graph/utils/VertexToTuple2Map.java | 2 +-
.../proxy/GraphAlgorithmWrappingDataSet.java | 7 +-
.../proxy/GraphAlgorithmWrappingGraph.java | 7 +-
.../graph/utils/proxy/OptionalBoolean.java | 15 +-
.../flink/graph/validation/GraphValidator.java | 8 +-
.../validation/InvalidVertexIdsValidator.java | 11 +-
.../org/apache/flink/graph/asm/AsmTestBase.java | 14 +-
.../graph/asm/dataset/ChecksumHashCodeTest.java | 6 +-
.../flink/graph/asm/dataset/CollectTest.java | 6 +-
.../flink/graph/asm/dataset/CountTest.java | 6 +-
.../annotate/directed/EdgeDegreesPairTest.java | 4 +
.../directed/EdgeSourceDegreesTest.java | 4 +
.../directed/EdgeTargetDegreesTest.java | 4 +
.../annotate/directed/VertexDegreesTest.java | 4 +
.../annotate/directed/VertexInDegreeTest.java | 4 +
.../annotate/directed/VertexOutDegreeTest.java | 4 +
.../annotate/undirected/EdgeDegreePairTest.java | 4 +
.../undirected/EdgeSourceDegreeTest.java | 4 +
.../undirected/EdgeTargetDegreeTest.java | 4 +
.../annotate/undirected/VertexDegreeTest.java | 4 +
.../filter/undirected/MaximumDegreeTest.java | 4 +
.../graph/asm/simple/directed/SimplifyTest.java | 4 +
.../asm/simple/undirected/SimplifyTest.java | 4 +
.../graph/asm/translate/TranslateTest.java | 10 +-
.../translators/LongValueAddOffsetTest.java | 4 +
.../LongValueToSignedIntValueTest.java | 16 +-
.../translators/LongValueToStringValueTest.java | 4 +
.../LongValueToUnsignedIntValueTest.java | 8 +-
.../translate/translators/ToNullValueTest.java | 4 +
.../graph/bipartite/BipartiteEdgeTest.java | 4 +-
.../graph/bipartite/BipartiteGraphTest.java | 4 +
.../flink/graph/bipartite/ProjectionTest.java | 4 +
.../graph/generator/AbstractGraphTest.java | 32 -
.../graph/generator/CirculantGraphTest.java | 8 +-
.../graph/generator/CompleteGraphTest.java | 8 +-
.../flink/graph/generator/CycleGraphTest.java | 6 +-
.../flink/graph/generator/EchoGraphTest.java | 6 +-
.../flink/graph/generator/EmptyGraphTest.java | 6 +-
.../graph/generator/GraphGeneratorTestBase.java | 36 ++
.../flink/graph/generator/GridGraphTest.java | 10 +-
.../graph/generator/HypercubeGraphTest.java | 6 +-
.../flink/graph/generator/PathGraphTest.java | 6 +-
.../flink/graph/generator/RMatGraphTest.java | 8 +-
.../graph/generator/SingletonEdgeGraphTest.java | 6 +-
.../flink/graph/generator/StarGraphTest.java | 6 +-
.../apache/flink/graph/generator/TestUtils.java | 5 +
.../apache/flink/graph/gsa/GSACompilerTest.java | 120 ++--
.../flink/graph/gsa/GSATranslationTest.java | 168 +++---
...ctedComponentsWithRandomisedEdgesITCase.java | 7 +-
.../AverageClusteringCoefficientTest.java | 6 +-
.../GlobalClusteringCoefficientTest.java | 8 +-
.../LocalClusteringCoefficientTest.java | 8 +-
.../clustering/directed/TriadicCensusTest.java | 8 +-
.../directed/TriangleListingTest.java | 8 +-
.../AverageClusteringCoefficientTest.java | 6 +-
.../GlobalClusteringCoefficientTest.java | 8 +-
.../LocalClusteringCoefficientTest.java | 8 +-
.../undirected/TriadicCensusTest.java | 8 +-
.../undirected/TriangleListingTest.java | 8 +-
.../graph/library/link_analysis/HITSTest.java | 144 -----
.../library/link_analysis/PageRankTest.java | 135 -----
.../graph/library/linkanalysis/HITSTest.java | 148 +++++
.../library/linkanalysis/PageRankTest.java | 139 +++++
.../library/metric/ChecksumHashCodeTest.java | 4 +
.../metric/directed/EdgeMetricsTest.java | 8 +-
.../metric/directed/VertexMetricsTest.java | 8 +-
.../metric/undirected/EdgeMetricsTest.java | 8 +-
.../metric/undirected/VertexMetricsTest.java | 8 +-
.../library/similarity/AdamicAdarTest.java | 18 +-
.../library/similarity/JaccardIndexTest.java | 4 +
.../flink/graph/pregel/PregelCompilerTest.java | 383 ++++++------
.../graph/pregel/PregelTranslationTest.java | 149 +++--
.../graph/spargel/SpargelCompilerTest.java | 292 +++++-----
.../graph/spargel/SpargelTranslationTest.java | 223 ++++---
.../test/CollectionModeSuperstepITCase.java | 13 +-
.../test/GatherSumApplyConfigurationITCase.java | 14 +-
.../test/ScatterGatherConfigurationITCase.java | 10 +-
.../apache/flink/graph/test/TestGraphUtils.java | 62 +-
.../graph/test/operations/DegreesITCase.java | 7 +-
.../operations/DegreesWithExceptionITCase.java | 22 +-
.../test/operations/FromCollectionITCase.java | 7 +-
.../test/operations/GraphCreationITCase.java | 10 +-
.../operations/GraphCreationWithCsvITCase.java | 44 +-
.../GraphCreationWithMapperITCase.java | 4 +
.../test/operations/GraphMutationsITCase.java | 46 +-
.../test/operations/GraphOperationsITCase.java | 6 +-
.../test/operations/JoinWithEdgesITCase.java | 7 +-
.../test/operations/JoinWithVerticesITCase.java | 4 +
.../graph/test/operations/MapEdgesITCase.java | 6 +-
.../test/operations/MapVerticesITCase.java | 4 +
.../operations/ReduceOnEdgesMethodsITCase.java | 30 +-
.../ReduceOnEdgesWithExceptionITCase.java | 18 +-
.../ReduceOnNeighborMethodsITCase.java | 50 +-
.../ReduceOnNeighborsWithExceptionITCase.java | 17 +-
.../test/operations/TypeExtractorTest.java | 18 +-
.../valuearray/IntValueArrayComparatorTest.java | 3 +
.../valuearray/IntValueArraySerializerTest.java | 2 +-
.../types/valuearray/IntValueArrayTest.java | 20 +-
.../LongValueArrayComparatorTest.java | 3 +
.../LongValueArraySerializerTest.java | 2 +-
.../types/valuearray/LongValueArrayTest.java | 20 +-
.../NullValueArrayComparatorTest.java | 3 +
.../NullValueArraySerializerTest.java | 2 +-
.../types/valuearray/NullValueArrayTest.java | 12 +-
.../StringValueArrayComparatorTest.java | 3 +
.../StringValueArraySerializerTest.java | 2 +-
.../types/valuearray/StringValueArrayTest.java | 40 +-
.../valuearray/ValueArrayTypeInfoTest.java | 5 +-
.../graph/utils/proxy/OptionalBooleanTest.java | 11 +-
320 files changed, 4607 insertions(+), 3968 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/pom.xml b/flink-libraries/flink-gelly-examples/pom.xml
index 68ad050..3da6263 100644
--- a/flink-libraries/flink-gelly-examples/pom.xml
+++ b/flink-libraries/flink-gelly-examples/pom.xml
@@ -234,6 +234,41 @@
<configLocation>${project.basedir}/../../tools/maven/scalastyle-config.xml</configLocation>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.17</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>6.19</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
+ <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
+ <executions>
+ <!--
+ Execute checkstyle after compilation but before tests.
+
+ This ensures that any parsing or type checking errors are from
+ javac, so they look as expected. Beyond that, we want to
+ fail as early as possible.
+ -->
+ <execution>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/Runner.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/Runner.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/Runner.java
index 07cad1f..e468a58 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/Runner.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/Runner.java
@@ -18,8 +18,6 @@
package org.apache.flink.graph;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.text.StrBuilder;
import org.apache.flink.api.common.ExecutionConfig;
import org.apache.flink.api.java.ExecutionEnvironment;
import org.apache.flink.api.java.io.CsvOutputFormat;
@@ -52,6 +50,9 @@ import org.apache.flink.graph.drivers.output.Print;
import org.apache.flink.graph.drivers.parameter.Parameterized;
import org.apache.flink.util.InstantiationUtil;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.text.StrBuilder;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -59,14 +60,14 @@ import java.util.List;
/**
* This default main class executes Flink drivers.
*
- * An execution has one input, one algorithm, and one output. Anything more
+ * <p>An execution has one input, one algorithm, and one output. Anything more
* complex can be expressed as a user program written in a JVM language.
*
- * Inputs and algorithms are decoupled by, respectively, producing and
+ * <p>Inputs and algorithms are decoupled by, respectively, producing and
* consuming a graph. Currently only {@code Graph} is supported but later
* updates may add support for new graph types such as {@code BipartiteGraph}.
*
- * Algorithms must explicitly support each type of output via implementation of
+ * <p>Algorithms must explicitly support each type of output via implementation of
* interfaces. This is scalable as the number of outputs is small and finite.
*/
public class Runner {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/AdamicAdar.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/AdamicAdar.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/AdamicAdar.java
index 8bf9268..c5867ed 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/AdamicAdar.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/AdamicAdar.java
@@ -18,8 +18,6 @@
package org.apache.flink.graph.drivers;
-import org.apache.commons.lang3.text.StrBuilder;
-import org.apache.commons.lang3.text.WordUtils;
import org.apache.flink.api.java.DataSet;
import org.apache.flink.graph.Graph;
import org.apache.flink.graph.drivers.output.CSV;
@@ -29,6 +27,9 @@ import org.apache.flink.graph.drivers.parameter.LongParameter;
import org.apache.flink.graph.library.similarity.AdamicAdar.Result;
import org.apache.flink.types.CopyableValue;
+import org.apache.commons.lang3.text.StrBuilder;
+import org.apache.commons.lang3.text.WordUtils;
+
import static org.apache.flink.api.common.ExecutionConfig.PARALLELISM_DEFAULT;
/**
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/ClusteringCoefficient.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/ClusteringCoefficient.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/ClusteringCoefficient.java
index 4958b5a..bcd8ec4 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/ClusteringCoefficient.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/ClusteringCoefficient.java
@@ -18,8 +18,6 @@
package org.apache.flink.graph.drivers;
-import org.apache.commons.lang3.text.StrBuilder;
-import org.apache.commons.lang3.text.WordUtils;
import org.apache.flink.api.java.DataSet;
import org.apache.flink.graph.Graph;
import org.apache.flink.graph.GraphAnalytic;
@@ -31,6 +29,9 @@ import org.apache.flink.graph.drivers.parameter.ChoiceParameter;
import org.apache.flink.graph.drivers.parameter.LongParameter;
import org.apache.flink.types.CopyableValue;
+import org.apache.commons.lang3.text.StrBuilder;
+import org.apache.commons.lang3.text.WordUtils;
+
import static org.apache.flink.api.common.ExecutionConfig.PARALLELISM_DEFAULT;
/**
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/ConnectedComponents.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/ConnectedComponents.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/ConnectedComponents.java
index 95904d8..8a158a2 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/ConnectedComponents.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/ConnectedComponents.java
@@ -36,7 +36,7 @@ import java.util.List;
/**
* Driver for {@link org.apache.flink.graph.library.GSAConnectedComponents}.
*
- * The gather-sum-apply implementation is used because scatter-gather does not
+ * <p>The gather-sum-apply implementation is used because scatter-gather does not
* handle object reuse (see FLINK-5891).
*/
public class ConnectedComponents<K extends Comparable<K>, VV, EV>
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/Driver.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/Driver.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/Driver.java
index b001875..fda9079 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/Driver.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/Driver.java
@@ -27,7 +27,7 @@ import org.apache.flink.graph.drivers.parameter.Parameterized;
* A driver for one or more {@link GraphAlgorithm}s and/or
* {@link GraphAnalytic}s.
*
- * It is preferable to include multiple, overlapping algorithms/analytics in
+ * <p>It is preferable to include multiple, overlapping algorithms/analytics in
* the same driver both for simplicity and since this examples module
* demonstrates Flink capabilities rather than absolute performance.
*
@@ -56,7 +56,7 @@ extends Parameterized {
* "Run" algorithms and analytics on the input graph. The execution plan
* is not finalized here but in the output methods.
*
- * Drivers are first configured, next planned, and finally the chosen
+ * <p>Drivers are first configured, next planned, and finally the chosen
* output method is called.
*
* @param graph input graph
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/GraphMetrics.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/GraphMetrics.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/GraphMetrics.java
index aef8f9f..ea02225 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/GraphMetrics.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/GraphMetrics.java
@@ -18,7 +18,6 @@
package org.apache.flink.graph.drivers;
-import org.apache.commons.lang3.text.StrBuilder;
import org.apache.flink.graph.Graph;
import org.apache.flink.graph.GraphAnalytic;
import org.apache.flink.graph.asm.result.PrintableResult;
@@ -27,6 +26,8 @@ import org.apache.flink.graph.drivers.output.Print;
import org.apache.flink.graph.drivers.parameter.ChoiceParameter;
import org.apache.flink.graph.drivers.parameter.ParameterizedBase;
+import org.apache.commons.lang3.text.StrBuilder;
+
/**
* Driver for directed and undirected graph metrics analytics.
*
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/HITS.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/HITS.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/HITS.java
index 209cddf..6f24c09 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/HITS.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/HITS.java
@@ -18,17 +18,18 @@
package org.apache.flink.graph.drivers;
-import org.apache.commons.lang3.text.StrBuilder;
-import org.apache.commons.lang3.text.WordUtils;
import org.apache.flink.api.java.DataSet;
import org.apache.flink.graph.Graph;
import org.apache.flink.graph.drivers.output.CSV;
import org.apache.flink.graph.drivers.output.Print;
import org.apache.flink.graph.drivers.parameter.IterationConvergence;
-import org.apache.flink.graph.library.link_analysis.HITS.Result;
+import org.apache.flink.graph.library.linkanalysis.HITS.Result;
+
+import org.apache.commons.lang3.text.StrBuilder;
+import org.apache.commons.lang3.text.WordUtils;
/**
- * Driver for {@link org.apache.flink.graph.library.link_analysis.HITS}.
+ * Driver for {@link org.apache.flink.graph.library.linkanalysis.HITS}.
*/
public class HITS<K, VV, EV>
extends SimpleDriver<K, VV, EV, Result<K>>
@@ -62,7 +63,7 @@ implements CSV, Print {
@Override
protected DataSet<Result<K>> simplePlan(Graph<K, VV, EV> graph) throws Exception {
return graph
- .run(new org.apache.flink.graph.library.link_analysis.HITS<K, VV, EV>(
+ .run(new org.apache.flink.graph.library.linkanalysis.HITS<K, VV, EV>(
iterationConvergence.getValue().iterations,
iterationConvergence.getValue().convergenceThreshold));
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/JaccardIndex.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/JaccardIndex.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/JaccardIndex.java
index d5b2ae3..f6e10f0 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/JaccardIndex.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/JaccardIndex.java
@@ -18,8 +18,6 @@
package org.apache.flink.graph.drivers;
-import org.apache.commons.lang3.text.StrBuilder;
-import org.apache.commons.lang3.text.WordUtils;
import org.apache.flink.api.java.DataSet;
import org.apache.flink.graph.Graph;
import org.apache.flink.graph.drivers.output.CSV;
@@ -30,6 +28,9 @@ import org.apache.flink.graph.drivers.parameter.LongParameter;
import org.apache.flink.graph.library.similarity.JaccardIndex.Result;
import org.apache.flink.types.CopyableValue;
+import org.apache.commons.lang3.text.StrBuilder;
+import org.apache.commons.lang3.text.WordUtils;
+
import static org.apache.flink.api.common.ExecutionConfig.PARALLELISM_DEFAULT;
/**
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/PageRank.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/PageRank.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/PageRank.java
index 5d74bdb..b2602b9 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/PageRank.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/PageRank.java
@@ -18,17 +18,18 @@
package org.apache.flink.graph.drivers;
-import org.apache.commons.lang3.text.StrBuilder;
import org.apache.flink.api.java.DataSet;
import org.apache.flink.graph.Graph;
import org.apache.flink.graph.drivers.output.CSV;
import org.apache.flink.graph.drivers.output.Print;
import org.apache.flink.graph.drivers.parameter.DoubleParameter;
import org.apache.flink.graph.drivers.parameter.IterationConvergence;
-import org.apache.flink.graph.library.link_analysis.PageRank.Result;
+import org.apache.flink.graph.library.linkanalysis.PageRank.Result;
+
+import org.apache.commons.lang3.text.StrBuilder;
/**
- * @see org.apache.flink.graph.library.link_analysis.PageRank
+ * @see org.apache.flink.graph.library.linkanalysis.PageRank
*/
public class PageRank<K, VV, EV>
extends SimpleDriver<K, VV, EV, Result<K>>
@@ -67,7 +68,7 @@ implements CSV, Print {
@Override
protected DataSet<Result<K>> simplePlan(Graph<K, VV, EV> graph) throws Exception {
return graph
- .run(new org.apache.flink.graph.library.link_analysis.PageRank<K, VV, EV>(
+ .run(new org.apache.flink.graph.library.linkanalysis.PageRank<K, VV, EV>(
dampingFactor.getValue(),
iterationConvergence.getValue().iterations,
iterationConvergence.getValue().convergenceThreshold));
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/SimpleDriver.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/SimpleDriver.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/SimpleDriver.java
index 5cecca1..a5ace26 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/SimpleDriver.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/SimpleDriver.java
@@ -61,7 +61,7 @@ implements Driver<K, VV, EV> {
/**
* Print hash of execution results.
*
- * Does *not* implement/override {@code Hash} since {@link Driver}
+ * <p>Does *not* implement/override {@code Hash} since {@link Driver}
* implementations designate the appropriate outputs.
*
* @param executionName job name
@@ -78,7 +78,7 @@ implements Driver<K, VV, EV> {
/**
* Print execution results.
*
- * Does *not* implement/override {@code Print} since {@link Driver}
+ * <p>Does *not* implement/override {@code Print} since {@link Driver}
* implementations designate the appropriate outputs.
*
* @param executionName job name
@@ -95,7 +95,7 @@ implements Driver<K, VV, EV> {
/**
* Write execution results to file using CSV format.
*
- * Does *not* implement/override {@code CSV} since {@link Driver}
+ * <p>Does *not* implement/override {@code CSV} since {@link Driver}
* implementations designate the appropriate outputs.
*
* @param filename output filename
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/TriangleListing.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/TriangleListing.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/TriangleListing.java
index 5157b8e..1c9bdc5 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/TriangleListing.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/TriangleListing.java
@@ -18,8 +18,6 @@
package org.apache.flink.graph.drivers;
-import org.apache.commons.lang3.text.StrBuilder;
-import org.apache.commons.lang3.text.WordUtils;
import org.apache.flink.api.java.DataSet;
import org.apache.flink.graph.Graph;
import org.apache.flink.graph.GraphAnalytic;
@@ -32,6 +30,9 @@ import org.apache.flink.graph.drivers.parameter.ChoiceParameter;
import org.apache.flink.graph.drivers.parameter.LongParameter;
import org.apache.flink.types.CopyableValue;
+import org.apache.commons.lang3.text.StrBuilder;
+import org.apache.commons.lang3.text.WordUtils;
+
import static org.apache.flink.api.common.ExecutionConfig.PARALLELISM_DEFAULT;
/**
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/CSV.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/CSV.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/CSV.java
index 58b65b6..b3f88f6 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/CSV.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/CSV.java
@@ -18,7 +18,6 @@
package org.apache.flink.graph.drivers.input;
-import org.apache.commons.lang3.text.WordUtils;
import org.apache.flink.api.java.ExecutionEnvironment;
import org.apache.flink.api.java.io.CsvInputFormat;
import org.apache.flink.client.program.ProgramParametrizationException;
@@ -33,6 +32,8 @@ import org.apache.flink.types.LongValue;
import org.apache.flink.types.NullValue;
import org.apache.flink.types.StringValue;
+import org.apache.commons.lang3.text.WordUtils;
+
/**
* Read a {@link Graph} from a CSV file using {@link IntValue},
* {@link LongValue}, or {@link StringValue} keys.
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/CirculantGraph.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/CirculantGraph.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/CirculantGraph.java
index 14ee816..a5a2540 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/CirculantGraph.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/CirculantGraph.java
@@ -83,7 +83,7 @@ extends GeneratedGraph<LongValue> {
ProgramParametrizationException exception = new ProgramParametrizationException("Circulant offset range" +
" must use a colon to separate the integer offset and integer length:" + field + "'");
- if (! field.contains(":")) {
+ if (!field.contains(":")) {
throw exception;
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/GeneratedGraph.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/GeneratedGraph.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/GeneratedGraph.java
index 610722c..d4467df 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/GeneratedGraph.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/GeneratedGraph.java
@@ -18,7 +18,6 @@
package org.apache.flink.graph.drivers.input;
-import org.apache.commons.lang3.text.WordUtils;
import org.apache.flink.api.java.ExecutionEnvironment;
import org.apache.flink.client.program.ProgramParametrizationException;
import org.apache.flink.graph.Graph;
@@ -34,6 +33,8 @@ import org.apache.flink.types.LongValue;
import org.apache.flink.types.NullValue;
import org.apache.flink.types.ShortValue;
+import org.apache.commons.lang3.text.WordUtils;
+
/**
* Base class for generated graphs.
*
@@ -177,7 +178,7 @@ implements Input<K, NullValue, NullValue> {
/**
* Translate {@link LongValue} to {@link ByteValue}.
*
- * Throws {@link RuntimeException} for byte overflow.
+ * <p>Throws {@link RuntimeException} for byte overflow.
*/
static class LongValueToUnsignedByteValue
implements TranslateFunction<LongValue, ByteValue> {
@@ -205,7 +206,7 @@ implements Input<K, NullValue, NullValue> {
/**
* Translate {@link LongValue} to {@link Byte}.
*
- * Throws {@link RuntimeException} for byte overflow.
+ * <p>Throws {@link RuntimeException} for byte overflow.
*/
static class LongValueToUnsignedByte
implements TranslateFunction<LongValue, Byte> {
@@ -227,7 +228,7 @@ implements Input<K, NullValue, NullValue> {
/**
* Translate {@link LongValue} to {@link ShortValue}.
*
- * Throws {@link RuntimeException} for short overflow.
+ * <p>Throws {@link RuntimeException} for short overflow.
*/
static class LongValueToUnsignedShortValue
implements TranslateFunction<LongValue, ShortValue> {
@@ -255,7 +256,7 @@ implements Input<K, NullValue, NullValue> {
/**
* Translate {@link LongValue} to {@link Short}.
*
- * Throws {@link RuntimeException} for short overflow.
+ * <p>Throws {@link RuntimeException} for short overflow.
*/
static class LongValueToUnsignedShort
implements TranslateFunction<LongValue, Short> {
@@ -277,7 +278,7 @@ implements Input<K, NullValue, NullValue> {
/**
* Translate {@link LongValue} to {@link CharValue}.
*
- * Throws {@link RuntimeException} for char overflow.
+ * <p>Throws {@link RuntimeException} for char overflow.
*/
static class LongValueToCharValue
implements TranslateFunction<LongValue, CharValue> {
@@ -305,7 +306,7 @@ implements Input<K, NullValue, NullValue> {
/**
* Translate {@link LongValue} to {@code Character}.
*
- * Throws {@link RuntimeException} for char overflow.
+ * <p>Throws {@link RuntimeException} for char overflow.
*/
static class LongValueToChar
implements TranslateFunction<LongValue, Character> {
@@ -327,7 +328,7 @@ implements Input<K, NullValue, NullValue> {
/**
* Translate {@link LongValue} to {@link Integer}.
*
- * Throws {@link RuntimeException} for integer overflow.
+ * <p>Throws {@link RuntimeException} for integer overflow.
*/
static class LongValueToUnsignedInt
implements TranslateFunction<LongValue, Integer> {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/GridGraph.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/GridGraph.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/GridGraph.java
index 2ce3c77..a3aabd9 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/GridGraph.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/GridGraph.java
@@ -134,7 +134,7 @@ extends GeneratedGraph<LongValue> {
"a colon to separate the integer size and boolean indicating whether the dimension endpoints are " +
"connected: '" + field + "'");
- if (! field.contains(":")) {
+ if (!field.contains(":")) {
throw exception;
}
@@ -147,7 +147,7 @@ extends GeneratedGraph<LongValue> {
try {
size = Long.parseLong(parts[0]);
wrapEndpoints = Boolean.parseBoolean(parts[1]);
- } catch(NumberFormatException ex) {
+ } catch (NumberFormatException ex) {
throw exception;
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/RMatGraph.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/RMatGraph.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/RMatGraph.java
index adee1eb..3b75089 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/RMatGraph.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/input/RMatGraph.java
@@ -18,7 +18,6 @@
package org.apache.flink.graph.drivers.input;
-import org.apache.commons.math3.random.JDKRandomGenerator;
import org.apache.flink.api.java.ExecutionEnvironment;
import org.apache.flink.graph.Graph;
import org.apache.flink.graph.drivers.parameter.BooleanParameter;
@@ -31,6 +30,8 @@ import org.apache.flink.types.LongValue;
import org.apache.flink.types.NullValue;
import org.apache.flink.types.StringValue;
+import org.apache.commons.math3.random.JDKRandomGenerator;
+
import static org.apache.flink.api.common.ExecutionConfig.PARALLELISM_DEFAULT;
/**
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/ChoiceParameter.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/ChoiceParameter.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/ChoiceParameter.java
index f1b716d..c8033de 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/ChoiceParameter.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/ChoiceParameter.java
@@ -18,12 +18,13 @@
package org.apache.flink.graph.drivers.parameter;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.text.StrBuilder;
import org.apache.flink.api.java.utils.ParameterTool;
import org.apache.flink.client.program.ProgramParametrizationException;
import org.apache.flink.util.Preconditions;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.text.StrBuilder;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/IterationConvergence.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/IterationConvergence.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/IterationConvergence.java
index e9d648a..f02c536 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/IterationConvergence.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/IterationConvergence.java
@@ -26,7 +26,7 @@ import org.apache.flink.graph.drivers.parameter.IterationConvergence.Value;
* of iterations or a convergence threshold which stops computation when the
* total change in scores is below a given delta.
*
- * If the command-line configuration specifies neither a number of iterations
+ * <p>If the command-line configuration specifies neither a number of iterations
* nor a convergence threshold then a default number of iterations is used
* with an infinite convergence threshold. Otherwise, when either value is
* configured then an unset value is set to infinity.
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/Parameter.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/Parameter.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/Parameter.java
index 46785f8..9dbac4b 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/Parameter.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/Parameter.java
@@ -30,9 +30,9 @@ public interface Parameter<T> {
/**
* An informal usage string. Parameter names are prefixed with "--".
*
- * Optional parameters are enclosed by "[" and "]".
+ * <p>Optional parameters are enclosed by "[" and "]".
*
- * Generic values are represented by all-caps with specific values enclosed
+ * <p>Generic values are represented by all-caps with specific values enclosed
* by "<" and ">".
*
* @return command-line usage string
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/ParameterizedBase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/ParameterizedBase.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/ParameterizedBase.java
index 5f36ff5..a3991cf 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/ParameterizedBase.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/ParameterizedBase.java
@@ -18,10 +18,11 @@
package org.apache.flink.graph.drivers.parameter;
-import org.apache.commons.lang3.text.StrBuilder;
import org.apache.flink.api.java.utils.ParameterTool;
import org.apache.flink.client.program.ProgramParametrizationException;
+import org.apache.commons.lang3.text.StrBuilder;
+
import java.util.ArrayList;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/Simplify.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/Simplify.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/Simplify.java
index 3e9fd9a..4d9e481 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/Simplify.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/drivers/parameter/Simplify.java
@@ -30,12 +30,15 @@ import org.apache.flink.types.NullValue;
* a directed graph where each undirected edge is represented by a directed
* edge in each direction.
*
- * This {@link Parameter} indicates whether to simplify the graph and if the
+ * <p>This {@link Parameter} indicates whether to simplify the graph and if the
* graph should be directed or undirected.
*/
public class Simplify
implements Parameter<Ordering> {
+ /**
+ * Whether and how to simplify the graph.
+ */
public enum Ordering {
// leave the graph unchanged
NONE,
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/EuclideanGraphWeighing.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/EuclideanGraphWeighing.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/EuclideanGraphWeighing.java
index a7f9198..6380628 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/EuclideanGraphWeighing.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/EuclideanGraphWeighing.java
@@ -18,7 +18,6 @@
package org.apache.flink.graph.examples;
-import org.apache.flink.graph.examples.data.EuclideanGraphData;
import org.apache.flink.api.common.ProgramDescription;
import org.apache.flink.api.common.functions.MapFunction;
import org.apache.flink.api.java.DataSet;
@@ -30,19 +29,19 @@ import org.apache.flink.graph.EdgeJoinFunction;
import org.apache.flink.graph.Graph;
import org.apache.flink.graph.Triplet;
import org.apache.flink.graph.Vertex;
+import org.apache.flink.graph.examples.data.EuclideanGraphData;
import java.io.Serializable;
/**
* This example shows how to use Gelly's {@link Graph#getTriplets()} and
* {@link Graph#joinWithEdges(DataSet, EdgeJoinFunction)} methods.
- *
- * Given a directed, unweighted graph, with vertex values representing points in a plain,
+ *
+ * <p>Given a directed, unweighted graph, with vertex values representing points in a plain,
* return a weighted graph where the edge weights are equal to the Euclidean distance between the
* src and the trg vertex values.
*
- * <p>
- * Input files are plain text files and must be formatted as follows:
+ * <p>Input files are plain text files and must be formatted as follows:
* <ul>
* <li> Vertices are represented by their vertexIds and vertex values and are separated by newlines,
* the value being formed of two doubles separated by a comma.
@@ -52,7 +51,7 @@ import java.io.Serializable;
* For example: <code>1,2\n1,3\n</code> defines two edges 1-2 and 1-3.
* </ul>
*
- * Usage <code>EuclideanGraphWeighing <vertex path> <edge path> <result path></code><br>
+ * <p>Usage <code>EuclideanGraphWeighing <vertex path> <edge path> <result path></code><br>
* If no parameters are provided, the program is run with default data from
* {@link EuclideanGraphData}
*/
@@ -137,7 +136,7 @@ public class EuclideanGraphWeighing implements ProgramDescription {
}
public double euclideanDistance(Point other) {
- return Math.sqrt((x-other.x)*(x-other.x) + (y-other.y)*(y-other.y));
+ return Math.sqrt((x - other.x) * (x - other.x) + (y - other.y) * (y - other.y));
}
@Override
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/GSAPageRank.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/GSAPageRank.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/GSAPageRank.java
index db2e4f2..4508419 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/GSAPageRank.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/GSAPageRank.java
@@ -35,7 +35,7 @@ import org.apache.flink.types.LongValue;
* This is an implementation of a simple PageRank algorithm, using a gather-sum-apply iteration.
* The user can define the damping factor and the maximum number of iterations.
*
- * The implementation assumes that each page has at least one incoming and one outgoing link.
+ * <p>The implementation assumes that each page has at least one incoming and one outgoing link.
*/
public class GSAPageRank<K> implements GraphAlgorithm<K, Double, Double, DataSet<Vertex<K, Double>>> {
@@ -45,8 +45,8 @@ public class GSAPageRank<K> implements GraphAlgorithm<K, Double, Double, DataSet
/**
* Creates an instance of the GSA PageRank algorithm.
*
- * The implementation assumes that each page has at least one incoming and one outgoing link.
- *
+ * <p>The implementation assumes that each page has at least one incoming and one outgoing link.
+ *
* @param beta the damping factor
* @param maxIterations the maximum number of iterations
*/
@@ -81,7 +81,7 @@ public class GSAPageRank<K> implements GraphAlgorithm<K, Double, Double, DataSet
public Double gather(Neighbor<Double, Double> neighbor) {
double neighborRank = neighbor.getNeighborValue();
- if(getSuperstepNumber() == 1) {
+ if (getSuperstepNumber() == 1) {
neighborRank = 1.0 / this.getNumberOfVertices();
}
@@ -109,7 +109,7 @@ public class GSAPageRank<K> implements GraphAlgorithm<K, Double, Double, DataSet
@Override
public void apply(Double rankSum, Double currentValue) {
- setResult((1-beta)/this.getNumberOfVertices() + beta * rankSum);
+ setResult((1 - beta) / this.getNumberOfVertices() + beta * rankSum);
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/GSASingleSourceShortestPaths.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/GSASingleSourceShortestPaths.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/GSASingleSourceShortestPaths.java
index 1cd3549..aa2b7e9 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/GSASingleSourceShortestPaths.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/GSASingleSourceShortestPaths.java
@@ -18,7 +18,6 @@
package org.apache.flink.graph.examples;
-import org.apache.flink.graph.examples.data.SingleSourceShortestPathsData;
import org.apache.flink.api.common.ProgramDescription;
import org.apache.flink.api.common.functions.MapFunction;
import org.apache.flink.api.java.DataSet;
@@ -26,26 +25,27 @@ import org.apache.flink.api.java.ExecutionEnvironment;
import org.apache.flink.graph.Edge;
import org.apache.flink.graph.Graph;
import org.apache.flink.graph.Vertex;
+import org.apache.flink.graph.examples.data.SingleSourceShortestPathsData;
import org.apache.flink.graph.gsa.ApplyFunction;
import org.apache.flink.graph.gsa.GatherFunction;
-import org.apache.flink.graph.gsa.SumFunction;
import org.apache.flink.graph.gsa.Neighbor;
+import org.apache.flink.graph.gsa.SumFunction;
import org.apache.flink.graph.utils.Tuple3ToEdgeMap;
/**
* This example shows how to use Gelly's Gather-Sum-Apply iterations.
- *
- * It is an implementation of the Single-Source-Shortest-Paths algorithm.
+ *
+ * <p>It is an implementation of the Single-Source-Shortest-Paths algorithm.
* For a scatter-gather implementation of the same algorithm, please refer to {@link SingleSourceShortestPaths}
- * and for a vertex-centric implementation, see {@link PregelSSSP}.
+ * and for a vertex-centric implementation, see {@link PregelSSSP}.
*
- * The input file is a plain text file and must be formatted as follows:
+ * <p>The input file is a plain text file and must be formatted as follows:
* Edges are represented by tuples of srcVertexId, trgVertexId, distance which are
* separated by tabs. Edges themselves are separated by newlines.
* For example: <code>1\t2\t0.1\n1\t3\t1.4\n</code> defines two edges,
* edge 1-2 with distance 0.1, and edge 1-3 with distance 1.4.
*
- * If no parameters are provided, the program is run with default data from
+ * <p>If no parameters are provided, the program is run with default data from
* {@link SingleSourceShortestPathsData}
*/
public class GSASingleSourceShortestPaths implements ProgramDescription {
@@ -56,7 +56,7 @@ public class GSASingleSourceShortestPaths implements ProgramDescription {
public static void main(String[] args) throws Exception {
- if(!parseParameters(args)) {
+ if (!parseParameters(args)) {
return;
}
@@ -74,7 +74,7 @@ public class GSASingleSourceShortestPaths implements ProgramDescription {
DataSet<Vertex<Long, Double>> singleSourceShortestPaths = result.getVertices();
// emit result
- if(fileOutput) {
+ if (fileOutput) {
singleSourceShortestPaths.writeAsCsv(outputPath, "\n", ",");
// since file sinks are lazy, we trigger the execution explicitly
@@ -140,7 +140,7 @@ public class GSASingleSourceShortestPaths implements ProgramDescription {
private static boolean fileOutput = false;
- private static Long srcVertexId = 1l;
+ private static Long srcVertexId = 1L;
private static String edgesInputPath = null;
@@ -151,7 +151,7 @@ public class GSASingleSourceShortestPaths implements ProgramDescription {
private static boolean parseParameters(String[] args) {
if (args.length > 0) {
- if(args.length != 4) {
+ if (args.length != 4) {
System.err.println("Usage: GSASingleSourceShortestPaths <source vertex id>" +
" <input edges path> <output path> <num iterations>");
return false;
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/IncrementalSSSP.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/IncrementalSSSP.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/IncrementalSSSP.java
index 631384c..197ad68 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/IncrementalSSSP.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/IncrementalSSSP.java
@@ -33,26 +33,26 @@ import org.apache.flink.graph.spargel.ScatterFunction;
import org.apache.flink.graph.spargel.ScatterGatherConfiguration;
/**
- * This example illustrates how to
+ * This example illustrates how to
* <ul>
* <li> create a Graph directly from CSV files
* <li> use the scatter-gather iteration's messaging direction configuration option
* </ul>
- *
- * Incremental Single Sink Shortest Paths Example. Shortest Paths are incrementally updated
+ *
+ * <p>Incremental Single Sink Shortest Paths Example. Shortest Paths are incrementally updated
* upon edge removal.
*
- * The program takes as input the resulted graph after a SSSP computation,
- * an edge to be removed and the initial graph(i.e. before SSSP was computed).
+ * <p>The program takes as input the resultant graph after a SSSP computation,
+ * an edge to be removed and the initial graph (i.e. before SSSP was computed).
* In the following description, SP-graph is used as an abbreviation for
* the graph resulted from the SSSP computation. We denote the edges that belong to this
* graph by SP-edges.
- *
- * - If the removed edge does not belong to the SP-graph, no computation is necessary.
- * The edge is simply removed from the graph.
+ * - If the removed edge does not belong to the SP-graph then no computation is necessary
+ * and the edge is simply removed from the graph.
* - If the removed edge is an SP-edge, then all nodes, whose shortest path contains the removed edge,
* potentially require re-computation.
- * When the edge {@code <u, v>} is removed, v checks if it has another out-going SP-edge.
+ *
+ * <p>When the edge <code><u, v></code> is removed, v checks if it has another out-going SP-edge.
* If yes, no further computation is required.
* If v has no other out-going SP-edge, it invalidates its current value, by setting it to INF.
* Then, it informs all its SP-in-neighbors by sending them an INVALIDATE message.
@@ -61,7 +61,7 @@ import org.apache.flink.graph.spargel.ScatterGatherConfiguration;
* 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 <code>IncrementalSSSP <vertex path> <edge path> <edges in SSSP>
+ * <p>Usage <code>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></code><br>
* If no parameters are provided, the program is run with default data from
@@ -72,7 +72,7 @@ public class IncrementalSSSP implements ProgramDescription {
public static void main(String [] args) throws Exception {
- if(!parseParameters(args)) {
+ if (!parseParameters(args)) {
return;
}
@@ -91,7 +91,7 @@ public class IncrementalSSSP implements ProgramDescription {
// configure the iteration
ScatterGatherConfiguration parameters = new ScatterGatherConfiguration();
- if(isInSSSP(edgeToBeRemoved, ssspGraph.getEdges())) {
+ if (isInSSSP(edgeToBeRemoved, ssspGraph.getEdges())) {
parameters.setDirection(EdgeDirection.IN);
parameters.setOptDegrees(true);
@@ -103,7 +103,7 @@ public class IncrementalSSSP implements ProgramDescription {
DataSet<Vertex<Long, Double>> resultedVertices = result.getVertices();
// Emit results
- if(fileOutput) {
+ if (fileOutput) {
resultedVertices.writeAsCsv(outputPath, "\n", ",");
env.execute("Incremental SSSP Example");
} else {
@@ -111,7 +111,7 @@ public class IncrementalSSSP implements ProgramDescription {
}
} else {
// print the vertices
- if(fileOutput) {
+ if (fileOutput) {
graph.getVertices().writeAsCsv(outputPath, "\n", ",");
env.execute("Incremental SSSP Example");
} else {
@@ -147,6 +147,9 @@ public class IncrementalSSSP implements ProgramDescription {
}).count() > 0;
}
+ /**
+ * Initiate or propagate INVALIDATE messages.
+ */
public static final class InvalidateMessenger extends ScatterFunction<Long, Double, Double, Double> {
private Edge<Long, Double> edgeToBeRemoved;
@@ -158,23 +161,27 @@ public class IncrementalSSSP implements ProgramDescription {
@Override
public void sendMessages(Vertex<Long, Double> vertex) throws Exception {
-
- if(getSuperstepNumber() == 1) {
- if(vertex.getId().equals(edgeToBeRemoved.getSource())) {
+ if (getSuperstepNumber() == 1) {
+ if (vertex.getId().equals(edgeToBeRemoved.getSource())) {
// activate the edge target
sendMessageTo(edgeToBeRemoved.getSource(), Double.MAX_VALUE);
}
}
- if(getSuperstepNumber() > 1) {
+ if (getSuperstepNumber() > 1) {
// invalidate all edges
- for(Edge<Long, Double> edge : getEdges()) {
+ for (Edge<Long, Double> edge : getEdges()) {
sendMessageTo(edge.getSource(), Double.MAX_VALUE);
}
}
}
}
+ /**
+ * When an INVALIDATE message indicates that the only shortest path
+ * containing this vertex has been removed then set the vertex distance to
+ * infinity.
+ */
public static final class VertexDistanceUpdater extends GatherFunction<Long, Double, Double> {
@Override
@@ -239,7 +246,7 @@ public class IncrementalSSSP implements ProgramDescription {
}
private static Graph<Long, Double, Double> getGraph(ExecutionEnvironment env) {
- if(fileOutput) {
+ if (fileOutput) {
return Graph.fromCsvReader(verticesInputPath, edgesInputPath, env).lineDelimiterEdges("\n")
.types(Long.class, Double.class, Double.class);
} else {
@@ -248,7 +255,7 @@ public class IncrementalSSSP implements ProgramDescription {
}
private static Graph<Long, Double, Double> getSSSPGraph(ExecutionEnvironment env) {
- if(fileOutput) {
+ if (fileOutput) {
return Graph.fromCsvReader(verticesInputPath, edgesInSSSPInputPath, env).lineDelimiterEdges("\n")
.types(Long.class, Double.class, Double.class);
} else {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/MusicProfiles.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/MusicProfiles.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/MusicProfiles.java
index b7b590d..43a0a9b 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/MusicProfiles.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/MusicProfiles.java
@@ -18,9 +18,6 @@
package org.apache.flink.graph.examples;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.flink.api.common.ProgramDescription;
import org.apache.flink.api.common.functions.CoGroupFunction;
import org.apache.flink.api.common.functions.FilterFunction;
@@ -43,6 +40,9 @@ import org.apache.flink.graph.library.LabelPropagation;
import org.apache.flink.types.NullValue;
import org.apache.flink.util.Collector;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* This example demonstrates how to mix the DataSet Flink API with the Gelly API.
* The input is a set <userId - songId - playCount> triplets and
@@ -57,14 +57,14 @@ import org.apache.flink.util.Collector;
* Finally, we use the graph API to run the label propagation community detection algorithm on
* the similarity graph.
*
- * The triplets input is expected to be given as one triplet per line,
+ * <p>The triplets input is expected to be given as one triplet per line,
* in the following format: "<userID>\t<songID>\t<playcount>".
*
- * The mismatches input file is expected to contain one mismatch record per line,
+ * <p>The mismatches input file is expected to contain one mismatch record per line,
* in the following format:
* "ERROR: <songID trackID> song_title"
*
- * If no arguments are provided, the example runs with default data from {@link MusicProfilesData}.
+ * <p>If no arguments are provided, the example runs with default data from {@link MusicProfilesData}.
*/
@SuppressWarnings("serial")
public class MusicProfiles implements ProgramDescription {
@@ -131,7 +131,7 @@ public class MusicProfiles implements ProgramDescription {
Graph<String, Long, NullValue> similarUsersGraph = Graph.fromDataSet(similarUsers,
new MapFunction<String, Long>() {
public Long map(String value) {
- return 1l;
+ return 1L;
}
}, env).getUndirected();
@@ -167,7 +167,7 @@ public class MusicProfiles implements ProgramDescription {
}
- public static final class ExtractMismatchSongIds implements MapFunction<String, Tuple1<String>> {
+ private static final class ExtractMismatchSongIds implements MapFunction<String, Tuple1<String>> {
public Tuple1<String> map(String value) {
String[] tokens = value.split("\\s+");
@@ -176,7 +176,7 @@ public class MusicProfiles implements ProgramDescription {
}
}
- public static final class FilterOutMismatches implements CoGroupFunction<Tuple3<String, String, Integer>,
+ private static final class FilterOutMismatches implements CoGroupFunction<Tuple3<String, String, Integer>,
Tuple1<String>, Tuple3<String, String, Integer>> {
public void coGroup(Iterable<Tuple3<String, String, Integer>> triplets,
@@ -191,13 +191,13 @@ public class MusicProfiles implements ProgramDescription {
}
}
- public static final class FilterSongNodes implements FilterFunction<Tuple2<String, String>> {
+ private static final class FilterSongNodes implements FilterFunction<Tuple2<String, String>> {
public boolean filter(Tuple2<String, String> value) throws Exception {
return !value.f1.equals("");
}
}
- public static final class GetTopSongPerUser implements EdgesFunctionWithVertexValue<String, NullValue, Integer,
+ private static final class GetTopSongPerUser implements EdgesFunctionWithVertexValue<String, NullValue, Integer,
Tuple2<String, String>> {
public void iterateEdges(Vertex<String, NullValue> vertex,
@@ -215,7 +215,7 @@ public class MusicProfiles implements ProgramDescription {
}
}
- public static final class CreateSimilarUserEdges implements GroupReduceFunction<Edge<String, Integer>,
+ private static final class CreateSimilarUserEdges implements GroupReduceFunction<Edge<String, Integer>,
Edge<String, NullValue>> {
public void reduce(Iterable<Edge<String, Integer>> edges, Collector<Edge<String, NullValue>> out) {
@@ -257,8 +257,8 @@ public class MusicProfiles implements ProgramDescription {
private static boolean parseParameters(String[] args) {
- if(args.length > 0) {
- if(args.length != 6) {
+ if (args.length > 0) {
+ if (args.length != 6) {
System.err.println("Usage: MusicProfiles <input user song triplets path>" +
" <input song mismatches path> <output top tracks path> "
+ "<playcount threshold> <output communities path> <num iterations>");
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/PageRank.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/PageRank.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/PageRank.java
index 6be8116..a88f80e 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/PageRank.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/PageRank.java
@@ -35,7 +35,7 @@ import org.apache.flink.types.LongValue;
* This is an implementation of a simple PageRank algorithm, using a scatter-gather iteration.
* The user can define the damping factor and the maximum number of iterations.
*
- * The implementation assumes that each page has at least one incoming and one outgoing link.
+ * <p>The implementation assumes that each page has at least one incoming and one outgoing link.
*/
public class PageRank<K> implements GraphAlgorithm<K, Double, Double, DataSet<Vertex<K, Double>>> {
@@ -45,8 +45,8 @@ public class PageRank<K> implements GraphAlgorithm<K, Double, Double, DataSet<Ve
/**
* Creates an instance of the PageRank algorithm.
*
- * The implementation assumes that each page has at least one incoming and one outgoing link.
- *
+ * <p>The implementation assumes that each page has at least one incoming and one outgoing link.
+ *
* @param beta the damping factor
* @param maxIterations the maximum number of iterations
*/
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/PregelSSSP.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/PregelSSSP.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/PregelSSSP.java
index e647653..97a7c5f 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/PregelSSSP.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/PregelSSSP.java
@@ -33,18 +33,18 @@ import org.apache.flink.graph.utils.Tuple3ToEdgeMap;
/**
* This example shows how to use Gelly's Vertex-Centric iterations.
- *
- * It is an implementation of the Single-Source-Shortest-Paths algorithm.
+ *
+ * <p>It is an implementation of the Single-Source-Shortest-Paths algorithm.
* For a scatter-gather implementation of the same algorithm, please refer to {@link SingleSourceShortestPaths}
- * and for a gather-sum-apply implementation see {@link GSASingleSourceShortestPaths}.
+ * and for a gather-sum-apply implementation see {@link GSASingleSourceShortestPaths}.
*
- * The input file is a plain text file and must be formatted as follows:
+ * <p>The input file is a plain text file and must be formatted as follows:
* Edges are represented by tuples of srcVertexId, trgVertexId, distance which are
* separated by tabs. Edges themselves are separated by newlines.
* For example: <code>1\t2\t0.1\n1\t3\t1.4\n</code> defines two edges,
* edge 1-2 with distance 0.1, and edge 1-3 with distance 1.4.
*
- * If no parameters are provided, the program is run with default data from
+ * <p>If no parameters are provided, the program is run with default data from
* {@link org.apache.flink.graph.examples.data.SingleSourceShortestPathsData}
*/
public class PregelSSSP implements ProgramDescription {
@@ -63,7 +63,7 @@ public class PregelSSSP implements ProgramDescription {
// Execute the vertex-centric iteration
Graph<Long, Double, Double> result = graph.runVertexCentricIteration(
- new SSSPComputeFunction(srcVertexId), new SSSPCombiner(),
+ new SSSPComputeFunction(srcVertexId), new SSSPCombiner(),
maxIterations);
// Extract the vertices as the result
@@ -86,11 +86,13 @@ public class PregelSSSP implements ProgramDescription {
@SuppressWarnings("serial")
private static final class InitVertices implements MapFunction<Long, Double> {
- public Double map(Long id) { return Double.POSITIVE_INFINITY; }
+ public Double map(Long id) {
+ return Double.POSITIVE_INFINITY;
+ }
}
/**
- * The compute function for SSSP
+ * The compute function for SSSP.
*/
@SuppressWarnings("serial")
public static final class SSSPComputeFunction extends ComputeFunction<Long, Double, Double, Double> {
@@ -141,7 +143,7 @@ public class PregelSSSP implements ProgramDescription {
private static boolean fileOutput = false;
- private static Long srcVertexId = 1l;
+ private static Long srcVertexId = 1L;
private static String edgesInputPath = null;
@@ -151,8 +153,8 @@ public class PregelSSSP implements ProgramDescription {
private static boolean parseParameters(String[] args) {
- if(args.length > 0) {
- if(args.length != 4) {
+ if (args.length > 0) {
+ if (args.length != 4) {
System.err.println("Usage: PregelSSSP <source vertex id>" +
" <input edges path> <output path> <num iterations>");
return false;
@@ -191,4 +193,4 @@ public class PregelSSSP implements ProgramDescription {
public String getDescription() {
return "Vertex-centric Single Source Shortest Paths";
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/SingleSourceShortestPaths.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/SingleSourceShortestPaths.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/SingleSourceShortestPaths.java
index 68d20e0..07c6b56 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/SingleSourceShortestPaths.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/SingleSourceShortestPaths.java
@@ -18,7 +18,6 @@
package org.apache.flink.graph.examples;
-import org.apache.flink.graph.examples.data.SingleSourceShortestPathsData;
import org.apache.flink.api.common.ProgramDescription;
import org.apache.flink.api.common.functions.MapFunction;
import org.apache.flink.api.java.DataSet;
@@ -26,6 +25,7 @@ import org.apache.flink.api.java.ExecutionEnvironment;
import org.apache.flink.graph.Edge;
import org.apache.flink.graph.Graph;
import org.apache.flink.graph.Vertex;
+import org.apache.flink.graph.examples.data.SingleSourceShortestPathsData;
import org.apache.flink.graph.spargel.GatherFunction;
import org.apache.flink.graph.spargel.MessageIterator;
import org.apache.flink.graph.spargel.ScatterFunction;
@@ -33,17 +33,17 @@ import org.apache.flink.graph.utils.Tuple3ToEdgeMap;
/**
* This example shows how to use Gelly's scatter-gather iterations.
- *
- * It is an implementation of the Single-Source-Shortest-Paths algorithm.
- * For a gather-sum-apply implementation of the same algorithm, please refer to {@link GSASingleSourceShortestPaths}.
*
- * The input file is a plain text file and must be formatted as follows:
+ * <p>It is an implementation of the Single-Source-Shortest-Paths algorithm.
+ * For a gather-sum-apply implementation of the same algorithm, please refer to {@link GSASingleSourceShortestPaths}.
+ *
+ * <p>The input file is a plain text file and must be formatted as follows:
* Edges are represented by tuples of srcVertexId, trgVertexId, distance which are
* separated by tabs. Edges themselves are separated by newlines.
* For example: <code>1\t2\t0.1\n1\t3\t1.4\n</code> defines two edges,
* edge 1-2 with distance 0.1, and edge 1-3 with distance 1.4.
*
- * If no parameters are provided, the program is run with default data from
+ * <p>If no parameters are provided, the program is run with default data from
* {@link SingleSourceShortestPathsData}
*/
public class SingleSourceShortestPaths implements ProgramDescription {
@@ -149,7 +149,7 @@ public class SingleSourceShortestPaths implements ProgramDescription {
private static boolean fileOutput = false;
- private static Long srcVertexId = 1l;
+ private static Long srcVertexId = 1L;
private static String edgesInputPath = null;
@@ -159,8 +159,8 @@ public class SingleSourceShortestPaths implements ProgramDescription {
private static boolean parseParameters(String[] args) {
- if(args.length > 0) {
- if(args.length != 4) {
+ if (args.length > 0) {
+ if (args.length != 4) {
System.err.println("Usage: SingleSourceShortestPaths <source vertex id>" +
" <input edges path> <output path> <num iterations>");
return false;
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/CommunityDetectionData.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/CommunityDetectionData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/CommunityDetectionData.java
index d3ddfd8..1d9b257 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/CommunityDetectionData.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/CommunityDetectionData.java
@@ -37,7 +37,7 @@ public class CommunityDetectionData {
public static final double DELTA = 0.5f;
public static final String COMMUNITIES_SINGLE_ITERATION = "1,5\n" + "2,6\n"
- + "3,1\n" + "4,1\n" + "5,1\n" + "6,8\n" + "7,8\n" + "8,7";
+ + "3,1\n" + "4,1\n" + "5,1\n" + "6,8\n" + "7,8\n" + "8,7";
public static final String COMMUNITIES_WITH_TIE = "1,2\n" + "2,1\n" + "3,1\n" + "4,1\n" + "5,1";
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/ConnectedComponentsDefaultData.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/ConnectedComponentsDefaultData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/ConnectedComponentsDefaultData.java
index d9fb5cc..5b1e88f 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/ConnectedComponentsDefaultData.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/ConnectedComponentsDefaultData.java
@@ -46,7 +46,7 @@ public class ConnectedComponentsDefaultData {
public static DataSet<Edge<Long, NullValue>> getDefaultEdgeDataSet(ExecutionEnvironment env) {
List<Edge<Long, NullValue>> edgeList = new LinkedList<>();
for (Object[] edge : DEFAULT_EDGES) {
- edgeList.add(new Edge<>((long)edge[0], (long)edge[1], NullValue.getInstance()));
+ edgeList.add(new Edge<>((long) edge[0], (long) edge[1], NullValue.getInstance()));
}
return env.fromCollection(edgeList);
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/EuclideanGraphData.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/EuclideanGraphData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/EuclideanGraphData.java
index 2b4277d..1ac9272 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/EuclideanGraphData.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/EuclideanGraphData.java
@@ -41,7 +41,7 @@ public class EuclideanGraphData {
public static DataSet<Vertex<Long, EuclideanGraphWeighing.Point>> getDefaultVertexDataSet(ExecutionEnvironment env) {
List<Vertex<Long, EuclideanGraphWeighing.Point>> vertices = new ArrayList<Vertex<Long, EuclideanGraphWeighing.Point>>();
- for(int i=1; i<=NUM_VERTICES; i++) {
+ for (int i = 1; i <= NUM_VERTICES; i++) {
vertices.add(new Vertex<Long, EuclideanGraphWeighing.Point>(new Long(i),
new EuclideanGraphWeighing.Point(new Double(i), new Double(i))));
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/IncrementalSSSPData.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/IncrementalSSSPData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/IncrementalSSSPData.java
index 99e363a..eaa2cde 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/IncrementalSSSPData.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/IncrementalSSSPData.java
@@ -88,7 +88,7 @@ public class IncrementalSSSPData {
return new Edge<Long, Double>(2L, 5L, 2.0);
}
- public static final String RESULTED_VERTICES = "1," + Double.MAX_VALUE + "\n" + "2," + Double.MAX_VALUE+ "\n"
+ public static final String RESULTED_VERTICES = "1," + Double.MAX_VALUE + "\n" + "2," + Double.MAX_VALUE + "\n"
+ "3," + Double.MAX_VALUE + "\n" + "4,1.0\n" + "5,0.0";
private IncrementalSSSPData() {}