svn commit: r1481247 - in /ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval: EvaluationOfEventEventRelations.java EvaluationOfTemporalRelations_ImplBase.java EvaluationOfTimeSpans.java

[tm...@apache.org]

Author: tmill
Date: Sat May 11 01:33:18 2013
New Revision: 1481247

URL: http://svn.apache.org/r1481247
Log:
Commented out checked in versions that were causing compiler errors - depends on unreleased cleartk snapshots.

Modified:
    ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventEventRelations.java
    ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations_ImplBase.java
    ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTimeSpans.java

Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventEventRelations.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventEventRelations.java?rev=1481247&r1=1481246&r2=1481247&view=diff
==============================================================================
--- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventEventRelations.java (original)
+++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventEventRelations.java Sat May 11 01:33:18 2013
@@ -1,4 +1,4 @@
-package org.apache.ctakes.temporal.eval;
+/*package org.apache.ctakes.temporal.eval;
 
 import java.io.File;
 import java.net.URI;
@@ -216,3 +216,4 @@ public class EvaluationOfEventEventRelat
 	}
 
 }
+*/
\ No newline at end of file

Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations_ImplBase.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations_ImplBase.java?rev=1481247&r1=1481246&r2=1481247&view=diff
==============================================================================
--- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations_ImplBase.java (original)
+++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations_ImplBase.java Sat May 11 01:33:18 2013
@@ -1,4 +1,4 @@
-package org.apache.ctakes.temporal.eval;
+/*package org.apache.ctakes.temporal.eval;
 
 import java.io.File;
 import java.util.Collection;
@@ -94,3 +94,4 @@ public abstract class EvaluationOfTempor
 	  }
 
 }
+*/
\ No newline at end of file

Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTimeSpans.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTimeSpans.java?rev=1481247&r1=1481246&r2=1481247&view=diff
==============================================================================
--- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTimeSpans.java (original)
+++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTimeSpans.java Sat May 11 01:33:18 2013
@@ -32,6 +32,8 @@ import org.apache.uima.resource.Resource
 import org.cleartk.classifier.jar.JarClassifierBuilder;
 import org.cleartk.classifier.libsvm.LIBSVMStringOutcomeDataWriter;
 import org.cleartk.eval.AnnotationStatistics;
+import org.uimafit.factory.AnalysisEngineFactory;
+
 import com.lexicalscope.jewel.cli.CliFactory;
 
 public class EvaluationOfTimeSpans extends EvaluationOfAnnotationSpans_ImplBase {
@@ -65,22 +67,26 @@ public class EvaluationOfTimeSpans exten
   @Override
   protected AnalysisEngineDescription getDataWriterDescription(File directory)
       throws ResourceInitializationException {
-    return ConstituencyBasedTimeAnnotator.createDataWriterDescription(LIBSVMStringOutcomeDataWriter.class, directory);
+    return AnalysisEngineFactory.createAggregateDescription(
+//        TimeAnnotator.createDataWriterDescription(LIBSVMStringOutcomeDataWriter.class, new File(directory, "/seq")),
+        ConstituencyBasedTimeAnnotator.createDataWriterDescription(LIBSVMStringOutcomeDataWriter.class, new File(directory, "/tree")));
+//    return ConstituencyBasedTimeAnnotator.createDataWriterDescription(LIBSVMStringOutcomeDataWriter.class, directory);
   }
 
   @Override
   protected void trainAndPackage(File directory) throws Exception {
-    JarClassifierBuilder.trainAndPackage(directory, "-c", "10000");
+//    JarClassifierBuilder.trainAndPackage(new File(directory, "/seq"), "-c", "10000");
+    JarClassifierBuilder.trainAndPackage(new File(directory, "/tree"), "-c", "10000");
   }
 
   @Override
   protected AnalysisEngineDescription getAnnotatorDescription(File directory)
       throws ResourceInitializationException {
-//    return AnalysisEngineFactory.createAggregateDescription(
-//        TimeAnnotator.createAnnotatorDescription(directory),
-//        AnalysisEngineFactory.createPrimitiveDescription(RemoveTreeAlignedMentions.class),
-//        ConstituencyBasedTimeAnnotator.createAnnotatorDescription(directory));
-    return ConstituencyBasedTimeAnnotator.createAnnotatorDescription(directory);
+    return AnalysisEngineFactory.createAggregateDescription(
+//        TimeAnnotator.createAnnotatorDescription(new File(directory, "/seq")),
+//        AnalysisEngineFactory.createPrimitiveDescription(RemoveTreeAlignedMentions.class, RemoveTreeAlignedMentions.PARAM_GOLDVIEW_NAME, GOLD_VIEW_NAME),
+        ConstituencyBasedTimeAnnotator.createAnnotatorDescription(new File(directory, "/tree")));
+//    return ConstituencyBasedTimeAnnotator.createAnnotatorDescription(directory);
   }
 
   @Override