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 9188817948 for ; Wed, 29 Oct 2014 14:01:45 +0000 (UTC) Received: (qmail 51693 invoked by uid 500); 29 Oct 2014 14:01:45 -0000 Delivered-To: apmail-ctakes-commits-archive@ctakes.apache.org Received: (qmail 51654 invoked by uid 500); 29 Oct 2014 14:01:45 -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 51645 invoked by uid 99); 29 Oct 2014 14:01:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Oct 2014 14:01:45 +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; Wed, 29 Oct 2014 14:01:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3B0E92388A38; Wed, 29 Oct 2014 14:00:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1635137 - /ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/SubjectCleartkAnalysisEngine.java Date: Wed, 29 Oct 2014 14:00:54 -0000 To: commits@ctakes.apache.org From: tmill@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141029140054.3B0E92388A38@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tmill Date: Wed Oct 29 14:00:53 2014 New Revision: 1635137 URL: http://svn.apache.org/r1635137 Log: CTAKES-94: Remove commented-out code from subject classes. Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/SubjectCleartkAnalysisEngine.java Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/SubjectCleartkAnalysisEngine.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/SubjectCleartkAnalysisEngine.java?rev=1635137&r1=1635136&r2=1635137&view=diff ============================================================================== --- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/SubjectCleartkAnalysisEngine.java (original) +++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/medfacts/cleartk/SubjectCleartkAnalysisEngine.java Wed Oct 29 14:00:53 2014 @@ -45,24 +45,13 @@ public class SubjectCleartkAnalysisEngin throw new IllegalArgumentException(PARAM_GOLD_VIEW_NAME + " must be defined during training"); } -// if (USE_DEFAULT_EXTRACTORS) { -// } else { - initialize_subject_extractor(); -// } - initializeFeatureSelection(); + initialize_subject_extractor(); + initializeFeatureSelection(); } private void initialize_subject_extractor() { - -// if (this.contextFeatureExtractors==null) { -// this.contextFeatureExtractors = new ArrayList(); -// } -// this.contextFeatureExtractors.add( -// new CleartkExtractor( -// IdentifiedAnnotation.class, new SubjectFeaturesExtractor()) ); - this.entityFeatureExtractors.add( new SubjectFeaturesExtractor()); } @@ -79,11 +68,9 @@ public class SubjectCleartkAnalysisEngin return; } instance.setOutcome(subj); -// this.dataWriter.write(instance); logger.log(Level.DEBUG, String.format("[%s] expected: ''; actual: ''; features: %s", this.getClass().getSimpleName(), instance.toString() - //StringUtils.join(instance.getFeatures(), ", ") )); } else { @@ -94,7 +81,6 @@ public class SubjectCleartkAnalysisEngin } public static FeatureSelection createFeatureSelection(double threshold) { return new Chi2FeatureSelection<>(AssertionCleartkAnalysisEngine.FEATURE_SELECTION_NAME, threshold, false); - // return new MutualInformationFeatureSelection(AssertionCleartkAnalysisEngine.FEATURE_SELECTION_NAME); } public static URI createFeatureSelectionURI(File outputDirectoryName) { @@ -107,14 +93,6 @@ public class SubjectCleartkAnalysisEngin this.featureSelection = null; } else { this.featureSelection = createFeatureSelection(this.featureSelectionThreshold); - -// if ( (new File(this.featureSelectionURI)).exists() ) { -// try { -// this.featureSelection.load(this.featureSelectionURI); -// } catch (IOException e) { -// throw new ResourceInitializationException(e); -// } -// } } }