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.

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

backport NAb fix #4842

Merged
merged 1 commit into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 api/src/org/labkey/api/util/JsonUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ public static void safePut(JSONObject json, String key, Number value)
json.put(key, translateNumber(value));
}

private static Object translateNumber(Number value)
public static Object translateNumber(Number value)
{
if (value instanceof Double d)
{
Expand Down
2 changes: 1 addition & 1 deletion core/src/org/labkey/core/statistics/ParameterCurveFit.java
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ protected SigmoidalParameters calculateFitParameters(double minValue, double max
{
double absoluteCutoff = min + (0.5 * (max - min));
double relativeEC50 = getInterpolatedCutoffXValue(absoluteCutoff);
if (relativeEC50 != Double.POSITIVE_INFINITY && relativeEC50 != Double.NEGATIVE_INFINITY)
if (!Double.isInfinite(relativeEC50) && !Double.isNaN(relativeEC50))
{
parameters.max = max;
parameters.inflection = relativeEC50;
Expand Down