remove flags for applying runtime loaded Enhancements and group them …

…all in one
Unidata · Oct 15, 2024 · 3b509f6 · 3b509f6
1 parent 431a142
commit 3b509f6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 22 deletions.
diff --git a/cdm/core/src/main/java/ucar/nc2/dataset/NetcdfDataset.java b/cdm/core/src/main/java/ucar/nc2/dataset/NetcdfDataset.java
@@ -115,21 +115,6 @@ public enum Enhance {
      * every dimension in a variable has a corresponding coordinate variable.
      */
     IncompleteCoordSystems,
-    /**
-     * Calculate mean and standard deviation and apply to data: (z-mean)/standard_deviation.
-     * If the enhanced data type is not {@code FLOAT} or {@code DOUBLE}, this has no effect.
-     */
-    ApplyStandardizer,
-    /**
-     * Calculate minimum value and range (maximum - minimum) and apply to data: (z - min)/range.
-     * If the enhanced data type is not {@code FLOAT} or {@code DOUBLE}, this has no effect.
-     */
-    ApplyNormalizer,
-    /**
-     * Classify doubles or floats based on positive/negative into 1 or 0 {@code}
-     * x<0 --> 0 x>0 --> 1
-     */
-    ApplyClassifier,
     /**
      * All other Enhancement implementations that are loaded by service provider
      * This includes third party implementations found on the classpath and loaded at runtime.
@@ -139,8 +124,7 @@ public enum Enhance {
 
   private static Set<Enhance> EnhanceAll =
       Collections.unmodifiableSet(EnumSet.of(Enhance.ConvertEnums, Enhance.ConvertUnsigned, Enhance.ApplyScaleOffset,
-          Enhance.ConvertMissing, Enhance.CoordSystems, Enhance.ApplyStandardizer, Enhance.ApplyNormalizer,
-          Enhance.ApplyClassifier, Enhance.ApplyRuntimeLoadedEnhancements));
+          Enhance.ConvertMissing, Enhance.CoordSystems, Enhance.ApplyRuntimeLoadedEnhancements));
   private static Set<Enhance> EnhanceNone = Collections.unmodifiableSet(EnumSet.noneOf(Enhance.class));
   private static Set<Enhance> defaultEnhanceMode = EnhanceAll;
 

diff --git a/cdm/core/src/main/java/ucar/nc2/filter/Classifier.java b/cdm/core/src/main/java/ucar/nc2/filter/Classifier.java
@@ -128,7 +128,7 @@ public String getAttributeName() {
 
     @Override
     public boolean appliesTo(Set<Enhance> enhance, DataType dt) {
-      return enhance.contains(Enhance.ApplyClassifier) && dt.isNumeric();
+      return dt.isNumeric();
     }
 
     @Override

diff --git a/cdm/core/src/main/java/ucar/nc2/filter/Normalizer.java b/cdm/core/src/main/java/ucar/nc2/filter/Normalizer.java
@@ -88,16 +88,14 @@ public String getAttributeName() {
 
     @Override
     public boolean appliesTo(Set<Enhance> enhance, DataType dt) {
-      return enhance.contains(Enhance.ApplyNormalizer) && dt.isFloatingPoint();
+      return dt.isFloatingPoint();
     }
 
     @Override
     public Normalizer create(VariableDS var) {
       return Normalizer.createFromVariable(var);
     }
 
-
-
   }
 
 }
diff --git a/cdm/core/src/main/java/ucar/nc2/filter/Standardizer.java b/cdm/core/src/main/java/ucar/nc2/filter/Standardizer.java
@@ -90,7 +90,7 @@ public String getAttributeName() {
 
     @Override
     public boolean appliesTo(Set<Enhance> enhance, DataType dt) {
-      return enhance.contains(Enhance.ApplyStandardizer) && dt.isFloatingPoint();
+      return dt.isFloatingPoint();
     }
 
     @Override