From 3c6f8d1e44948c5cf77b44324ec3781e65211467 Mon Sep 17 00:00:00 2001
From: miconis <m.debonis991@gmail.com>
Date: Mon, 8 Jul 2019 11:01:49 +0200
Subject: [PATCH] bug fixing in the keywordsclustering class

---
 .../dnetlib/pace/clustering/KeywordsClustering.java   |  9 +++++----
 .../eu/dnetlib/pace/common/AbstractPaceFunctions.java |  4 ++--
 .../pace/clustering/ClusteringFunctionTest.java       |  7 +++++++
 release.properties                                    | 11 +++++++++++
 4 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 release.properties

diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/KeywordsClustering.java b/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/KeywordsClustering.java
index 1aac6c8a5..dfd59384b 100644
--- a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/KeywordsClustering.java
+++ b/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/KeywordsClustering.java
@@ -19,16 +19,17 @@ public class KeywordsClustering extends AbstractClusteringFunction {
     @Override
     protected Collection<String> doApply(String s) {
 
-        List<String> keywords = getCodes(s, translationMap, params.getOrDefault("windowSize", 4));
-        List<String> cities = getCodes(s, cityMap, params.getOrDefault("windowSize", 4));
+        //takes city codes and keywords codes without duplicates
+        Set<String> keywords = getCodes(s, translationMap, params.getOrDefault("windowSize", 4));
+        Set<String> cities = getCodes(s, cityMap, params.getOrDefault("windowSize", 4));
 
+        //list of combination to return as result
         final Collection<String> combinations = new LinkedHashSet<String>();
 
-        int size = 0;
         for (String keyword: keywords){
             for (String city: cities) {
                 combinations.add(keyword+"-"+city);
-                if (++size>params.getOrDefault("max", 2)) {
+                if (combinations.size()>=params.getOrDefault("max", 2)) {
                     return combinations;
                 }
             }
diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/common/AbstractPaceFunctions.java b/dnet-pace-core/src/main/java/eu/dnetlib/pace/common/AbstractPaceFunctions.java
index 8c99342a7..748eec9a6 100644
--- a/dnet-pace-core/src/main/java/eu/dnetlib/pace/common/AbstractPaceFunctions.java
+++ b/dnet-pace-core/src/main/java/eu/dnetlib/pace/common/AbstractPaceFunctions.java
@@ -320,7 +320,7 @@ public abstract class AbstractPaceFunctions {
 	}
 
 	//get the list of codes into the input string
-	public List<String> getCodes(String s1, Map<String, String> translationMap, int windowSize){
+	public Set<String> getCodes(String s1, Map<String, String> translationMap, int windowSize){
 
 		String s = cleanup(s1);
 
@@ -328,7 +328,7 @@ public abstract class AbstractPaceFunctions {
 
 		List<String> tokens = Arrays.asList(s.toLowerCase().split(" "));
 
-		List<String> codes = new ArrayList<>();
+		Set<String> codes = new HashSet<>();
 
 		if (tokens.size()<windowSize)
 			windowSize = tokens.size();
diff --git a/dnet-pace-core/src/test/java/eu/dnetlib/pace/clustering/ClusteringFunctionTest.java b/dnet-pace-core/src/test/java/eu/dnetlib/pace/clustering/ClusteringFunctionTest.java
index 270a44b65..b845c395e 100644
--- a/dnet-pace-core/src/test/java/eu/dnetlib/pace/clustering/ClusteringFunctionTest.java
+++ b/dnet-pace-core/src/test/java/eu/dnetlib/pace/clustering/ClusteringFunctionTest.java
@@ -129,6 +129,13 @@ public class ClusteringFunctionTest extends AbstractPaceTest {
 		System.out.println(s1);
 		System.out.println(cf.apply(Lists.newArrayList(title(s1))));
 
+		final String s2 = "Universita farmaceutica culturale di milano bergamo";
+		System.out.println("s2 = " + s2);
+		System.out.println(cf.apply(Lists.newArrayList(title(s2))));
+
+		final String s3 = "universita universita milano milano";
+		System.out.println("s3 = " + s3);
+		System.out.println(cf.apply(Lists.newArrayList(title(s3))));
 
 	}
 
diff --git a/release.properties b/release.properties
new file mode 100644
index 000000000..5c101a586
--- /dev/null
+++ b/release.properties
@@ -0,0 +1,11 @@
+#release configuration
+#Mon Jul 08 10:03:15 CEST 2019
+scm.tagNameFormat=@{project.artifactId}-@{project.version}
+pushChanges=true
+scm.url=scm\:git\:https\://github.com/dnet-team/dnet-dedup.git
+preparationGoals=clean verify
+projectVersionPolicyId=default
+remoteTagging=true
+scm.commentPrefix=[maven-release-plugin] 
+exec.snapshotReleasePluginAllowed=false
+completedPhase=create-backup-poms