You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by jo...@apache.org on 2011/10/04 20:12:08 UTC
svn commit: r1178890 [1/2] - in
/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine: META-INF/ desc/
src/main/java/org/apache/uima/textmarker/
src/main/java/org/apache/uima/textmarker/engine/
src/main/java/org/apache/uima/textmarker/rule/ src/mai...
Author: joern
Date: Tue Oct 4 18:12:06 2011
New Revision: 1178890
URL: http://svn.apache.org/viewvc?rev=1178890&view=rev
Log:
UIMA-2234 Dynamic anchoring of rule elements. Patch from Peter Klügl applied.
Added:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/org/apache/uima/textmarker/DynamicAnchoringTest.java (with props)
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/org/apache/uima/textmarker/DynamicAnchoringTest2.java (with props)
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/org/apache/uima/textmarker/DynamicAnchoringTest2.tm
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/org/apache/uima/textmarker/DynamicAnchoringTest2.txt (with props)
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/META-INF/MANIFEST.MF
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/BasicEngine.xml
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/BasicTypeSystem.xml
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/AbstractRuleElement.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/ComposedRuleElement.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleElement.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleElementCaretaker.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleElementMatch.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/MinMaxGreedy.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/MinMaxReluctant.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/PlusGreedy.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/PlusReluctant.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/QuestionReluctant.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/StarReluctant.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugBlockApply.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugBlockApply_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugEvaluatedCondition.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugEvaluatedCondition_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugFailedRuleMatch.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugFailedRuleMatch_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugMatchedRuleMatch.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugMatchedRuleMatch_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleApply.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleApply_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatch.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatch_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatches.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatches_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleMatch.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleMatch_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalseNegative.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalseNegative_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalsePositive.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalsePositive_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/ProfiledAnnotation.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/ProfiledAnnotation_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/Statistics.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/Statistics_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerAnnotation.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerAnnotation_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerBasic.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerBasic_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerColoring.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerColoring_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerFrame.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerFrame_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TruePositive.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TruePositive_Type.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/visitor/DebugInfoFactory.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/org/apache/uima/textmarker/RuleInferenceTest.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/org/apache/uima/textmarker/TextMarkerTestUtils.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/org/apache/uima/textmarker/RuleInferenceTest.tm
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/META-INF/MANIFEST.MF?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/META-INF/MANIFEST.MF (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/META-INF/MANIFEST.MF Tue Oct 4 18:12:06 2011
@@ -71,9 +71,9 @@ Export-Package:
org.apache.uima.textmarker.utils,
org.apache.uima.textmarker.verbalize,
org.apache.uima.textmarker.visitor
-Require-Bundle:
- org.apache.uima.runtime;bundle-version="2.3.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.apache.uima.runtime;bundle-version="2.3.1",
+ org.junit4;bundle-version="4.8.1"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: University of Würzburg
Eclipse-BuddyPolicy: registered
Eclipse-RegisterBuddy: org.apache.uima.runtime
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/BasicEngine.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/BasicEngine.xml?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/BasicEngine.xml (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/BasicEngine.xml Tue Oct 4 18:12:06 2011
@@ -154,6 +154,13 @@
<multiValued>false</multiValued>
<mandatory>false</mandatory>
</configurationParameter>
+ <configurationParameter>
+ <name>dynamicAnchoring</name>
+ <description>Activates dynamic achoring (possible speed up).</description>
+ <type>Boolean</type>
+ <multiValued>false</multiValued>
+ <mandatory>false</mandatory>
+ </configurationParameter>
</configurationParameters>
<configurationParameterSettings>
<nameValuePair>
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/BasicTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/BasicTypeSystem.xml?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/BasicTypeSystem.xml (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/BasicTypeSystem.xml Tue Oct 4 18:12:06 2011
@@ -17,6 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
+
<typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
<name>BasicTypeSystem</name>
<description/>
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml Tue Oct 4 18:12:06 2011
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
<typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
<name>InternalTypeSystem</name>
<description/>
@@ -147,6 +166,11 @@
<description/>
<rangeTypeName>uima.cas.String</rangeTypeName>
</featureDescription>
+ <featureDescription>
+ <name>ruleAnchor</name>
+ <description/>
+ <rangeTypeName>uima.cas.Boolean</rangeTypeName>
+ </featureDescription>
</features>
</typeDescription>
<typeDescription>
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java Tue Oct 4 18:12:06 2011
@@ -70,6 +70,8 @@ public class TextMarkerStream extends FS
private Map<Integer, TextMarkerBasic> pointerMap = new HashMap<Integer, TextMarkerBasic>();
+ private boolean dynamicAnchoring;
+
protected TextMarkerStream(CAS cas, FSIterator<AnnotationFS> basic,
FSIterator<AnnotationFS> current, Type basicType, FilterManager filter) {
super();
@@ -582,7 +584,7 @@ public class TextMarkerStream extends FS
}
public double getIndexPenalty() {
- return 5;
+ return 2;
}
public TextMarkerBasic getEndAnchor(int end) {
@@ -593,4 +595,12 @@ public class TextMarkerStream extends FS
return beginAnchors.get(begin);
}
+ public boolean isDynamicAnchoring() {
+ return dynamicAnchoring;
+ }
+
+ public void setDynamicAnchoring(boolean dynamicAnchoring) {
+ this.dynamicAnchoring = dynamicAnchoring;
+ }
+
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java Tue Oct 4 18:12:06 2011
@@ -116,6 +116,8 @@ public class TextMarkerEngine extends JC
public static final String DEFAULT_FILTERED_MARKUPS = "defaultFilteredMarkups";
+ public static final String DYNAMIC_ANCHORING = "dynamicAnchoring";
+
private String[] seeders;
private String useBasics;
@@ -172,6 +174,8 @@ public class TextMarkerEngine extends JC
private Map<String, TypeSystemDescription> localTSDMap;
+ private Boolean dynamicAnchoring;
+
@Override
public void initialize(UimaContext aContext) throws ResourceInitializationException {
super.initialize(aContext);
@@ -201,6 +205,7 @@ public class TextMarkerEngine extends JC
scriptEncoding = (String) aContext.getConfigParameterValue(SCRIPT_ENCODING);
defaultFilteredTypes = (String[]) aContext.getConfigParameterValue(DEFAULT_FILTERED_TYPES);
defaultFilteredMarkups = (String[]) aContext.getConfigParameterValue(DEFAULT_FILTERED_MARKUPS);
+ dynamicAnchoring = (Boolean) aContext.getConfigParameterValue(DYNAMIC_ANCHORING);
styleMapFactory = new StyleMapFactory();
@@ -215,6 +220,7 @@ public class TextMarkerEngine extends JC
defaultFilteredTypes = defaultFilteredTypes == null ? new String[0] : defaultFilteredTypes;
defaultFilteredMarkups = defaultFilteredMarkups == null ? new String[0]
: defaultFilteredMarkups;
+ dynamicAnchoring = dynamicAnchoring == null ? false : dynamicAnchoring;
this.context = aContext;
@@ -236,7 +242,7 @@ public class TextMarkerEngine extends JC
}
initializeScript(cas.getCas());
TextMarkerStream stream = initializeStream(cas.getCas());
-
+ stream.setDynamicAnchoring(dynamicAnchoring);
InferenceCrowd crowd = initializeCrowd();
try {
script.apply(stream, crowd);
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/AbstractRuleElement.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/AbstractRuleElement.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/AbstractRuleElement.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/AbstractRuleElement.java Tue Oct 4 18:12:06 2011
@@ -112,6 +112,21 @@ public abstract class AbstractRuleElemen
return result;
}
+ public boolean hasAncestor(boolean after) {
+ RuleElementContainer c = getContainer();
+ if (c == null) {
+ return false;
+ }
+ RuleElement nextElement = c.getNextElement(after, this);
+ if (nextElement != null) {
+ return true;
+ }
+ if (c instanceof ComposedRuleElement) {
+ return ((ComposedRuleElement) c).hasAncestor(after);
+ }
+ return false;
+ }
+
public RuleElementQuantifier getQuantifier() {
return quantifier;
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/ComposedRuleElement.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/ComposedRuleElement.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/ComposedRuleElement.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/ComposedRuleElement.java Tue Oct 4 18:12:06 2011
@@ -68,26 +68,29 @@ public class ComposedRuleElement extends
@Override
public void continueMatch(boolean after, AnnotationFS annotation, RuleMatch ruleMatch,
- RuleApply ruleApply, ComposedRuleElementMatch containerMatch, RuleElement entryPoint,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RuleApply ruleApply, ComposedRuleElementMatch containerMatch,
+ TextMarkerRuleElement sideStepOrigin, RuleElement entryPoint, TextMarkerStream stream,
+ InferenceCrowd crowd) {
+ // TODO: this method cannot be correct!!!!
RuleElement nextElement = getNextElement(after, this);
ComposedRuleElementMatch composedMatch = createComposedMatch(ruleMatch, containerMatch);
- nextElement.continueMatch(after, annotation, ruleMatch, ruleApply, composedMatch, null, stream,
- crowd);
+ nextElement.continueMatch(after, annotation, ruleMatch, ruleApply, composedMatch,
+ sideStepOrigin, entryPoint, stream, crowd);
}
public void fallbackContinue(boolean after, boolean failed, AnnotationFS annotation,
RuleMatch ruleMatch, RuleApply ruleApply, ComposedRuleElementMatch containerMatch,
- RuleElement entryPoint, TextMarkerStream stream, InferenceCrowd crowd) {
+ TextMarkerRuleElement sideStepOrigin, RuleElement entryPoint, TextMarkerStream stream,
+ InferenceCrowd crowd) {
RuleElementContainer container = getContainer();
doMatch(containerMatch, stream, crowd);
if (this.equals(entryPoint)) {
return;
}
if (container == null) {
- fallback(after, failed, annotation, ruleMatch, ruleApply, containerMatch, entryPoint, stream,
- crowd);
+ fallback(after, failed, annotation, ruleMatch, ruleApply, containerMatch, sideStepOrigin,
+ entryPoint, stream, crowd);
} else {
ComposedRuleElementMatch parentContainerMatch = containerMatch.getContainerMatch();
RuleElement nextElement = container.getNextElement(after, this);
@@ -99,26 +102,26 @@ public class ComposedRuleElement extends
AnnotationFS backtrackedAnnotation = getBacktrackedAnnotation(evaluateMatches);
if (backtrackedAnnotation != null) {
nextElement.continueMatch(after, backtrackedAnnotation, ruleMatch, ruleApply,
- parentContainerMatch, null, stream, crowd);
+ parentContainerMatch, sideStepOrigin, null, stream, crowd);
} else {
fallback(after, failed, annotation, ruleMatch, ruleApply, parentContainerMatch,
- entryPoint, stream, crowd);
+ sideStepOrigin, entryPoint, stream, crowd);
}
} else {
fallback(after, failed, annotation, ruleMatch, ruleApply, parentContainerMatch,
- entryPoint, stream, crowd);
+ sideStepOrigin, entryPoint, stream, crowd);
}
} else {
if (quantifier.continueMatch(after, annotation, this, ruleMatch, parentContainerMatch,
stream, crowd)) {
- continueMatch(after, annotation, ruleMatch, ruleApply, parentContainerMatch, null,
- stream, crowd);
+ continueMatch(after, annotation, ruleMatch, ruleApply, parentContainerMatch,
+ sideStepOrigin, null, stream, crowd);
} else if (nextElement != null) {
nextElement.continueMatch(after, annotation, ruleMatch, ruleApply, parentContainerMatch,
- null, stream, crowd);
+ sideStepOrigin, null, stream, crowd);
} else {
fallback(after, failed, annotation, ruleMatch, ruleApply, parentContainerMatch,
- entryPoint, stream, crowd);
+ sideStepOrigin, entryPoint, stream, crowd);
}
}
}
@@ -128,6 +131,7 @@ public class ComposedRuleElement extends
if (evaluateMatches == null) {
return null;
}
+ // TODO both directions!
List<AnnotationFS> textsMatched = evaluateMatches.get(evaluateMatches.size() - 1)
.getTextsMatched();
AnnotationFS backtrackedAnnotation = textsMatched.get(textsMatched.size() - 1);
@@ -136,15 +140,17 @@ public class ComposedRuleElement extends
private void fallback(boolean after, boolean failed, AnnotationFS annotation,
RuleMatch ruleMatch, RuleApply ruleApply, ComposedRuleElementMatch containerMatch,
- RuleElement entryPoint, TextMarkerStream stream, InferenceCrowd crowd) {
- Object sidestep = null;
+ TextMarkerRuleElement sideStepOrigin, RuleElement entryPoint, TextMarkerStream stream,
+ InferenceCrowd crowd) {
RuleElementContainer parentContainer = getContainer();
if (parentContainer instanceof ComposedRuleElement) {
ComposedRuleElement parentElement = (ComposedRuleElement) parentContainer;
parentElement.fallbackContinue(after, failed, annotation, ruleMatch, ruleApply,
- containerMatch, entryPoint, stream, crowd);
- } else if (sidestep != null) {
- // TODO call sidestep
+ containerMatch, sideStepOrigin, entryPoint, stream, crowd);
+ } else if (sideStepOrigin != null) {
+ // System.out.println("SIDESTEP: " + sideStepOrigin);
+ sideStepOrigin.continueSideStep(after, ruleMatch, ruleApply, containerMatch, entryPoint,
+ stream, crowd);
} else {
doneMatching(ruleMatch, ruleApply, stream, crowd);
}
@@ -193,7 +199,7 @@ public class ComposedRuleElement extends
for (RuleElement each : elements) {
result += each.estimateAnchors(stream);
}
- return result / elements.size();
+ return result;
}
@Override
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleElement.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleElement.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleElement.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleElement.java Tue Oct 4 18:12:06 2011
@@ -39,8 +39,9 @@ public interface RuleElement {
InferenceCrowd crowd);
void continueMatch(boolean after, AnnotationFS annotation, RuleMatch ruleMatch,
- RuleApply ruleApply, ComposedRuleElementMatch containerMatch, RuleElement entryPoint,
- TextMarkerStream stream, InferenceCrowd crowd);
+ RuleApply ruleApply, ComposedRuleElementMatch containerMatch,
+ TextMarkerRuleElement sideStepOrigin, RuleElement entryPoint, TextMarkerStream stream,
+ InferenceCrowd crowd);
List<RuleElementMatch> evaluateMatches(List<RuleElementMatch> matches, TextMarkerBlock parent);
@@ -62,4 +63,5 @@ public interface RuleElement {
List<AbstractTextMarkerAction> getActions();
+ boolean hasAncestor(boolean after);
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleElementCaretaker.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleElementCaretaker.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleElementCaretaker.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleElementCaretaker.java Tue Oct 4 18:12:06 2011
@@ -62,24 +62,27 @@ public class RuleElementCaretaker implem
if (ruleElements.size() == 1) {
return ruleElements.get(0);
}
+
+ if (stream.isDynamicAnchoring()) {
+ // TODO activate dynamic anchoring
+ int min = Integer.MAX_VALUE;
+ RuleElement minElement = null;
+ int i = 1;
+ for (RuleElement each : ruleElements) {
+ int estimate = each.estimateAnchors(stream);
+ // TODO what about this formula?
+ double factor = stream.getIndexPenalty();
+ estimate = (int) (Math.log(estimate) * (i * factor));
+ if (estimate < min) {
+ min = estimate;
+ minElement = each;
+ }
+ i++;
+ }
+ return minElement;
+ }
return ruleElements.get(0);
- // TODO activate dynamic anchoring
- // int min = Integer.MAX_VALUE;
- // RuleElement minElement = null;
- // int i = 1;
- // for (RuleElement each : ruleElements) {
- // int estimate = each.estimateAnchors(stream);
- // // TODO what about this formula?
- // double factor = stream.getIndexPenalty();
- // estimate = (int) (Math.log(estimate) * (i * i * i * factor));
- // if (estimate < min) {
- // min = estimate;
- // minElement = each;
- // }
- // i++;
- // }
- // return minElement;
}
@Override
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleElementMatch.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleElementMatch.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleElementMatch.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleElementMatch.java Tue Oct 4 18:12:06 2011
@@ -38,6 +38,8 @@ public class RuleElementMatch {
protected ComposedRuleElementMatch containerMatch;
+ private boolean ruleAnchor = false;
+
public RuleElementMatch(RuleElement ruleElement, ComposedRuleElementMatch containerMatch) {
super();
this.ruleElement = ruleElement;
@@ -125,6 +127,15 @@ public class RuleElementMatch {
copy.setConditions(conditions);
copy.setConditionsMatched(conditionsMatched);
copy.setTextsMatched(textsMatched);
+ copy.setRuleAnchor(ruleAnchor);
return copy;
}
+
+ public boolean isRuleAnchor() {
+ return ruleAnchor;
+ }
+
+ public void setRuleAnchor(boolean ruleAnchor) {
+ this.ruleAnchor = ruleAnchor;
+ }
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java Tue Oct 4 18:12:06 2011
@@ -64,30 +64,32 @@ public class TextMarkerRuleElement exten
extendedContainerMatch = containerMatch.copy();
extendedMatch = ruleMatch.copy(extendedContainerMatch);
}
- doMatch(eachAnchor, extendedMatch, extendedContainerMatch, stream, crowd);
+ doMatch(eachAnchor, extendedMatch, extendedContainerMatch, true, stream, crowd);
if (extendedMatch.matched()) {
+ RuleElement after = getContainer().getNextElement(true, this);
+ RuleElement before = getContainer().getNextElement(false, this);
+ TextMarkerRuleElement sideStepOrigin = hasAncestor(false) ? this : null;
if (quantifier.continueMatch(true, eachAnchor, this, extendedMatch, extendedContainerMatch,
stream, crowd)) {
- continueMatch(true, eachAnchor, extendedMatch, ruleApply, extendedContainerMatch, null,
- stream, crowd);
+ continueMatch(true, eachAnchor, extendedMatch, ruleApply, extendedContainerMatch,
+ sideStepOrigin, null, stream, crowd);
} else {
- RuleElement after = getContainer().getNextElement(true, this);
- RuleElement before = getContainer().getNextElement(false, this);
if (after != null) {
+ sideStepOrigin = hasAncestor(false) ? this : null;
after.continueMatch(true, eachAnchor, extendedMatch, ruleApply, extendedContainerMatch,
- null, stream, crowd);
- }
- // TODO add sidestep functionality here for dynamic anchoring
- if (before != null) {
+ sideStepOrigin, null, stream, crowd);
+ } else if (stream.isDynamicAnchoring() && before != null) {
+ sideStepOrigin = hasAncestor(true) ? this : null;
before.continueMatch(false, eachAnchor, extendedMatch, ruleApply,
- extendedContainerMatch, null, stream, crowd);
+ extendedContainerMatch, sideStepOrigin, null, stream, crowd);
}
if (after == null && before == null) {
if (getContainer() instanceof ComposedRuleElement) {
+ sideStepOrigin = hasAncestor(false) ? this : null;
ComposedRuleElement composed = (ComposedRuleElement) getContainer();
composed.fallbackContinue(true, false, eachAnchor, extendedMatch, ruleApply,
- extendedContainerMatch, entryPoint, stream, crowd);
+ extendedContainerMatch, sideStepOrigin, entryPoint, stream, crowd);
} else if (getContainer() instanceof RuleElementIsolator) {
// TODO move and refactor this:
@@ -99,7 +101,7 @@ public class TextMarkerRuleElement exten
if (getContainer() instanceof ComposedRuleElement) {
ComposedRuleElement composed = (ComposedRuleElement) getContainer();
composed.fallbackContinue(true, true, eachAnchor, extendedMatch, ruleApply,
- extendedContainerMatch, null, stream, crowd);
+ extendedContainerMatch, null, null, stream, crowd);
}
}
@@ -109,14 +111,15 @@ public class TextMarkerRuleElement exten
@Override
public void continueMatch(boolean after, AnnotationFS annotation, RuleMatch ruleMatch,
- RuleApply ruleApply, ComposedRuleElementMatch containerMatch, RuleElement entryPoint,
- TextMarkerStream stream, InferenceCrowd crowd) {
+ RuleApply ruleApply, ComposedRuleElementMatch containerMatch,
+ TextMarkerRuleElement sideStepOrigin, RuleElement entryPoint, TextMarkerStream stream,
+ InferenceCrowd crowd) {
// if() for really lazy quantifiers
if (quantifier.continueMatch(after, annotation, this, ruleMatch, containerMatch, stream, crowd)) {
Collection<AnnotationFS> nextAnnotations = getNextAnnotations(after, annotation, stream);
if (nextAnnotations.isEmpty()) {
- stepbackMatch(after, annotation, ruleMatch, ruleApply, containerMatch, stream, crowd,
- entryPoint);
+ stepbackMatch(after, annotation, ruleMatch, ruleApply, containerMatch, sideStepOrigin,
+ stream, crowd, entryPoint);
}
boolean useAlternatives = entryPoint == null; // nextAnnotations.size() > 1;
for (AnnotationFS eachAnchor : nextAnnotations) {
@@ -127,7 +130,7 @@ public class TextMarkerRuleElement exten
extendedMatch = ruleMatch.copy(extendedContainerMatch);
}
- doMatch(eachAnchor, extendedMatch, extendedContainerMatch, stream, crowd);
+ doMatch(eachAnchor, extendedMatch, extendedContainerMatch, false, stream, crowd);
if (this.equals(entryPoint)) {
return;
@@ -136,32 +139,33 @@ public class TextMarkerRuleElement exten
if (quantifier.continueMatch(after, annotation, this, extendedMatch,
extendedContainerMatch, stream, crowd)) {
continueMatch(after, eachAnchor, extendedMatch, ruleApply, extendedContainerMatch,
- entryPoint, stream, crowd);
+ sideStepOrigin, entryPoint, stream, crowd);
} else {
RuleElement nextRuleElement = getContainer().getNextElement(after, this);
if (nextRuleElement != null) {
nextRuleElement.continueMatch(after, eachAnchor, extendedMatch, ruleApply,
- extendedContainerMatch, null, stream, crowd);
+ extendedContainerMatch, sideStepOrigin, null, stream, crowd);
} else if (getContainer() instanceof ComposedRuleElement) {
ComposedRuleElement composed = (ComposedRuleElement) getContainer();
composed.fallbackContinue(after, false, eachAnchor, extendedMatch, ruleApply,
- extendedContainerMatch, entryPoint, stream, crowd);
+ extendedContainerMatch, sideStepOrigin, entryPoint, stream, crowd);
}
}
} else {
stepbackMatch(after, annotation, extendedMatch, ruleApply, extendedContainerMatch,
- stream, crowd, entryPoint);
+ sideStepOrigin, stream, crowd, entryPoint);
}
}
} else {
- stepbackMatch(after, annotation, ruleMatch, ruleApply, containerMatch, stream, crowd,
- entryPoint);
+ stepbackMatch(after, annotation, ruleMatch, ruleApply, containerMatch, sideStepOrigin,
+ stream, crowd, entryPoint);
}
}
private void stepbackMatch(boolean after, AnnotationFS annotation, RuleMatch ruleMatch,
- RuleApply ruleApply, ComposedRuleElementMatch containerMatch, TextMarkerStream stream,
- InferenceCrowd crowd, RuleElement entryPoint) {
+ RuleApply ruleApply, ComposedRuleElementMatch containerMatch,
+ TextMarkerRuleElement sideStepOrigin, TextMarkerStream stream, InferenceCrowd crowd,
+ RuleElement entryPoint) {
if (ruleApply == null) {
return;
}
@@ -172,11 +176,11 @@ public class TextMarkerRuleElement exten
RuleElement nextRuleElement = getContainer().getNextElement(after, this);
if (nextRuleElement != null) {
nextRuleElement.continueMatch(after, annotation, ruleMatch, ruleApply, containerMatch,
- null, stream, crowd);
+ sideStepOrigin, null, stream, crowd);
} else if (getContainer() instanceof ComposedRuleElement) {
ComposedRuleElement composed = (ComposedRuleElement) getContainer();
composed.fallbackContinue(after, true, annotation, ruleMatch, ruleApply, containerMatch,
- entryPoint, stream, crowd);
+ sideStepOrigin, entryPoint, stream, crowd);
}
} else if (getContainer() instanceof ComposedRuleElement) {
RuleElementMatch failedMatch = new RuleElementMatch(this, containerMatch);
@@ -184,7 +188,7 @@ public class TextMarkerRuleElement exten
containerMatch.addInnerMatch(this, failedMatch);
ComposedRuleElement composed = (ComposedRuleElement) getContainer();
composed.fallbackContinue(after, true, annotation, ruleMatch, ruleApply, containerMatch,
- null, stream, crowd);
+ sideStepOrigin, null, stream, crowd);
}
} else {
List<RuleElementMatch> evaluateMatches = quantifier.evaluateMatches(matchInfo, parent, crowd);
@@ -193,22 +197,67 @@ public class TextMarkerRuleElement exten
RuleElement nextRuleElement = getContainer().getNextElement(after, this);
if (nextRuleElement != null) {
nextRuleElement.continueMatch(after, annotation, ruleMatch, ruleApply, containerMatch,
- null, stream, crowd);
+ sideStepOrigin, null, stream, crowd);
} else {
if (getContainer() instanceof ComposedRuleElement) {
ComposedRuleElement composed = (ComposedRuleElement) getContainer();
composed.fallbackContinue(after, true, annotation, ruleMatch, ruleApply,
- containerMatch, null, stream, crowd);
+ containerMatch, sideStepOrigin, null, stream, crowd);
}
}
}
}
}
+ public void continueSideStep(boolean after, RuleMatch ruleMatch, RuleApply ruleApply,
+ ComposedRuleElementMatch containerMatch, RuleElement entryPoint, TextMarkerStream stream,
+ InferenceCrowd crowd) {
+ boolean newDirection = !after;
+
+ List<AnnotationFS> matchedAnnotationsOf = ruleMatch.getMatchedAnnotationsOf(this, stream);
+ AnnotationFS annotation = null;
+ if (newDirection) {
+ annotation = matchedAnnotationsOf.get(matchedAnnotationsOf.size() - 1);
+ } else {
+ annotation = matchedAnnotationsOf.get(0);
+ }
+ ComposedRuleElementMatch sideStepContainerMatch = containerMatch;
+ if (!containerMatch.getRuleElement().equals(getContainer())) {
+ List<List<RuleElementMatch>> matchInfo = ruleMatch
+ .getMatchInfo((ComposedRuleElement) getContainer());
+ if (newDirection) {
+ List<RuleElementMatch> list = matchInfo.get(matchInfo.size() - 1);
+ sideStepContainerMatch = (ComposedRuleElementMatch) list.get(list.size() - 1);
+ } else {
+ List<RuleElementMatch> list = matchInfo.get(0);
+ sideStepContainerMatch = (ComposedRuleElementMatch) list.get(0);
+ }
+ }
+
+ if (quantifier.continueMatch(newDirection, annotation, this, ruleMatch, sideStepContainerMatch,
+ stream, crowd)) {
+ continueMatch(newDirection, annotation, ruleMatch, ruleApply, sideStepContainerMatch, null,
+ entryPoint, stream, crowd);
+ } else {
+ RuleElement nextRuleElement = getContainer().getNextElement(newDirection, this);
+ if (nextRuleElement != null) {
+ nextRuleElement.continueMatch(newDirection, annotation, ruleMatch, ruleApply,
+ sideStepContainerMatch, null, null, stream, crowd);
+ } else if (getContainer() instanceof ComposedRuleElement) {
+ ComposedRuleElement composed = (ComposedRuleElement) getContainer();
+ composed.fallbackContinue(newDirection, false, annotation, ruleMatch, ruleApply,
+ sideStepContainerMatch, null, entryPoint, stream, crowd);
+ }
+ }
+
+ }
+
private void doMatch(AnnotationFS annotation, RuleMatch ruleMatch,
- ComposedRuleElementMatch containerMatch, TextMarkerStream stream, InferenceCrowd crowd) {
+ ComposedRuleElementMatch containerMatch, boolean ruleAnchor, TextMarkerStream stream,
+ InferenceCrowd crowd) {
// TODO rewite this method!
RuleElementMatch result = new RuleElementMatch(this, containerMatch);
+ result.setRuleAnchor(ruleAnchor);
List<EvaluatedCondition> evaluatedConditions = new ArrayList<EvaluatedCondition>(
conditions.size());
boolean base = matcher.match(annotation, stream, getParent());
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/MinMaxGreedy.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/MinMaxGreedy.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/MinMaxGreedy.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/MinMaxGreedy.java Tue Oct 4 18:12:06 2011
@@ -53,17 +53,6 @@ public class MinMaxGreedy implements Rul
}
}
- // @Override
- // public boolean continueMatch(int index, List<RuleElement> elements, TextMarkerBasic next,
- // RuleElementMatch match, List<RuleElementMatch> matches, TextMarkerStream stream,
- // InferenceCrowd crowd) {
- // int minValue = min.getIntegerValue(elements.get(index).getParent());
- // int maxValue = max.getIntegerValue(elements.get(index).getParent());
- // int matchedSize = matches.size();
- // return matchedSize < maxValue
- // || (!match.matched() && matchedSize >= minValue && matchedSize <= maxValue);
- // }
-
public List<RuleElementMatch> evaluateMatches(List<RuleElementMatch> matches,
TextMarkerStatement element, InferenceCrowd crowd) {
int minValue = min.getIntegerValue(element.getParent());
@@ -105,7 +94,7 @@ public class MinMaxGreedy implements Rul
return true;
}
int matchedSize = list.size();
- if (list == null || list.isEmpty() || matchedSize < maxValue) {
+ if (list == null || list.isEmpty() || matchedSize < minValue) {
return true;
}
RuleElementMatch lastMatch = null;
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/MinMaxReluctant.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/MinMaxReluctant.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/MinMaxReluctant.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/MinMaxReluctant.java Tue Oct 4 18:12:06 2011
@@ -61,40 +61,17 @@ public class MinMaxReluctant implements
return max;
}
- // @Override
- // public boolean continueMatch(int index, List<RuleElement> elements, TextMarkerBasic next,
- // RuleElementMatch match, List<RuleElementMatch> matches, TextMarkerStream stream,
- // InferenceCrowd crowd) {
- // if (next == null)
- // return false;
- // int minValue = min.getIntegerValue(elements.get(index).getParent());
- // int maxValue = max.getIntegerValue(elements.get(index).getParent());
- // int matchedSize = matches.size();
- // boolean result = true;
- // if (index == elements.size() - 1 && matchedSize == minValue) {
- // // reluctant = minimal ... last element needs to match only once.
- // return false;
- // }
- // if (minValue <= matchedSize) {
- // if (index + 1 < elements.size()) {
- // RuleElement element = elements.get(index + 1);
- // // RuleElementMatch nextMatch = element.startMatch(next, null, stream, crowd);
- // // if (nextMatch.matched()) {
- // // result = false;
- // // }
- // }
- // }
- // if (matchedSize >= maxValue) {
- // result = false;
- // }
- // return result;
- //
- // }
@Override
public List<RuleElementMatch> evaluateMatches(List<RuleElementMatch> matches,
TextMarkerStatement element, InferenceCrowd crowd) {
int minValue = min.getIntegerValue(element.getParent());
int maxValue = max.getIntegerValue(element.getParent());
+ if (matches.size() > 0) {
+ RuleElementMatch ruleElementMatch = matches.get(matches.size() - 1);
+ if (!ruleElementMatch.matched()) {
+ matches.remove(ruleElementMatch);
+ }
+ }
int matchedSize = matches.size();
boolean result = matchedSize >= minValue && matchedSize <= maxValue;
if (result) {
@@ -106,14 +83,44 @@ public class MinMaxReluctant implements
@Override
public boolean continueMatch(boolean after, AnnotationFS annotation, RuleElement ruleElement,
- RuleMatch extendedMatch, ComposedRuleElementMatch containerMatch,
- TextMarkerStream stream, InferenceCrowd crowd) {
- return false;
+ RuleMatch ruleMatch, ComposedRuleElementMatch containerMatch, TextMarkerStream stream,
+ InferenceCrowd crowd) {
+ int minValue = min.getIntegerValue(ruleElement.getParent());
+ int maxValue = max.getIntegerValue(ruleElement.getParent());
+ List<RuleElementMatch> list = containerMatch.getInnerMatches().get(ruleElement);
+ if (list == null && maxValue > 0) {
+ return true;
+ }
+
+ int matchedSize = list.size();
+ if (list == null || list.isEmpty() || matchedSize < minValue) {
+ return true;
+ }
+ RuleElementMatch lastMatch = null;
+ if (after) {
+ lastMatch = list.get(list.size() - 1);
+ } else {
+ lastMatch = list.get(0);
+ }
+
+ RuleElement nextElement = ruleElement.getContainer().getNextElement(after, ruleElement);
+ if (nextElement == null) {
+ return false;
+ }
+ ComposedRuleElementMatch extendedContainerMatch = containerMatch.copy();
+ RuleMatch extendedMatch = ruleMatch.copy(extendedContainerMatch);
+ nextElement.continueMatch(after, annotation, extendedMatch, null, extendedContainerMatch, null,
+ nextElement, stream, crowd);
+ List<RuleElementMatch> nextList = extendedContainerMatch.getInnerMatches().get(nextElement);
+ boolean nextMatched = (nextList == null || nextList.isEmpty());
+
+ return matchedSize < maxValue
+ || (!lastMatch.matched() && matchedSize >= minValue && matchedSize <= maxValue && !nextMatched);
}
@Override
public boolean isOptional(TextMarkerBlock parent) {
int minValue = min.getIntegerValue(parent);
- return minValue > 0;
+ return minValue == 0;
}
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/PlusGreedy.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/PlusGreedy.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/PlusGreedy.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/PlusGreedy.java Tue Oct 4 18:12:06 2011
@@ -37,13 +37,6 @@ public class PlusGreedy implements RuleE
super();
}
- // @Override
- // public boolean continueMatch(int index, List<RuleElement> elements, TextMarkerBasic next,
- // RuleElementMatch match, List<RuleElementMatch> matches, TextMarkerStream stream,
- // InferenceCrowd crowd) {
- // return match == null || next != null;
- // }
-
@Override
public List<RuleElementMatch> evaluateMatches(List<RuleElementMatch> matches,
TextMarkerStatement element, InferenceCrowd crowd) {
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/PlusReluctant.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/PlusReluctant.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/PlusReluctant.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/PlusReluctant.java Tue Oct 4 18:12:06 2011
@@ -88,7 +88,7 @@ public class PlusReluctant implements Ru
}
ComposedRuleElementMatch extendedContainerMatch = containerMatch.copy();
RuleMatch extendedMatch = ruleMatch.copy(extendedContainerMatch);
- nextElement.continueMatch(after, annotation, extendedMatch, null, extendedContainerMatch,
+ nextElement.continueMatch(after, annotation, extendedMatch, null, extendedContainerMatch, null,
nextElement, stream, crowd);
List<RuleElementMatch> nextList = extendedContainerMatch.getInnerMatches().get(nextElement);
return nextList == null || nextList.isEmpty();
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/QuestionReluctant.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/QuestionReluctant.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/QuestionReluctant.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/QuestionReluctant.java Tue Oct 4 18:12:06 2011
@@ -66,7 +66,7 @@ public class QuestionReluctant implement
}
ComposedRuleElementMatch extendedContainerMatch = containerMatch.copy();
RuleMatch extendedMatch = ruleMatch.copy(extendedContainerMatch);
- nextElement.continueMatch(after, annotation, extendedMatch, null, extendedContainerMatch,
+ nextElement.continueMatch(after, annotation, extendedMatch, null, extendedContainerMatch, null,
nextElement, stream, crowd);
List<RuleElementMatch> nextList = extendedContainerMatch.getInnerMatches().get(nextElement);
return nextList == null || nextList.isEmpty();
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/StarReluctant.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/StarReluctant.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/StarReluctant.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/StarReluctant.java Tue Oct 4 18:12:06 2011
@@ -48,7 +48,7 @@ public class StarReluctant implements Ru
}
ComposedRuleElementMatch extendedContainerMatch = containerMatch.copy();
RuleMatch extendedMatch = ruleMatch.copy(extendedContainerMatch);
- nextElement.continueMatch(after, annotation, extendedMatch, null, extendedContainerMatch,
+ nextElement.continueMatch(after, annotation, extendedMatch, null, extendedContainerMatch, null,
nextElement, stream, crowd);
List<RuleElementMatch> nextList = extendedContainerMatch.getInnerMatches().get(nextElement);
return nextList == null || nextList.isEmpty();
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugBlockApply.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugBlockApply.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugBlockApply.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugBlockApply.java Tue Oct 4 18:12:06 2011
@@ -10,7 +10,7 @@ import org.apache.uima.jcas.cas.TOP_Type
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* XML source: D:/work/workspace-uima3/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
* @generated */
public class DebugBlockApply extends DebugRuleApply {
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugBlockApply_Type.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugBlockApply_Type.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugBlockApply_Type.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugBlockApply_Type.java Tue Oct 4 18:12:06 2011
@@ -13,7 +13,7 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* @generated */
public class DebugBlockApply_Type extends DebugRuleApply_Type {
/** @generated */
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugEvaluatedCondition.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugEvaluatedCondition.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugEvaluatedCondition.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugEvaluatedCondition.java Tue Oct 4 18:12:06 2011
@@ -11,7 +11,7 @@ import org.apache.uima.jcas.cas.TOP_Type
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* XML source: D:/work/workspace-uima3/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
* @generated */
public class DebugEvaluatedCondition extends TOP {
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugEvaluatedCondition_Type.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugEvaluatedCondition_Type.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugEvaluatedCondition_Type.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugEvaluatedCondition_Type.java Tue Oct 4 18:12:06 2011
@@ -14,7 +14,7 @@ import org.apache.uima.jcas.JCasRegistry
import org.apache.uima.jcas.cas.TOP_Type;
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* @generated */
public class DebugEvaluatedCondition_Type extends TOP_Type {
/** @generated */
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugFailedRuleMatch.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugFailedRuleMatch.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugFailedRuleMatch.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugFailedRuleMatch.java Tue Oct 4 18:12:06 2011
@@ -10,7 +10,7 @@ import org.apache.uima.jcas.cas.TOP_Type
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* XML source: D:/work/workspace-uima3/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
* @generated */
public class DebugFailedRuleMatch extends DebugRuleMatch {
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugFailedRuleMatch_Type.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugFailedRuleMatch_Type.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugFailedRuleMatch_Type.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugFailedRuleMatch_Type.java Tue Oct 4 18:12:06 2011
@@ -11,7 +11,7 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* @generated */
public class DebugFailedRuleMatch_Type extends DebugRuleMatch_Type {
/** @generated */
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugMatchedRuleMatch.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugMatchedRuleMatch.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugMatchedRuleMatch.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugMatchedRuleMatch.java Tue Oct 4 18:12:06 2011
@@ -10,7 +10,7 @@ import org.apache.uima.jcas.cas.TOP_Type
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* XML source: D:/work/workspace-uima3/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
* @generated */
public class DebugMatchedRuleMatch extends DebugRuleMatch {
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugMatchedRuleMatch_Type.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugMatchedRuleMatch_Type.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugMatchedRuleMatch_Type.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugMatchedRuleMatch_Type.java Tue Oct 4 18:12:06 2011
@@ -11,7 +11,7 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* @generated */
public class DebugMatchedRuleMatch_Type extends DebugRuleMatch_Type {
/** @generated */
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleApply.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleApply.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleApply.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleApply.java Tue Oct 4 18:12:06 2011
@@ -10,7 +10,7 @@ import org.apache.uima.jcas.cas.TOP_Type
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* XML source: D:/work/workspace-uima3/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
* @generated */
public class DebugRuleApply extends DebugScriptApply {
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleApply_Type.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleApply_Type.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleApply_Type.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleApply_Type.java Tue Oct 4 18:12:06 2011
@@ -13,7 +13,7 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* @generated */
public class DebugRuleApply_Type extends DebugScriptApply_Type {
/** @generated */
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatch.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatch.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatch.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatch.java Tue Oct 4 18:12:06 2011
@@ -10,7 +10,7 @@ import org.apache.uima.jcas.cas.TOP_Type
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* XML source: D:/work/workspace-uima3/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
* @generated */
public class DebugRuleElementMatch extends ProfiledAnnotation {
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatch_Type.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatch_Type.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatch_Type.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatch_Type.java Tue Oct 4 18:12:06 2011
@@ -13,7 +13,7 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* @generated */
public class DebugRuleElementMatch_Type extends ProfiledAnnotation_Type {
/** @generated */
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatches.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatches.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatches.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatches.java Tue Oct 4 18:12:06 2011
@@ -11,7 +11,7 @@ import org.apache.uima.jcas.cas.TOP_Type
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* XML source: D:/work/workspace-uima3/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
* @generated */
public class DebugRuleElementMatches extends TOP {
@@ -101,6 +101,24 @@ public class DebugRuleElementMatches ext
if (DebugRuleElementMatches_Type.featOkTst && ((DebugRuleElementMatches_Type)jcasType).casFeat_element == null)
jcasType.jcas.throwFeatMissing("element", "org.apache.uima.textmarker.type.DebugRuleElementMatches");
jcasType.ll_cas.ll_setStringValue(addr, ((DebugRuleElementMatches_Type)jcasType).casFeatCode_element, v);}
+
+
+ //*--------------*
+ //* Feature: ruleAnchor
+
+ /** getter for ruleAnchor - gets
+ * @generated */
+ public boolean getRuleAnchor() {
+ if (DebugRuleElementMatches_Type.featOkTst && ((DebugRuleElementMatches_Type)jcasType).casFeat_ruleAnchor == null)
+ jcasType.jcas.throwFeatMissing("ruleAnchor", "org.apache.uima.textmarker.type.DebugRuleElementMatches");
+ return jcasType.ll_cas.ll_getBooleanValue(addr, ((DebugRuleElementMatches_Type)jcasType).casFeatCode_ruleAnchor);}
+
+ /** setter for ruleAnchor - sets
+ * @generated */
+ public void setRuleAnchor(boolean v) {
+ if (DebugRuleElementMatches_Type.featOkTst && ((DebugRuleElementMatches_Type)jcasType).casFeat_ruleAnchor == null)
+ jcasType.jcas.throwFeatMissing("ruleAnchor", "org.apache.uima.textmarker.type.DebugRuleElementMatches");
+ jcasType.ll_cas.ll_setBooleanValue(addr, ((DebugRuleElementMatches_Type)jcasType).casFeatCode_ruleAnchor, v);}
}
\ No newline at end of file
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatches_Type.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatches_Type.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatches_Type.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleElementMatches_Type.java Tue Oct 4 18:12:06 2011
@@ -14,7 +14,7 @@ import org.apache.uima.jcas.JCasRegistry
import org.apache.uima.jcas.cas.TOP_Type;
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* @generated */
public class DebugRuleElementMatches_Type extends TOP_Type {
/** @generated */
@@ -95,6 +95,24 @@ public class DebugRuleElementMatches_Typ
ll_cas.ll_setStringValue(addr, casFeatCode_element, v);}
+
+ /** @generated */
+ final Feature casFeat_ruleAnchor;
+ /** @generated */
+ final int casFeatCode_ruleAnchor;
+ /** @generated */
+ public boolean getRuleAnchor(int addr) {
+ if (featOkTst && casFeat_ruleAnchor == null)
+ jcas.throwFeatMissing("ruleAnchor", "org.apache.uima.textmarker.type.DebugRuleElementMatches");
+ return ll_cas.ll_getBooleanValue(addr, casFeatCode_ruleAnchor);
+ }
+ /** @generated */
+ public void setRuleAnchor(int addr, boolean v) {
+ if (featOkTst && casFeat_ruleAnchor == null)
+ jcas.throwFeatMissing("ruleAnchor", "org.apache.uima.textmarker.type.DebugRuleElementMatches");
+ ll_cas.ll_setBooleanValue(addr, casFeatCode_ruleAnchor, v);}
+
+
@@ -112,6 +130,10 @@ public class DebugRuleElementMatches_Typ
casFeat_element = jcas.getRequiredFeatureDE(casType, "element", "uima.cas.String", featOkTst);
casFeatCode_element = (null == casFeat_element) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_element).getCode();
+
+ casFeat_ruleAnchor = jcas.getRequiredFeatureDE(casType, "ruleAnchor", "uima.cas.Boolean", featOkTst);
+ casFeatCode_ruleAnchor = (null == casFeat_ruleAnchor) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_ruleAnchor).getCode();
+
}
}
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleMatch.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleMatch.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleMatch.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleMatch.java Tue Oct 4 18:12:06 2011
@@ -10,7 +10,7 @@ import org.apache.uima.jcas.cas.TOP_Type
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* XML source: D:/work/workspace-uima3/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
* @generated */
public class DebugRuleMatch extends ProfiledAnnotation {
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleMatch_Type.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleMatch_Type.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleMatch_Type.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugRuleMatch_Type.java Tue Oct 4 18:12:06 2011
@@ -13,7 +13,7 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* @generated */
public class DebugRuleMatch_Type extends ProfiledAnnotation_Type {
/** @generated */
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply.java Tue Oct 4 18:12:06 2011
@@ -10,7 +10,7 @@ import org.apache.uima.jcas.cas.TOP_Type
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* XML source: D:/work/workspace-uima3/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
* @generated */
public class DebugScriptApply extends ProfiledAnnotation {
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply_Type.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply_Type.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply_Type.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/DebugScriptApply_Type.java Tue Oct 4 18:12:06 2011
@@ -13,7 +13,7 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* @generated */
public class DebugScriptApply_Type extends ProfiledAnnotation_Type {
/** @generated */
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation.java Tue Oct 4 18:12:06 2011
@@ -10,7 +10,7 @@ import org.apache.uima.jcas.tcas.Annotat
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* XML source: D:/work/workspace-uima3/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
* @generated */
public class EvalAnnotation extends Annotation {
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation_Type.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation_Type.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation_Type.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/EvalAnnotation_Type.java Tue Oct 4 18:12:06 2011
@@ -14,7 +14,7 @@ import org.apache.uima.jcas.JCasRegistry
import org.apache.uima.jcas.tcas.Annotation_Type;
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* @generated */
public class EvalAnnotation_Type extends Annotation_Type {
/** @generated */
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalseNegative.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalseNegative.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalseNegative.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalseNegative.java Tue Oct 4 18:12:06 2011
@@ -10,7 +10,7 @@ import org.apache.uima.jcas.cas.TOP_Type
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* XML source: D:/work/workspace-uima3/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
* @generated */
public class FalseNegative extends EvalAnnotation {
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalseNegative_Type.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalseNegative_Type.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalseNegative_Type.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalseNegative_Type.java Tue Oct 4 18:12:06 2011
@@ -11,7 +11,7 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* @generated */
public class FalseNegative_Type extends EvalAnnotation_Type {
/** @generated */
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalsePositive.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalsePositive.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalsePositive.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalsePositive.java Tue Oct 4 18:12:06 2011
@@ -10,7 +10,7 @@ import org.apache.uima.jcas.cas.TOP_Type
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* XML source: D:/work/workspace-uima3/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
* @generated */
public class FalsePositive extends EvalAnnotation {
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalsePositive_Type.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalsePositive_Type.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalsePositive_Type.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/FalsePositive_Type.java Tue Oct 4 18:12:06 2011
@@ -11,7 +11,7 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* @generated */
public class FalsePositive_Type extends EvalAnnotation_Type {
/** @generated */
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/ProfiledAnnotation.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/ProfiledAnnotation.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/ProfiledAnnotation.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/ProfiledAnnotation.java Tue Oct 4 18:12:06 2011
@@ -10,7 +10,7 @@ import org.apache.uima.jcas.tcas.Annotat
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* XML source: D:/work/workspace-uima3/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
* @generated */
public class ProfiledAnnotation extends Annotation {
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/ProfiledAnnotation_Type.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/ProfiledAnnotation_Type.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/ProfiledAnnotation_Type.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/ProfiledAnnotation_Type.java Tue Oct 4 18:12:06 2011
@@ -14,7 +14,7 @@ import org.apache.uima.jcas.JCasRegistry
import org.apache.uima.jcas.tcas.Annotation_Type;
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* @generated */
public class ProfiledAnnotation_Type extends Annotation_Type {
/** @generated */
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/Statistics.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/Statistics.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/Statistics.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/Statistics.java Tue Oct 4 18:12:06 2011
@@ -13,7 +13,7 @@ import org.apache.uima.jcas.cas.TOP_Type
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* XML source: D:/work/workspace-uima3/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
* @generated */
public class Statistics extends TOP {
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/Statistics_Type.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/Statistics_Type.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/Statistics_Type.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/Statistics_Type.java Tue Oct 4 18:12:06 2011
@@ -14,7 +14,7 @@ import org.apache.uima.jcas.JCasRegistry
import org.apache.uima.jcas.cas.TOP_Type;
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* @generated */
public class Statistics_Type extends TOP_Type {
/** @generated */
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerAnnotation.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerAnnotation.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerAnnotation.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerAnnotation.java Tue Oct 4 18:12:06 2011
@@ -10,7 +10,7 @@ import org.apache.uima.jcas.tcas.Annotat
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* XML source: D:/work/workspace-uima3/uimaj-ep-textmarker-engine/desc/InternalTypeSystem.xml
* @generated */
public class TextMarkerAnnotation extends Annotation {
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerAnnotation_Type.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerAnnotation_Type.java?rev=1178890&r1=1178889&r2=1178890&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerAnnotation_Type.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerAnnotation_Type.java Tue Oct 4 18:12:06 2011
@@ -14,7 +14,7 @@ import org.apache.uima.jcas.JCasRegistry
import org.apache.uima.jcas.tcas.Annotation_Type;
/**
- * Updated by JCasGen Tue Sep 20 15:37:41 CEST 2011
+ * Updated by JCasGen Mon Sep 26 19:07:28 CEST 2011
* @generated */
public class TextMarkerAnnotation_Type extends Annotation_Type {
/** @generated */