From e65eb5c9d69e3339ac768cba8f72915044e4da04 Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 2 Feb 2024 11:55:58 +0100 Subject: [PATCH 1/3] Add metals to gitignore --- .gitignore | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7cbb73c34..a99c96c97 100644 --- a/.gitignore +++ b/.gitignore @@ -242,4 +242,9 @@ docs/readthedocs/_build **/*.synctex.gz **/*.synctex(busy) -docs/javadoc \ No newline at end of file +### Metals ### +.metals/ +.bloop/ +project/**/metals.sbt + +docs/javadoc From d0b4289dc2f64594b5ac806514ba1b12e122910b Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 2 Feb 2024 12:00:54 +0100 Subject: [PATCH 2/3] Fix equals behavior of ConnectorResult --- .../ie3/datamodel/models/result/connector/ConnectorResult.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/edu/ie3/datamodel/models/result/connector/ConnectorResult.java b/src/main/java/edu/ie3/datamodel/models/result/connector/ConnectorResult.java index 7b8030396..e78ba6da9 100644 --- a/src/main/java/edu/ie3/datamodel/models/result/connector/ConnectorResult.java +++ b/src/main/java/edu/ie3/datamodel/models/result/connector/ConnectorResult.java @@ -115,6 +115,7 @@ public void setiBAng(ComparableQuantity iBAng) { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; + if (!super.equals(o)) return false; ConnectorResult that = (ConnectorResult) o; return iAMag.equals(that.iAMag) && iAAng.equals(that.iAAng) From 0ecaf2d456f5d61bd5c4e67cdbaa2b3b3eb600bb Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 2 Feb 2024 12:06:13 +0100 Subject: [PATCH 3/3] Update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 332853b8e..1cf7c5a8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed some tests no failing when they should [#958](https://github.com/ie3-institute/PowerSystemDataModel/issues/958) - Fixed thermal-house-documentation [#873](https://github.com/ie3-institute/PowerSystemDataModel/issues/873) - Fixed ElectricVehicle Documentation [#875](https://github.com/ie3-institute/PowerSystemDataModel/issues/875) +- Fixed Equal behavior of `ConnectorResult` [#1001](https://github.com/ie3-institute/PowerSystemDataModel/issues/1001) ### Changed - Changing from comparing strings to comparing uuids in `EntitySource.findFirstEntityByUuid` [#829](https://github.com/ie3-institute/PowerSystemDataModel/issues/829)