svn commit: r1633461 - in /opennlp/trunk/opennlp-tools/src: main/java/opennlp/tools/ml/model/ComparableEvent.java test/java/opennlp/tools/ml/perceptron/PerceptronPrepAttachTest.java

[joern]

Author: joern
Date: Tue Oct 21 20:54:37 2014
New Revision: 1633461

URL: http://svn.apache.org/r1633461
Log:
OPENNLP-722 Ordering of features is removed from the Comparable Event. The 
feature odering should not depend on the ids assigned to them.

Modified:
    
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ComparableEvent.java
    
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/perceptron/PerceptronPrepAttachTest.java

Modified: 
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ComparableEvent.java
URL: 
http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ComparableEvent.java?rev=1633461&r1=1633460&r2=1633461&view=diff
==============================================================================
--- 
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ComparableEvent.java
 (original)
+++ 
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ComparableEvent.java
 Tue Oct 21 20:54:37 2014
@@ -35,11 +35,11 @@ public class ComparableEvent implements 
 
   public ComparableEvent(int oc, int[] pids, float[] values) {
     outcome = oc;
-    if (values == null) {
-      Arrays.sort(pids);
-    } else {
-      sort(pids, values);
-    }
+//    if (values == null) {
+//      Arrays.sort(pids);
+//    } else {
+//      sort(pids, values);
+//    }
     this.values = values; // needs to be sorted like pids
     predIndexes = pids;
   }

Modified: 
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/perceptron/PerceptronPrepAttachTest.java
URL: 
http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/perceptron/PerceptronPrepAttachTest.java?rev=1633461&r1=1633460&r2=1633461&view=diff
==============================================================================
--- 
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/perceptron/PerceptronPrepAttachTest.java
 (original)
+++ 
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/perceptron/PerceptronPrepAttachTest.java
 Tue Oct 21 20:54:37 2014
@@ -83,6 +83,6 @@ public class PerceptronPrepAttachTest {
 
     MaxentModel model = TrainUtil.train(createTrainingStream(), trainParams, 
null);
 
-    testModel(model, 0.7756870512503095);
+    testModel(model, 0.7791532557563754);
   }
 }