Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix wrong NaN check in MovingFunctions#stdDev() #31888

Merged
merged 1 commit into from
Jul 10, 2018
Merged

Fix wrong NaN check in MovingFunctions#stdDev() #31888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...r/src/main/java/org/elasticsearch/search/aggregations/pipeline/movfn/MovingFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public static double unweightedAvg(double[] values) {
* The average is based on the count of non-null, non-NaN values.
*/
public static double stdDev(double[] values, double avg) {
if (avg == Double.NaN) {
if (Double.isNaN(avg)) {
return Double.NaN;
} else {
long count = 0;
Expand Down
4 changes: 4 additions & 0 deletions ...a/org/elasticsearch/search/aggregations/pipeline/movfn/MovFnWhitelistedFunctionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,10 @@ public void testEmptySimpleStdDev() {
assertThat(actual, equalTo(Double.NaN));
}

public void testStdDevNaNAvg() {
assertThat(MovingFunctions.stdDev(new double[] { 1.0, 2.0, 3.0 }, Double.NaN), equalTo(Double.NaN));
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if this test is useful since it cannot check the early termination of the method, but might be worth adding just to cover that code path, wdyt?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++ can't hurt :)

}

public void testLinearMovAvg() {

int numValues = randomIntBetween(1, 100);
Expand Down