Return-Path: X-Original-To: apmail-ctakes-commits-archive@www.apache.org Delivered-To: apmail-ctakes-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8018210566 for ; Thu, 6 Feb 2014 21:15:22 +0000 (UTC) Received: (qmail 76071 invoked by uid 500); 6 Feb 2014 21:15:21 -0000 Delivered-To: apmail-ctakes-commits-archive@ctakes.apache.org Received: (qmail 76032 invoked by uid 500); 6 Feb 2014 21:15:21 -0000 Mailing-List: contact commits-help@ctakes.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ctakes.apache.org Delivered-To: mailing list commits@ctakes.apache.org Received: (qmail 76025 invoked by uid 99); 6 Feb 2014 21:15:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Feb 2014 21:15:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Feb 2014 21:15:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5B3CC2388994; Thu, 6 Feb 2014 21:14:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1565439 - /ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/extractors/ContextWordWindowExtractor.java Date: Thu, 06 Feb 2014 21:14:57 -0000 To: commits@ctakes.apache.org From: tmill@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140206211457.5B3CC2388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tmill Date: Thu Feb 6 21:14:56 2014 New Revision: 1565439 URL: http://svn.apache.org/r1565439 Log: Fixed to use InputStream instead of FileLocator as in ctakes-210. Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/extractors/ContextWordWindowExtractor.java Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/extractors/ContextWordWindowExtractor.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/extractors/ContextWordWindowExtractor.java?rev=1565439&r1=1565438&r2=1565439&view=diff ============================================================================== --- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/extractors/ContextWordWindowExtractor.java (original) +++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/extractors/ContextWordWindowExtractor.java Thu Feb 6 21:14:56 2014 @@ -1,7 +1,7 @@ package org.apache.ctakes.assertion.medfacts.cleartk.extractors; -import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -9,12 +9,10 @@ import java.util.Scanner; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.ctakes.core.resource.FileLocator; import org.apache.ctakes.typesystem.type.syntax.BaseToken; import org.apache.ctakes.typesystem.type.textspan.Sentence; import org.apache.uima.jcas.JCas; import org.apache.uima.jcas.tcas.Annotation; -import org.apache.uima.resource.ResourceInitializationException; import org.cleartk.classifier.Feature; import org.cleartk.classifier.feature.extractor.CleartkExtractorException; import org.cleartk.classifier.feature.extractor.simple.SimpleFeatureExtractor; @@ -32,34 +30,36 @@ public class ContextWordWindowExtractor } } - public ContextWordWindowExtractor(String resourceFilename) throws ResourceInitializationException { + public ContextWordWindowExtractor(String resourceFilename) { termVals = new HashMap(); - try{ - File termFile = FileLocator.locateFile(resourceFilename); - Scanner scanner = new Scanner(termFile); - Matcher m = null; - double max = 0.0; - double maxNeg = 0.0; - while(scanner.hasNextLine()){ - String line = scanner.nextLine().trim(); - m = linePatt.matcher(line); - if(m.matches()){ - double val = Double.parseDouble(m.group(2)); - termVals.put(m.group(1), val); - if(Math.abs(val) > max){ - max = Math.abs(val); - } - if(val < maxNeg){ - maxNeg = val; - } - } - } - max = max - maxNeg; - for(String key : termVals.keySet()){ - termVals.put(key, (termVals.get(key)-maxNeg) / max); - } - }catch(IOException e){ - throw new ResourceInitializationException(); + InputStream is = getClass().getClassLoader().getResourceAsStream(resourceFilename); + + Scanner scanner = new Scanner(is); + Matcher m = null; + double max = 0.0; + double maxNeg = 0.0; + while(scanner.hasNextLine()){ + String line = scanner.nextLine().trim(); + m = linePatt.matcher(line); + if(m.matches()){ + double val = Double.parseDouble(m.group(2)); + termVals.put(m.group(1), val); + if(Math.abs(val) > max){ + max = Math.abs(val); + } + if(val < maxNeg){ + maxNeg = val; + } + } + } + try { + is.close(); + } catch (IOException e) { + e.printStackTrace(); + } + max = max - maxNeg; + for(String key : termVals.keySet()){ + termVals.put(key, (termVals.get(key)-maxNeg) / max); } }