Skip to content

Set to default strategies if null is given #236

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Set to default strategies if null is given #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49857b6
Set to default strategies if null is given
pingpingy1 Feb 22, 2024
4e88264
Apply suggestions from code review
pingpingy1 Feb 22, 2024
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
5 changes: 3 additions & 2 deletions ...ath-legacy/src/main/java/org/apache/commons/math4/legacy/stat/ranking/NaturalRanking.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;

import org.apache.commons.rng.UniformRandomProvider;
import org.apache.commons.rng.simple.RandomSource;
Expand Down Expand Up @@ -158,8 +159,8 @@ public NaturalRanking(NaNStrategy nanStrategy,
private NaturalRanking(NaNStrategy nanStrategy,
TiesStrategy tiesStrategy,
UniformRandomProvider random) {
this.nanStrategy = nanStrategy;
this.tiesStrategy = tiesStrategy;
this.nanStrategy = Objects.requireNonNull(nanStrategy, "nanStrategy");
this.tiesStrategy = Objects.requireNonNull(tiesStrategy, "tiesStrategy");
this.random = random;
}

Expand Down
14 changes: 14 additions & 0 deletions ...legacy/src/test/java/org/apache/commons/math4/legacy/stat/ranking/NaturalRankingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,4 +279,18 @@ public void testNoNaNsFailed() {
double[] ranks = ranking.rank(data);
TestUtils.assertEquals(data, ranks, 0d);
}

/**
* Tests NaturalRanking constructor with null strategies as inputs.
* These should be switched to the default strategies.
*/
@Test
public void testNullStrategies() {
Assert.assertThrows(NullPointerException.class, () -> {
new NaturalRanking((NaNStrategy) null, (TiesStrategy) null);
});
Assert.assertThrows(NullPointerException.class, () -> {
new NaturalRanking(NaturalRanking.DEFAULT_NAN_STRATEGY, (TiesStrategy) null);
});
}
}