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/03/28 16:52:52 UTC

svn commit: r1462169 - in /uima/sandbox/textmarker/trunk/textmarker-ep-textruler/src/main/java/org/apache/uima/textmarker/textruler: core/TextRulerBasicLearner.java preferences/AlgorithmPreferencePage.java ui/LearnerConfigurator.java

Author: pkluegl
Date: Thu Mar 28 15:52:51 2013
New Revision: 1462169

URL: http://svn.apache.org/r1462169
Log:
UIMA-2777
- fixed preferences
- filter TMBs

Modified:
    uima/sandbox/textmarker/trunk/textmarker-ep-textruler/src/main/java/org/apache/uima/textmarker/textruler/core/TextRulerBasicLearner.java
    uima/sandbox/textmarker/trunk/textmarker-ep-textruler/src/main/java/org/apache/uima/textmarker/textruler/preferences/AlgorithmPreferencePage.java
    uima/sandbox/textmarker/trunk/textmarker-ep-textruler/src/main/java/org/apache/uima/textmarker/textruler/ui/LearnerConfigurator.java

Modified: uima/sandbox/textmarker/trunk/textmarker-ep-textruler/src/main/java/org/apache/uima/textmarker/textruler/core/TextRulerBasicLearner.java
URL: http://svn.apache.org/viewvc/uima/sandbox/textmarker/trunk/textmarker-ep-textruler/src/main/java/org/apache/uima/textmarker/textruler/core/TextRulerBasicLearner.java?rev=1462169&r1=1462168&r2=1462169&view=diff
==============================================================================
--- uima/sandbox/textmarker/trunk/textmarker-ep-textruler/src/main/java/org/apache/uima/textmarker/textruler/core/TextRulerBasicLearner.java (original)
+++ uima/sandbox/textmarker/trunk/textmarker-ep-textruler/src/main/java/org/apache/uima/textmarker/textruler/core/TextRulerBasicLearner.java Thu Mar 28 15:52:51 2013
@@ -84,6 +84,7 @@ public abstract class TextRulerBasicLear
     this.delegate = delegate;
     this.filterSet = filterSet;
     filterSetWithSlotNames = new HashSet<String>(filterSet);
+    filterSetWithSlotNames.add(TextMarkerEngine.BASIC_TYPE);
     for (String s : slotNames) {
       filterSetWithSlotNames.add(s);
       filterSetWithSlotNames.add(TextRulerTarget.getSingleSlotTypeName(

Modified: uima/sandbox/textmarker/trunk/textmarker-ep-textruler/src/main/java/org/apache/uima/textmarker/textruler/preferences/AlgorithmPreferencePage.java
URL: http://svn.apache.org/viewvc/uima/sandbox/textmarker/trunk/textmarker-ep-textruler/src/main/java/org/apache/uima/textmarker/textruler/preferences/AlgorithmPreferencePage.java?rev=1462169&r1=1462168&r2=1462169&view=diff
==============================================================================
--- uima/sandbox/textmarker/trunk/textmarker-ep-textruler/src/main/java/org/apache/uima/textmarker/textruler/preferences/AlgorithmPreferencePage.java (original)
+++ uima/sandbox/textmarker/trunk/textmarker-ep-textruler/src/main/java/org/apache/uima/textmarker/textruler/preferences/AlgorithmPreferencePage.java Thu Mar 28 15:52:51 2013
@@ -70,6 +70,7 @@ public class AlgorithmPreferencePage ext
           }
 
           case ML_FLOAT_PARAM:
+          case ML_DOUBLE_PARAM:
           case ML_INT_PARAM:
           case ML_STRING_PARAM: {
             l = new StringFieldEditor(id, p.name, getFieldEditorParent());

Modified: uima/sandbox/textmarker/trunk/textmarker-ep-textruler/src/main/java/org/apache/uima/textmarker/textruler/ui/LearnerConfigurator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/textmarker/trunk/textmarker-ep-textruler/src/main/java/org/apache/uima/textmarker/textruler/ui/LearnerConfigurator.java?rev=1462169&r1=1462168&r2=1462169&view=diff
==============================================================================
--- uima/sandbox/textmarker/trunk/textmarker-ep-textruler/src/main/java/org/apache/uima/textmarker/textruler/ui/LearnerConfigurator.java (original)
+++ uima/sandbox/textmarker/trunk/textmarker-ep-textruler/src/main/java/org/apache/uima/textmarker/textruler/ui/LearnerConfigurator.java Thu Mar 28 15:52:51 2013
@@ -151,19 +151,19 @@ public class LearnerConfigurator {
         String id = algorithmController.getID() + "." + p.id;
         switch (p.type) {
           case ML_BOOL_PARAM: {
-            result.put(id, store.getBoolean(id));
+            result.put(p.id, store.getBoolean(id));
             break;
           }
           case ML_FLOAT_PARAM: {
-            result.put(id, store.getFloat(id));
+            result.put(p.id, store.getFloat(id));
             break;
           }
           case ML_INT_PARAM: {
-            result.put(id, store.getInt(id));
+            result.put(p.id, store.getInt(id));
             break;
           }
           case ML_STRING_PARAM: {
-            result.put(id, store.getString(id));
+            result.put(p.id, store.getString(id));
             break;
           }
             // case ML_SELECT_PARAM: {