SOLR-11414: Add gammaDistribution Stream Evaluator

This commit is contained in:
Joel Bernstein 2017-09-28 14:08:38 -04:00
parent 790533da12
commit 3f94f2ed4c
3 changed files with 100 additions and 1 deletions

View File

@ -306,7 +306,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
.withFunctionName("mode", ModeEvaluator.class)
.withFunctionName("logNormalDistribution", LogNormalDistributionEvaluator.class)
.withFunctionName("zipFDistribution", ZipFDistributionEvaluator.class)
.withFunctionName("gammaDistribution", GammaDistributionEvaluator.class)
// Boolean Stream Evaluators
.withFunctionName("and", AndEvaluator.class)

View File

@ -0,0 +1,48 @@
/*
* 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 org.apache.commons.math3.distribution.GammaDistribution;
import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
public class GammaDistributionEvaluator extends RecursiveNumericEvaluator implements TwoValueWorker {
private static final long serialVersionUID = 1;
public GammaDistributionEvaluator(StreamExpression expression, StreamFactory factory) throws IOException {
super(expression, factory);
}
@Override
public Object doWork(Object first, Object second) throws IOException{
if(null == first){
throw new IOException(String.format(Locale.ROOT,"Invalid expression %s - null found for the first value",toExpression(constructingFactory)));
}
if(null == second){
throw new IOException(String.format(Locale.ROOT,"Invalid expression %s - null found for the second value",toExpression(constructingFactory)));
}
Number shape = (Number)first;
Number scale = (Number)second;
return new GammaDistribution(shape.doubleValue(), scale.doubleValue());
}
}

View File

@ -6398,6 +6398,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
}
}
@Test
public void testEnumeratedDistribution() throws Exception {
String cexpr = "let(a=uniformIntegerDistribution(1, 10)," +
@ -6625,6 +6627,55 @@ public class StreamExpressionTest extends SolrCloudTestCase {
assertTrue(f.doubleValue() < g.doubleValue());
}
@Test
public void testGammaDistribution() throws Exception {
String cexpr = "let(echo=true, " +
"a=describe(sample(gammaDistribution(1, 10),10000)), " +
"b=describe(sample(gammaDistribution(3, 10),10000)), " +
"c=describe(sample(gammaDistribution(5, 10),10000))," +
"d=describe(sample(gammaDistribution(7, 10),10000))," +
"e=mean(sample(gammaDistribution(1, 10),10000))," +
"f=mean(sample(gammaDistribution(1, 20),10000))," +
"g=mean(sample(gammaDistribution(1, 30),10000)))";
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 a = (Map)tuples.get(0).get("a");
Map b = (Map)tuples.get(0).get("b");
Map c = (Map)tuples.get(0).get("c");
Map d = (Map)tuples.get(0).get("d");
Number sa = (Number)a.get("skewness");
Number sb = (Number)b.get("skewness");
Number sc = (Number)c.get("skewness");
Number sd = (Number)d.get("skewness");
//Test shape change
assertTrue(sa.doubleValue() > sb.doubleValue());
assertTrue(sb.doubleValue() > sc.doubleValue());
assertTrue(sc.doubleValue() > sd.doubleValue());
//Test scale change
Number e = (Number)tuples.get(0).get("e");
Number f = (Number)tuples.get(0).get("f");
Number g = (Number)tuples.get(0).get("g");
assertTrue(e.doubleValue() < f.doubleValue());
assertTrue(f.doubleValue() < g.doubleValue());
}
@Test
public void testLogNormalDistribution() throws Exception {
String cexpr = "let(echo=true, " +