Filter by feature when retrieving time-series datasets in memory, #408.

NOAA-OWP · Feb 11, 2025 · 97e63ab · 97e63ab
1 parent 888f5d4
commit 97e63ab
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/wres-datamodel/src/wres/datamodel/time/TimeSeriesStore.java b/wres-datamodel/src/wres/datamodel/time/TimeSeriesStore.java
@@ -77,10 +77,10 @@ public Stream<TimeSeries<Double>> getSingleValuedSeries( DatasetOrientation orie
                               .stream()
                               .filter( next -> features.contains( next.getMetadata()
                                                                       .getFeature() )
-                                               && Objects.isNull( variableName )
-                                               || Objects.equals( next.getMetadata()
-                                                                      .getVariableName(),
-                                                                  variableName ) );
+                                               && ( Objects.isNull( variableName )
+                                                    || Objects.equals( next.getMetadata()
+                                                                           .getVariableName(),
+                                                                       variableName ) ) );
     }
 
     /**
@@ -144,10 +144,10 @@ public Stream<TimeSeries<Double>> getSingleValuedSeries( TimeWindowOuter timeWin
                               .stream()
                               .filter( next -> features.contains( next.getMetadata()
                                                                       .getFeature() )
-                                               && Objects.isNull( variableName )
-                                               || Objects.equals( next.getMetadata()
-                                                                      .getVariableName(),
-                                                                  variableName ) )
+                                               && ( Objects.isNull( variableName )
+                                                    || Objects.equals( next.getMetadata()
+                                                                           .getVariableName(),
+                                                                       variableName ) ) )
                               .map( next -> TimeSeriesSlicer.filter( next, timeWindow ) );
     }
 
@@ -179,10 +179,10 @@ public Stream<TimeSeries<Ensemble>> getEnsembleSeries( TimeWindowOuter timeWindo
                               .stream()
                               .filter( next -> features.contains( next.getMetadata()
                                                                       .getFeature() )
-                                               && Objects.isNull( variableName )
-                                               || Objects.equals( next.getMetadata()
-                                                                      .getVariableName(),
-                                                                  variableName ) )
+                                               && ( Objects.isNull( variableName )
+                                                    || Objects.equals( next.getMetadata()
+                                                                           .getVariableName(),
+                                                                       variableName ) ) )
                               .map( next -> TimeSeriesSlicer.filter( next,
                                                                      timeWindow ) );
     }
@@ -453,4 +453,4 @@ private long getEventCount()
                                             .sum();
     }
 
-}
+}