You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2018/08/27 15:00:44 UTC
[2/2] lucene-solr:branch_7x: SOLR-12702: Add zscores Stream Evaluator
SOLR-12702: Add zscores Stream Evaluator
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/22c07e1c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/22c07e1c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/22c07e1c
Branch: refs/heads/branch_7x
Commit: 22c07e1cc8a482a09cb621eb43fd6a54982305bc
Parents: a517a7a
Author: Joel Bernstein <jb...@apache.org>
Authored: Mon Aug 27 10:54:36 2018 -0400
Committer: Joel Bernstein <jb...@apache.org>
Committed: Mon Aug 27 10:57:12 2018 -0400
----------------------------------------------------------------------
.../java/org/apache/solr/client/solrj/io/Lang.java | 2 ++
.../org/apache/solr/client/solrj/io/TestLang.java | 2 +-
.../client/solrj/io/stream/MathExpressionTest.java | 14 ++++++++++----
3 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/22c07e1c/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java
index 69673ee..32ee6fc 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java
@@ -254,6 +254,8 @@ public class Lang {
.withFunctionName("getCache", GetCacheEvaluator.class)
.withFunctionName("removeCache", RemoveCacheEvaluator.class)
.withFunctionName("listCache", ListCacheEvaluator.class)
+ .withFunctionName("zscores", NormalizeEvaluator.class)
+
// Boolean Stream Evaluators
.withFunctionName("and", AndEvaluator.class)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/22c07e1c/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java
index 242f551..8c2cb65 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java
@@ -70,7 +70,7 @@ public class TestLang extends LuceneTestCase {
"mod", "ceil", "floor", "sin", "asin", "sinh", "cos", "acos", "cosh", "tan", "atan", "tanh", "round", "sqrt",
"cbrt", "coalesce", "uuid", "if", "convert", "valueAt", "memset", "fft", "ifft", "euclidean","manhattan",
"earthMovers", "canberra", "chebyshev", "ones", "zeros", "setValue", "getValue", "knnRegress", "gaussfit",
- "outliers", "stream", "getCache", "putCache", "listCache", "removeCache"};
+ "outliers", "stream", "getCache", "putCache", "listCache", "removeCache", "zscores"};
@Test
public void testLang() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/22c07e1c/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
index 468d0b3..229e9eb 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
@@ -1327,7 +1327,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
@Test
public void testStandardize() throws Exception {
- String cexpr = "let(echo=true, a=standardize(matrix(array(1,2,3), array(4,5,6))), b=standardize(array(4,5,6)))";
+ String cexpr = "let(echo=true, a=standardize(matrix(array(1,2,3), array(4,5,6))), b=standardize(array(4,5,6)), c=zscores(array(4,5,6)))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
paramsLoc.set("qt", "/stream");
@@ -1353,9 +1353,15 @@ public class MathExpressionTest extends SolrCloudTestCase {
List<Number> array3 = (List<Number>)tuples.get(0).get("b");
assertEquals(array3.size(), 3);
- assertEquals(array2.get(0).doubleValue(), -1, 0.0);
- assertEquals(array2.get(1).doubleValue(), 0, 0.0);
- assertEquals(array2.get(2).doubleValue(), 1, 0.0);
+ assertEquals(array3.get(0).doubleValue(), -1, 0.0);
+ assertEquals(array3.get(1).doubleValue(), 0, 0.0);
+ assertEquals(array3.get(2).doubleValue(), 1, 0.0);
+
+ List<Number> array4 = (List<Number>)tuples.get(0).get("c");
+ assertEquals(array4.size(), 3);
+ assertEquals(array4.get(0).doubleValue(), -1, 0.0);
+ assertEquals(array4.get(1).doubleValue(), 0, 0.0);
+ assertEquals(array4.get(2).doubleValue(), 1, 0.0);
}
@Test