You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/09/11 20:06:13 UTC
[1/2] lucene-solr:master: SOLR-11351: make LTRScoringModel model more
extensible
Repository: lucene-solr
Updated Branches:
refs/heads/master 154483930 -> 708ed8fb4
SOLR-11351: make LTRScoringModel model more extensible
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0c831b99
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0c831b99
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0c831b99
Branch: refs/heads/master
Commit: 0c831b9970550716e800478fe77ec05eecc05d57
Parents: 1544839
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Sep 11 12:35:27 2017 -0700
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Sep 11 12:47:35 2017 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../ltr/src/java/org/apache/solr/ltr/model/LTRScoringModel.java | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0c831b99/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 519852e..5d243c5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -203,6 +203,8 @@ Other Changes
* SOLR-11132: Refactor common getSortField logic in various FieldTypes (Jason Gerlowski, hossman)
+* SOLR-11351: Make LTRScoringModel model more extensible. (Christine Poerschke)
+
================== 7.0.0 ==================
Versions of Major Components
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0c831b99/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/LTRScoringModel.java
----------------------------------------------------------------------
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
index 9edcfe5..2b4f575 100644
--- 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
@@ -80,7 +80,7 @@ public abstract class LTRScoringModel {
protected final List<Feature> features;
private final List<Feature> allFeatures;
private final Map<String,Object> params;
- private final List<Normalizer> norms;
+ protected final List<Normalizer> norms;
public static LTRScoringModel getInstance(SolrResourceLoader solrResourceLoader,
String className, String name, List<Feature> features,
@@ -123,6 +123,8 @@ public abstract class LTRScoringModel {
* {@link ModelException} if they do not make sense.
*/
protected void validate() throws ModelException {
+ final List<Feature> features = getFeatures();
+ final List<Normalizer> norms = getNorms();
if (features.isEmpty()) {
throw new ModelException("no features declared for model "+name);
}
[2/2] lucene-solr:master: TestRerankBase.getModelInJson to permit
empty features array.
Posted by cp...@apache.org.
TestRerankBase.getModelInJson to permit empty features array.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/708ed8fb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/708ed8fb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/708ed8fb
Branch: refs/heads/master
Commit: 708ed8fb4880bf1a7dcb9211f4eb1923bdd325d8
Parents: 0c831b9
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Sep 11 12:41:19 2017 -0700
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Sep 11 12:47:44 2017 -0700
----------------------------------------------------------------------
.../src/test/org/apache/solr/ltr/TestRerankBase.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/708ed8fb/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
index 6f5e0ce..796fe39 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java
@@ -239,12 +239,14 @@ public class TestRerankBase extends RestTestBase {
.append(",\n");
sb.append("\"class\":").append('"').append(type).append('"').append(",\n");
sb.append("\"features\":").append('[');
- for (final String feature : features) {
- sb.append("\n\t{ ");
- sb.append("\"name\":").append('"').append(feature).append('"')
- .append("},");
+ if (features.length > 0) {
+ for (final String feature : features) {
+ sb.append("\n\t{ ");
+ sb.append("\"name\":").append('"').append(feature).append('"')
+ .append("},");
+ }
+ sb.deleteCharAt(sb.length() - 1);
}
- sb.deleteCharAt(sb.length() - 1);
sb.append("\n]\n");
if (params != null) {
sb.append(",\n");