You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by co...@apache.org on 2017/05/17 15:52:41 UTC

[15/50] opennlp git commit: OPENNLP-1043: Ensure files are always loaded in same order

OPENNLP-1043: Ensure files are always loaded in same order

Closes #181


Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo
Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/065a6297
Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/065a6297
Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/065a6297

Branch: refs/heads/LangDetect
Commit: 065a62975b1f6f9da50b2efe0c02346d30332968
Parents: 735b1b5
Author: Jörn Kottmann <jo...@apache.org>
Authored: Fri Apr 21 16:14:28 2017 +0200
Committer: Jörn Kottmann <jo...@apache.org>
Committed: Mon Apr 24 11:54:02 2017 +0200

----------------------------------------------------------------------
 .../main/java/opennlp/tools/formats/DirectorySampleStream.java  | 5 +++--
 .../test/java/opennlp/tools/eval/OntoNotes4NameFinderEval.java  | 2 +-
 .../test/java/opennlp/tools/eval/OntoNotes4PosTaggerEval.java   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/opennlp/blob/065a6297/opennlp-tools/src/main/java/opennlp/tools/formats/DirectorySampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/DirectorySampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/formats/DirectorySampleStream.java
index da73507..8d63acc 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/DirectorySampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/DirectorySampleStream.java
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Stack;
@@ -95,6 +96,8 @@ public class DirectorySampleStream implements ObjectStream<File> {
         files = dir.listFiles();
       }
 
+      Arrays.sort(files);
+
       for (File file : files) {
         if (file.isFile()) {
           textFiles.push(file);
@@ -128,7 +131,5 @@ public class DirectorySampleStream implements ObjectStream<File> {
    */
   @Override
   public void close() throws IOException {
-
   }
-  
 }

http://git-wip-us.apache.org/repos/asf/opennlp/blob/065a6297/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4NameFinderEval.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4NameFinderEval.java b/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4NameFinderEval.java
index d654014..e0e3912 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4NameFinderEval.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4NameFinderEval.java
@@ -68,7 +68,7 @@ public class OntoNotes4NameFinderEval {
   @Test
   public void evalEnglishPersonNameFinder() throws IOException {
     TrainingParameters params = ModelUtil.createDefaultTrainingParameters();
-    crossEval(params, "person", 0.8299903903167106d);
+    crossEval(params, "person", 0.8286204642039883d);
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/opennlp/blob/065a6297/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4PosTaggerEval.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4PosTaggerEval.java b/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4PosTaggerEval.java
index 31b42d1..ab33568 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4PosTaggerEval.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4PosTaggerEval.java
@@ -62,6 +62,6 @@ public class OntoNotes4PosTaggerEval {
 
   @Test
   public void evalEnglishMaxentTagger() throws IOException {
-    crossEval(ModelUtil.createDefaultTrainingParameters(), 0.9699561275750962d);
+    crossEval(ModelUtil.createDefaultTrainingParameters(), 0.9698145168879707d);
   }
 }