Merge pull request #30 from intuit/nn_multiple_match_fix

fixed NEAREST_NEIGHBORS MatchTypes to allow returning Multiple tokens

Author: manishobhatia

src/main/java/com/intuit/fuzzymatcher/component/TokenRepo.java

@@ -44,30 +44,26 @@ private class Repo {
 
         Map<Object, Set<Element>> tokenElementSet;
 
-        TreeSet<Token> tokenBinaryTree;
+        TreeSet<Object> tokenBinaryTree;
 
         Repo(MatchType matchType) {
             this.matchType = matchType;
             switch (matchType) {
+                case NEAREST_NEIGHBORS:
+                    tokenBinaryTree = new TreeSet<>();
                 case EQUALITY:
                     tokenElementSet = new ConcurrentHashMap<>();
-                    break;
-                case NEAREST_NEIGHBORS:
-                    tokenBinaryTree = new TreeSet<>(Token.byValue);
-                    break;
             }
         }
 
         void put(Token token, Element element) {
             switch (matchType) {
+                case NEAREST_NEIGHBORS:
+                    tokenBinaryTree.add(token.getValue());
                 case EQUALITY:
                     Set<Element> elements = tokenElementSet.getOrDefault(token.getValue(), new HashSet<>());
                     elements.add(element);
                     tokenElementSet.put(token.getValue(), elements);
-                    break;
-                case NEAREST_NEIGHBORS:
-                    tokenBinaryTree.add(token);
-
             }
         }
 
@@ -79,7 +75,7 @@ Set<Element> get(Token token) {
                     TokenRange tokenRange = new TokenRange(token, token.getElement().getNeighborhoodRange());
                     return tokenBinaryTree.subSet(tokenRange.lower, true, tokenRange.higher, true)
                             .stream()
-                            .map(Token::getElement).collect(Collectors.toSet());
+                            .flatMap(val -> tokenElementSet.get(val).stream()).collect(Collectors.toSet());
 
             }
             return null;
@@ -88,37 +84,33 @@ Set<Element> get(Token token) {
 
     private class TokenRange {
 
-        private final Token lower;
-        private final Token higher;
+        private final Object lower;
+        private final Object higher;
         private static final double DATE_SCALE_FACTOR = 1.1;
 
 
         TokenRange(Token token, double pct) {
             Object value = token.getValue();
             if (value instanceof Double) {
-                this.lower = new Token(getLower((Double) value, pct).doubleValue(), token.getElement());
-                this.higher = new Token(getHigher((Double) value, pct).doubleValue(), token.getElement());
+                this.lower = getLower((Double) value, pct).doubleValue();
+                this.higher = getHigher((Double) value, pct).doubleValue();
             } else if (value instanceof Integer) {
-                this.lower = new Token(getLower((Integer) value, pct).intValue(), token.getElement());
-                this.higher = new Token(getHigher((Integer) value, pct).intValue(), token.getElement());
+                this.lower = getLower((Integer) value, pct).intValue();
+                this.higher = getHigher((Integer) value, pct).intValue();
             } else if (value instanceof Long) {
-                this.lower = new Token(getLower((Long) value, pct).longValue(), token.getElement());
-                this.higher = new Token(getHigher((Long) value, pct).longValue(), token.getElement());
+                this.lower = getLower((Long) value, pct).longValue();
+                this.higher = getHigher((Long) value, pct).longValue();
             } else if (value instanceof Float) {
-                this.lower = new Token(getLower((Float) value, pct).floatValue(), token.getElement());
-                this.higher = new Token(getHigher((Float) value, pct).floatValue(), token.getElement());
+                this.lower = getLower((Float) value, pct).floatValue();
+                this.higher = getHigher((Float) value, pct).floatValue();
             } else if (value instanceof Date) {
-                this.lower = getDateToken(getLower(((Date) value).getTime(), pct * DATE_SCALE_FACTOR), token);
-                this.higher = getDateToken(getHigher(((Date) value).getTime(), pct * DATE_SCALE_FACTOR), token);
+                this.lower = new Date(getLower(((Date) value).getTime(), pct * DATE_SCALE_FACTOR).longValue());
+                this.higher = new Date(getHigher(((Date) value).getTime(), pct * DATE_SCALE_FACTOR).longValue());
             } else {
                 throw new MatchException("Data Type not supported");
             }
         }
 
-        private Token getDateToken(Number number, Token token) {
-            return new Token(new Date(number.longValue()), token.getElement());
-        }
-
         private Number getLower(Number number, double pct) {
             Double dnum = number.doubleValue();
             Double pctVal = Math.abs(dnum * (1.0 - pct));

src/main/java/com/intuit/fuzzymatcher/domain/Token.java

@@ -45,18 +45,4 @@ public int hashCode() {
 
         return Objects.hash(value, element);
     }
-
-    public static Comparator<Token> byValue = (Token t1, Token t2) -> {
-        if (t2 == null) {
-            return -1;
-        }
-        if (t1 == null) {
-            return 1;
-        }
-
-        if (t1.getValue() instanceof Comparable) {
-            return ((Comparable) t1.getValue()).compareTo((Comparable) t2.getValue());
-        }
-        return -1;
-    };
 }

src/test/java/com/intuit/fuzzymatcher/component/MatchServiceTest.java

@@ -482,7 +482,7 @@ public void itShouldApplyMatchForBalancedEmptyElements() throws FileNotFoundExce
     }
 
     @Test
-    public void itShouldApplyMatchForUnBalancedEmptyElements() throws FileNotFoundException {
+    public void itShouldApplyMatchForUnBalancedEmptyElements() {
         List<Document> inputData = new ArrayList<>();
         inputData.add(new Document.Builder("1")
                 .addElement(new Element.Builder().setType(NAME).setValue("James Parker").createElement())

src/test/java/com/intuit/fuzzymatcher/component/TokenRepoTest.java

@@ -19,6 +19,8 @@
 
 public class TokenRepoTest {
 
+    private final AtomicInteger ai = new AtomicInteger(0);
+
     @Test
     public void shouldGetForNameWithEquality() {
         List<Object> names = Arrays.asList("Amy Doe", "Brian Doe", "Jane Amy", "Michael Wane");
@@ -169,7 +171,6 @@ private Date getDate(String val) {
     }
 
     @Test
-    @Ignore
     public void shouldGetMultipleMatchedWithNearestNeighbour() {
         List<Object> numbers = Arrays.asList(100, 100);
 
@@ -195,7 +196,6 @@ private List<Element> getElements(List<Object> values, ElementType elementType,
                 .map(value -> getElement(value, elementType, matchType)).collect(Collectors.toList());
     }
 
-    AtomicInteger ai = new AtomicInteger(0);
     private Element getElement(Object value, ElementType elementType, MatchType matchType) {
         Document.Builder documentBuilder = new Document.Builder(ai.incrementAndGet()+"");
         Element.Builder elementBuilder = new Element.Builder().setType(elementType).setValue(value);