You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2013/09/26 13:44:49 UTC

svn commit: r1526449 - in /uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta: cde/ui/ testing/evaluator/ testing/preferences/ testing/ui/handlers/ testing/ui/views/

Author: pkluegl
Date: Thu Sep 26 11:44:48 2013
New Revision: 1526449

URL: http://svn.apache.org/r1526449
Log:
UIMA-3304
- evaluate only selected types not their subtypes
- added preference to include subtypes anyway

Removed:
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/TestingPerspective.java
Modified:
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/DocumentViewRunHandler.java
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/AbstractCasEvaluator.java
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/CoreMatchCasEvaluator.java
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/ExactCasEvaluator.java
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/FeatureCasEvaluator.java
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/ICasEvaluator.java
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/PartialMatchCasEvaluator.java
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/StringFeatureCasEvaluator.java
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/TemplateCasEvaluator.java
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/WordAccuracyCasEvaluator.java
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/WordTemplateCasEvaluator.java
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/preferences/TestingPreferenceConstants.java
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/preferences/TestingPreferenceInitializer.java
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/preferences/TestingPreferencePage.java
    uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RerunActionHandler.java

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/DocumentViewRunHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/DocumentViewRunHandler.java?rev=1526449&r1=1526448&r2=1526449&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/DocumentViewRunHandler.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/DocumentViewRunHandler.java Thu Sep 26 11:44:48 2013
@@ -195,10 +195,12 @@ public class DocumentViewRunHandler impl
                 XmiCasDeserializer.deserialize(new FileInputStream(testFile), testCas, true);
                 IPreferenceStore store = RutaAddonsPlugin.getDefault().getPreferenceStore();
                 String factoryName = store.getString(TestingPreferenceConstants.EVALUATOR_FACTORY);
+                boolean includeSubtypes = store.getBoolean(TestingPreferenceConstants.INCLUDE_SUBTYPES);
+                
                 ICasEvaluator evaluator = RutaAddonsPlugin.getCasEvaluatorFactoryById(factoryName)
                         .createEvaluator();
                 ArrayList<String> excludedTypes = new ArrayList<String>();
