honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename scale_weight -> decay

This commit is contained in:
Britta Weber 2013-08-16 19:27:02 +02:00
parent 41b4a14933
commit 9e7ad7249f
7 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/elasticsearch/index/query/functionscore/DecayFunction.java
View File

@ -45,10 +45,10 @@ public interface DecayFunction {
* *
* @param scale * @param scale
* the raw scale value given by the user * the raw scale value given by the user
* @param value * @param decay
* the value which decay function should take once the distance * the value which decay function should take once the distance
* reaches this scale * reaches this scale
* */ * */
public double processScale(double scale, double value); public double processScale(double scale, double decay);
} }

14
src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java
View File

@ -28,13 +28,13 @@ public abstract class DecayFunctionBuilder implements ScoreFunctionBuilder {
protected static final String REFERNECE = "reference"; protected static final String REFERNECE = "reference";
protected static final String SCALE = "scale"; protected static final String SCALE = "scale";
protected static final String SCALE_WEIGHT = "scale_weight"; protected static final String DECAY = "decay";
protected static final String OFFSET = "offset"; protected static final String OFFSET = "offset";
private String fieldName; private String fieldName;
private Object reference; private Object reference;
private Object scale; private Object scale;
private double scaleWeight = -1; private double decay = -1;
private Object offset; private Object offset;
public DecayFunctionBuilder(String fieldName, Object reference, Object scale) { public DecayFunctionBuilder(String fieldName, Object reference, Object scale) {
@ -43,11 +43,11 @@ public abstract class DecayFunctionBuilder implements ScoreFunctionBuilder {
this.scale = scale; this.scale = scale;
} }
public DecayFunctionBuilder setScaleWeight(double scaleWeight) { public DecayFunctionBuilder setDecay(double decay) {
if (scaleWeight <= 0 || scaleWeight >= 1.0) { if (decay <= 0 || decay >= 1.0) {
throw new ElasticSearchIllegalStateException("scale weight parameter must be in range 0..1!"); throw new ElasticSearchIllegalStateException("scale weight parameter must be in range 0..1!");
} }
this.scaleWeight = scaleWeight; this.decay = decay;
return this; return this;
} }
@ -62,8 +62,8 @@ public abstract class DecayFunctionBuilder implements ScoreFunctionBuilder {
builder.startObject(fieldName); builder.startObject(fieldName);
builder.field(REFERNECE, reference); builder.field(REFERNECE, reference);
builder.field(SCALE, scale); builder.field(SCALE, scale);
if (scaleWeight > 0) { if (decay > 0) {
builder.field(SCALE_WEIGHT, scaleWeight); builder.field(DECAY, decay);
} }
if (offset != null) { if (offset != null) {
builder.field(OFFSET, offset); builder.field(OFFSET, offset);

40
src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java
View File

@ -163,7 +163,7 @@ public abstract class DecayFunctionParser implements ScoreFunctionParser {
String parameterName = null; String parameterName = null;
double scale = 0; double scale = 0;
double reference = 0; double reference = 0;
double scaleWeight = 0.5; double decay = 0.5;
double offset = 0.0d; double offset = 0.0d;
boolean scaleFound = false; boolean scaleFound = false;
boolean refFound = false; boolean refFound = false;
@ -173,8 +173,8 @@ public abstract class DecayFunctionParser implements ScoreFunctionParser {
} else if (parameterName.equals(DecayFunctionBuilder.SCALE)) { } else if (parameterName.equals(DecayFunctionBuilder.SCALE)) {
scale = parser.doubleValue(); scale = parser.doubleValue();
scaleFound = true; scaleFound = true;
} else if (parameterName.equals(DecayFunctionBuilder.SCALE_WEIGHT)) { } else if (parameterName.equals(DecayFunctionBuilder.DECAY)) {
scaleWeight = parser.doubleValue(); decay = parser.doubleValue();
} else if (parameterName.equals(DecayFunctionBuilder.REFERNECE)) { } else if (parameterName.equals(DecayFunctionBuilder.REFERNECE)) {
reference = parser.doubleValue(); reference = parser.doubleValue();
refFound = true; refFound = true;
@ -189,7 +189,7 @@ public abstract class DecayFunctionParser implements ScoreFunctionParser {
+ " must be set for numeric fields."); + " must be set for numeric fields.");
} }
IndexNumericFieldData<?> numericFieldData = parseContext.fieldData().getForField(mapper); IndexNumericFieldData<?> numericFieldData = parseContext.fieldData().getForField(mapper);
return new NumericFieldDataScoreFunction(reference, scale, scaleWeight, offset, getDecayFunction(), numericFieldData); return new NumericFieldDataScoreFunction(reference, scale, decay, offset, getDecayFunction(), numericFieldData);
} }
private ScoreFunction parseGeoVariable(String fieldName, XContentParser parser, QueryParseContext parseContext, private ScoreFunction parseGeoVariable(String fieldName, XContentParser parser, QueryParseContext parseContext,
@ -199,7 +199,7 @@ public abstract class DecayFunctionParser implements ScoreFunctionParser {
GeoPoint reference = new GeoPoint(); GeoPoint reference = new GeoPoint();
String scaleString = "1km"; String scaleString = "1km";
String offsetString = "0km"; String offsetString = "0km";
double scaleWeight = 0.5; double decay = 0.5;
while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) { while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
parameterName = parser.currentName(); parameterName = parser.currentName();
@ -207,8 +207,8 @@ public abstract class DecayFunctionParser implements ScoreFunctionParser {
scaleString = parser.text(); scaleString = parser.text();
} else if (parameterName.equals(DecayFunctionBuilder.REFERNECE)) { } else if (parameterName.equals(DecayFunctionBuilder.REFERNECE)) {
reference = GeoPoint.parse(parser); reference = GeoPoint.parse(parser);
} else if (parameterName.equals(DecayFunctionBuilder.SCALE_WEIGHT)) { } else if (parameterName.equals(DecayFunctionBuilder.DECAY)) {
scaleWeight = parser.doubleValue(); decay = parser.doubleValue();
} else if (parameterName.equals(DecayFunctionBuilder.OFFSET)) { } else if (parameterName.equals(DecayFunctionBuilder.OFFSET)) {
offsetString = parser.text(); offsetString = parser.text();
} else { } else {
@ -221,7 +221,7 @@ public abstract class DecayFunctionParser implements ScoreFunctionParser {
double scale = DistanceUnit.parse(scaleString, DistanceUnit.METERS, DistanceUnit.METERS); double scale = DistanceUnit.parse(scaleString, DistanceUnit.METERS, DistanceUnit.METERS);
double offset = DistanceUnit.parse(offsetString, DistanceUnit.METERS, DistanceUnit.METERS); double offset = DistanceUnit.parse(offsetString, DistanceUnit.METERS, DistanceUnit.METERS);
IndexGeoPointFieldData<?> indexFieldData = parseContext.fieldData().getForField(mapper); IndexGeoPointFieldData<?> indexFieldData = parseContext.fieldData().getForField(mapper);
return new GeoFieldDataScoreFunction(reference, scale, scaleWeight, offset, getDecayFunction(), indexFieldData); return new GeoFieldDataScoreFunction(reference, scale, decay, offset, getDecayFunction(), indexFieldData);
} }
@ -232,7 +232,7 @@ public abstract class DecayFunctionParser implements ScoreFunctionParser {
String scaleString = null; String scaleString = null;
String referenceString = null; String referenceString = null;
String offsetString = "0d"; String offsetString = "0d";
double scaleWeight = 0.5; double decay = 0.5;
while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) { while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
parameterName = parser.currentName(); parameterName = parser.currentName();
@ -240,8 +240,8 @@ public abstract class DecayFunctionParser implements ScoreFunctionParser {
scaleString = parser.text(); scaleString = parser.text();
} else if (parameterName.equals(DecayFunctionBuilder.REFERNECE)) { } else if (parameterName.equals(DecayFunctionBuilder.REFERNECE)) {
referenceString = parser.text(); referenceString = parser.text();
} else if (parameterName.equals(DecayFunctionBuilder.SCALE_WEIGHT)) { } else if (parameterName.equals(DecayFunctionBuilder.DECAY)) {
scaleWeight = parser.doubleValue(); decay = parser.doubleValue();
} else if (parameterName.equals(DecayFunctionBuilder.OFFSET)) { } else if (parameterName.equals(DecayFunctionBuilder.OFFSET)) {
offsetString = parser.text(); offsetString = parser.text();
} else { } else {
@ -261,7 +261,7 @@ public abstract class DecayFunctionParser implements ScoreFunctionParser {
val = TimeValue.parseTimeValue(offsetString, TimeValue.timeValueHours(24)); val = TimeValue.parseTimeValue(offsetString, TimeValue.timeValueHours(24));
double offset = val.getMillis(); double offset = val.getMillis();
IndexNumericFieldData<?> numericFieldData = parseContext.fieldData().getForField(dateFieldMapper); IndexNumericFieldData<?> numericFieldData = parseContext.fieldData().getForField(dateFieldMapper);
return new NumericFieldDataScoreFunction(reference, scale, scaleWeight, offset, getDecayFunction(), numericFieldData); return new NumericFieldDataScoreFunction(reference, scale, decay, offset, getDecayFunction(), numericFieldData);
} }
static class GeoFieldDataScoreFunction extends AbstractDistanceScoreFunction { static class GeoFieldDataScoreFunction extends AbstractDistanceScoreFunction {
@ -272,9 +272,9 @@ public abstract class DecayFunctionParser implements ScoreFunctionParser {
private static final GeoDistance distFunction = GeoDistance.fromString("arc"); private static final GeoDistance distFunction = GeoDistance.fromString("arc");
public GeoFieldDataScoreFunction(GeoPoint reference, double scale, double scaleWeight, double offset, DecayFunction func, public GeoFieldDataScoreFunction(GeoPoint reference, double scale, double decay, double offset, DecayFunction func,
IndexGeoPointFieldData<?> fieldData) { IndexGeoPointFieldData<?> fieldData) {
super(scale, scaleWeight, offset, func); super(scale, decay, offset, func);
this.reference = reference; this.reference = reference;
this.fieldData = fieldData; this.fieldData = fieldData;
} }
@ -315,9 +315,9 @@ public abstract class DecayFunctionParser implements ScoreFunctionParser {
private final double reference; private final double reference;
private DoubleValues doubleValues; private DoubleValues doubleValues;
public NumericFieldDataScoreFunction(double reference, double scale, double scaleWeight, double offset, DecayFunction func, public NumericFieldDataScoreFunction(double reference, double scale, double decay, double offset, DecayFunction func,
IndexNumericFieldData<?> fieldData) { IndexNumericFieldData<?> fieldData) {
super(scale, scaleWeight, offset, func); super(scale, decay, offset, func);
this.fieldData = fieldData; this.fieldData = fieldData;
this.reference = reference; this.reference = reference;
} }
@ -358,16 +358,16 @@ public abstract class DecayFunctionParser implements ScoreFunctionParser {
protected final double offset; protected final double offset;
private final DecayFunction func; private final DecayFunction func;
public AbstractDistanceScoreFunction(double userSuppiedScale, double userSuppliedScaleWeight, double offset, DecayFunction func) { public AbstractDistanceScoreFunction(double userSuppiedScale, double decay, double offset, DecayFunction func) {
super(CombineFunction.MULT); super(CombineFunction.MULT);
if (userSuppiedScale <= 0.0) { if (userSuppiedScale <= 0.0) {
throw new ElasticSearchIllegalArgumentException(FunctionScoreQueryParser.NAME + " : scale must be > 0.0."); throw new ElasticSearchIllegalArgumentException(FunctionScoreQueryParser.NAME + " : scale must be > 0.0.");
} }
if (userSuppliedScaleWeight <= 0.0 || userSuppliedScaleWeight >= 1.0) { if (decay <= 0.0 || decay >= 1.0) {
throw new ElasticSearchIllegalArgumentException(FunctionScoreQueryParser.NAME throw new ElasticSearchIllegalArgumentException(FunctionScoreQueryParser.NAME
+ " : scale_weight must be in the range [0..1]."); + " : decay must be in the range [0..1].");
} }
this.scale = func.processScale(userSuppiedScale, userSuppliedScaleWeight); this.scale = func.processScale(userSuppiedScale, decay);
this.func = func; this.func = func;
if (offset < 0.0d) { if (offset < 0.0d) {
throw new ElasticSearchIllegalArgumentException(FunctionScoreQueryParser.NAME + " : offset must be > 0.0"); throw new ElasticSearchIllegalArgumentException(FunctionScoreQueryParser.NAME + " : offset must be > 0.0");

4
src/main/java/org/elasticsearch/index/query/functionscore/exp/ExponentialDecayFunctionParser.java
View File

@ -56,8 +56,8 @@ public class ExponentialDecayFunctionParser extends DecayFunctionParser {
} }
@Override @Override
public double processScale(double scale, double value) { public double processScale(double scale, double decay) {
return Math.log(value) / scale; return Math.log(decay) / scale;
} }
} }

4
src/main/java/org/elasticsearch/index/query/functionscore/gauss/GaussDecayFunctionParser.java
View File

@ -52,8 +52,8 @@ public class GaussDecayFunctionParser extends DecayFunctionParser {
} }
@Override @Override
public double processScale(double scale, double value) { public double processScale(double scale, double decay) {
return 0.5 * Math.pow(scale, 2.0) / Math.log(value); return 0.5 * Math.pow(scale, 2.0) / Math.log(decay);
} }
} }

4
src/main/java/org/elasticsearch/index/query/functionscore/lin/LinearDecayFunctionParser.java
View File

@ -56,8 +56,8 @@ public class LinearDecayFunctionParser extends DecayFunctionParser {
} }
@Override @Override
public double processScale(double scale, double value) { public double processScale(double scale, double decay) {
return scale / (1.0 - value); return scale / (1.0 - decay);
} }
} }

4
src/test/java/org/elasticsearch/test/integration/search/functionscore/DecayFunctionScoreTests.java
View File

@ -340,7 +340,7 @@ public class DecayFunctionScoreTests extends AbstractSharedClusterTest {
indexRandom("test", false, builders); indexRandom("test", false, builders);
refresh(); refresh();
DecayFunctionBuilder fb = new GaussDecayFunctionBuilder("num", 0.0, 1.0).setScaleWeight(0.5); DecayFunctionBuilder fb = new GaussDecayFunctionBuilder("num", 0.0, 1.0).setDecay(0.5);
// function score should return 0.5 for this function // function score should return 0.5 for this function
ActionFuture<SearchResponse> response = client().search( ActionFuture<SearchResponse> response = client().search(
@ -448,7 +448,7 @@ public class DecayFunctionScoreTests extends AbstractSharedClusterTest {
@Test(expected = ElasticSearchIllegalStateException.class) @Test(expected = ElasticSearchIllegalStateException.class)
public void testExceptionThrownIfScaleRefNotBetween0And1() throws Exception { public void testExceptionThrownIfScaleRefNotBetween0And1() throws Exception {
DecayFunctionBuilder gfb = new GaussDecayFunctionBuilder("num1", "2013-05-28", "1d").setScaleWeight(100); DecayFunctionBuilder gfb = new GaussDecayFunctionBuilder("num1", "2013-05-28", "1d").setDecay(100);
} }