Repository: lucene-solr
Updated Branches:
refs/heads/master 9586d12af -> 94a680c31
SOLR-11682: Add gtestDataSet 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/94a680c3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/94a680c3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/94a680c3
Branch: refs/heads/master
Commit: 94a680c31115094cb229bb0134c15a65a7a074d9
Parents: 9586d12
Author: Joel Bernstein <jb...@apache.org>
Authored: Wed Jan 3 21:31:12 2018 -0500
Committer: Joel Bernstein <jb...@apache.org>
Committed: Wed Jan 3 21:31:39 2018 -0500
----------------------------------------------------------------------
.../org/apache/solr/handler/StreamHandler.java | 1 +
.../solrj/io/eval/GTestDataSetEvaluator.java | 64 ++++++++++++++++++++
.../solrj/io/stream/StreamExpressionTest.java | 23 +++++++
3 files changed, 88 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/94a680c3/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
index b8c5ae5..8f3c4d6 100644
--- a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
@@ -291,6 +291,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
.withFunctionName("akima", AkimaEvaluator.class)
.withFunctionName("lerp", LerpEvaluator.class)
.withFunctionName("chiSquareDataSet", ChiSquareDataSetEvaluator.class)
+ .withFunctionName("gtestDataSet", GTestDataSetEvaluator.class)
// Boolean Stream Evaluators
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/94a680c3/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GTestDataSetEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GTestDataSetEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GTestDataSetEvaluator.java
new file mode 100644
index 0000000..d553197
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/GTestDataSetEvaluator.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.solr.client.solrj.io.eval;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.math3.stat.inference.GTest;
+import org.apache.solr.client.solrj.io.Tuple;
+import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
+import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
+
+
+public class GTestDataSetEvaluator extends RecursiveNumericListEvaluator implements TwoValueWorker {
+ protected static final long serialVersionUID = 1L;
+
+ public GTestDataSetEvaluator(StreamExpression expression, StreamFactory factory) throws IOException {
+ super(expression, factory);
+ }
+
+ @Override
+ public Object doWork(Object value1, Object value2) throws IOException {
+
+ List<Number> listA = (List<Number>) value1;
+ List<Number> listB = (List<Number>) value2;
+
+ long[] sampleA = new long[listA.size()];
+ long[] sampleB = new long[listB.size()];
+
+ for(int i=0; i<sampleA.length; i++) {
+ sampleA[i] = listA.get(i).longValue();
+ }
+
+ for(int i=0; i<sampleB.length; i++) {
+ sampleB[i] = listB.get(i).longValue();
+ }
+
+ GTest gTest = new GTest();
+ double g = gTest.gDataSetsComparison(sampleA, sampleB);
+ double p = gTest.gTestDataSetsComparison(sampleA, sampleB);
+
+ Map<String,Number> m = new HashMap<>();
+ m.put("G-statistic", g);
+ m.put("p-value", p);
+ return new Tuple(m);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/94a680c3/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
index 17d67e3..9d41c54 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
@@ -7248,6 +7248,29 @@ public class StreamExpressionTest extends SolrCloudTestCase {
assertEquals(pval.doubleValue(), 0.04242018685334226, .0001);
}
+ @Test
+ public void testGtestDataSet() throws Exception {
+ String cexpr = "let(echo=true," +
+ " a=array(1,1,2,3,4,5,6,7,9,10,11,12), " +
+ " b=array(1,1,2,3,4,5,6,7,1,1,1,1), " +
+ " gtest=gtestDataSet(a, b))";
+
+ ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
+ paramsLoc.set("expr", cexpr);
+ paramsLoc.set("qt", "/stream");
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString()+"/"+COLLECTIONORALIAS;
+ TupleStream solrStream = new SolrStream(url, paramsLoc);
+ StreamContext context = new StreamContext();
+ solrStream.setStreamContext(context);
+ List<Tuple> tuples = getTuples(solrStream);
+ assertTrue(tuples.size() == 1);
+ Map testResult = (Map)tuples.get(0).get("gtest");
+ Number gstat = (Number)testResult.get("G-statistic");
+ Number pval = (Number)testResult.get("p-value");
+ assertEquals(gstat.doubleValue(), 22.41955157784917, .0001);
+ assertEquals(pval.doubleValue(), 0.021317102314826752, .0001);
+ }
+
@Test
public void testMultiVariateNormalDistribution() throws Exception {