Move ltr.feature.norm classes into their own ltr.norm package (apache#87

) * Move ltr.feature.norm classes into their own ltr.norm package (since now Feature.java now longer uses Normalizer.java). * Folding norm.impl.* into just norm package. * Remove two not-needed imports.
mnilsson23 · Sep 28, 2016 · 70c1682 · 70c1682
1 parent 843b299
commit 70c1682
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 53 deletions.
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/norm/impl/package-info.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/feature/norm/impl/package-info.java
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/log/LoggingModel.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/log/LoggingModel.java
@@ -22,8 +22,8 @@
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.Explanation;
-import org.apache.solr.ltr.feature.norm.Normalizer;
 import org.apache.solr.ltr.model.LTRScoringModel;
+import org.apache.solr.ltr.norm.Normalizer;
 import org.apache.solr.ltr.ranking.Feature;
 import org.apache.solr.ltr.util.LTRUtils;
 

diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/LTRScoringModel.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/LTRScoringModel.java
@@ -24,8 +24,8 @@
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.Explanation;
 import org.apache.solr.ltr.feature.FeatureException;
-import org.apache.solr.ltr.feature.norm.Normalizer;
-import org.apache.solr.ltr.feature.norm.impl.IdentityNormalizer;
+import org.apache.solr.ltr.norm.IdentityNormalizer;
+import org.apache.solr.ltr.norm.Normalizer;
 import org.apache.solr.ltr.ranking.Feature;
 
 /**

diff --git a/...feature/norm/impl/IdentityNormalizer.java → ...che/solr/ltr/norm/IdentityNormalizer.java b/...feature/norm/impl/IdentityNormalizer.java → ...che/solr/ltr/norm/IdentityNormalizer.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.solr.ltr.feature.norm.impl;
+package org.apache.solr.ltr.norm;
 
 import java.util.LinkedHashMap;
 
-import org.apache.solr.ltr.feature.norm.Normalizer;
-
 public class IdentityNormalizer extends Normalizer {
 
   public static final IdentityNormalizer INSTANCE = new IdentityNormalizer();

diff --git a/...r/feature/norm/impl/MinMaxNormalizer.java → ...pache/solr/ltr/norm/MinMaxNormalizer.java b/...r/feature/norm/impl/MinMaxNormalizer.java → ...pache/solr/ltr/norm/MinMaxNormalizer.java
@@ -14,10 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.solr.ltr.feature.norm.impl;
+package org.apache.solr.ltr.norm;
 
 import java.util.LinkedHashMap;
-import org.apache.solr.ltr.feature.norm.Normalizer;
 
 public class MinMaxNormalizer extends Normalizer {
 

diff --git a/...che/solr/ltr/feature/norm/Normalizer.java → .../org/apache/solr/ltr/norm/Normalizer.java b/...che/solr/ltr/feature/norm/Normalizer.java → .../org/apache/solr/ltr/norm/Normalizer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.solr.ltr.feature.norm;
+package org.apache.solr.ltr.norm;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

diff --git a/...feature/norm/impl/StandardNormalizer.java → ...che/solr/ltr/norm/StandardNormalizer.java b/...feature/norm/impl/StandardNormalizer.java → ...che/solr/ltr/norm/StandardNormalizer.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.solr.ltr.feature.norm.impl;
+package org.apache.solr.ltr.norm;
 
 import java.util.LinkedHashMap;
 
-import org.apache.solr.ltr.feature.norm.Normalizer;
-
 public class StandardNormalizer extends Normalizer {
 
   private float avg = 0f;

diff --git a/...e/solr/ltr/feature/norm/package-info.java → ...rg/apache/solr/ltr/norm/package-info.java b/...e/solr/ltr/feature/norm/package-info.java → ...rg/apache/solr/ltr/norm/package-info.java
@@ -20,4 +20,4 @@
  * will be computed, the normalizer will be applied and the resulting values
  * will be received by the model.
  */
