refactoring findOIData() to compute mask1D in general, see new FitsTableFilter base class

Author: bourgesl

src/main/java/fr/jmmc/oitools/model/Granule.java

@@ -44,47 +44,6 @@ public enum GranuleField {
         TARGET, INS_MODE, NIGHT;
     }
 
-    public final static Matcher<Granule> MATCHER_LIKE = new Matcher<Granule>() {
-
-        @Override
-        public boolean match(final Granule pattern, final Granule candidate) {
-            if (pattern == candidate) {
-                return true;
-            }
-            if ((pattern.getTarget() != null) && (candidate.getTarget() != null)) {
-                if (!pattern.getTarget().equals(candidate.getTarget())) {
-                    return false;
-                }
-            }
-            if ((pattern.getInsMode() != null) && (candidate.getInsMode() != null)) {
-                if (!pattern.getInsMode().equals(candidate.getInsMode())) {
-                    return false;
-                }
-            }
-            if ((pattern.getNight() != null) && (candidate.getNight() != null)) {
-                if (!pattern.getNight().equals(candidate.getNight())) {
-                    return false;
-                }
-            }
-            if (pattern.hasDistinctStaNames() && candidate.hasDistinctStaNames()) {
-                if (!Granule.match(pattern.getDistinctStaNames(), candidate.getDistinctStaNames())) {
-                    return false;
-                }
-            }
-            if (pattern.hasDistinctMjdRanges() && candidate.hasDistinctMjdRanges()) {
-                if (!Range.matchRanges(pattern.getDistinctMjdRanges(), candidate.getDistinctMjdRanges())) {
-                    return false;
-                }
-            }
-            if (pattern.hasDistinctWavelengthRanges() && (candidate.getInsMode() != null)) {
-                if (!Range.matchRange(pattern.getDistinctWavelengthRanges(), candidate.getInsMode().getWavelengthRange())) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    };
-
     /* members */
     private Target target;
     private InstrumentMode insMode;
@@ -94,8 +53,6 @@ public boolean match(final Granule pattern, final Granule candidate) {
     private Set<String> distinctStaNames = null;
     /** distinct MJD values */
     private Set<Range> distinctMjdRanges = null;
-    /** distinct Wavelength values */
-    private Set<Range> distinctWavelengthRanges = null;
 
     public Granule() {
         this(null, null, null);
@@ -171,7 +128,7 @@ public boolean equals(Object obj) {
 
     public boolean isEmpty() {
         return (this.target == null) && (this.insMode == null) && (this.night == null)
-                && !hasDistinctStaNames() && !hasDistinctMjdRanges() && !hasDistinctWavelengthRanges();
+                && !hasDistinctStaNames() && !hasDistinctMjdRanges();
     }
 
     /* extra information (filters) */
@@ -197,23 +154,11 @@ public Set<Range> getDistinctMjdRanges() {
         return distinctMjdRanges;
     }
 
-    public boolean hasDistinctWavelengthRanges() {
-        return (distinctWavelengthRanges != null) && !distinctWavelengthRanges.isEmpty();
-    }
-
-    public Set<Range> getDistinctWavelengthRanges() {
-        if (distinctWavelengthRanges == null) {
-            distinctWavelengthRanges = new LinkedHashSet<Range>();
-        }
-        return distinctWavelengthRanges;
-    }
-
     @Override
     public String toString() {
         return "Granule{" + "target=" + target + ", insMode=" + insMode + ", night=" + night
                 + ", distinctStaNames=" + distinctStaNames
                 + ", distinctMjdRanges=" + distinctMjdRanges
-                + ", distinctWavelengthRanges=" + distinctWavelengthRanges
                 + '}';
     }
 
@@ -231,13 +176,4 @@ public static <K> List<K> getSortedDistinctGranuleField(final Collection<Granule
         Collections.sort(sorted, GranuleComparator.getComparator(field));
         return sorted;
     }
-
-    public static boolean match(final Set<String> selected, final Set<String> candidates) {
-        for (String sel : selected) {
-            if (candidates.contains(sel)) {
-                return true;
-            }
-        }
-        return false;
-    }
 }

src/main/java/fr/jmmc/oitools/model/GranuleMatcher.java

@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * JMMC project ( http://www.jmmc.fr ) - Copyright (C) CNRS.
+ ******************************************************************************/
+package fr.jmmc.oitools.model;
+
+import fr.jmmc.oitools.model.range.Range;
+import java.util.Set;
+
+/**
+ *
+ */
+public final class GranuleMatcher implements Matcher<Granule> {
+
+    private final static GranuleMatcher MATCHER_LIKE = new GranuleMatcher(null);
+
+    public static GranuleMatcher getInstance(final Set<Range> distinctWavelengthRanges) {
+        if (distinctWavelengthRanges == null || distinctWavelengthRanges.isEmpty()) {
+            return MATCHER_LIKE;
+        }
+        return new GranuleMatcher(distinctWavelengthRanges);
+    }
+
+    /** distinct Wavelength values */
+    private final Set<Range> distinctWavelengthRanges;
+
+    private GranuleMatcher(final Set<Range> distinctWavelengthRanges) {
+        this.distinctWavelengthRanges = distinctWavelengthRanges;
+    }
+
+    public boolean isEmpty() {
+        return !hasDistinctWavelengthRanges();
+    }
+
+    @Override
+    public boolean match(final Granule pattern, final Granule candidate) {
+        if (pattern == candidate) {
+            return true;
+        }
+        if ((pattern.getTarget() != null) && (candidate.getTarget() != null)) {
+            if (!pattern.getTarget().equals(candidate.getTarget())) {
+                return false;
+            }
+        }
+        if ((pattern.getInsMode() != null) && (candidate.getInsMode() != null)) {
+            if (!pattern.getInsMode().equals(candidate.getInsMode())) {
+                return false;
+            }
+        }
+        if ((pattern.getNight() != null) && (candidate.getNight() != null)) {
+            if (!pattern.getNight().equals(candidate.getNight())) {
+                return false;
+            }
+        }
+        if (pattern.hasDistinctStaNames() && candidate.hasDistinctStaNames()) {
+            if (!match(pattern.getDistinctStaNames(), candidate.getDistinctStaNames())) {
+                return false;
+            }
+        }
+        if (pattern.hasDistinctMjdRanges() && candidate.hasDistinctMjdRanges()) {
+            if (!Range.matchRanges(pattern.getDistinctMjdRanges(), candidate.getDistinctMjdRanges())) {
+                return false;
+            }
+        }
+        if (hasDistinctWavelengthRanges() && (candidate.getInsMode() != null)) {
+            if (!Range.matchRange(getDistinctWavelengthRanges(), candidate.getInsMode().getWavelengthRange())) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean hasDistinctWavelengthRanges() {
+        return (distinctWavelengthRanges != null) && !distinctWavelengthRanges.isEmpty();
+    }
+
+    public Set<Range> getDistinctWavelengthRanges() {
+        return distinctWavelengthRanges;
+    }
+
+    @Override
+    public String toString() {
+        return "GranuleMatcher{"
+                + ", distinctWavelengthRanges=" + distinctWavelengthRanges
+                + '}';
+    }
+
+    public static boolean match(final Set<String> selected, final Set<String> candidates) {
+        for (String sel : selected) {
+            if (candidates.contains(sel)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}