From 3b509f603683c5747143f77d40c410a4627757e0 Mon Sep 17 00:00:00 2001 From: haileyajohnson Date: Tue, 15 Oct 2024 08:59:26 -0700 Subject: [PATCH] remove flags for applying runtime loaded Enhancements and group them all in one --- .../java/ucar/nc2/dataset/NetcdfDataset.java | 18 +----------------- .../main/java/ucar/nc2/filter/Classifier.java | 2 +- .../main/java/ucar/nc2/filter/Normalizer.java | 4 +--- .../java/ucar/nc2/filter/Standardizer.java | 2 +- 4 files changed, 4 insertions(+), 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 index 03d6329402..0374e73285 100644 --- 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 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 EnhanceNone = Collections.unmodifiableSet(EnumSet.noneOf(Enhance.class)); private static Set 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 index 442c51b626..bf768fab9e 100644 --- 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, 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 index 7d7be9bd85..0d2c5deaed 100644 --- a/cdm/core/src/main/java/ucar/nc2/filter/Normalizer.java +++ b/cdm/core/src/main/java/ucar/nc2/filter/Normalizer.java @@ -88,7 +88,7 @@ public String getAttributeName() { @Override public boolean appliesTo(Set enhance, DataType dt) { - return enhance.contains(Enhance.ApplyNormalizer) && dt.isFloatingPoint(); + return dt.isFloatingPoint(); } @Override @@ -96,8 +96,6 @@ 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 index 74768931d4..68589beee1 100644 --- 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, DataType dt) { - return enhance.contains(Enhance.ApplyStandardizer) && dt.isFloatingPoint(); + return dt.isFloatingPoint(); } @Override