diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b80b8475..5d6ed40ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased/Snapshot] +### Fixed +- Fixed `equals` of `ResultEntity` and `TimeSeriesEntry` [#1037](https://github.com/ie3-institute/PowerSystemDataModel/issues/1037) + ## [5.0.0] - 2024-03-06 ### Added diff --git a/src/main/java/edu/ie3/datamodel/models/result/ResultEntity.java b/src/main/java/edu/ie3/datamodel/models/result/ResultEntity.java index 6d502fe43..09ac36ea7 100644 --- a/src/main/java/edu/ie3/datamodel/models/result/ResultEntity.java +++ b/src/main/java/edu/ie3/datamodel/models/result/ResultEntity.java @@ -49,7 +49,6 @@ public void setTime(ZonedDateTime time) { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; ResultEntity that = (ResultEntity) o; return time.equals(that.time) && inputModel.equals(that.inputModel); } diff --git a/src/main/java/edu/ie3/datamodel/models/timeseries/TimeSeriesEntry.java b/src/main/java/edu/ie3/datamodel/models/timeseries/TimeSeriesEntry.java index ba40bd603..30f487e47 100644 --- a/src/main/java/edu/ie3/datamodel/models/timeseries/TimeSeriesEntry.java +++ b/src/main/java/edu/ie3/datamodel/models/timeseries/TimeSeriesEntry.java @@ -29,8 +29,6 @@ public V getValue() { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; - TimeSeriesEntry entry = (TimeSeriesEntry) o; return value.equals(entry.value); }