Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-14043: Allow the precision Stream Evaluator to operate on matrices

This commit is contained in:
Joel Bernstein 2019-12-10 12:57:05 -05:00
parent fed199df7b
commit 8c6a2640ed
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PrecisionEvaluator.java
View File

@ -25,7 +25,7 @@ import org.apache.commons.math3.util.Precision;
import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
public class PrecisionEvaluator extends RecursiveNumericEvaluator implements TwoValueWorker {
public class PrecisionEvaluator extends RecursiveObjectEvaluator implements TwoValueWorker {
protected static final long serialVersionUID = 1L;
public PrecisionEvaluator(StreamExpression expression, StreamFactory factory) throws IOException{
@ -43,6 +43,17 @@ public class PrecisionEvaluator extends RecursiveNumericEvaluator implements Two
}
else if(value instanceof List){
return ((List<?>)value).stream().map(innerValue -> doWork(innerValue, ((Number)value2).intValue())).collect(Collectors.toList());
} else if(value instanceof Matrix) {
int p = ((Number)value2).intValue();
Matrix matrix = (Matrix)value;
double[][] data = matrix.getData();
for(int i=0; i<data.length; ++i) {
for(int j=0; j < data[i].length; j++) {
data[i][j] = Precision.round(data[i][j], p);
}
}
return matrix;
}
else{
return Precision.round(((Number)value).doubleValue(), ((Number)value2).intValue());

26
solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
View File

@ -5463,6 +5463,32 @@ public class MathExpressionTest extends SolrCloudTestCase {
assertEquals(num, 1.4445, 0.0);
}
@Test
public void testPrecisionMatrix() throws Exception {
String cexpr = "let(a=matrix(array(1.3333999, 2.4444445), array(2.333333, 10.10009)), b=precision(a, 4))";
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);
List<List<Number>> rows = (List<List<Number>>)tuples.get(0).get("b");
assertTrue(rows.size() == 2);
List<Number> row1 = rows.get(0);
assertTrue(row1.size() == 2);
assertEquals(row1.get(0).doubleValue(), 1.3334, 0);
assertEquals(row1.get(1).doubleValue(), 2.4444, 0);
List<Number> row2 = rows.get(1);
assertTrue(row2.size() == 2);
assertEquals(row2.get(0).doubleValue(), 2.3333, 0);
assertEquals(row2.get(1).doubleValue(), 10.1001, 0);
}
@Test
public void testMinMaxScale() throws Exception {
String cexpr = "let(echo=true, a=minMaxScale(matrix(array(1,2,3,4,5), array(10,20,30,40,50))), " +