From 7fef7e3374da8ea79616d56d583465dea7ead20b Mon Sep 17 00:00:00 2001 From: Joel Bernstein Date: Thu, 25 May 2017 10:32:28 -0400 Subject: [PATCH] SOLR-10746: Move all Stream Evaluators to the eval package --- .../client/solrj/io/{stream => eval}/ColumnEvaluator.java | 3 +-- .../solrj/io/{stream => eval}/ConvolutionEvaluator.java | 4 +--- .../client/solrj/io/{stream => eval}/CopyOfEvaluator.java | 4 +--- .../solrj/io/{stream => eval}/CopyOfRangeEvaluator.java | 4 +--- .../solrj/io/{stream => eval}/CorrelationEvaluator.java | 4 +--- .../client/solrj/io/{stream => eval}/CovarianceEvaluator.java | 4 +--- .../client/solrj/io/{stream => eval}/DescribeEvaluator.java | 4 +--- .../client/solrj/io/{stream => eval}/DistanceEvaluator.java | 4 +--- .../io/{stream => eval}/EmpiricalDistributionEvaluator.java | 4 +--- .../client/solrj/io/{stream => eval}/FindDelayEvaluator.java | 4 +--- .../client/solrj/io/{stream => eval}/LengthEvaluator.java | 4 +--- .../client/solrj/io/{stream => eval}/NormalizeEvaluator.java | 4 +--- .../client/solrj/io/{stream => eval}/PercentileEvaluator.java | 4 +--- .../client/solrj/io/{stream => eval}/PredictEvaluator.java | 4 +--- .../solr/client/solrj/io/{stream => eval}/RankEvaluator.java | 4 +--- .../client/solrj/io/{stream => eval}/RegressionEvaluator.java | 4 +--- .../client/solrj/io/{stream => eval}/ReverseEvaluator.java | 4 +--- .../solr/client/solrj/io/{stream => eval}/ScaleEvaluator.java | 4 +--- 18 files changed, 18 insertions(+), 53 deletions(-) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/ColumnEvaluator.java (96%) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/ConvolutionEvaluator.java (94%) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/CopyOfEvaluator.java (94%) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/CopyOfRangeEvaluator.java (94%) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/CorrelationEvaluator.java (94%) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/CovarianceEvaluator.java (94%) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/DescribeEvaluator.java (95%) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/DistanceEvaluator.java (94%) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/EmpiricalDistributionEvaluator.java (96%) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/FindDelayEvaluator.java (95%) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/LengthEvaluator.java (93%) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/NormalizeEvaluator.java (94%) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/PercentileEvaluator.java (94%) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/PredictEvaluator.java (93%) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/RankEvaluator.java (94%) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/RegressionEvaluator.java (96%) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/ReverseEvaluator.java (93%) rename solr/solrj/src/java/org/apache/solr/client/solrj/io/{stream => eval}/ScaleEvaluator.java (94%) diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ColumnEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ColumnEvaluator.java similarity index 96% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ColumnEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ColumnEvaluator.java index 3e56837a338..dbb17b07731 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ColumnEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ColumnEvaluator.java @@ -14,14 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import java.util.ArrayList; import java.util.List; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.SimpleEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ConvolutionEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java similarity index 94% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ConvolutionEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java index 6d6e3e33836..6ca178d480f 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ConvolutionEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import java.util.List; @@ -22,8 +22,6 @@ import java.util.ArrayList; import org.apache.commons.math3.util.MathArrays; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.ComplexEvaluator; -import org.apache.solr.client.solrj.io.eval.StreamEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CopyOfEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CopyOfEvaluator.java similarity index 94% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CopyOfEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CopyOfEvaluator.java index 2380e8fce89..d379c41fed5 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CopyOfEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CopyOfEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import java.util.ArrayList; @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.ComplexEvaluator; -import org.apache.solr.client.solrj.io.eval.StreamEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CopyOfRangeEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CopyOfRangeEvaluator.java similarity index 94% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CopyOfRangeEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CopyOfRangeEvaluator.java index c4c1e779094..f1e56ddd137 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CopyOfRangeEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CopyOfRangeEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import java.util.ArrayList; @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.ComplexEvaluator; -import org.apache.solr.client.solrj.io.eval.StreamEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CorrelationEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CorrelationEvaluator.java similarity index 94% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CorrelationEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CorrelationEvaluator.java index 75d0c119e36..fc3d8c3b31e 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CorrelationEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CorrelationEvaluator.java @@ -14,15 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import java.util.List; import org.apache.commons.math3.stat.correlation.PearsonsCorrelation; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.ComplexEvaluator; -import org.apache.solr.client.solrj.io.eval.StreamEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CovarianceEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CovarianceEvaluator.java similarity index 94% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CovarianceEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CovarianceEvaluator.java index 0e3ffcc4d72..7a6de689f8f 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CovarianceEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CovarianceEvaluator.java @@ -14,15 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import java.util.List; import org.apache.commons.math3.stat.correlation.Covariance; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.ComplexEvaluator; -import org.apache.solr.client.solrj.io.eval.StreamEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DescribeEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DescribeEvaluator.java similarity index 95% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DescribeEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DescribeEvaluator.java index e086ebf2df4..196afe57dc1 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DescribeEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DescribeEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import java.util.HashMap; @@ -23,8 +23,6 @@ import java.util.Map; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.ComplexEvaluator; -import org.apache.solr.client.solrj.io.eval.StreamEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DistanceEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DistanceEvaluator.java similarity index 94% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DistanceEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DistanceEvaluator.java index ef45d291cc8..201da4bd5ca 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DistanceEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DistanceEvaluator.java @@ -15,15 +15,13 @@ * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import java.util.List; import org.apache.commons.math3.ml.distance.EuclideanDistance; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.ComplexEvaluator; -import org.apache.solr.client.solrj.io.eval.StreamEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/EmpiricalDistributionEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EmpiricalDistributionEvaluator.java similarity index 96% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/EmpiricalDistributionEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EmpiricalDistributionEvaluator.java index 46d08f5a91f..6885352291d 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/EmpiricalDistributionEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/EmpiricalDistributionEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import java.util.HashMap; @@ -25,8 +25,6 @@ import java.util.Arrays; import org.apache.commons.math3.random.EmpiricalDistribution; import org.apache.commons.math3.stat.descriptive.StatisticalSummary; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.ComplexEvaluator; -import org.apache.solr.client.solrj.io.eval.StreamEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FindDelayEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FindDelayEvaluator.java similarity index 95% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FindDelayEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FindDelayEvaluator.java index c4f9eec2146..c5a9b8acaa0 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FindDelayEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FindDelayEvaluator.java @@ -15,15 +15,13 @@ * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import java.util.List; import org.apache.commons.math3.util.MathArrays; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.ComplexEvaluator; -import org.apache.solr.client.solrj.io.eval.StreamEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/LengthEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LengthEvaluator.java similarity index 93% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/LengthEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LengthEvaluator.java index 3ff0db3b30f..da55ee49316 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/LengthEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LengthEvaluator.java @@ -14,14 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import java.util.List; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.ComplexEvaluator; -import org.apache.solr.client.solrj.io.eval.StreamEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/NormalizeEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NormalizeEvaluator.java similarity index 94% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/NormalizeEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NormalizeEvaluator.java index e011933ad69..c85ac200607 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/NormalizeEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NormalizeEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import java.util.ArrayList; @@ -22,8 +22,6 @@ import java.util.List; import org.apache.commons.math3.stat.StatUtils; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.ComplexEvaluator; -import org.apache.solr.client.solrj.io.eval.StreamEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PercentileEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java similarity index 94% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PercentileEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java index 2bf4d60d33d..19d423d22c2 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PercentileEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java @@ -15,13 +15,11 @@ * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.ComplexEvaluator; -import org.apache.solr.client.solrj.io.eval.StreamEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PredictEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PredictEvaluator.java similarity index 93% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PredictEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PredictEvaluator.java index 3c3ab8447f0..0d1e76312e8 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PredictEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PredictEvaluator.java @@ -15,13 +15,11 @@ * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.ComplexEvaluator; -import org.apache.solr.client.solrj.io.eval.StreamEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RankEvaluator.java similarity index 94% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RankEvaluator.java index 20849289c66..8a22e940b3d 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RankEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import java.util.ArrayList; @@ -22,8 +22,6 @@ import java.util.List; import org.apache.commons.math3.stat.ranking.NaturalRanking; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.ComplexEvaluator; -import org.apache.solr.client.solrj.io.eval.StreamEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RegressionEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RegressionEvaluator.java similarity index 96% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RegressionEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RegressionEvaluator.java index 5306193355c..42a69552846 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RegressionEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RegressionEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import java.util.HashMap; @@ -23,8 +23,6 @@ import java.util.Map; import org.apache.commons.math3.stat.regression.SimpleRegression; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.ComplexEvaluator; -import org.apache.solr.client.solrj.io.eval.StreamEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ReverseEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ReverseEvaluator.java similarity index 93% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ReverseEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ReverseEvaluator.java index 5518ed0fb9f..016e995a614 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ReverseEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ReverseEvaluator.java @@ -14,15 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import java.util.ArrayList; import java.util.List; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.ComplexEvaluator; -import org.apache.solr.client.solrj.io.eval.StreamEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ScaleEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java similarity index 94% rename from solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ScaleEvaluator.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java index 04722aa60ea..8ff2a7cedc5 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ScaleEvaluator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.client.solrj.io.stream; +package org.apache.solr.client.solrj.io.eval; import java.io.IOException; import java.util.ArrayList; @@ -22,8 +22,6 @@ import java.util.List; import org.apache.commons.math3.util.MathArrays; import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.eval.ComplexEvaluator; -import org.apache.solr.client.solrj.io.eval.StreamEvaluator; import org.apache.solr.client.solrj.io.stream.expr.Explanation; import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType; import org.apache.solr.client.solrj.io.stream.expr.Expressible;