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 2018/04/25 01:38:46 UTC
lucene-solr:master: SOLR-12266: Add discrete Fourier transform Stream
Evaluators
Repository: lucene-solr
Updated Branches:
refs/heads/master ac027145f -> c5a173815
SOLR-12266: Add discrete Fourier transform Stream Evaluators
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c5a17381
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c5a17381
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c5a17381
Branch: refs/heads/master
Commit: c5a1738151ef183be3ea20d10d0c897252d9e6ff
Parents: ac02714
Author: Joel Bernstein <jb...@apache.org>
Authored: Tue Apr 24 21:34:55 2018 -0400
Committer: Joel Bernstein <jb...@apache.org>
Committed: Tue Apr 24 21:35:19 2018 -0400
----------------------------------------------------------------------
.../org/apache/solr/client/solrj/io/Lang.java | 2 +
.../solr/client/solrj/io/eval/FFTEvaluator.java | 73 ++++++++++++++++++++
.../client/solrj/io/eval/IFFTEvaluator.java | 71 +++++++++++++++++++
.../apache/solr/client/solrj/io/TestLang.java | 2 +-
.../solrj/io/stream/MathExpressionTest.java | 59 ++++++++++++++++
5 files changed, 206 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c5a17381/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java
index 067bc84..77a7029 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java
@@ -235,6 +235,8 @@ public class Lang {
.withFunctionName("bicubicSpline", BicubicSplineEvaluator.class)
.withFunctionName("valueAt", ValueAtEvaluator.class)
.withFunctionName("memset", MemsetEvaluator.class)
+ .withFunctionName("fft", FFTEvaluator.class)
+ .withFunctionName("ifft", IFFTEvaluator.class)
// Boolean Stream Evaluators
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c5a17381/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FFTEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FFTEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FFTEvaluator.java
new file mode 100644
index 0000000..94fecbf
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FFTEvaluator.java
@@ -0,0 +1,73 @@
+/*
+ * 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.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.commons.math3.transform.DftNormalization;
+import org.apache.commons.math3.transform.FastFourierTransformer;
+import org.apache.commons.math3.transform.TransformType;
+import org.apache.commons.math3.complex.Complex;
+import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
+import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
+
+public class FFTEvaluator extends RecursiveNumericEvaluator implements OneValueWorker {
+ protected static final long serialVersionUID = 1L;
+
+ private static List<String> clabels = new ArrayList();
+
+ static {
+ clabels.add("real");
+ clabels.add("imaginary");
+ }
+
+ public FFTEvaluator(StreamExpression expression, StreamFactory factory) throws IOException{
+ super(expression, factory);
+
+ if(containedEvaluators.size() < 1){
+ throw new IOException(String.format(Locale.ROOT,"Invalid expression %s - expecting at least one value but found %d",expression,containedEvaluators.size()));
+ }
+ }
+
+ @Override
+ public Object doWork(Object v) throws IOException {
+
+ double[] data = ((List<?>)v).stream().mapToDouble(value -> ((Number)value).doubleValue()).toArray();
+
+ FastFourierTransformer fastFourierTransformer = new FastFourierTransformer(DftNormalization.STANDARD);
+ Complex[] complex = fastFourierTransformer.transform(data, TransformType.FORWARD);
+
+ double[] real = new double[complex.length];
+ double[] imaginary = new double[complex.length];
+
+ for(int i=0; i<real.length; ++i) {
+ real[i] = complex[i].getReal();
+ imaginary[i] = complex[i].getImaginary();
+ }
+
+ double[][] d = new double[2][];
+ d[0]=real;
+ d[1]=imaginary;
+
+ Matrix matrix = new Matrix(d);
+ matrix.setRowLabels(clabels);
+ return matrix;
+ }
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c5a17381/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/IFFTEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/IFFTEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/IFFTEvaluator.java
new file mode 100644
index 0000000..2ca230f
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/IFFTEvaluator.java
@@ -0,0 +1,71 @@
+/*
+ * 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.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.commons.math3.complex.Complex;
+import org.apache.commons.math3.transform.DftNormalization;
+import org.apache.commons.math3.transform.FastFourierTransformer;
+import org.apache.commons.math3.transform.TransformType;
+import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
+import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
+
+public class IFFTEvaluator extends RecursiveObjectEvaluator implements OneValueWorker {
+ protected static final long serialVersionUID = 1L;
+
+ public IFFTEvaluator(StreamExpression expression, StreamFactory factory) throws IOException {
+ super(expression, factory);
+ if(containedEvaluators.size() < 1){
+ throw new IOException(String.format(Locale.ROOT,"Invalid expression %s - expecting at least one value but found %d",expression,containedEvaluators.size()));
+ }
+
+ }
+
+ @Override
+ public Object doWork(Object v) throws IOException {
+
+ if(v instanceof Matrix) {
+
+ Matrix matrix = (Matrix)v;
+ double[][] data = matrix.getData();
+ double[] real = data[0];
+ double[] imaginary = data[1];
+ Complex[] complex = new Complex[real.length];
+
+ for (int i = 0; i < real.length; ++i) {
+ complex[i] = new Complex(real[i], imaginary[i]);
+ }
+
+ FastFourierTransformer fastFourierTransformer = new FastFourierTransformer(DftNormalization.STANDARD);
+ Complex[] result = fastFourierTransformer.transform(complex, TransformType.INVERSE);
+
+ List<Number> realResult = new ArrayList();
+ for (int i = 0; i < result.length; ++i) {
+ realResult.add(result[i].getReal());
+ }
+
+ return realResult;
+ } else {
+ throw new IOException("ifft function requires a matrix as a parameter");
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c5a17381/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java
index a98db51..8344191 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java
@@ -68,7 +68,7 @@ public class TestLang extends LuceneTestCase {
TemporalEvaluatorEpoch.FUNCTION_NAME, TemporalEvaluatorWeek.FUNCTION_NAME, TemporalEvaluatorQuarter.FUNCTION_NAME,
TemporalEvaluatorDayOfQuarter.FUNCTION_NAME, "abs", "add", "div", "mult", "sub", "log", "pow",
"mod", "ceil", "floor", "sin", "asin", "sinh", "cos", "acos", "cosh", "tan", "atan", "tanh", "round", "sqrt",
- "cbrt", "coalesce", "uuid", "if", "convert", "valueAt", "memset"};
+ "cbrt", "coalesce", "uuid", "if", "convert", "valueAt", "memset", "fft", "ifft"};
@Test
public void testLang() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c5a17381/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
index 0cf4884..a48e61a 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
@@ -2302,6 +2302,65 @@ public class MathExpressionTest extends SolrCloudTestCase {
}
@Test
+ public void testFFT() throws Exception {
+ String cexpr = "let(echo=true," +
+ " a=fft(array(1, 4, 8, 4, 1, 4, 8, 4, 1, 4, 8, 4, 1, 4, 8, 4))," +
+ " b=ifft(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);
+ assertEquals(tuples.size(), 1);
+
+ List<List<Number>> fft = (List<List<Number>>)tuples.get(0).get("a");
+ assertEquals(fft.size(), 2);
+ List<Number> reals = fft.get(0);
+ assertEquals(reals.get(0).doubleValue(), 68, 0.0);
+ assertEquals(reals.get(1).doubleValue(), 0, 0.0);
+ assertEquals(reals.get(2).doubleValue(), 0, 0.0);
+ assertEquals(reals.get(3).doubleValue(), 0, 0.0);
+ assertEquals(reals.get(4).doubleValue(), -28, 0.0);
+ assertEquals(reals.get(5).doubleValue(), 0, 0.0);
+ assertEquals(reals.get(6).doubleValue(), 0, 0.0);
+ assertEquals(reals.get(7).doubleValue(), 0, 0.0);
+ assertEquals(reals.get(8).doubleValue(), 4, 0.0);
+ assertEquals(reals.get(9).doubleValue(), 0, 0.0);
+ assertEquals(reals.get(10).doubleValue(), 0, 0.0);
+ assertEquals(reals.get(11).doubleValue(), 0, 0.0);
+ assertEquals(reals.get(12).doubleValue(), -28, 0.0);
+ assertEquals(reals.get(13).doubleValue(), 0, 0.0);
+ assertEquals(reals.get(14).doubleValue(), 0, 0.0);
+ assertEquals(reals.get(15).doubleValue(), 0, 0.0);
+
+ List<Number> imaginary = fft.get(1);
+ for(int i=0; i<imaginary.size(); i++) {
+ assertEquals(imaginary.get(i).doubleValue(), 0.0, 0.0);
+ }
+
+ List<Number> ifft = (List<Number>)tuples.get(0).get("b");
+ assertEquals(ifft.get(0).doubleValue(), 1, 0.0);
+ assertEquals(ifft.get(1).doubleValue(), 4, 0.0);
+ assertEquals(ifft.get(2).doubleValue(), 8, 0.0);
+ assertEquals(ifft.get(3).doubleValue(), 4, 0.0);
+ assertEquals(ifft.get(4).doubleValue(), 1, 0.0);
+ assertEquals(ifft.get(5).doubleValue(), 4, 0.0);
+ assertEquals(ifft.get(6).doubleValue(), 8, 0.0);
+ assertEquals(ifft.get(7).doubleValue(), 4, 0.0);
+ assertEquals(ifft.get(8).doubleValue(), 1, 0.0);
+ assertEquals(ifft.get(9).doubleValue(), 4, 0.0);
+ assertEquals(ifft.get(10).doubleValue(), 8, 0.0);
+ assertEquals(ifft.get(11).doubleValue(), 4, 0.0);
+ assertEquals(ifft.get(12).doubleValue(), 1, 0.0);
+ assertEquals(ifft.get(13).doubleValue(), 4, 0.0);
+ assertEquals(ifft.get(14).doubleValue(), 8, 0.0);
+ assertEquals(ifft.get(15).doubleValue(), 4, 0.0);
+ }
+
+ @Test
public void testCosineSimilarity() throws Exception {
String cexpr = "cosineSimilarity(array(2,4,6,8),array(1,1,3,4))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();