looks like all works??

Unidata · Jul 15, 2024 · c39b033 · c39b033
1 parent 66ead40
commit c39b033
Showing 5 changed files with 39 additions and 19 deletions.
diff --git a/cdm/core/src/main/java/ucar/nc2/dataset/VariableDS.java b/cdm/core/src/main/java/ucar/nc2/dataset/VariableDS.java
@@ -275,10 +275,6 @@ Array convert(Array data, Set<NetcdfDataset.Enhance> enhancements) {
       // TODO: change to a provider for extensible Enhancements
       List<Enhancement> toApply = new ArrayList<>();
 
-
-
-
-
       if (enhancements.contains(Enhance.ConvertUnsigned) && unsignedConversion != null) {
         toApply.add(unsignedConversion);
         convertedType = unsignedConversion.getOutType();
@@ -291,16 +287,16 @@ Array convert(Array data, Set<NetcdfDataset.Enhance> enhancements) {
         toApply.add(scaleOffset);
         convertedType = scaleOffset.getScaledOffsetType();
       }
-      if (enhancements.contains(Enhance.ApplyStandardizer) && standardizer != null) {
-        toApply.add(standardizer);
-      }
-      if (enhancements.contains(Enhance.ApplyNormalizer) && normalizer != null) {
-        toApply.add(normalizer);
-      }
-      if (enhancements.contains(Enhance.ApplyClassifier) && classifier != null) {
-        toApply.add(classifier);
+/**  this == variableDS */
+      for (Enhance enhance : enhancements) {
+        for (EnhancementProvider service : ServiceLoader.load(EnhancementProvider.class)) {
+          if (service.appliesTo(enhance, this)) {
+            toApply.add(service.returnObject(this));
+          }
+        }
       }
 
+
       double[] dataArray = (double[]) data.get1DJavaArray(DataType.DOUBLE);
 
       dataArray = Arrays.stream(dataArray).parallel().map((num) -> {

diff --git a/cdm/core/src/main/java/ucar/nc2/filter/Classifier.java b/cdm/core/src/main/java/ucar/nc2/filter/Classifier.java
@@ -171,12 +171,16 @@ public boolean canDo (Set<Enhance> enhancements){
     public boolean appliesTo(Enhance enhance,  AttributeContainer attributes) {
       return enhance == Enhance.ApplyClassifier && attributes.findAttribute(CDM.CLASSIFY)!= null;
     }
-//    @Override
-//    public void applyEnhancement(Object instance) {
-//      Attribute classifierAtt = findAttribute(CDM.CLASSIFY);
-//      if (classifierAtt != null && instance.enhanceMode.contains(Enhance.ApplyClassifier) && instance.dataType.isNumeric()) {
-//        instance.classifier = Classifier.createFromVariable(instance);
-//      }
+    @Override
+    public boolean appliesTo(Enhance enhance,VariableDS var){
+      return enhance == Enhance.ApplyClassifier && var.classifier!=null;
+    }
+
+    public Classifier returnObject( VariableDS var){
+      return var.classifier;
+    }
+
+
 
   }
 

diff --git a/cdm/core/src/main/java/ucar/nc2/filter/EnhancementProvider.java b/cdm/core/src/main/java/ucar/nc2/filter/EnhancementProvider.java
@@ -36,7 +36,10 @@ public interface EnhancementProvider {
 
  boolean appliesTo(Enhance enhance, AttributeContainer attributes);
 
+ boolean appliesTo(Enhance enhance, VariableDS var);
+
  void Create(VariableDS var);
+ Enhancement returnObject(VariableDS var);
 
 
 //  void applyEnhancement(Object instance);

diff --git a/cdm/core/src/main/java/ucar/nc2/filter/Normalizer.java b/cdm/core/src/main/java/ucar/nc2/filter/Normalizer.java
@@ -98,6 +98,16 @@ public boolean canDo (Set<Enhance> enhancements){
     public boolean appliesTo(Enhance enhance, AttributeContainer attributes) {
       return enhance == Enhance.ApplyNormalizer && attributes.findAttribute(CDM.NORMALIZE)!= null;
     }
+    @Override
+    public boolean appliesTo(Enhance enhance,VariableDS var){
+      return enhance == Enhance.ApplyNormalizer && var.normalizer!= null;
+    }
+@Override
+    public Normalizer returnObject( VariableDS var){
+      return var.normalizer;
+    }
+
+
 
 
   }

diff --git a/cdm/core/src/main/java/ucar/nc2/filter/Standardizer.java b/cdm/core/src/main/java/ucar/nc2/filter/Standardizer.java
@@ -102,8 +102,15 @@ public boolean canDo (Set<Enhance> enhancements){
     public boolean appliesTo(Enhance enhance, AttributeContainer attributes) {
          return enhance == Enhance.ApplyStandardizer && attributes.findAttribute(CDM.STANDARDIZE)!= null;
     }
+    @Override
+    public boolean appliesTo(Enhance enhance,VariableDS var){
+      return enhance == Enhance.ApplyStandardizer && var.standardizer!= null;
+    }
 
-
+    @Override
+    public Standardizer returnObject( VariableDS var){
+      return var.standardizer;
+    }
   }
 }