revert switch to fuzzy equals

Unidata · Mar 12, 2024 · 92d1d83 · 92d1d83
1 parent a2c7146
commit 92d1d83
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/cdm/core/src/main/java/ucar/nc2/util/Misc.java b/cdm/core/src/main/java/ucar/nc2/util/Misc.java
@@ -97,8 +97,8 @@ public static boolean nearlyEquals(float a, float b) {
   }
 
   /** AbsoluteDifference is less than maxAbsDiff. */
-  public static boolean nearlyEquals(float a, float b, float maxAbsDiff) {
-    return DoubleMath.fuzzyEquals(a, b, maxAbsDiff);
+  public static boolean nearlyEquals(float a, float b, float maxRelDiff) {
+    return relativeDifference(a, b) < maxRelDiff;
   }
 
   /** AbsoluteDifference is less than {@link #defaultMaxRelativeDiffDouble}. */
@@ -107,8 +107,8 @@ public static boolean nearlyEquals(double a, double b) {
   }
 
   /** AbsoluteDifference is less than maxAbsDiff. */
-  public static boolean nearlyEquals(double a, double b, double maxAbsDiff) {
-    return DoubleMath.fuzzyEquals(a, b, maxAbsDiff);
+  public static boolean nearlyEquals(double a, double b, double maxRelDiff) {
+    return relativeDifference(a, b) < maxRelDiff;
   }
 
   /** AbsoluteDifference is less than maxAbsDiff. */

diff --git a/cdm/core/src/test/java/ucar/nc2/filter/TestEnhancements.java b/cdm/core/src/test/java/ucar/nc2/filter/TestEnhancements.java
@@ -17,6 +17,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import java.io.IOException;
+import java.util.Arrays;
 
 public class TestEnhancements {
 
@@ -75,6 +76,14 @@ public static void setUp() throws IOException, InvalidRangeException {
         .addAttribute(new Attribute(CDM.FILL_VALUE, SIGNED_SCALED_FILL_VALUE))
         .addAttribute(new Attribute(CDM.MISSING_VALUE, SIGNED_SCALED_MISSING_VALUE));
 
+    // short data with small scale and offsets
+    Array smallVals = Array.factory(DataType.FLOAT, new int[] {dataLen}, missingData);
+
+    builder.addVariable("smallVals", DataType.FLOAT, "dim")
+            .addAttribute(new Attribute(CDM.SCALE_FACTOR, 1e-12)).addAttribute(new Attribute(CDM.ADD_OFFSET, 1e-12))
+            .addAttribute(new Attribute(CDM.FILL_VALUE, 110));
+
+
     // write data
     NetcdfFormatWriter writer = builder.build();
     writer.write(writer.findVariable("signedVar"), new int[1], signedData);
@@ -85,6 +94,7 @@ public static void setUp() throws IOException, InvalidRangeException {
     writer.write(writer.findVariable("validMinMax"), new int[1], missingDataArray);
     writer.write(writer.findVariable("validRange"), new int[1], missingDataArray);
     writer.write(writer.findVariable("enhanceAll"), new int[1], enhanceAllArray);
+    writer.write(writer.findVariable("smallVals"), new int[1], smallVals);
     writer.close();
     ncd = NetcdfDatasets.openDataset(filePath);
   }
@@ -152,4 +162,11 @@ public void testCombinedEnhancements() throws IOException {
     Array data = v.read();
     assertThat((double[]) data.copyTo1DJavaArray()).isEqualTo(expected);
   }
+  @Test
+  public void testConvertMissingWithSmallScaleAndOffset() throws IOException {
+      Variable v = ncd.findVariable("smallVals");
+      Array data = v.read();
+      assertThat(Double.isNaN(data.getDouble(2))).isTrue();
+      assertThat(Double.isNaN(data.getDouble(1))).isFalse();
+  }
 }