You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by tm...@apache.org on 2016/02/18 22:52:46 UTC
svn commit: r1731158 - in /ctakes/trunk/ctakes-assertion: ./
src/main/java/org/apache/ctakes/assertion/pipelines/
src/main/java/org/apache/ctakes/assertion/train/
Author: tmill
Date: Thu Feb 18 21:52:45 2016
New Revision: 1731158
URL: http://svn.apache.org/viewvc?rev=1731158&view=rev
Log:
Remove reliance on scala in assertion.
Modified:
ctakes/trunk/ctakes-assertion/pom.xml
ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/pipelines/RunJudgeAttributeInstances.java
ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/CrossValidateAttributeModels.java
ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/CrossValidateChi2GridSearch.java
ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/JustJudgeStep.java
ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/PolarityCotrainingTests.java
ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/PolarityCotrainingTrain.java
ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/PolarityDomainAdaptationTests.java
ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/ReadAndPreprocessForAttributeModels.java
ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/ReadPreprocessTrainTestJudge.java
ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/TestAttributeModels.java
ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/TrainAttributeModels.java
Modified: ctakes/trunk/ctakes-assertion/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/pom.xml?rev=1731158&r1=1731157&r2=1731158&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/pom.xml (original)
+++ ctakes/trunk/ctakes-assertion/pom.xml Thu Feb 18 21:52:45 2016
@@ -165,11 +165,6 @@
</dependency>
<dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>2.9.0</version>
- </dependency>
- <dependency>
<groupId>org.scala-tools.sbinary</groupId>
<artifactId>sbinary_2.9.0</artifactId>
<version>0.4.0</version>
Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/pipelines/RunJudgeAttributeInstances.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/pipelines/RunJudgeAttributeInstances.java?rev=1731158&r1=1731157&r2=1731158&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/pipelines/RunJudgeAttributeInstances.java (original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/pipelines/RunJudgeAttributeInstances.java Thu Feb 18 21:52:45 2016
@@ -20,6 +20,7 @@ package org.apache.ctakes.assertion.pipe
import java.io.File;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import org.apache.ctakes.assertion.cc.JudgeAttributeInstances;
@@ -38,8 +39,6 @@ import org.kohsuke.args4j.CmdLineExcepti
import org.kohsuke.args4j.CmdLineParser;
import org.kohsuke.args4j.Option;
-import scala.actors.threadpool.Arrays;
-
public class RunJudgeAttributeInstances {
public static class Options {
@Option(
Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/CrossValidateAttributeModels.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/CrossValidateAttributeModels.java?rev=1731158&r1=1731157&r2=1731158&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/CrossValidateAttributeModels.java (original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/CrossValidateAttributeModels.java Thu Feb 18 21:52:45 2016
@@ -19,13 +19,10 @@
package org.apache.ctakes.assertion.train;
import java.util.ArrayList;
-import java.util.HashMap;
import org.apache.ctakes.assertion.eval.AssertionEvaluation;
import org.apache.ctakes.assertion.util.AssertionConst;
-import scala.actors.threadpool.Arrays;
-
public class CrossValidateAttributeModels {
public static void main(String[] args) throws Exception {
Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/CrossValidateChi2GridSearch.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/CrossValidateChi2GridSearch.java?rev=1731158&r1=1731157&r2=1731158&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/CrossValidateChi2GridSearch.java (original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/CrossValidateChi2GridSearch.java Thu Feb 18 21:52:45 2016
@@ -19,13 +19,10 @@
package org.apache.ctakes.assertion.train;
import java.util.ArrayList;
-import java.util.HashMap;
import org.apache.ctakes.assertion.eval.AssertionEvaluation;
import org.apache.ctakes.assertion.util.AssertionConst;
-import scala.actors.threadpool.Arrays;
-
public class CrossValidateChi2GridSearch {
public static void main(String[] args) throws Exception {
Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/JustJudgeStep.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/JustJudgeStep.java?rev=1731158&r1=1731157&r2=1731158&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/JustJudgeStep.java (original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/JustJudgeStep.java Thu Feb 18 21:52:45 2016
@@ -18,16 +18,10 @@
*/
package org.apache.ctakes.assertion.train;
-import java.io.File;
import java.util.ArrayList;
-import java.util.HashMap;
-import org.apache.ctakes.assertion.eval.AssertionEvaluation;
import org.apache.ctakes.assertion.pipelines.RunJudgeAttributeInstances;
import org.apache.ctakes.assertion.util.AssertionConst;
-import org.kohsuke.args4j.Option;
-
-import scala.actors.threadpool.Arrays;
public class JustJudgeStep {
Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/PolarityCotrainingTests.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/PolarityCotrainingTests.java?rev=1731158&r1=1731157&r2=1731158&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/PolarityCotrainingTests.java (original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/PolarityCotrainingTests.java Thu Feb 18 21:52:45 2016
@@ -20,12 +20,12 @@ package org.apache.ctakes.assertion.trai
import java.io.File;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import org.apache.ctakes.assertion.eval.AssertionEvaluation;
import org.apache.ctakes.assertion.util.AssertionConst;
-import scala.actors.threadpool.Arrays;
/**
Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/PolarityCotrainingTrain.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/PolarityCotrainingTrain.java?rev=1731158&r1=1731157&r2=1731158&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/PolarityCotrainingTrain.java (original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/PolarityCotrainingTrain.java Thu Feb 18 21:52:45 2016
@@ -24,8 +24,6 @@ import java.util.Map.Entry;
import org.apache.ctakes.assertion.eval.AssertionEvaluation;
import org.apache.ctakes.assertion.util.AssertionConst;
-
-import scala.actors.threadpool.Arrays;
/**
* For each assertion attribute (polarity, conditional, etc), train a model using the data
* in the training directories for that attribute, and store the model under the models-dir
Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/PolarityDomainAdaptationTests.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/PolarityDomainAdaptationTests.java?rev=1731158&r1=1731157&r2=1731158&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/PolarityDomainAdaptationTests.java (original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/PolarityDomainAdaptationTests.java Thu Feb 18 21:52:45 2016
@@ -20,14 +20,13 @@ package org.apache.ctakes.assertion.trai
import java.io.File;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import org.apache.ctakes.assertion.eval.AssertionEvaluation;
import org.apache.ctakes.assertion.medfacts.cleartk.AssertionCleartkAnalysisEngine;
import org.apache.ctakes.assertion.util.AssertionConst;
-import scala.actors.threadpool.Arrays;
-
/**
* For each assertion attribute (polarity, conditional, etc), run against the test directories
Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/ReadAndPreprocessForAttributeModels.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/ReadAndPreprocessForAttributeModels.java?rev=1731158&r1=1731157&r2=1731158&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/ReadAndPreprocessForAttributeModels.java (original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/ReadAndPreprocessForAttributeModels.java Thu Feb 18 21:52:45 2016
@@ -20,13 +20,10 @@ package org.apache.ctakes.assertion.trai
import java.io.File;
import java.util.ArrayList;
-import java.util.HashMap;
import org.apache.ctakes.assertion.eval.AssertionEvaluation;
import org.apache.ctakes.assertion.util.AssertionConst;
-import scala.actors.threadpool.Arrays;
-
public class ReadAndPreprocessForAttributeModels {
public static void main(String[] args) throws Exception {
Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/ReadPreprocessTrainTestJudge.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/ReadPreprocessTrainTestJudge.java?rev=1731158&r1=1731157&r2=1731158&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/ReadPreprocessTrainTestJudge.java (original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/ReadPreprocessTrainTestJudge.java Thu Feb 18 21:52:45 2016
@@ -18,16 +18,10 @@
*/
package org.apache.ctakes.assertion.train;
-import java.io.File;
import java.util.ArrayList;
-import java.util.HashMap;
-import org.apache.ctakes.assertion.eval.AssertionEvaluation;
import org.apache.ctakes.assertion.pipelines.RunJudgeAttributeInstances;
import org.apache.ctakes.assertion.util.AssertionConst;
-import org.kohsuke.args4j.Option;
-
-import scala.actors.threadpool.Arrays;
public class ReadPreprocessTrainTestJudge {
Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/TestAttributeModels.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/TestAttributeModels.java?rev=1731158&r1=1731157&r2=1731158&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/TestAttributeModels.java (original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/TestAttributeModels.java Thu Feb 18 21:52:45 2016
@@ -19,13 +19,12 @@
package org.apache.ctakes.assertion.train;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
-import java.util.HashMap;
import org.apache.ctakes.assertion.eval.AssertionEvaluation;
import org.apache.ctakes.assertion.util.AssertionConst;
-import scala.actors.threadpool.Arrays;
/**
Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/TrainAttributeModels.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/TrainAttributeModels.java?rev=1731158&r1=1731157&r2=1731158&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/TrainAttributeModels.java (original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/train/TrainAttributeModels.java Thu Feb 18 21:52:45 2016
@@ -24,7 +24,6 @@ import java.util.HashMap;
import org.apache.ctakes.assertion.eval.AssertionEvaluation;
import org.apache.ctakes.assertion.util.AssertionConst;
-import scala.actors.threadpool.Arrays;
/**
* For each assertion attribute (polarity, conditional, etc), train a model using the data
* in the training directories for that attribute, and store the model under the models-dir