X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fjava%2Fpnews%2FNER.java;h=5e7ce292a143a3865dd94ff7e143bb8028798740;hb=9ff314621235d6b748abb128edf0331480d0eaaf;hp=bcb8951fb6904a02db5b2c6d42ef608134cb8ced;hpb=7e7f5169cbba419822c4fd7e05a85e81972a9fd6;p=pnews.git

diff --git a/war/src/main/java/pnews/NER.java b/war/src/main/java/pnews/NER.java
index bcb8951..5e7ce29 100644
--- a/war/src/main/java/pnews/NER.java
+++ b/war/src/main/java/pnews/NER.java
@@ -6,21 +6,17 @@ import java.util.List;
 import java.util.logging.Logger;
 
 import edu.stanford.nlp.ie.crf.CRFClassifier;
-import edu.stanford.nlp.ling.CoreLabel;
+import edu.stanford.nlp.util.CoreMap;
 import edu.stanford.nlp.util.Triple;
+import pnews.servlet.Config;
 
 /** https://stanfordnlp.github.io/CoreNLP/api.html */
 public class NER {
         private static final String CLASS_NAME = NER.class.getName();
         private static final Logger LOG = Logger.getLogger(CLASS_NAME);
-        private static final ThreadLocal<CRFClassifier<CoreLabel>> classifier = new ThreadLocal<CRFClassifier<CoreLabel>>() {
-                @Override 
-                protected CRFClassifier<CoreLabel> initialValue() {
-                        return CRFClassifier.getDefaultClassifier();
-                }
-        };
+        private static final CRFClassifier<CoreMap> classifier = CRFClassifier.getDefaultClassifier();
         
-        public static List<String> classify(String str, List<String> entities) throws ClassCastException, ClassNotFoundException, IOException {
+        public static List<String> classify(String str, List<String> entities, Config config) throws ClassCastException, ClassNotFoundException, IOException {
                 
                 List<Triple<String, Integer, Integer>> triples;
                 String w;
@@ -28,21 +24,17 @@ public class NER {
                 
                 LOG.entering(CLASS_NAME, FUNCTION_NAME, str);
 
-                OpenNLP.classify(str, entities);
+                OpenNLP.classify(str, entities, config);
                                 
                 synchronized (classifier) {
-                        triples = classifier.get().classifyToCharacterOffsets(str);
-                        for (Triple<String, Integer, Integer> t: triples) {
-                                w = str.substring(t.second, t.third);
-                                if (!entities.contains(w))
-                                        entities.add(w);
-                        }
+                        triples = classifier.classifyToCharacterOffsets(str);
+                }
+                 
+                for (Triple<String, Integer, Integer> t: triples) {
+                        w = str.substring(t.second, t.third);
+                        if (!config.isBlacklistedEntity(w) && !entities.contains(w))
+                                entities.add(config.getEntityAlias(w));
                 }
-                
-                entities.remove("CNET");
-                entities.remove("Read More");
-                entities.remove("New");
-                entities.remove("App");
                 
                 LOG.exiting(CLASS_NAME, FUNCTION_NAME, entities);
                 
@@ -52,7 +44,7 @@ public class NER {
         public static void main(String[] args) throws Exception {
                 List<String> lst;
                 
-                lst = classify("I live in Washington and New York in United States.", new ArrayList<>());
+                lst = classify("I live in Washington and New York in United States.", new ArrayList<>(), new Config());
                 for (String str: lst)
                         System.out.println(str);
         }