Skip to content

Commit 8bc97ca

Browse files
committed
Improving the code for finding the last previous tick.
1 parent 0928900 commit 8bc97ca

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/main/java/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public Optional<ZonedDateTime> getLastTimeKeyBefore(ZonedDateTime time) {
205205
.executeQuery(
206206
queryForValueBefore, ps -> ps.setTimestamp(1, Timestamp.from(time.toInstant())))
207207
.map(valueFactory::extractTime)
208-
.findFirst();
208+
.max(ZonedDateTime::compareTo);
209209
}
210210

211211
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-

src/main/java/edu/ie3/datamodel/models/timeseries/individual/IndividualTimeSeries.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public Optional<V> getValue(ZonedDateTime time) {
5555
@Override
5656
public Optional<ZonedDateTime> getPreviousDateTime(ZonedDateTime time) {
5757
return timeToValue.keySet().stream()
58-
.filter(valueTime -> valueTime.compareTo(time) < 0)
59-
.max(Comparator.naturalOrder());
58+
.filter(valueTime -> valueTime.isBefore(time))
59+
.max(ZonedDateTime::compareTo);
6060
}
6161

6262
@Override

0 commit comments

Comments
 (0)