From 7664c409d2a1e0ebff744ab12f7fd38801dc88dd Mon Sep 17 00:00:00 2001 From: Smitha Milli Date: Thu, 19 May 2016 11:45:16 -0500 Subject: [PATCH 1/2] Fix filtering of characters --- src/novels/annotators/CharacterAnnotator.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/novels/annotators/CharacterAnnotator.java b/src/novels/annotators/CharacterAnnotator.java index a71e027..87dd845 100644 --- a/src/novels/annotators/CharacterAnnotator.java +++ b/src/novels/annotators/CharacterAnnotator.java @@ -102,9 +102,14 @@ public void findCharacters(Book book, Dictionaries dicts) { // if one character's name is a complete subset of another's, // don't add it (e.g., Joe > Mr. Joe Gargery) - if (!name.equals(name2) && name2Set.containsAll(nameSet)) { + if (!nameSet.equals(name2Set) && name2Set.containsAll(nameSet)) { flag = true; - continue; + } + // if there are namesets that are equal (e.g. "Sakura Kinomoto" + // and "Kinomoto Sakura") then only add the name first in + // lexicographic order + if (nameSet.equals(name2Set) && name.compareTo(name2) > 0) { + flag = true; } } From 2e472a64a24d615e997a75dc7f01b94b084d2184 Mon Sep 17 00:00:00 2001 From: Smitha Milli Date: Thu, 19 May 2016 16:04:48 -0500 Subject: [PATCH 2/2] Add continue statements --- src/novels/annotators/CharacterAnnotator.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/novels/annotators/CharacterAnnotator.java b/src/novels/annotators/CharacterAnnotator.java index 87dd845..bf22664 100644 --- a/src/novels/annotators/CharacterAnnotator.java +++ b/src/novels/annotators/CharacterAnnotator.java @@ -104,12 +104,14 @@ public void findCharacters(Book book, Dictionaries dicts) { // don't add it (e.g., Joe > Mr. Joe Gargery) if (!nameSet.equals(name2Set) && name2Set.containsAll(nameSet)) { flag = true; + continue; } // if there are namesets that are equal (e.g. "Sakura Kinomoto" // and "Kinomoto Sakura") then only add the name first in // lexicographic order if (nameSet.equals(name2Set) && name.compareTo(name2) > 0) { flag = true; + continue; } }