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

use Math.max rather than an if statement

This commit is contained in:
Simon Willnauer 2013-10-31 14:36:24 +01:00
parent 59588913b3
commit fcfc41209b
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,10 +297,7 @@ public abstract class DecayFunctionParser implements ScoreFunctionParser {
GeoPoint other = getValue(docId, origin); GeoPoint other = getValue(docId, origin);
double distance = Math.abs(distFunction.calculate(origin.lat(), origin.lon(), other.lat(), other.lon(), double distance = Math.abs(distFunction.calculate(origin.lat(), origin.lon(), other.lat(), other.lon(),
DistanceUnit.METERS)) - offset; DistanceUnit.METERS)) - offset;
if (distance < 0.0d) { return Math.max(0.0d, distance);
distance = 0.0d;
}
return distance;
} }
@Override @Override
@ -345,10 +342,7 @@ public abstract class DecayFunctionParser implements ScoreFunctionParser {
@Override @Override
protected double distance(int docId) { protected double distance(int docId) {
double distance = Math.abs(getValue(docId, origin) - origin) - offset; double distance = Math.abs(getValue(docId, origin) - origin) - offset;
if (distance < 0.0) { return Math.max(0.0d, distance);
distance = 0.0;
}
return distance;
} }
@Override @Override