Merge pull request #143 from dice-group/hotfix/fix-exact-match

hotfix/fix-exact-match
dice-group · Feb 16, 2018 · 27096f1 · 27096f1
2 parents bd69ec7 + 34583fa
commit 27096f1
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 6 deletions.
diff --git a/limes-core/pom.xml b/limes-core/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.aksw.limes.core</groupId>
     <artifactId>limes-core</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.3</version>
     <name>LIMES</name>
     <description>LIMES – Link Discovery Framework for Metric Spaces.</description>
     <url>http://aksw.org/Projects/LIMES</url>

diff --git a/limes-core/resources/lgd-lgd-optional-properties.xml b/limes-core/resources/lgd-lgd-optional-properties.xml
@@ -13,6 +13,10 @@
 		<NAMESPACE>http://linkedgeodata.org/ontology/</NAMESPACE>
 		<LABEL>lgdo</LABEL>
 	</PREFIX>
+    <PREFIX>
+        <NAMESPACE>http://www.w3.org/2000/01/rdf-schema#</NAMESPACE>
+        <LABEL>rdfs</LABEL>
+    </PREFIX>
 	<SOURCE>
 		<ID>linkedgeodata</ID>
 		<ENDPOINT>http://linkedgeodata.org/sparql</ENDPOINT>

diff --git a/limes-core/src/main/java/org/aksw/limes/core/measures/mapper/string/ExactMatchMapper.java b/limes-core/src/main/java/org/aksw/limes/core/measures/mapper/string/ExactMatchMapper.java
@@ -58,7 +58,7 @@ public AMapping getMapping(ACache source, ACache target, String sourceVar, Strin
         Map<String, Set<String>> targetIndex = getValueToUriMap(target, properties.get(1));
         AMapping m = MappingFactory.createDefaultMapping();
         boolean swapped = sourceIndex.keySet().size() > targetIndex.keySet().size();
-        (swapped ? sourceIndex : targetIndex).keySet().stream().filter(targetIndex::containsKey).forEach(value -> {
+        (swapped ? sourceIndex : targetIndex).keySet().stream().filter(swapped ? targetIndex::containsKey : sourceIndex::containsKey).forEach(value -> {
             for (String sourceUri : (swapped ? sourceIndex : targetIndex).get(value)) {
                 for (String targetUri : (swapped ? targetIndex : sourceIndex).get(value)) {
                     m.add(sourceUri, targetUri, 1d);

diff --git a/limes-core/src/main/resources/lgd-lgd-ml.xml b/limes-core/src/main/resources/lgd-lgd-ml.xml
@@ -15,6 +15,11 @@
 		<NAMESPACE>http://linkedgeodata.org/ontology/</NAMESPACE>
 		<LABEL>lgdo</LABEL>
 	</PREFIX>
+
+    <PREFIX>
+        <NAMESPACE>http://www.w3.org/2000/01/rdf-schema#</NAMESPACE>
+        <LABEL>rdfs</LABEL>
+    </PREFIX>
 
 	<SOURCE>
 		<ID>linkedgeodata</ID>

diff --git a/limes-core/src/main/resources/lgd-lgd.xml b/limes-core/src/main/resources/lgd-lgd.xml
@@ -13,6 +13,10 @@
 		<NAMESPACE>http://linkedgeodata.org/ontology/</NAMESPACE>
 		<LABEL>lgdo</LABEL>
 	</PREFIX>
+    <PREFIX>
+        <NAMESPACE>http://www.w3.org/2000/01/rdf-schema#</NAMESPACE>
+        <LABEL>rdfs</LABEL>
+    </PREFIX>
 	<SOURCE>
 		<ID>linkedgeodata</ID>
 		<ENDPOINT>http://linkedgeodata.org/sparql</ENDPOINT>

diff --git a/...re/src/test/java/org/aksw/limes/core/io/config/reader/xml/XMLConfigurationReaderTest.java b/...re/src/test/java/org/aksw/limes/core/io/config/reader/xml/XMLConfigurationReaderTest.java
@@ -33,6 +33,7 @@ public void init() {
         prefixes.put("geos", "http://www.opengis.net/ont/geosparql#");
         prefixes.put("lgdo", "http://linkedgeodata.org/ontology/");
         prefixes.put("geom", "http://geovocab.org/geometry#");
+        prefixes.put("rdfs", "http://www.w3.org/2000/01/rdf-schema#");
         prefixes = Collections.unmodifiableMap(prefixes);
         HashMap<String, String> f = new HashMap<>();
         f.put("polygon", null);

diff --git a/limes-gui/pom.xml b/limes-gui/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.aksw.limes.core</groupId>
     <artifactId>limes-gui</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.3</version>
 
     <description>LIMES – Link Discovery Framework for Metric Spaces.</description>
     <name>LIMES GUI</name>
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.aksw.limes.full</groupId>
         <artifactId>limes-full</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.3</version>
     </parent>
 
     <build>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.aksw.limes.core</groupId>
             <artifactId>limes-core</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.2.3</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.aksw.limes.full</groupId>
 	<artifactId>limes-full</artifactId>
-	<version>1.2.1</version>
+	<version>1.2.3</version>
 	<name>LIMES</name>
 	<description>LIMES – Link Discovery Framework for Metric Spaces.</description>
 	<url>http://aksw.org/Projects/LIMES</url>