You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by to...@apache.org on 2018/03/27 08:15:42 UTC
lucene-solr:master: LUCENE-8223 - remove time dependent checks in
performance test
Repository: lucene-solr
Updated Branches:
refs/heads/master ecb94ba44 -> b3cf209f6
LUCENE-8223 - remove time dependent checks in performance test
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b3cf209f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b3cf209f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b3cf209f
Branch: refs/heads/master
Commit: b3cf209f6faaedd70e8846bcf1ef369942a1acb6
Parents: ecb94ba
Author: Tommaso Teofili <to...@apache.org>
Authored: Tue Mar 27 10:14:55 2018 +0200
Committer: Tommaso Teofili <to...@apache.org>
Committed: Tue Mar 27 10:14:55 2018 +0200
----------------------------------------------------------------------
.../lucene/classification/BM25NBClassifierTest.java | 11 ++---------
.../classification/BooleanPerceptronClassifierTest.java | 11 ++---------
.../classification/CachingNaiveBayesClassifierTest.java | 11 ++---------
.../classification/KNearestFuzzyClassifierTest.java | 12 +++---------
.../classification/KNearestNeighborClassifierTest.java | 12 +++---------
.../classification/SimpleNaiveBayesClassifierTest.java | 11 ++---------
6 files changed, 14 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b3cf209f/lucene/classification/src/test/org/apache/lucene/classification/BM25NBClassifierTest.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/test/org/apache/lucene/classification/BM25NBClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/BM25NBClassifierTest.java
index 724f2a6..237c53f 100644
--- a/lucene/classification/src/test/org/apache/lucene/classification/BM25NBClassifierTest.java
+++ b/lucene/classification/src/test/org/apache/lucene/classification/BM25NBClassifierTest.java
@@ -96,22 +96,15 @@ public class BM25NBClassifierTest extends ClassificationTestBase<BytesRef> {
MockAnalyzer analyzer = new MockAnalyzer(random());
LeafReader leafReader = getRandomIndex(analyzer, 100);
try {
- long trainStart = System.currentTimeMillis();
BM25NBClassifier classifier = new BM25NBClassifier(leafReader,
analyzer, null, categoryFieldName, textFieldName);
- long trainEnd = System.currentTimeMillis();
- long trainTime = trainEnd - trainStart;
- assertTrue("training took more than 10s: " + trainTime / 1000 + "s", trainTime < 10000);
- long evaluationStart = System.currentTimeMillis();
ConfusionMatrixGenerator.ConfusionMatrix confusionMatrix = ConfusionMatrixGenerator.getConfusionMatrix(leafReader,
classifier, categoryFieldName, textFieldName, -1);
assertNotNull(confusionMatrix);
- long evaluationEnd = System.currentTimeMillis();
- long evaluationTime = evaluationEnd - evaluationStart;
- assertTrue("evaluation took more than 2m: " + evaluationTime / 1000 + "s", evaluationTime < 120000);
+
double avgClassificationTime = confusionMatrix.getAvgClassificationTime();
- assertTrue("avg classification time: " + avgClassificationTime, 5000 > avgClassificationTime);
+ assertTrue(avgClassificationTime >= 0);
double f1 = confusionMatrix.getF1Measure();
assertTrue(f1 >= 0d);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b3cf209f/lucene/classification/src/test/org/apache/lucene/classification/BooleanPerceptronClassifierTest.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/test/org/apache/lucene/classification/BooleanPerceptronClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/BooleanPerceptronClassifierTest.java
index 5ecf9c6..9f22e6f 100644
--- a/lucene/classification/src/test/org/apache/lucene/classification/BooleanPerceptronClassifierTest.java
+++ b/lucene/classification/src/test/org/apache/lucene/classification/BooleanPerceptronClassifierTest.java
@@ -86,21 +86,14 @@ public class BooleanPerceptronClassifierTest extends ClassificationTestBase<Bool
MockAnalyzer analyzer = new MockAnalyzer(random());
LeafReader leafReader = getRandomIndex(analyzer, 100);
try {
- long trainStart = System.currentTimeMillis();
BooleanPerceptronClassifier classifier = new BooleanPerceptronClassifier(leafReader, analyzer, null, 1, null, booleanFieldName, textFieldName);
- long trainEnd = System.currentTimeMillis();
- long trainTime = trainEnd - trainStart;
- assertTrue("training took more than 10s: " + trainTime / 1000 + "s", trainTime < 10000);
- long evaluationStart = System.currentTimeMillis();
ConfusionMatrixGenerator.ConfusionMatrix confusionMatrix = ConfusionMatrixGenerator.getConfusionMatrix(leafReader,
classifier, booleanFieldName, textFieldName, -1);
assertNotNull(confusionMatrix);
- long evaluationEnd = System.currentTimeMillis();
- long evaluationTime = evaluationEnd - evaluationStart;
- assertTrue("evaluation took more than 1m: " + evaluationTime / 1000 + "s", evaluationTime < 60000);
+
double avgClassificationTime = confusionMatrix.getAvgClassificationTime();
- assertTrue(5000 > avgClassificationTime);
+ assertTrue(avgClassificationTime >= 0);
double f1 = confusionMatrix.getF1Measure();
assertTrue(f1 >= 0d);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b3cf209f/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java
index ccdb207..00fa4fe 100644
--- a/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java
+++ b/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java
@@ -95,22 +95,15 @@ public class CachingNaiveBayesClassifierTest extends ClassificationTestBase<Byte
MockAnalyzer analyzer = new MockAnalyzer(random());
LeafReader leafReader = getRandomIndex(analyzer, 100);
try {
- long trainStart = System.currentTimeMillis();
CachingNaiveBayesClassifier simpleNaiveBayesClassifier = new CachingNaiveBayesClassifier(leafReader,
analyzer, null, categoryFieldName, textFieldName);
- long trainEnd = System.currentTimeMillis();
- long trainTime = trainEnd - trainStart;
- assertTrue("training took more than 10s: " + trainTime / 1000 + "s", trainTime < 10000);
- long evaluationStart = System.currentTimeMillis();
ConfusionMatrixGenerator.ConfusionMatrix confusionMatrix = ConfusionMatrixGenerator.getConfusionMatrix(leafReader,
simpleNaiveBayesClassifier, categoryFieldName, textFieldName, -1);
assertNotNull(confusionMatrix);
- long evaluationEnd = System.currentTimeMillis();
- long evaluationTime = evaluationEnd - evaluationStart;
- assertTrue("evaluation took more than 1m: " + evaluationTime / 1000 + "s", evaluationTime < 60000);
+
double avgClassificationTime = confusionMatrix.getAvgClassificationTime();
- assertTrue(5000 > avgClassificationTime);
+ assertTrue(avgClassificationTime >= 0);
double accuracy = confusionMatrix.getAccuracy();
assertTrue(accuracy >= 0d);
assertTrue(accuracy <= 1d);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b3cf209f/lucene/classification/src/test/org/apache/lucene/classification/KNearestFuzzyClassifierTest.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/test/org/apache/lucene/classification/KNearestFuzzyClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/KNearestFuzzyClassifierTest.java
index 5c5122a..91cf943 100644
--- a/lucene/classification/src/test/org/apache/lucene/classification/KNearestFuzzyClassifierTest.java
+++ b/lucene/classification/src/test/org/apache/lucene/classification/KNearestFuzzyClassifierTest.java
@@ -69,21 +69,15 @@ public class KNearestFuzzyClassifierTest extends ClassificationTestBase<BytesRef
MockAnalyzer analyzer = new MockAnalyzer(random());
LeafReader leafReader = getRandomIndex(analyzer, 100);
try {
- long trainStart = System.currentTimeMillis();
Classifier<BytesRef> classifier = new KNearestFuzzyClassifier(leafReader, null, analyzer, null, 3, categoryFieldName, textFieldName);
- long trainEnd = System.currentTimeMillis();
- long trainTime = trainEnd - trainStart;
- assertTrue("training took more than 10s: " + trainTime / 1000 + "s", trainTime < 10000);
- long evaluationStart = System.currentTimeMillis();
ConfusionMatrixGenerator.ConfusionMatrix confusionMatrix = ConfusionMatrixGenerator.getConfusionMatrix(leafReader,
classifier, categoryFieldName, textFieldName, -1);
assertNotNull(confusionMatrix);
- long evaluationEnd = System.currentTimeMillis();
- long evaluationTime = evaluationEnd - evaluationStart;
- assertTrue("evaluation took more than 2m: " + evaluationTime / 1000 + "s", evaluationTime < 120000);
+
double avgClassificationTime = confusionMatrix.getAvgClassificationTime();
- assertTrue(5000 > avgClassificationTime);
+ assertTrue(avgClassificationTime >= 0);
+
double accuracy = confusionMatrix.getAccuracy();
assertTrue(accuracy >= 0d);
assertTrue(accuracy <= 1d);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b3cf209f/lucene/classification/src/test/org/apache/lucene/classification/KNearestNeighborClassifierTest.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/test/org/apache/lucene/classification/KNearestNeighborClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/KNearestNeighborClassifierTest.java
index 5e3ce7b..ab73185 100644
--- a/lucene/classification/src/test/org/apache/lucene/classification/KNearestNeighborClassifierTest.java
+++ b/lucene/classification/src/test/org/apache/lucene/classification/KNearestNeighborClassifierTest.java
@@ -125,22 +125,16 @@ public class KNearestNeighborClassifierTest extends ClassificationTestBase<Bytes
MockAnalyzer analyzer = new MockAnalyzer(random());
LeafReader leafReader = getRandomIndex(analyzer, 100);
try {
- long trainStart = System.currentTimeMillis();
KNearestNeighborClassifier kNearestNeighborClassifier = new KNearestNeighborClassifier(leafReader, null,
analyzer, null, 1, 1, 1, categoryFieldName, textFieldName);
- long trainEnd = System.currentTimeMillis();
- long trainTime = trainEnd - trainStart;
- assertTrue("training took more than 10s: " + trainTime / 1000 + "s", trainTime < 10000);
- long evaluationStart = System.currentTimeMillis();
ConfusionMatrixGenerator.ConfusionMatrix confusionMatrix = ConfusionMatrixGenerator.getConfusionMatrix(leafReader,
kNearestNeighborClassifier, categoryFieldName, textFieldName, -1);
assertNotNull(confusionMatrix);
- long evaluationEnd = System.currentTimeMillis();
- long evaluationTime = evaluationEnd - evaluationStart;
- assertTrue("evaluation took more than 2m: " + evaluationTime / 1000 + "s", evaluationTime < 120000);
+
double avgClassificationTime = confusionMatrix.getAvgClassificationTime();
- assertTrue(5000 > avgClassificationTime);
+ assertTrue(avgClassificationTime >= 0);
+
double accuracy = confusionMatrix.getAccuracy();
assertTrue(accuracy >= 0d);
assertTrue(accuracy <= 1d);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b3cf209f/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java
index 0e05d4f..be1eab1 100644
--- a/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java
+++ b/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java
@@ -98,22 +98,15 @@ public class SimpleNaiveBayesClassifierTest extends ClassificationTestBase<Bytes
MockAnalyzer analyzer = new MockAnalyzer(random());
LeafReader leafReader = getRandomIndex(analyzer, 100);
try {
- long trainStart = System.currentTimeMillis();
SimpleNaiveBayesClassifier simpleNaiveBayesClassifier = new SimpleNaiveBayesClassifier(leafReader,
analyzer, null, categoryFieldName, textFieldName);
- long trainEnd = System.currentTimeMillis();
- long trainTime = trainEnd - trainStart;
- assertTrue("training took more than 10s: " + trainTime / 1000 + "s", trainTime < 10000);
- long evaluationStart = System.currentTimeMillis();
ConfusionMatrixGenerator.ConfusionMatrix confusionMatrix = ConfusionMatrixGenerator.getConfusionMatrix(leafReader,
simpleNaiveBayesClassifier, categoryFieldName, textFieldName, -1);
assertNotNull(confusionMatrix);
- long evaluationEnd = System.currentTimeMillis();
- long evaluationTime = evaluationEnd - evaluationStart;
- assertTrue("evaluation took more than 2m: " + evaluationTime / 1000 + "s", evaluationTime < 120000);
+
double avgClassificationTime = confusionMatrix.getAvgClassificationTime();
- assertTrue("avg classification time: " + avgClassificationTime, 5000 > avgClassificationTime);
+ assertTrue(avgClassificationTime >= 0);
double f1 = confusionMatrix.getF1Measure();
assertTrue(f1 >= 0d);