Merge branch 'develop' of github.com:SANSA-Stack/SANSA-Inference into develop

Author: LorenzBuehmann

pom.xml

@@ -69,7 +69,7 @@
     <scala.version>2.11.11</scala.version>
     <scala.binary.version>2.11</scala.binary.version>
     <spark.version>2.2.1</spark.version>
-    <flink.version>1.4.0</flink.version>
+    <flink.version>1.3.2</flink.version>
     <jena.version>3.5.0</jena.version>
     <sansa.stack.version>0.2.0</sansa.stack.version>
     <sansa.rdf.version>${sansa.stack.version}</sansa.rdf.version>
@@ -149,14 +149,6 @@
         <version>${spark.version}</version>
       </dependency>
 
-      <!-- Apache Hadoop -->
-      <!-- Dependency below was added for Spark -->
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-common</artifactId>
-        <version>2.7.0</version>
-      </dependency>
-
       <!-- Apache Flink -->
       <dependency>
         <groupId>org.apache.flink</groupId>

sansa-inference-common/src/main/scala/net/sansa_stack/inference/utils/JenaTripleToNTripleString.scala

@@ -14,9 +14,9 @@ class JenaTripleToNTripleString
   override def apply(t: Triple): String = {
     val subStr =
       if (t.getSubject.isBlank) {
-        s"_:${t.getSubject}"
+        s"_:${t.getSubject.getBlankNodeLabel}"
       } else {
-        s"<${t.getSubject}"
+        s"<${t.getSubject.getURI}>"
       }
 
     val objStr =
@@ -29,4 +29,5 @@ class JenaTripleToNTripleString
       }
     s"${subStr} <${t.getPredicate}> ${objStr} ."
   }
-}
+}
+

sansa-inference-spark/src/main/scala/net/sansa_stack/inference/spark/forwardchaining/triples/ForwardRuleReasonerEL.scala

@@ -310,7 +310,11 @@ class ForwardRuleReasonerEL (sc: SparkContext, parallelism: Int = 2) extends Tra
         val newCount = triplesRDD.count()
         logger.debug("New overall count: " + newCount)
         if (newCount > oldCount) {
-          rule.getInfluencedRules().foreach(rulesQueue.enqueue(_))
+          rule.getInfluencedRules().foreach(rule => {
+            if (!rulesQueue.contains(rule)) {
+              rulesQueue.enqueue(rule)
+            }
+          })
         }
       }
     }