Skip to content

Commit 8423502

Browse files
Merge pull request #1002 from ie3-institute/to/#1001-connector-eq
Fix equals behavior of `ConnectorResult`
2 parents 4049dad + 0ecaf2d commit 8423502

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,4 +242,9 @@ docs/readthedocs/_build
242242
**/*.synctex.gz
243243
**/*.synctex(busy)
244244

245-
docs/javadoc
245+
### Metals ###
246+
.metals/
247+
.bloop/
248+
project/**/metals.sbt
249+
250+
docs/javadoc

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1717
- Fixed some tests no failing when they should [#958](https://github.com/ie3-institute/PowerSystemDataModel/issues/958)
1818
- Fixed thermal-house-documentation [#873](https://github.com/ie3-institute/PowerSystemDataModel/issues/873)
1919
- Fixed ElectricVehicle Documentation [#875](https://github.com/ie3-institute/PowerSystemDataModel/issues/875)
20+
- Fixed Equal behavior of `ConnectorResult` [#1001](https://github.com/ie3-institute/PowerSystemDataModel/issues/1001)
2021

2122
### Changed
2223
- Changing from comparing strings to comparing uuids in `EntitySource.findFirstEntityByUuid` [#829](https://github.com/ie3-institute/PowerSystemDataModel/issues/829)

src/main/java/edu/ie3/datamodel/models/result/connector/ConnectorResult.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ public void setiBAng(ComparableQuantity<Angle> iBAng) {
115115
public boolean equals(Object o) {
116116
if (this == o) return true;
117117
if (o == null || getClass() != o.getClass()) return false;
118+
if (!super.equals(o)) return false;
118119
ConnectorResult that = (ConnectorResult) o;
119120
return iAMag.equals(that.iAMag)
120121
&& iAAng.equals(that.iAAng)

0 commit comments

Comments
 (0)