-                CAS resultCas = evaluator.evaluate(testCas, inputCAS, excludedTypes);
+                CAS resultCas = evaluator.evaluate(testCas, inputCAS, excludedTypes, includeSubtypes);
                 document.setFMeasure(calculateF1(resultCas));
               }
             }

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/AbstractCasEvaluator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/AbstractCasEvaluator.java?rev=1526449&r1=1526448&r2=1526449&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/AbstractCasEvaluator.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/AbstractCasEvaluator.java Thu Sep 26 11:44:48 2013
@@ -30,14 +30,17 @@ import org.apache.uima.cas.text.Annotati
 
 public abstract class AbstractCasEvaluator implements ICasEvaluator {
 
-  protected List<AnnotationFS> getAnnotations(List<Type> types, CAS cas) {
+  protected List<AnnotationFS> getAnnotations(List<Type> types, CAS cas, boolean includeSubtypes) {
     List<AnnotationFS> result = new ArrayList<AnnotationFS>();
     TypeSystem typeSystem = cas.getTypeSystem();
     AnnotationIndex<AnnotationFS> annotationIndex = cas.getAnnotationIndex();
     for (AnnotationFS each : annotationIndex) {
       Type type = each.getType();
       for (Type eachType : types) {
-        if(typeSystem.subsumes(eachType, type)) {
+        if(includeSubtypes && typeSystem.subsumes(eachType, type)) {
+          result.add(each);
+          break;
+        } else if(eachType.getName().equals(type.getName())) {
           result.add(each);
           break;
         }

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/CoreMatchCasEvaluator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/CoreMatchCasEvaluator.java?rev=1526449&r1=1526448&r2=1526449&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/CoreMatchCasEvaluator.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/CoreMatchCasEvaluator.java Thu Sep 26 11:44:48 2013
@@ -34,7 +34,7 @@ import org.apache.uima.cas.text.Annotati
 
 public class CoreMatchCasEvaluator extends AbstractCasEvaluator {
 
-  public CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes)
+  public CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes, boolean includeSubtypes)
           throws CASRuntimeException, CASException {
     Type annotationType = test.getAnnotationType();
     Type falsePositiveType = run.getTypeSystem().getType(ICasEvaluator.FALSE_POSITIVE);
@@ -52,8 +52,8 @@ public class CoreMatchCasEvaluator exten
       }
     }
 
-    List<AnnotationFS> testAnnotations = getAnnotations(types, test);
-    List<AnnotationFS> runAnnotations = getAnnotations(types, run);
+    List<AnnotationFS> testAnnotations = getAnnotations(types, test, includeSubtypes);
+    List<AnnotationFS> runAnnotations = getAnnotations(types, run, includeSubtypes);
 
     Collection<AnnotationFS> matched = new HashSet<AnnotationFS>();
     List<AnnotationFS> fp = new ArrayList<AnnotationFS>();

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/ExactCasEvaluator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/ExactCasEvaluator.java?rev=1526449&r1=1526448&r2=1526449&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/ExactCasEvaluator.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/ExactCasEvaluator.java Thu Sep 26 11:44:48 2013
@@ -33,7 +33,7 @@ import org.apache.uima.cas.text.Annotati
 
 public class ExactCasEvaluator extends AbstractCasEvaluator {
 
-  public CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes)
+  public CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes, boolean includeSubtypes)
           throws CASRuntimeException, CASException {
     Type annotationType = test.getAnnotationType();
     Type falsePositiveType = run.getTypeSystem().getType(ICasEvaluator.FALSE_POSITIVE);
@@ -51,8 +51,8 @@ public class ExactCasEvaluator extends A
       }
     }
 
-    List<AnnotationFS> testAnnotations = getAnnotations(types, test);
-    List<AnnotationFS> runAnnotations = getAnnotations(types, run);
+    List<AnnotationFS> testAnnotations = getAnnotations(types, test, includeSubtypes);
+    List<AnnotationFS> runAnnotations = getAnnotations(types, run, includeSubtypes);
 
     Collection<AnnotationFS> matched = new HashSet<AnnotationFS>();
     List<AnnotationFS> fp = new ArrayList<AnnotationFS>();

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/FeatureCasEvaluator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/FeatureCasEvaluator.java?rev=1526449&r1=1526448&r2=1526449&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/FeatureCasEvaluator.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/FeatureCasEvaluator.java Thu Sep 26 11:44:48 2013
@@ -40,7 +40,7 @@ import org.apache.uima.ruta.engine.RutaE
 
 public class FeatureCasEvaluator extends AbstractCasEvaluator {
 
-  public CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes)
+  public CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes, boolean includeSubtypes)
           throws CASRuntimeException, CASException {
 
     Type falsePositiveType = run.getTypeSystem().getType(ICasEvaluator.FALSE_POSITIVE);

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/ICasEvaluator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/ICasEvaluator.java?rev=1526449&r1=1526448&r2=1526449&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/ICasEvaluator.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/ICasEvaluator.java Thu Sep 26 11:44:48 2013
@@ -35,7 +35,7 @@ public interface ICasEvaluator {
 
   public static final String ORIGINAL = "original";
 
-  CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes) throws CASRuntimeException,
+  CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes, boolean includeSubtypes) throws CASRuntimeException,
           CASException;
 
 }

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/PartialMatchCasEvaluator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/PartialMatchCasEvaluator.java?rev=1526449&r1=1526448&r2=1526449&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/PartialMatchCasEvaluator.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/PartialMatchCasEvaluator.java Thu Sep 26 11:44:48 2013
@@ -33,7 +33,7 @@ import org.apache.uima.cas.text.Annotati
 
 public class PartialMatchCasEvaluator extends AbstractCasEvaluator {
 
-  public CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes)
+  public CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes, boolean includeSubtypes)
           throws CASRuntimeException, CASException {
     Type annotationType = test.getAnnotationType();
     Type falsePositiveType = run.getTypeSystem().getType(ICasEvaluator.FALSE_POSITIVE);
@@ -51,8 +51,8 @@ public class PartialMatchCasEvaluator ex
       }
     }
 
