You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by st...@apache.org on 2013/05/10 12:06:51 UTC
svn commit: r1480973 -
/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations.java
Author: stevenbethard
Date: Fri May 10 10:06:51 2013
New Revision: 1480973
URL: http://svn.apache.org/r1480973
Log:
Removes unnecessary view parameters. Annotators should only have view parameters if they need to work with more than one view.
Modified:
ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations.java
Modified: ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations.java?rev=1480973&r1=1480972&r2=1480973&view=diff
==============================================================================
--- ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations.java (original)
+++ ctakes/trunk/ctakes-temporal/src/main/java/org/apache/ctakes/temporal/eval/EvaluationOfTemporalRelations.java Fri May 10 10:06:51 2013
@@ -155,6 +155,8 @@ public class EvaluationOfTemporalRelatio
GOLD_VIEW_NAME);
aggregateBuilder.add(AnalysisEngineFactory.createPrimitiveDescription(
RemoveCrossSentenceRelations.class,
+ RemoveCrossSentenceRelations.PARAM_SENTENCE_VIEW,
+ CAS.NAME_DEFAULT_SOFA,
RemoveCrossSentenceRelations.PARAM_RELATION_VIEW,
GOLD_VIEW_NAME));
if (this.useClosure) {
@@ -163,10 +165,10 @@ public class EvaluationOfTemporalRelatio
CAS.NAME_DEFAULT_SOFA,
GOLD_VIEW_NAME);
}
- aggregateBuilder.add(AnalysisEngineFactory.createPrimitiveDescription(
- RemoveEventEventRelations.class,
- RemoveEventEventRelations.PARAM_RELATION_VIEW,
- GOLD_VIEW_NAME));
+ aggregateBuilder.add(
+ AnalysisEngineFactory.createPrimitiveDescription(RemoveEventEventRelations.class),
+ CAS.NAME_DEFAULT_SOFA,
+ GOLD_VIEW_NAME);
aggregateBuilder.add(AnalysisEngineFactory.createPrimitiveDescription(RemoveRelations.class));
aggregateBuilder.add(EventTimeRelationAnnotator.createAnnotatorDescription(directory));
@@ -265,20 +267,9 @@ public class EvaluationOfTemporalRelatio
public static class RemoveEventEventRelations extends JCasAnnotator_ImplBase {
- public static final String PARAM_RELATION_VIEW = "RelationView";
-
- @ConfigurationParameter(name = PARAM_RELATION_VIEW)
- private String relationViewName = CAS.NAME_DEFAULT_SOFA;
@Override
public void process(JCas jCas) throws AnalysisEngineProcessException {
- JCas relationView;
- try {
- relationView = jCas.getView(this.relationViewName);
- } catch (CASException e) {
- throw new AnalysisEngineProcessException(e);
- }
-
- for(BinaryTextRelation relation : Lists.newArrayList(JCasUtil.select(relationView, BinaryTextRelation.class))){
+ for(BinaryTextRelation relation : Lists.newArrayList(JCasUtil.select(jCas, BinaryTextRelation.class))){
if(relation.getCategory().equals("CONTAINS")){
RelationArgument arg1 = relation.getArg1();
RelationArgument arg2 = relation.getArg2();
@@ -312,6 +303,11 @@ public class EvaluationOfTemporalRelatio
public static class RemoveCrossSentenceRelations extends JCasAnnotator_ImplBase {
+ public static final String PARAM_SENTENCE_VIEW = "SentenceView";
+
+ @ConfigurationParameter(name = PARAM_SENTENCE_VIEW)
+ private String sentenceViewName = CAS.NAME_DEFAULT_SOFA;
+
public static final String PARAM_RELATION_VIEW = "RelationView";
@ConfigurationParameter(name = PARAM_RELATION_VIEW)
@@ -319,8 +315,9 @@ public class EvaluationOfTemporalRelatio
@Override
public void process(JCas jCas) throws AnalysisEngineProcessException {
- JCas relationView;
+ JCas sentenceView, relationView;
try {
+ sentenceView = jCas.getView(this.sentenceViewName);
relationView = jCas.getView(this.relationViewName);
} catch (CASException e) {
throw new AnalysisEngineProcessException(e);
@@ -329,7 +326,7 @@ public class EvaluationOfTemporalRelatio
// map events and times to the sentences that contain them
Map<IdentifiedAnnotation, Integer> sentenceIndex = Maps.newHashMap();
int index = -1;
- for (Sentence sentence : JCasUtil.select(jCas, Sentence.class)) {
+ for (Sentence sentence : JCasUtil.select(sentenceView, Sentence.class)) {
++index;
for (EventMention event : JCasUtil.selectCovered(relationView, EventMention.class, sentence)) {
sentenceIndex.put(event, index);
@@ -355,21 +352,10 @@ public class EvaluationOfTemporalRelatio
}
public static class RemoveNonContainsRelations extends JCasAnnotator_ImplBase {
- public static final String PARAM_RELATION_VIEW = "RelationView";
-
- @ConfigurationParameter(name = PARAM_RELATION_VIEW)
- private String relationViewName = CAS.NAME_DEFAULT_SOFA;
-
@Override
public void process(JCas jCas) throws AnalysisEngineProcessException {
- JCas relationView;
- try {
- relationView = jCas.getView(this.relationViewName);
- } catch (CASException e) {
- throw new AnalysisEngineProcessException(e);
- }
for (BinaryTextRelation relation : Lists.newArrayList(JCasUtil.select(
- relationView,
+ jCas,
BinaryTextRelation.class))) {
if (!relation.getCategory().startsWith("CONTAINS")) {
relation.getArg1().removeFromIndexes();