-package org.apache.solr.ltr.feature.norm;
+package org.apache.solr.ltr.norm;
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/ranking/LambdaMARTModel.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/ranking/LambdaMARTModel.java
@@ -23,9 +23,9 @@
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.Explanation;
-import org.apache.solr.ltr.feature.norm.Normalizer;
 import org.apache.solr.ltr.model.LTRScoringModel;
 import org.apache.solr.ltr.model.ModelException;
+import org.apache.solr.ltr.norm.Normalizer;
 import org.apache.solr.ltr.util.LTRUtils;
 
 public class LambdaMARTModel extends LTRScoringModel {

diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/ranking/RankSVMModel.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/ranking/RankSVMModel.java
@@ -22,9 +22,9 @@
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.Explanation;
-import org.apache.solr.ltr.feature.norm.Normalizer;
 import org.apache.solr.ltr.model.LTRScoringModel;
 import org.apache.solr.ltr.model.ModelException;
+import org.apache.solr.ltr.norm.Normalizer;
 
 public class RankSVMModel extends LTRScoringModel {
 

diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/rest/ManagedModelStore.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/rest/ManagedModelStore.java
@@ -32,10 +32,10 @@
 import org.apache.solr.core.SolrResourceLoader;
 import org.apache.solr.ltr.feature.FeatureStore;
 import org.apache.solr.ltr.feature.ModelStore;
-import org.apache.solr.ltr.feature.norm.Normalizer;
-import org.apache.solr.ltr.feature.norm.impl.IdentityNormalizer;
 import org.apache.solr.ltr.model.LTRScoringModel;
 import org.apache.solr.ltr.model.ModelException;
+import org.apache.solr.ltr.norm.IdentityNormalizer;
+import org.apache.solr.ltr.norm.Normalizer;
 import org.apache.solr.ltr.ranking.Feature;
 import org.apache.solr.ltr.util.CommonLTRParams;
 import org.apache.solr.response.SolrQueryResponse;

diff --git a/solr/contrib/ltr/src/test-files/modelExamples/fq-model.json b/solr/contrib/ltr/src/test-files/modelExamples/fq-model.json
@@ -5,7 +5,7 @@
         {
             "name":"matchedTitle",
             "norm": {
-                "class":"org.apache.solr.ltr.feature.norm.impl.MinMaxNormalizer",
+                "class":"org.apache.solr.ltr.norm.MinMaxNormalizer",
                 "params":{ "min":"0.0f", "max":"10.0f" }
             }
         },

diff --git a/solr/contrib/ltr/src/test-files/modelExamples/ranksvm-model.json b/solr/contrib/ltr/src/test-files/modelExamples/ranksvm-model.json
@@ -8,7 +8,7 @@
         {
             "name":"popularity",
             "norm": {
-                "class":"org.apache.solr.ltr.feature.norm.impl.MinMaxNormalizer",
+                "class":"org.apache.solr.ltr.norm.MinMaxNormalizer",
                 "params":{ "min":"0.0f", "max":"10.0f" }
             }
         },

diff --git a/solr/contrib/ltr/src/test-files/modelExamples/svm-model-normalized.json b/solr/contrib/ltr/src/test-files/modelExamples/svm-model-normalized.json
@@ -5,7 +5,7 @@
 	    {
                 "name":"feature2normalize",
                 "norm": {
-                    "class":"org.apache.solr.ltr.feature.norm.impl.StandardNormalizer",
+                    "class":"org.apache.solr.ltr.norm.StandardNormalizer",
 
                     "params":{
                         "avg":0.0,

diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestLTRScoringModel.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestLTRScoringModel.java
@@ -25,10 +25,10 @@
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.ltr.TestRerankBase;
-import org.apache.solr.ltr.feature.norm.Normalizer;
-import org.apache.solr.ltr.feature.norm.impl.IdentityNormalizer;
 import org.apache.solr.ltr.model.LTRScoringModel;
 import org.apache.solr.ltr.model.ModelException;
+import org.apache.solr.ltr.norm.IdentityNormalizer;
+import org.apache.solr.ltr.norm.Normalizer;
 import org.apache.solr.ltr.ranking.Feature;
 import org.apache.solr.ltr.ranking.RankSVMModel;
 import org.apache.solr.ltr.rest.ManagedModelStore;

diff --git a/...ature/norm/impl/TestMinMaxNormalizer.java → ...e/solr/ltr/norm/TestMinMaxNormalizer.java b/...ature/norm/impl/TestMinMaxNormalizer.java → ...e/solr/ltr/norm/TestMinMaxNormalizer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.solr.ltr.feature.norm.impl;
+package org.apache.solr.ltr.norm;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -23,7 +23,6 @@
 import java.util.Map;
 
 import org.apache.solr.core.SolrResourceLoader;
-import org.apache.solr.ltr.feature.norm.Normalizer;
 import org.junit.Test;
 
 public class TestMinMaxNormalizer {

diff --git a/...ure/norm/impl/TestStandardNormalizer.java → ...solr/ltr/norm/TestStandardNormalizer.java b/...ure/norm/impl/TestStandardNormalizer.java → ...solr/ltr/norm/TestStandardNormalizer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.solr.ltr.feature.norm.impl;
+package org.apache.solr.ltr.norm;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -23,7 +23,6 @@
 import java.util.Map;
 
 import org.apache.solr.core.SolrResourceLoader;
-import org.apache.solr.ltr.feature.norm.Normalizer;
 import org.junit.Test;
 
 public class TestStandardNormalizer {

diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/ranking/TestModelQuery.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/ranking/TestModelQuery.java
@@ -44,11 +44,11 @@
 import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
 import org.apache.solr.core.SolrResourceLoader;
 import org.apache.solr.ltr.feature.impl.ValueFeature;
-import org.apache.solr.ltr.feature.norm.Normalizer;
 import org.apache.solr.ltr.ranking.ModelQuery.FeatureInfo;
-import org.apache.solr.ltr.feature.norm.impl.IdentityNormalizer;
 import org.apache.solr.ltr.model.LTRScoringModel;
 import org.apache.solr.ltr.model.ModelException;
+import org.apache.solr.ltr.norm.IdentityNormalizer;
+import org.apache.solr.ltr.norm.Normalizer;
 import org.junit.Test;
 
 @SuppressCodecs("Lucene3x")

diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/ranking/TestReRankingPipeline.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/ranking/TestReRankingPipeline.java
@@ -44,9 +44,9 @@
 import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
 import org.apache.solr.core.SolrResourceLoader;
 import org.apache.solr.ltr.feature.impl.FieldValueFeature;
-import org.apache.solr.ltr.feature.norm.Normalizer;
-import org.apache.solr.ltr.feature.norm.impl.IdentityNormalizer;
 import org.apache.solr.ltr.model.LTRScoringModel;
+import org.apache.solr.ltr.norm.IdentityNormalizer;
+import org.apache.solr.ltr.norm.Normalizer;
 import org.apache.solr.ltr.ranking.ModelQuery.ModelWeight;
 import org.apache.solr.ltr.ranking.ModelQuery.ModelWeight.ModelScorer;
 import org.junit.Ignore;

diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/ranking/TestSelectiveWeightCreation.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/ranking/TestSelectiveWeightCreation.java
@@ -43,9 +43,9 @@
 import org.apache.solr.core.SolrResourceLoader;
 import org.apache.solr.ltr.TestRerankBase;
 import org.apache.solr.ltr.feature.impl.ValueFeature;
-import org.apache.solr.ltr.feature.norm.Normalizer;
-import org.apache.solr.ltr.feature.norm.impl.IdentityNormalizer;
 import org.apache.solr.ltr.model.ModelException;
+import org.apache.solr.ltr.norm.IdentityNormalizer;
+import org.apache.solr.ltr.norm.Normalizer;
 import org.apache.solr.ltr.ranking.LTRThreadModule;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;