-    List<AnnotationFS> testAnnotations = getAnnotations(types, test);
-    List<AnnotationFS> runAnnotations = getAnnotations(types, run);
+    List<AnnotationFS> testAnnotations = getAnnotations(types, test, includeSubtypes);
+    List<AnnotationFS> runAnnotations = getAnnotations(types, run, includeSubtypes);
 
     Collection<AnnotationFS> matched = new HashSet<AnnotationFS>();
     List<AnnotationFS> fp = new ArrayList<AnnotationFS>();

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/StringFeatureCasEvaluator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/StringFeatureCasEvaluator.java?rev=1526449&r1=1526448&r2=1526449&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/StringFeatureCasEvaluator.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/StringFeatureCasEvaluator.java Thu Sep 26 11:44:48 2013
@@ -39,7 +39,7 @@ import org.apache.uima.ruta.engine.RutaE
 
 public class StringFeatureCasEvaluator extends AbstractCasEvaluator {
   
-  public CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes)
+  public CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes, boolean includeSubtypes)
           throws CASRuntimeException, CASException {
     Type falsePositiveType = run.getTypeSystem().getType(ICasEvaluator.FALSE_POSITIVE);
     Type falseNegativeType = run.getTypeSystem().getType(ICasEvaluator.FALSE_NEGATIVE);

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/TemplateCasEvaluator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/TemplateCasEvaluator.java?rev=1526449&r1=1526448&r2=1526449&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/TemplateCasEvaluator.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/TemplateCasEvaluator.java Thu Sep 26 11:44:48 2013
@@ -37,7 +37,7 @@ import org.apache.uima.jcas.tcas.Annotat
 
 public class TemplateCasEvaluator implements ICasEvaluator {
 
-  public CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes)
+  public CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes, boolean includeSubtypes)
           throws CASRuntimeException, CASException {
     Type falsePositiveType = run.getTypeSystem().getType(ICasEvaluator.FALSE_POSITIVE);
     Type falseNegativeType = run.getTypeSystem().getType(ICasEvaluator.FALSE_NEGATIVE);

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/WordAccuracyCasEvaluator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/WordAccuracyCasEvaluator.java?rev=1526449&r1=1526448&r2=1526449&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/WordAccuracyCasEvaluator.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/WordAccuracyCasEvaluator.java Thu Sep 26 11:44:48 2013
@@ -36,7 +36,7 @@ import org.apache.uima.ruta.seed.Default
 
 public class WordAccuracyCasEvaluator extends AbstractCasEvaluator {
 
-  public CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes)
+  public CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes, boolean includeSubtypes)
           throws CASRuntimeException, CASException {
     Type annotationType = test.getAnnotationType();
     Type falsePositiveType = run.getTypeSystem().getType(ICasEvaluator.FALSE_POSITIVE);
@@ -54,8 +54,8 @@ public class WordAccuracyCasEvaluator ex
       }
     }
 
