mirror of https://github.com/apache/lucene.git
SOLR-11588: Add matrixMult Stream Evaluator to support matrix multiplication
This commit is contained in:
parent
be7a811f61
commit
e746d7a001
|
@ -316,6 +316,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
|
|||
.withFunctionName("l2norm", NormEvaluator.class)
|
||||
.withFunctionName("l1norm", L1NormEvaluator.class)
|
||||
.withFunctionName("linfnorm", LInfNormEvaluator.class)
|
||||
.withFunctionName("matrixMult", MatrixMultiplyEvaluator.class)
|
||||
|
||||
// Boolean Stream Evaluators
|
||||
|
||||
|
|
|
@ -0,0 +1,67 @@
|
|||
/*
|
||||
* 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.List;
|
||||
import java.util.Locale;
|
||||
|
||||
import org.apache.commons.math3.linear.Array2DRowRealMatrix;
|
||||
import org.apache.commons.math3.linear.RealMatrix;
|
||||
|
||||
import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
|
||||
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
|
||||
|
||||
public class MatrixMultiplyEvaluator extends RecursiveObjectEvaluator implements TwoValueWorker {
|
||||
protected static final long serialVersionUID = 1L;
|
||||
|
||||
public MatrixMultiplyEvaluator(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)));
|
||||
}
|
||||
|
||||
RealMatrix realMatrix1 = getMatrix(first);
|
||||
RealMatrix realMatrix2 = getMatrix(second);
|
||||
RealMatrix realMatrix3 = realMatrix1.multiply(realMatrix2);
|
||||
return new Matrix(realMatrix3.getData());
|
||||
|
||||
}
|
||||
|
||||
private RealMatrix getMatrix(Object o) throws IOException {
|
||||
if(o instanceof Matrix) {
|
||||
Matrix matrix = (Matrix)o;
|
||||
return new Array2DRowRealMatrix(matrix.getData());
|
||||
} else if(o instanceof List) {
|
||||
List<Number> vec = (List<Number>)o;
|
||||
double[][] data1 = new double[1][vec.size()];
|
||||
for(int i=0; i<vec.size(); i++) {
|
||||
data1[0][i] = vec.get(i).doubleValue();
|
||||
}
|
||||
return new Array2DRowRealMatrix(data1);
|
||||
} else {
|
||||
throw new IOException("The matrixMult function can only be applied to numeric arrays and matrices:"+o.getClass().toString());
|
||||
}
|
||||
}
|
||||
}
|
|
@ -6997,6 +6997,84 @@ public class StreamExpressionTest extends SolrCloudTestCase {
|
|||
assertTrue(out.get(5).intValue() == 6);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Test
|
||||
public void testMatrixMult() throws Exception {
|
||||
String cexpr = "let(echo=true," +
|
||||
" a=array(1,2,3)," +
|
||||
" b=matrix(array(4), array(5), array(6))," +
|
||||
" c=matrixMult(a, b)," +
|
||||
" d=matrix(array(3, 4), array(10,11), array(30, 40))," +
|
||||
" e=matrixMult(a, d)," +
|
||||
" f=array(4,8,10)," +
|
||||
" g=matrix(a, f)," +
|
||||
" h=matrixMult(d, g)," +
|
||||
" i=matrixMult(b, a))";
|
||||
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>> matrix = (List<List<Number>>)tuples.get(0).get("c");
|
||||
assertEquals(matrix.size(), 1);
|
||||
List<Number> row = matrix.get(0);
|
||||
assertEquals(row.size(), 1);
|
||||
assertEquals(row.get(0).doubleValue(), 32.0, 0.0);
|
||||
|
||||
matrix = (List<List<Number>>)tuples.get(0).get("e");
|
||||
assertEquals(matrix.size(), 1);
|
||||
row = matrix.get(0);
|
||||
assertEquals(row.size(), 2);
|
||||
assertEquals(row.get(0).doubleValue(), 113.0, 0.0);
|
||||
assertEquals(row.get(1).doubleValue(), 146.0, 0.0);
|
||||
|
||||
matrix = (List<List<Number>>)tuples.get(0).get("h");
|
||||
assertEquals(matrix.size(), 3);
|
||||
row = matrix.get(0);
|
||||
assertEquals(row.size(), 3);
|
||||
assertEquals(row.get(0).doubleValue(), 19.0, 0.0);
|
||||
assertEquals(row.get(1).doubleValue(), 38.0, 0.0);
|
||||
assertEquals(row.get(2).doubleValue(), 49.0, 0.0);
|
||||
|
||||
row = matrix.get(1);
|
||||
assertEquals(row.size(), 3);
|
||||
assertEquals(row.get(0).doubleValue(), 54.0, 0.0);
|
||||
assertEquals(row.get(1).doubleValue(), 108.0, 0.0);
|
||||
assertEquals(row.get(2).doubleValue(), 140.0, 0.0);
|
||||
|
||||
row = matrix.get(2);
|
||||
assertEquals(row.size(), 3);
|
||||
assertEquals(row.get(0).doubleValue(), 190.0, 0.0);
|
||||
assertEquals(row.get(1).doubleValue(), 380.0, 0.0);
|
||||
assertEquals(row.get(2).doubleValue(), 490.0, 0.0);
|
||||
|
||||
matrix = (List<List<Number>>)tuples.get(0).get("i");
|
||||
|
||||
assertEquals(matrix.size(), 3);
|
||||
row = matrix.get(0);
|
||||
assertEquals(row.size(), 3);
|
||||
assertEquals(row.get(0).doubleValue(), 4.0, 0.0);
|
||||
assertEquals(row.get(1).doubleValue(), 8.0, 0.0);
|
||||
assertEquals(row.get(2).doubleValue(), 12.0, 0.0);
|
||||
|
||||
row = matrix.get(1);
|
||||
assertEquals(row.size(), 3);
|
||||
assertEquals(row.get(0).doubleValue(), 5.0, 0.0);
|
||||
assertEquals(row.get(1).doubleValue(), 10.0, 0.0);
|
||||
assertEquals(row.get(2).doubleValue(), 15.0, 0.0);
|
||||
|
||||
row = matrix.get(2);
|
||||
assertEquals(row.size(), 3);
|
||||
assertEquals(row.get(0).doubleValue(), 6.0, 0.0);
|
||||
assertEquals(row.get(1).doubleValue(), 12.0, 0.0);
|
||||
assertEquals(row.get(2).doubleValue(), 18.0, 0.0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testKmeans() throws Exception {
|
||||
String cexpr = "let(echo=true," +
|
||||
|
|
Loading…
Reference in New Issue