This is an automated email from the ASF dual-hosted git repository.
bertty pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-wayang.git
The following commit(s) were added to refs/heads/main by this push:
new afb51c7 update version to java-11 and spark-3.1.2
afb51c7 is described below
commit afb51c7dccdcea3e112e8d9c6a53049a471c2a7f
Author: bertty <[email protected]>
AuthorDate: Fri Aug 13 00:43:22 2021 +0200
update version to java-11 and spark-3.1.2
---
pom.xml | 12 +-
wayang-api/wayang-api-scala-java/pom.xml | 7 +-
wayang-commons/pom.xml | 4 +-
wayang-distro/pom.xml | 18 +--
wayang-platforms/pom.xml | 3 +-
wayang-platforms/wayang-spark/pom.xml | 10 +-
.../apache/wayang/spark/channels/RddChannel.java | 7 +-
.../spark/operators/SparkOperatorTestBase.java | 3 +-
wayang-plugins/wayang-iejoin/pom.xml | 7 +-
wayang-profiler/pom.xml | 12 +-
.../wayang/profiler/log/GeneticOptimizerApp.java | 4 +-
wayang-tests-integration/pom.xml | 42 +++----
.../apache/wayang/tests/GiraphIntegrationIT.java | 2 +-
.../apache/wayang/tests/GraphChiIntegrationIT.java | 126 ++++++++++-----------
.../java/org/apache/wayang/tests/WayangPlans.java | 2 +-
15 files changed, 140 insertions(+), 119 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8b6e143..35d22f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,6 +312,7 @@
<properties>
<jaxb.version>2.2.11</jaxb.version>
<java-activation.version>1.1.1</java-activation.version>
+ <javax-annotation-api>1.3.2</javax-annotation-api>
</properties>
<dependencies>
<dependency>
@@ -336,11 +337,11 @@
<!-- The compilation of java 11 is only possible in a select
number of modules,
it's necessary to fix this a soon as possible
-->
- <modules>
- <module>wayang-api</module>
- <module>wayang-commons/wayang-core</module>
- <module>wayang-commons/wayang-basic</module>
- </modules>
+<!-- <modules>-->
+<!-- <module>wayang-api</module>-->
+<!-- <module>wayang-commons/wayang-core</module>-->
+<!-- <module>wayang-commons/wayang-basic</module>-->
+<!-- </modules>-->
</profile>
<!--
@@ -956,6 +957,7 @@
<exclude>src/test/resources/ulysses.txt</exclude>
<exclude>src/test/resources/test.edgelist</exclude>
<exclude>src/test/resources/*.txt</exclude>
+ <exclude>**/wayang-graphchi/**</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/wayang-api/wayang-api-scala-java/pom.xml
b/wayang-api/wayang-api-scala-java/pom.xml
index 1470c30..38fe6b5 100644
--- a/wayang-api/wayang-api-scala-java/pom.xml
+++ b/wayang-api/wayang-api-scala-java/pom.xml
@@ -26,7 +26,7 @@
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>wayang-api-scala-java_2.11</artifactId>
+ <artifactId>wayang-api-scala-java_2.12</artifactId>
<version>0.6.0-SNAPSHOT</version>
<name>Wayang API Scala-Java</name>
@@ -103,6 +103,11 @@
<artifactId>hadoop-hdfs</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.thoughtworks.paranamer</groupId>
+ <artifactId>paranamer</artifactId>
+ <version>2.8</version>
+ </dependency>
</dependencies>
<build>
diff --git a/wayang-commons/pom.xml b/wayang-commons/pom.xml
index 4dab9d5..3db1828 100644
--- a/wayang-commons/pom.xml
+++ b/wayang-commons/pom.xml
@@ -184,7 +184,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.3.2</version>
+ <version>3.12.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -224,4 +224,4 @@
<module>wayang-basic</module>
</modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/wayang-distro/pom.xml b/wayang-distro/pom.xml
index e1bd196..b967504 100644
--- a/wayang-distro/pom.xml
+++ b/wayang-distro/pom.xml
@@ -28,7 +28,7 @@
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>wayang-distro_2.11</artifactId>
+ <artifactId>wayang-distro_2.12</artifactId>
<version>0.6.0-SNAPSHOT</version>
<build>
@@ -71,17 +71,17 @@
</dependency>
<dependency>
<groupId>org.apache.wayang</groupId>
- <artifactId>wayang-spark_2.11</artifactId>
+ <artifactId>wayang-spark_2.12</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.wayang</groupId>-->
+<!-- <artifactId>wayang-graphchi_2.11</artifactId>-->
+<!-- <version>0.6.0-SNAPSHOT</version>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.wayang</groupId>
- <artifactId>wayang-graphchi_2.11</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wayang</groupId>
- <artifactId>wayang-profiler_2.11</artifactId>
+ <artifactId>wayang-profiler_2.12</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -101,7 +101,7 @@
</dependency>
<dependency>
<groupId>org.apache.wayang</groupId>
- <artifactId>wayang-api-scala-java_2.11</artifactId>
+ <artifactId>wayang-api-scala-java_2.12</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/wayang-platforms/pom.xml b/wayang-platforms/pom.xml
index c6177b1..f3ea19b 100644
--- a/wayang-platforms/pom.xml
+++ b/wayang-platforms/pom.xml
@@ -39,7 +39,8 @@
<module>wayang-java</module>
<module>wayang-spark</module>
<module>wayang-postgres</module>
- <module>wayang-graphchi</module>
+<!-- TODO:: invalidate this version just when the scala version is bigger
than 2.11-->
+<!-- <module>wayang-graphchi</module>-->
<module>wayang-jdbc-template</module>
<module>wayang-sqlite3</module>
<module>wayang-giraph</module>
diff --git a/wayang-platforms/wayang-spark/pom.xml
b/wayang-platforms/wayang-spark/pom.xml
index a0c3972..1a1e5dc 100644
--- a/wayang-platforms/wayang-spark/pom.xml
+++ b/wayang-platforms/wayang-spark/pom.xml
@@ -26,7 +26,7 @@
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>wayang-spark_2.11</artifactId>
+ <artifactId>wayang-spark_2.12</artifactId>
<version>0.6.0-SNAPSHOT</version>
<name>Wayang Platform Spark</name>
@@ -36,7 +36,7 @@
<properties>
<java-module-name>org.apache.wayang.platform.spark</java-module-name>
- <spark.version>2.4.0</spark.version>
+ <spark.version>3.1.2</spark.version>
</properties>
@@ -79,6 +79,12 @@
<version>1.1.2.1</version>
<scope>${external.platforms.scope}</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>2.8.5</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/channels/RddChannel.java
b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/channels/RddChannel.java
index 36f1877..8baf392 100644
---
a/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/channels/RddChannel.java
+++
b/wayang-platforms/wayang-spark/src/main/java/org/apache/wayang/spark/channels/RddChannel.java
@@ -18,8 +18,9 @@
package org.apache.wayang.spark.channels;
-import org.apache.spark.Accumulator;
+import org.apache.spark.util.AccumulatorV2;
import org.apache.spark.api.java.JavaRDD;
+import org.apache.spark.util.LongAccumulator;
import org.apache.wayang.core.api.exception.WayangException;
import org.apache.wayang.core.optimizer.OptimizationContext;
import org.apache.wayang.core.plan.executionplan.Channel;
@@ -75,7 +76,7 @@ public class RddChannel extends Channel {
private JavaRDD<?> rdd;
- private Accumulator<Integer> accumulator;
+ private LongAccumulator accumulator;
public Instance(SparkExecutor executor,
OptimizationContext.OperatorContext
producerOperatorContext,
@@ -85,7 +86,7 @@ public class RddChannel extends Channel {
public void accept(JavaRDD<?> rdd, SparkExecutor sparkExecutor) throws
WayangException {
if (this.isMarkedForInstrumentation() && !this.isRddCached()) {
- final Accumulator<Integer> accumulator =
sparkExecutor.sc.accumulator(0);
+ final LongAccumulator accumulator =
sparkExecutor.sc.sc().longAccumulator();
this.rdd = rdd.filter(dataQuantum -> {
accumulator.add(1);
return true;
diff --git
a/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkOperatorTestBase.java
b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkOperatorTestBase.java
index a1ae810..7265ccc 100644
---
a/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkOperatorTestBase.java
+++
b/wayang-platforms/wayang-spark/src/test/java/org/apache/wayang/spark/operators/SparkOperatorTestBase.java
@@ -51,7 +51,8 @@ public class SparkOperatorTestBase {
@Before
public void setUp() {
this.configuration = new Configuration();
- this.sparkExecutor = (SparkExecutor)
SparkPlatform.getInstance().getExecutorFactory().create(this.mockJob());
+ if(sparkExecutor == null)
+ this.sparkExecutor = (SparkExecutor)
SparkPlatform.getInstance().getExecutorFactory().create(this.mockJob());
}
Job mockJob() {
diff --git a/wayang-plugins/wayang-iejoin/pom.xml
b/wayang-plugins/wayang-iejoin/pom.xml
index 303cf98..eb3fbf8 100644
--- a/wayang-plugins/wayang-iejoin/pom.xml
+++ b/wayang-plugins/wayang-iejoin/pom.xml
@@ -19,7 +19,7 @@
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>wayang-iejoin_2.11</artifactId>
+ <artifactId>wayang-iejoin_2.12</artifactId>
<version>0.6.0-SNAPSHOT</version>
<properties>
@@ -53,6 +53,11 @@
<artifactId>spark-core_${scala.mayor.version}</artifactId>
<version>${spark.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.thoughtworks.paranamer</groupId>
+ <artifactId>paranamer</artifactId>
+ <version>2.8</version>
+ </dependency>
</dependencies>
diff --git a/wayang-profiler/pom.xml b/wayang-profiler/pom.xml
index 3ccd939..143d8c7 100644
--- a/wayang-profiler/pom.xml
+++ b/wayang-profiler/pom.xml
@@ -26,7 +26,7 @@
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>wayang-profiler_2.11</artifactId>
+ <artifactId>wayang-profiler_2.12</artifactId>
<version>0.6.0-SNAPSHOT</version>
<name>Wayang Profiler</name>
@@ -65,11 +65,11 @@
<artifactId>wayang-java</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.wayang</groupId>
- <artifactId>wayang-graphchi_${scala.mayor.version}</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.wayang</groupId>-->
+<!--
<artifactId>wayang-graphchi_${scala.mayor.version}</artifactId>-->
+<!-- <version>0.6.0-SNAPSHOT</version>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.wayang</groupId>
<artifactId>wayang-postgres</artifactId>
diff --git
a/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/GeneticOptimizerApp.java
b/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/GeneticOptimizerApp.java
index 0a171a2..460e775 100644
---
a/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/GeneticOptimizerApp.java
+++
b/wayang-profiler/src/main/java/org/apache/wayang/profiler/log/GeneticOptimizerApp.java
@@ -33,7 +33,7 @@ import org.apache.wayang.core.util.Bitmask;
import org.apache.wayang.core.util.Formats;
import org.apache.wayang.core.util.WayangCollections;
import org.apache.wayang.core.util.Tuple;
-import org.apache.wayang.graphchi.GraphChi;
+//import org.apache.wayang.graphchi.GraphChi;
import org.apache.wayang.java.Java;
import org.apache.wayang.postgres.Postgres;
import org.apache.wayang.spark.Spark;
@@ -110,7 +110,7 @@ public class GeneticOptimizerApp {
Spark.platform();
Sqlite3.platform();
Postgres.platform();
- GraphChi.platform();
+ //GraphChi.platform();
// Load the ExecutionLog.
double samplingFactor =
this.configuration.getDoubleProperty("wayang.profiler.ga.sampling", 1d);
diff --git a/wayang-tests-integration/pom.xml b/wayang-tests-integration/pom.xml
index 0a595fc..e572e90 100644
--- a/wayang-tests-integration/pom.xml
+++ b/wayang-tests-integration/pom.xml
@@ -26,7 +26,7 @@
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>wayang-tests-integration_2.11</artifactId>
+ <artifactId>wayang-tests-integration_2.12</artifactId>
<version>0.6.0-SNAPSHOT</version>
<name>Wayang Integration Test</name>
@@ -35,9 +35,9 @@
<properties>
<java-module-name>org.apache.wayang.test.integration</java-module-name>
<graphchi.version>0.2.2</graphchi.version>
- <spark.version>2.4.0</spark.version>
+ <spark.version>3.1.2</spark.version>
<flink.version>1.7.1</flink.version>
- <scala.mayor.version>2.11</scala.mayor.version>
+ <scala.mayor.version>2.12</scala.mayor.version>
<giraph.version>1.2.0-hadoop2</giraph.version>
</properties>
@@ -78,30 +78,30 @@
<version>0.6.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.wayang</groupId>
- <artifactId>wayang-graphchi_${scala.mayor.version}</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.wayang</groupId>-->
+<!--
<artifactId>wayang-graphchi_${scala.mayor.version}</artifactId>-->
+<!-- <version>0.6.0-SNAPSHOT</version>-->
+<!-- <scope>test</scope>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.wayang</groupId>
<artifactId>wayang-spark_${scala.mayor.version}</artifactId>
<version>0.6.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.graphchi</groupId>
- <artifactId>graphchi-java_${scala.mayor.version}</artifactId>
- <version>${graphchi.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.graphchi</groupId>-->
+<!--
<artifactId>graphchi-java_${scala.mayor.version}</artifactId>-->
+<!-- <version>${graphchi.version}</version>-->
+<!-- <scope>test</scope>-->
+<!-- <exclusions>-->
+<!-- <exclusion>-->
+<!-- <groupId>org.apache.hadoop</groupId>-->
+<!-- <artifactId>hadoop-core</artifactId>-->
+<!-- </exclusion>-->
+<!-- </exclusions>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.wayang</groupId>
<artifactId>wayang-api-scala-java_${scala.mayor.version}</artifactId>
diff --git
a/wayang-tests-integration/src/test/java/org/apache/wayang/tests/GiraphIntegrationIT.java
b/wayang-tests-integration/src/test/java/org/apache/wayang/tests/GiraphIntegrationIT.java
index d5c1b2e..1d45e19 100644
---
a/wayang-tests-integration/src/test/java/org/apache/wayang/tests/GiraphIntegrationIT.java
+++
b/wayang-tests-integration/src/test/java/org/apache/wayang/tests/GiraphIntegrationIT.java
@@ -24,7 +24,7 @@ import org.apache.wayang.basic.data.Tuple2;
import org.apache.wayang.core.api.WayangContext;
import org.apache.wayang.core.plan.wayangplan.WayangPlan;
import org.apache.wayang.giraph.Giraph;
-import org.apache.wayang.graphchi.GraphChi;
+//import org.apache.wayang.graphchi.GraphChi;
import org.apache.wayang.java.Java;
import org.apache.wayang.spark.Spark;
import org.apache.wayang.tests.WayangPlans;
diff --git
a/wayang-tests-integration/src/test/java/org/apache/wayang/tests/GraphChiIntegrationIT.java
b/wayang-tests-integration/src/test/java/org/apache/wayang/tests/GraphChiIntegrationIT.java
index 8c42fd1..b45e08c 100644
---
a/wayang-tests-integration/src/test/java/org/apache/wayang/tests/GraphChiIntegrationIT.java
+++
b/wayang-tests-integration/src/test/java/org/apache/wayang/tests/GraphChiIntegrationIT.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import org.apache.wayang.basic.data.Tuple2;
import org.apache.wayang.core.api.WayangContext;
import org.apache.wayang.core.plan.wayangplan.WayangPlan;
-import org.apache.wayang.graphchi.GraphChi;
+//import org.apache.wayang.graphchi.GraphChi;
import org.apache.wayang.java.Java;
import org.apache.wayang.spark.Spark;
@@ -37,66 +37,66 @@ import java.util.stream.Collectors;
* Integration tests for the integration of GraphChi with Wayang.
*/
public class GraphChiIntegrationIT {
- //TODO test remove to validate if can run the clean on travis
- //@Test
- public void testPageRankWithJava() {
- List<Tuple2<Character, Float>> pageRanks = new ArrayList<>();
- WayangPlan wayangPlan =
WayangPlans.pageRankWithDictionaryCompression(pageRanks);
- WayangContext rc = new
WayangContext().with(Java.basicPlugin()).with(GraphChi.plugin());
- rc.execute(wayangPlan);
-
- // Seems like a bug in GraphChi: One too many vertices.
- pageRanks = pageRanks.stream().filter(pr -> pr.field0 !=
null).collect(Collectors.toList());
- this.check(pageRanks);
-
- }
- //TODO test remove to validate if can run the clean on travis
- //@Test
- public void testPageRankWithSpark() {
- List<Tuple2<Character, Float>> pageRanks = new ArrayList<>();
- WayangPlan wayangPlan =
WayangPlans.pageRankWithDictionaryCompression(pageRanks);
- WayangContext rc = new WayangContext().with(Spark.basicPlugin())
- .with(Java.channelConversionPlugin())
- .with(GraphChi.plugin());
- rc.execute(wayangPlan);
-
- // Seems like a bug in GraphChi: One too many vertices.
- pageRanks = pageRanks.stream().filter(pr -> pr.field0 !=
null).collect(Collectors.toList());
- this.check(pageRanks);
- }
- //TODO test remove to validate if can run the clean on travis
- //@Test
- public void testPageRankWithoutGraphChi() {
- List<Tuple2<Character, Float>> pageRanks = new ArrayList<>();
- WayangPlan wayangPlan =
WayangPlans.pageRankWithDictionaryCompression(pageRanks);
- WayangContext rc = new WayangContext().with(Spark.basicPlugin())
- .with(Java.basicPlugin())
- .with(Java.graphPlugin());
- rc.execute(wayangPlan);
-
- this.check(pageRanks);
- }
-
- private void check(List<Tuple2<Character, Float>> pageRanks) {
- final Map<Character, Float> solutions =
WayangPlans.pageRankWithDictionaryCompressionSolution();
- Set<Character> vertices =
pageRanks.stream().map(Tuple2::getField0).collect(Collectors.toSet());
- solutions.forEach((k, v) -> Assert.assertTrue(String.format("Missing
page rank for %s (got: %s).", k, pageRanks), vertices.contains(k)));
- Assert.assertEquals(String.format("Illegal number of page ranks in
%s.", pageRanks), solutions.size(), pageRanks.size());
- for (int i = 0; i < pageRanks.size(); i++) {
- char ci = pageRanks.get(i).field0;
- float fi = pageRanks.get(i).field1;
- float gi = solutions.get(ci);
-
- for (int j = i + 1; j < pageRanks.size(); j++) {
- char cj = pageRanks.get(j).field0;
- float fj = pageRanks.get(j).field1;
- float gj = solutions.get(cj);
-
- Assert.assertEquals(
- (int) Math.signum(Float.compare(fi, fj)),
- (int) Math.signum(Float.compare(gi, gj))
- );
- }
- }
- }
+// //TODO test remove to validate if can run the clean on travis
+// //@Test
+// public void testPageRankWithJava() {
+// List<Tuple2<Character, Float>> pageRanks = new ArrayList<>();
+// WayangPlan wayangPlan =
WayangPlans.pageRankWithDictionaryCompression(pageRanks);
+// WayangContext rc = new
WayangContext().with(Java.basicPlugin()).with(GraphChi.plugin());
+// rc.execute(wayangPlan);
+//
+// // Seems like a bug in GraphChi: One too many vertices.
+// pageRanks = pageRanks.stream().filter(pr -> pr.field0 !=
null).collect(Collectors.toList());
+// this.check(pageRanks);
+//
+// }
+// //TODO test remove to validate if can run the clean on travis
+// //@Test
+// public void testPageRankWithSpark() {
+// List<Tuple2<Character, Float>> pageRanks = new ArrayList<>();
+// WayangPlan wayangPlan =
WayangPlans.pageRankWithDictionaryCompression(pageRanks);
+// WayangContext rc = new WayangContext().with(Spark.basicPlugin())
+// .with(Java.channelConversionPlugin())
+// .with(GraphChi.plugin());
+// rc.execute(wayangPlan);
+//
+// // Seems like a bug in GraphChi: One too many vertices.
+// pageRanks = pageRanks.stream().filter(pr -> pr.field0 !=
null).collect(Collectors.toList());
+// this.check(pageRanks);
+// }
+// //TODO test remove to validate if can run the clean on travis
+// //@Test
+// public void testPageRankWithoutGraphChi() {
+// List<Tuple2<Character, Float>> pageRanks = new ArrayList<>();
+// WayangPlan wayangPlan =
WayangPlans.pageRankWithDictionaryCompression(pageRanks);
+// WayangContext rc = new WayangContext().with(Spark.basicPlugin())
+// .with(Java.basicPlugin())
+// .with(Java.graphPlugin());
+// rc.execute(wayangPlan);
+//
+// this.check(pageRanks);
+// }
+//
+// private void check(List<Tuple2<Character, Float>> pageRanks) {
+// final Map<Character, Float> solutions =
WayangPlans.pageRankWithDictionaryCompressionSolution();
+// Set<Character> vertices =
pageRanks.stream().map(Tuple2::getField0).collect(Collectors.toSet());
+// solutions.forEach((k, v) -> Assert.assertTrue(String.format("Missing
page rank for %s (got: %s).", k, pageRanks), vertices.contains(k)));
+// Assert.assertEquals(String.format("Illegal number of page ranks in
%s.", pageRanks), solutions.size(), pageRanks.size());
+// for (int i = 0; i < pageRanks.size(); i++) {
+// char ci = pageRanks.get(i).field0;
+// float fi = pageRanks.get(i).field1;
+// float gi = solutions.get(ci);
+//
+// for (int j = i + 1; j < pageRanks.size(); j++) {
+// char cj = pageRanks.get(j).field0;
+// float fj = pageRanks.get(j).field1;
+// float gj = solutions.get(cj);
+//
+// Assert.assertEquals(
+// (int) Math.signum(Float.compare(fi, fj)),
+// (int) Math.signum(Float.compare(gi, gj))
+// );
+// }
+// }
+// }
}
diff --git
a/wayang-tests-integration/src/test/java/org/apache/wayang/tests/WayangPlans.java
b/wayang-tests-integration/src/test/java/org/apache/wayang/tests/WayangPlans.java
index 3062afb..c210aed 100644
---
a/wayang-tests-integration/src/test/java/org/apache/wayang/tests/WayangPlans.java
+++
b/wayang-tests-integration/src/test/java/org/apache/wayang/tests/WayangPlans.java
@@ -89,7 +89,7 @@ public class WayangPlans {
public static URI createUri(String resourcePath) {
try {
- return
Thread.currentThread().getClass().getResource(resourcePath).toURI();
+ return WayangPlans.class.getResource(resourcePath).toURI();
} catch (URISyntaxException e) {
throw new IllegalArgumentException("Illegal URI.", e);
}
