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 2017/12/22 15:47:01 UTC
lucene-solr:branch_7x: SOLR-11791: Add density Stream Evaluator
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 928621598 -> 1888209f3
SOLR-11791: Add density 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/1888209f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1888209f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1888209f
Branch: refs/heads/branch_7x
Commit: 1888209f39a4d2a436e4c3f7ec447f55649ba4bd
Parents: 9286215
Author: Joel Bernstein <jb...@apache.org>
Authored: Fri Dec 22 10:41:42 2017 -0500
Committer: Joel Bernstein <jb...@apache.org>
Committed: Fri Dec 22 10:42:44 2017 -0500
----------------------------------------------------------------------
.../org/apache/solr/handler/StreamHandler.java | 1 +
.../client/solrj/io/eval/DensityEvaluator.java | 55 ++++++++++++++++++++
.../solrj/io/stream/StreamExpressionTest.java | 6 ++-
3 files changed, 61 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1888209f/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 67d6f7f..fa1aaaa 100644
--- a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
@@ -285,6 +285,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
.withFunctionName("pairedTtest", PairedTTestEvaluator.class)
.withFunctionName("multiVariateNormalDistribution", MultiVariateNormalDistributionEvaluator.class)
.withFunctionName("integrate", IntegrateEvaluator.class)
+ .withFunctionName("density", DensityEvaluator.class)
// Boolean Stream Evaluators
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1888209f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DensityEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DensityEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DensityEvaluator.java
new file mode 100644
index 0000000..4910e6f
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DensityEvaluator.java
@@ -0,0 +1,55 @@
+/*
+ * 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.Locale;
+import java.util.List;
+
+import org.apache.commons.math3.distribution.MultivariateRealDistribution;
+import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
+import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
+
+public class DensityEvaluator extends RecursiveObjectEvaluator implements TwoValueWorker {
+ protected static final long serialVersionUID = 1L;
+
+ public DensityEvaluator(StreamExpression expression, StreamFactory factory) throws IOException{
+ super(expression, factory);
+ }
+
+ @Override
+ public Object doWork(Object first, Object second) throws IOException{
+
+ if (!(first instanceof MultivariateRealDistribution)) {
+ throw new IOException(String.format(Locale.ROOT, "Invalid expression %s - found type %s for the first value, expecting a MultiVariateRealDistribution for density", toExpression(constructingFactory), first.getClass().getSimpleName()));
+ }
+ if (!(second instanceof List)) {
+ throw new IOException(String.format(Locale.ROOT, "Invalid expression %s - found type %s for the second value, expecting a numeric array.", toExpression(constructingFactory), first.getClass().getSimpleName()));
+ }
+
+ MultivariateRealDistribution multivariateRealDistribution = (MultivariateRealDistribution) first;
+ List<Number> nums = (List<Number>) second;
+
+ double[] vec = new double[nums.size()];
+
+ for(int i=0; i<vec.length; i++) {
+ vec[i] = nums.get(i).doubleValue();
+ }
+
+ return multivariateRealDistribution.density(vec);
+ }
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1888209f/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 a9f0f66..c564700 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
@@ -7190,7 +7190,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
" f=multiVariateNormalDistribution(d, e)," +
" g=sample(f, 10000)," +
" h=cov(g)," +
- " i=sample(f))";
+ " i=sample(f)," +
+ " j=density(f, array(4.016093243274465, 138.7283428008585)))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
@@ -7224,6 +7225,9 @@ public class StreamExpressionTest extends SolrCloudTestCase {
Number sample2 = sample.get(1);
assertTrue(sample1.doubleValue() > -30 && sample1.doubleValue() < 30);
assertTrue(sample2.doubleValue() > 50 && sample2.doubleValue() < 250);
+
+ Number density = (Number)tuples.get(0).get("j");
+ assertEquals(density.doubleValue(), 0.007852638121596995, .00001);
}