diff --git a/cdm/core/src/main/java/ucar/nc2/dataset/VariableDS.java b/cdm/core/src/main/java/ucar/nc2/dataset/VariableDS.java index bf7dbed589..5581a1faf4 100644 --- a/cdm/core/src/main/java/ucar/nc2/dataset/VariableDS.java +++ b/cdm/core/src/main/java/ucar/nc2/dataset/VariableDS.java @@ -943,18 +943,10 @@ private void createEnhancements() { if (normalizerAtt != null && this.enhanceMode.contains(Enhance.ApplyNormalizer) && dataType.isFloatingPoint()) { this.normalizer = Normalizer.createFromVariable(this); } - // I need to comment this one out, otherwise it applies the - // @Override - // public double convert(double val) { - // return classifyArray(val); - // } - // so for now I just turn it off. How else could we do this? - - - // Attribute classifierAtt = findAttribute(CDM.CLASSIFY); - // if (classifierAtt != null && this.enhanceMode.contains(Enhance.ApplyClassifier) && dataType.isNumeric()) { - // this.classifier = Classifier.createFromVariable(this); - // } + Attribute classifierAtt = findAttribute(CDM.CLASSIFY); + if (classifierAtt != null && this.enhanceMode.contains(Enhance.ApplyClassifier) && dataType.isNumeric()) { + this.classifier = Classifier.createFromVariable(this); + } } public Builder toBuilder() { 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 c196603bc4..ab3cae4ad2 100644 --- a/cdm/core/src/main/java/ucar/nc2/filter/Classifier.java +++ b/cdm/core/src/main/java/ucar/nc2/filter/Classifier.java @@ -12,7 +12,6 @@ public class Classifier implements Enhancement { - private int classifiedVal; private String[] AttCat; private List rules = new ArrayList<>(); @@ -65,31 +64,7 @@ public int[] classifyWithAttributes(Array arr) { return classifiedArray; } - /** Classify double array */ - public int[] classifyDoubleArray(Array arr) { - int[] classifiedArray = new int[(int) arr.getSize()]; - int i = 0; - IndexIterator iterArr = arr.getIndexIterator(); - while (iterArr.hasNext()) { - Number value = (Number) iterArr.getObjectNext(); - if (!Double.isNaN(value.doubleValue())) { - - classifiedArray[i] = classifyArray(value.doubleValue()); - } - i++; - } - return classifiedArray; - } - /** for a single double */ - public int classifyArray(double val) { - if (val >= 0) { - classifiedVal = 1; - } else { - classifiedVal = 0; - } - return classifiedVal; - } public int classifyArrayAttribute(double val) { for (int[] rule : rules) { @@ -112,7 +87,7 @@ private List loadClassificationRules() { @Override public double convert(double val) { - return classifyArray(val); + return classifyArrayAttribute(val); } public static int[] stringToIntArray(String str) { diff --git a/project-files/owasp-dependency-check/dependency-check-suppression.xml b/project-files/owasp-dependency-check/dependency-check-suppression.xml index 116614c9cb..550aa5617f 100644 --- a/project-files/owasp-dependency-check/dependency-check-suppression.xml +++ b/project-files/owasp-dependency-check/dependency-check-suppression.xml @@ -24,4 +24,14 @@ ]]> CVE-2023-35116 + + + ^pkg:maven/org\.jfree/jfreechart@.*$ + CVE-2024-23076 + CVE-2024-22949 + CVE-2023-52070 +