Author: chenpei
Date: Tue Nov 4 16:57:07 2014
New Revision: 1636645
URL: http://svn.apache.org/r1636645
Log:
CTAKES-327 - Make inner classes import explicit - if not, class names can be
ambiguous and depend on compiler order.
Modified:
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventCoreference.java
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventEventThymeRelations.java
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventProperties.java
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventTimeRelations.java
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfI2B2TemporalRelations.java
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfSelfEventTimeRelations.java
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations_ImplBase.java
ctakes/trunk/ctakes-temporal/src/test/java/org/apache/ctakes/temporal/ae/BackwardsTimeAnnotatorTest.java
ctakes/trunk/ctakes-temporal/src/test/java/org/apache/ctakes/temporal/ae/EventAnnotatorTest.java
Modified:
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventCoreference.java
URL:
http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventCoreference.java?rev=1636645&r1=1636644&r2=1636645&view=diff
==============================================================================
---
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventCoreference.java
(original)
+++
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventCoreference.java
Tue Nov 4 16:57:07 2014
@@ -256,7 +256,7 @@ public class EvaluationOfEventCoreferenc
return stats;
}
- public static class CoreferenceChainScoringOutput extends
JCasAnnotator_ImplBase {
+ public static class CoreferenceChainScoringOutput extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
public static final String PARAM_OUTPUT_FILENAME = "OutputDirectory";
@ConfigurationParameter(
name = PARAM_OUTPUT_FILENAME,
@@ -398,7 +398,7 @@ public class EvaluationOfEventCoreferenc
}
}
}
- public static class DocumentIDPrinter extends JCasAnnotator_ImplBase {
+ public static class DocumentIDPrinter extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
static Logger logger = Logger.getLogger(DocumentIDPrinter.class);
@Override
public void process(JCas jCas) throws AnalysisEngineProcessException {
@@ -411,7 +411,7 @@ public class EvaluationOfEventCoreferenc
}
- public static class ParagraphAnnotator extends JCasAnnotator_ImplBase {
+ public static class ParagraphAnnotator extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jcas) throws AnalysisEngineProcessException {
@@ -437,7 +437,7 @@ public class EvaluationOfEventCoreferenc
}
- public static class ParagraphVectorAnnotator extends JCasAnnotator_ImplBase {
+ public static class ParagraphVectorAnnotator extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
WordEmbeddings words = null;
@Override
Modified:
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventEventThymeRelations.java
URL:
http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventEventThymeRelations.java?rev=1636645&r1=1636644&r2=1636645&view=diff
==============================================================================
---
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventEventThymeRelations.java
(original)
+++
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventEventThymeRelations.java
Tue Nov 4 16:57:07 2014
@@ -454,7 +454,7 @@ EvaluationOfTemporalRelations_ImplBase{
return stats;
}
- public static class RemoveNonUMLSEvents extends JCasAnnotator_ImplBase {
+ public static class RemoveNonUMLSEvents extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
public static final String PARAM_GOLD_VIEW = "GoldView";
@ConfigurationParameter(name = PARAM_GOLD_VIEW,mandatory=false)
@@ -498,7 +498,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
}
- public static class AddEEPotentialRelations extends
JCasAnnotator_ImplBase {
+ public static class AddEEPotentialRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
public static final String PARAM_RELATION_VIEW = "RelationView";
@ConfigurationParameter(name =
PARAM_RELATION_VIEW,mandatory=false)
private String relationViewName = CAS.NAME_DEFAULT_SOFA;
@@ -659,7 +659,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
}*/
- public static class RemoveCrossSentenceRelations extends
JCasAnnotator_ImplBase {
+ public static class RemoveCrossSentenceRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
public static final String PARAM_SENTENCE_VIEW = "SentenceView";
@@ -710,7 +710,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
- public static class RemoveRelations extends JCasAnnotator_ImplBase {
+ public static class RemoveRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
for (BinaryTextRelation relation :
Lists.newArrayList(JCasUtil.select(
@@ -724,7 +724,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
- public static class AddTransitiveContainsRelations extends
JCasAnnotator_ImplBase {
+ public static class AddTransitiveContainsRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
@@ -789,7 +789,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
- public static class AddContain2Overlap extends JCasAnnotator_ImplBase {
+ public static class AddContain2Overlap extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
@@ -815,7 +815,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
}
- public static class AddFlippedOverlap extends JCasAnnotator_ImplBase {
+ public static class AddFlippedOverlap extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
Modified:
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventProperties.java
URL:
http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventProperties.java?rev=1636645&r1=1636644&r2=1636645&view=diff
==============================================================================
---
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventProperties.java
(original)
+++
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventProperties.java
Tue Nov 4 16:57:07 2014
@@ -269,7 +269,7 @@ Evaluation_ImplBase<Map<String, Annotati
};
}
- public static class ClearEventProperties extends JCasAnnotator_ImplBase
{
+ public static class ClearEventProperties extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
for (EventProperties eventProperties :
JCasUtil.select(jCas, EventProperties.class)) {
Modified:
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventTimeRelations.java
URL:
http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventTimeRelations.java?rev=1636645&r1=1636644&r2=1636645&view=diff
==============================================================================
---
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventTimeRelations.java
(original)
+++
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfEventTimeRelations.java
Tue Nov 4 16:57:07 2014
@@ -580,7 +580,7 @@ EvaluationOfTemporalRelations_ImplBase{
// }
- public static class RemoveEventEventRelations extends
JCasAnnotator_ImplBase {
+ public static class RemoveEventEventRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
public static final String PARAM_RELATION_VIEW = "RelationView";
@ConfigurationParameter(name =
PARAM_RELATION_VIEW,mandatory=false)
private String relationViewName = CAS.NAME_DEFAULT_SOFA;
@@ -613,7 +613,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
}
- public static class AddPotentialRelations extends
JCasAnnotator_ImplBase {
+ public static class AddPotentialRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
public static final String PARAM_RELATION_VIEW = "RelationView";
@ConfigurationParameter(name =
PARAM_RELATION_VIEW,mandatory=false)
private String relationViewName = CAS.NAME_DEFAULT_SOFA;
@@ -688,7 +688,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
}*/
- public static class RemoveCrossSentenceRelations extends
JCasAnnotator_ImplBase {
+ public static class RemoveCrossSentenceRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
public static final String PARAM_SENTENCE_VIEW = "SentenceView";
@@ -739,7 +739,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
- public static class RemoveRelations extends JCasAnnotator_ImplBase {
+ public static class RemoveRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
for (BinaryTextRelation relation :
Lists.newArrayList(JCasUtil.select(
@@ -836,7 +836,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
}
- public static class AddTransitiveContainsRelations extends
JCasAnnotator_ImplBase {
+ public static class AddTransitiveContainsRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
@@ -901,7 +901,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
- public static class AddContain2Overlap extends JCasAnnotator_ImplBase {
+ public static class AddContain2Overlap extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
@@ -927,7 +927,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
}
- public static class AddFlippedOverlap extends JCasAnnotator_ImplBase {
+ public static class AddFlippedOverlap extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
@@ -967,7 +967,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
}
- public static class AddClosure extends JCasAnnotator_ImplBase {
+ public static class AddClosure extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
Modified:
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfI2B2TemporalRelations.java
URL:
http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfI2B2TemporalRelations.java?rev=1636645&r1=1636644&r2=1636645&view=diff
==============================================================================
---
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfI2B2TemporalRelations.java
(original)
+++
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfI2B2TemporalRelations.java
Tue Nov 4 16:57:07 2014
@@ -636,7 +636,7 @@ EvaluationOfTemporalRelations_ImplBase{
// }
- public static class RemoveEventEventRelations extends
JCasAnnotator_ImplBase {
+ public static class RemoveEventEventRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
public static final String PARAM_RELATION_VIEW = "RelationView";
@ConfigurationParameter(name = PARAM_RELATION_VIEW)
private String relationViewName = CAS.NAME_DEFAULT_SOFA;
@@ -669,7 +669,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
}
- public static class RemoveNullArgumentRelations extends
JCasAnnotator_ImplBase {
+ public static class RemoveNullArgumentRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
for(BinaryTextRelation relation :
Lists.newArrayList(JCasUtil.select(jCas, BinaryTextRelation.class))){
@@ -699,7 +699,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
}*/
- public static class RemoveCrossSentenceRelations extends
JCasAnnotator_ImplBase {
+ public static class RemoveCrossSentenceRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
public static final String PARAM_SENTENCE_VIEW = "SentenceView";
@@ -750,7 +750,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
- public static class RemoveRelations extends JCasAnnotator_ImplBase {
+ public static class RemoveRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
for (BinaryTextRelation relation :
Lists.newArrayList(JCasUtil.select(
@@ -847,7 +847,7 @@ EvaluationOfTemporalRelations_ImplBase{
// }
// }
- public static class AddTransitiveContainsRelations extends
JCasAnnotator_ImplBase {
+ public static class AddTransitiveContainsRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
@@ -912,7 +912,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
- public static class AddContain2Overlap extends JCasAnnotator_ImplBase {
+ public static class AddContain2Overlap extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
@@ -938,7 +938,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
}
- public static class AddFlippedOverlap extends JCasAnnotator_ImplBase {
+ public static class AddFlippedOverlap extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
Modified:
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfSelfEventTimeRelations.java
URL:
http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfSelfEventTimeRelations.java?rev=1636645&r1=1636644&r2=1636645&view=diff
==============================================================================
---
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfSelfEventTimeRelations.java
(original)
+++
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfSelfEventTimeRelations.java
Tue Nov 4 16:57:07 2014
@@ -562,7 +562,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
- public static class RemoveEventEventRelations extends
JCasAnnotator_ImplBase {
+ public static class RemoveEventEventRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
public static final String PARAM_RELATION_VIEW = "RelationView";
@ConfigurationParameter(name =
PARAM_RELATION_VIEW,mandatory=false)
private String relationViewName = CAS.NAME_DEFAULT_SOFA;
@@ -595,7 +595,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
}
- public static class OverwriteTemporalRelationToSystem extends
JCasAnnotator_ImplBase {
+ public static class OverwriteTemporalRelationToSystem extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
@@ -650,7 +650,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
- public static class RemoveCrossSentenceRelations extends
JCasAnnotator_ImplBase {
+ public static class RemoveCrossSentenceRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
public static final String PARAM_SENTENCE_VIEW = "SentenceView";
@@ -701,7 +701,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
- public static class RemoveRelations extends JCasAnnotator_ImplBase {
+ public static class RemoveRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
for (BinaryTextRelation relation :
Lists.newArrayList(JCasUtil.select(
@@ -716,7 +716,7 @@ EvaluationOfTemporalRelations_ImplBase{
- public static class AddContain2Overlap extends JCasAnnotator_ImplBase {
+ public static class AddContain2Overlap extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
@@ -742,7 +742,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
}
- public static class AddFlippedOverlap extends JCasAnnotator_ImplBase {
+ public static class AddFlippedOverlap extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
@@ -782,7 +782,7 @@ EvaluationOfTemporalRelations_ImplBase{
}
}
- public static class AddClosure extends JCasAnnotator_ImplBase {
+ public static class AddClosure extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
@Override
public void process(JCas jCas) throws
AnalysisEngineProcessException {
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=1636645&r1=1636644&r2=1636645&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
Tue Nov 4 16:57:07 2014
@@ -99,7 +99,7 @@ Evaluation_ImplBase<AnnotationStatistics
this.printErrors = printErrors;
}
- public static class PreserveEventEventRelations extends
JCasAnnotator_ImplBase {
+ public static class PreserveEventEventRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
public static final String PARAM_GOLD_VIEW = "GoldView";
@ConfigurationParameter(name = PARAM_GOLD_VIEW,mandatory=false)
@@ -121,7 +121,7 @@ Evaluation_ImplBase<AnnotationStatistics
}
}
- public static class RemoveNonContainsRelations extends
JCasAnnotator_ImplBase {
+ public static class RemoveNonContainsRelations extends
org.apache.uima.fit.component.JCasAnnotator_ImplBase {
public static final String PARAM_RELATION_VIEW = "RelationView";
@ConfigurationParameter(name =
PARAM_RELATION_VIEW,mandatory=false)
Modified:
ctakes/trunk/ctakes-temporal/src/test/java/org/apache/ctakes/temporal/ae/BackwardsTimeAnnotatorTest.java
URL:
http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/test/java/org/apache/ctakes/temporal/ae/BackwardsTimeAnnotatorTest.java?rev=1636645&r1=1636644&r2=1636645&view=diff
==============================================================================
---
ctakes/trunk/ctakes-temporal/src/test/java/org/apache/ctakes/temporal/ae/BackwardsTimeAnnotatorTest.java
(original)
+++
ctakes/trunk/ctakes-temporal/src/test/java/org/apache/ctakes/temporal/ae/BackwardsTimeAnnotatorTest.java
Tue Nov 4 16:57:07 2014
@@ -86,6 +86,7 @@ public class BackwardsTimeAnnotatorTest
ArrayList<String> temp = new ArrayList<>();
for (TimeMention mention : mentions) {
LOGGER.info("Event: " + mention.getCoveredText());
+ //LOGGER.info("Time: " +
mention.getTime().getNormalizedForm());
temp.add(mention.getCoveredText());
}
assertEquals(2, temp.size());
Modified:
ctakes/trunk/ctakes-temporal/src/test/java/org/apache/ctakes/temporal/ae/EventAnnotatorTest.java
URL:
http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/test/java/org/apache/ctakes/temporal/ae/EventAnnotatorTest.java?rev=1636645&r1=1636644&r2=1636645&view=diff
==============================================================================
---
ctakes/trunk/ctakes-temporal/src/test/java/org/apache/ctakes/temporal/ae/EventAnnotatorTest.java
(original)
+++
ctakes/trunk/ctakes-temporal/src/test/java/org/apache/ctakes/temporal/ae/EventAnnotatorTest.java
Tue Nov 4 16:57:07 2014
@@ -83,8 +83,7 @@ public class EventAnnotatorTest {
ArrayList<String> temp = new ArrayList<>();
for (EventMention mention : mentions) {
- LOGGER.info("Event: " + mention.getCoveredText() + "
Confidence:"
- + mention.getConfidence());
+ LOGGER.info("Event: " + mention.getCoveredText() );
temp.add(mention.getCoveredText());
}
assertEquals(3, temp.size());