-    List<AnnotationFS> testAnnotations = getAnnotations(types, test);
-    List<AnnotationFS> runAnnotations = getAnnotations(types, run);
+    List<AnnotationFS> testAnnotations = getAnnotations(types, test, includeSubtypes);
+    List<AnnotationFS> runAnnotations = getAnnotations(types, run, includeSubtypes);
 
     Collection<AnnotationFS> matched = new HashSet<AnnotationFS>();
     List<AnnotationFS> fp = new ArrayList<AnnotationFS>();

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/WordTemplateCasEvaluator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/WordTemplateCasEvaluator.java?rev=1526449&r1=1526448&r2=1526449&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/WordTemplateCasEvaluator.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/evaluator/WordTemplateCasEvaluator.java Thu Sep 26 11:44:48 2013
@@ -40,7 +40,7 @@ import org.apache.uima.ruta.seed.Default
 
 public class WordTemplateCasEvaluator extends AbstractCasEvaluator {
 
-  public CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes)
+  public CAS evaluate(CAS test, CAS run, Collection<String> excludedTypes, boolean includeSubtypes)
           throws CASRuntimeException, CASException {
     Type falsePositiveType = run.getTypeSystem().getType(ICasEvaluator.FALSE_POSITIVE);
     Type falseNegativeType = run.getTypeSystem().getType(ICasEvaluator.FALSE_NEGATIVE);

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/preferences/TestingPreferenceConstants.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/preferences/TestingPreferenceConstants.java?rev=1526449&r1=1526448&r2=1526449&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/preferences/TestingPreferenceConstants.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/preferences/TestingPreferenceConstants.java Thu Sep 26 11:44:48 2013
@@ -37,15 +37,14 @@ public class TestingPreferenceConstants 
 
   public static final String LOAD_OLD_TEST_RESULTS = "LOAD_OLD_TEST_RESULTS";
 
+  public static final String INCLUDE_SUBTYPES = "INCLUDE_SUBTYPES";
+
   public static String[][] EVALUATORS = getEvaluators();
 
   public static String[][] getEvaluators() {
-
-    List<String[]> result = new ArrayList<String[]>();
-    int size = 0;
-
     IExtension[] evalExtensions = Platform.getExtensionRegistry()
             .getExtensionPoint(RutaAddonsPlugin.PLUGIN_ID, "evaluators").getExtensions();
+    int size = 0;
     for (IExtension extension : evalExtensions) {
       IConfigurationElement[] configurationElements = extension.getConfigurationElements();
       for (IConfigurationElement configurationElement : configurationElements) {

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/preferences/TestingPreferenceInitializer.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/preferences/TestingPreferenceInitializer.java?rev=1526449&r1=1526448&r2=1526449&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/preferences/TestingPreferenceInitializer.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/preferences/TestingPreferenceInitializer.java Thu Sep 26 11:44:48 2013
@@ -34,7 +34,7 @@ public class TestingPreferenceInitialize
 
     store.setDefault(TestingPreferenceConstants.AUTOMATED_FILE_SYNCRONIZATION, "0");
     store.setDefault(TestingPreferenceConstants.LOAD_OLD_TEST_RESULTS, "0");
-
+    store.setDefault(TestingPreferenceConstants.INCLUDE_SUBTYPES, "0");
   }
 
 }

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/preferences/TestingPreferencePage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/preferences/TestingPreferencePage.java?rev=1526449&r1=1526448&r2=1526449&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/preferences/TestingPreferencePage.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/preferences/TestingPreferencePage.java Thu Sep 26 11:44:48 2013
@@ -47,6 +47,8 @@ public class TestingPreferencePage exten
 
   private BooleanFieldEditor oldResults;
 
+  private BooleanFieldEditor includeSubtypes;
+
   public TestingPreferencePage() {
     IPreferenceStore store = RutaAddonsPlugin.getDefault().getPreferenceStore();
     setPreferenceStore(store);
@@ -75,6 +77,13 @@ public class TestingPreferencePage exten
     oldResults.setPreferenceStore(getPreferenceStore());
     oldResults.load();
 
+    includeSubtypes = new BooleanFieldEditor(TestingPreferenceConstants.INCLUDE_SUBTYPES,
+            "Additionally include subtypes", top);
+    includeSubtypes.setPage(this);
+    includeSubtypes.setPreferenceStore(getPreferenceStore());
+    includeSubtypes.load();
+    
+    
     evaluators = new DescriptionRadioGroupFieldEditor(TestingPreferenceConstants.EVALUATOR_FACTORY,
             "Evaluator :", 1, TestingPreferenceConstants.EVALUATORS, top);
 
@@ -113,6 +122,7 @@ public class TestingPreferencePage exten
     sync.loadDefault();
     oldResults.loadDefault();
     evaluators.loadDefault();
+    includeSubtypes.loadDefault();
     super.performDefaults();
   }
 
@@ -121,6 +131,7 @@ public class TestingPreferencePage exten
     sync.store();
     oldResults.store();
     evaluators.store();
+    includeSubtypes.store();
     return super.performOk();
   }
 }

Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RerunActionHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RerunActionHandler.java?rev=1526449&r1=1526448&r2=1526449&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RerunActionHandler.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RerunActionHandler.java Thu Sep 26 11:44:48 2013
@@ -216,9 +216,10 @@ public class RerunActionHandler implemen
           String factoryName = store.getString(TestingPreferenceConstants.EVALUATOR_FACTORY);
           ICasEvaluator evaluator = RutaAddonsPlugin.getCasEvaluatorFactoryById(factoryName)
                   .createEvaluator();
-
+          boolean includeSubtypes = store.getBoolean(TestingPreferenceConstants.INCLUDE_SUBTYPES);
+          
           ae.process(runCas);
-          CAS resultCas = evaluator.evaluate(testCas, runCas, excludedTypes);
+          CAS resultCas = evaluator.evaluate(testCas, runCas, excludedTypes, includeSubtypes);
 
           IPath path2Test = td.getPath().removeLastSegments(1);