backport NAb fix (#4842)

LabKey · Oct 20, 2023 · 2bf6909 · 2bf6909
1 parent 372298d
commit 2bf6909
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/api/src/org/labkey/api/util/JsonUtil.java b/api/src/org/labkey/api/util/JsonUtil.java
@@ -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)
         {

diff --git a/core/src/org/labkey/core/statistics/ParameterCurveFit.java b/core/src/org/labkey/core/statistics/ParameterCurveFit.java
@@ -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;