Skip to content
This repository was archived by the owner on Oct 8, 2020. It is now read-only.

Commit 53b63d1

Browse files
Merge branch 'release/0.7.1'
2 parents 62d14e4 + af6caed commit 53b63d1

File tree

13 files changed

+10
-230
lines changed

13 files changed

+10
-230
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>net.sansa-stack</groupId>
88
<artifactId>sansa-parent</artifactId>
9-
<version>0.6.0</version>
9+
<version>0.7.1</version>
1010
</parent>
1111

1212
<artifactId>sansa-inference-parent_2.11</artifactId>

sansa-inference-common/pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>sansa-inference-parent_2.11</artifactId>
66
<groupId>net.sansa-stack</groupId>
7-
<version>0.6.0</version>
7+
<version>0.7.1</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>sansa-inference-common_${scala.binary.version}</artifactId>
@@ -79,11 +79,6 @@
7979
<groupId>org.apache.calcite</groupId>
8080
<artifactId>calcite-core</artifactId>
8181
</dependency>
82-
<dependency>
83-
<groupId>com.google.protobuf</groupId>
84-
<artifactId>protobuf-java</artifactId>
85-
<version>3.5.0</version>
86-
</dependency>
8782

8883
<!-- Scopt CLI API-->
8984
<dependency>

sansa-inference-flink/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ under the License.
2323
<parent>
2424
<groupId>net.sansa-stack</groupId>
2525
<artifactId>sansa-inference-parent_2.11</artifactId>
26-
<version>0.6.0</version>
26+
<version>0.7.1</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929
<artifactId>sansa-inference-flink_${scala.binary.version}</artifactId>

sansa-inference-flink/src/main/scala/net/sansa_stack/inference/flink/forwardchaining/ForwardRuleReasonerRDFS.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ class ForwardRuleReasonerRDFS(env: ExecutionEnvironment) extends ForwardRuleReas
318318

319319
val additionalTripleRDDs = mutable.Seq(rdfs4, rdfs6, rdfs8_10, rdfs12)
320320

321-
allTriples = env.union(Seq(allTriples) ++ additionalTripleRDDs).distinct()
321+
allTriples = env.union(Seq(allTriples) ++ additionalTripleRDDs).distinct(_.hashCode)
322322
}
323323

324324
logger.info(

sansa-inference-flink/src/main/scala/net/sansa_stack/inference/flink/forwardchaining/TransitiveReasoner.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ import org.apache.flink.api.common.typeinfo.TypeInformation
77
import org.apache.flink.api.scala.{DataSet, _}
88
import org.apache.flink.util.Collector
99
import org.apache.jena.graph.{Node, Triple}
10-
import org.apache.jena.sparql.util.NodeComparator
1110

12-
import net.sansa_stack.inference.flink.utils.NodeKey
1311
import net.sansa_stack.inference.utils.Profiler
12+
import net.sansa_stack.rdf.flink.utils.NodeKey
1413

1514
/**
1615
* An engine to compute the transitive closure (TC) for a set of triples given in several datastructures.

sansa-inference-flink/src/main/scala/net/sansa_stack/inference/flink/utils/NodeKey.scala

Lines changed: 0 additions & 35 deletions
This file was deleted.

sansa-inference-flink/src/main/scala/net/sansa_stack/inference/flink/utils/key/Key.scala

Lines changed: 0 additions & 18 deletions
This file was deleted.

sansa-inference-flink/src/main/scala/net/sansa_stack/inference/flink/utils/key/Key1.scala

Lines changed: 0 additions & 36 deletions
This file was deleted.

sansa-inference-flink/src/main/scala/net/sansa_stack/inference/flink/utils/key/Key2.scala

Lines changed: 0 additions & 53 deletions
This file was deleted.

sansa-inference-flink/src/main/scala/net/sansa_stack/inference/flink/utils/key/Key3.scala

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)