Merge branch 'dev' into sp/#957-spi-em

Author: sebastian-peter

.gitignore

@@ -242,4 +242,9 @@ docs/readthedocs/_build
 **/*.synctex.gz
 **/*.synctex(busy)
 
-docs/javadoc
+### Metals ###
+.metals/
+.bloop/
+project/**/metals.sbt
+
+docs/javadoc

CHANGELOG.md

@@ -15,6 +15,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed Couchbase integration tests that randomly failed [#755](https://github.com/ie3-institute/PowerSystemDataModel/issues/755)
 - Fixed hyperlink in line documentation [#965](https://github.com/ie3-institute/PowerSystemDataModel/issues/965)
 - 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)

docs/readthedocs/models/input/participant/ev.md

@@ -20,7 +20,7 @@ Model of an electric vehicle, that is occasionally connected to the grid via an
 
    * - uuid
      - --
-     -
+     - 
 
    * - id
      - --
@@ -67,27 +67,31 @@ Model of an electric vehicle, that is occasionally connected to the grid via an
 
    * - uuid
      - --
-     -
+     - 
 
    * - id
      - --
      - Human readable identifier
 
    * - operator
      - --
-     -
+     - 
 
    * - operationTime
      - --
      - Timely restriction of operation
 
    * - node
      - --
-     -
+     - 
+     
+   * - qCharacteristics
+     - --
+     - :ref:`Reactive power characteristic<participant-general-q-characteristic>` to follow
 
    * - type
      - --
-     -
+     - 
 
    * - em
      - --

docs/readthedocs/models/input/participant/thermalhouse.md

@@ -19,15 +19,19 @@ This reflects a simple shoe box with transmission losses
 
    * - uuid
      - --
-     -
+     - 
 
    * - id
      - --
      - Human readable identifier
+     
+   * - bus
+     - --
+     - Thermal bus, the model is connected to
 
    * - operator
      - --
-     -
+     - 
 
    * - operationTime
      - --

docs/readthedocs/models/result/participant/ev.md

@@ -30,15 +30,15 @@ Result of an electric vehicle, that is occasionally connected to the grid via an
 
    * - p
      - MW
-     -
+     - 
 
    * - q
      - MVAr
-     -
+     - 
 
    * - soc
      - %
-     -
+     - 
 
 ```
 

docs/readthedocs/models/result/participant/thermalhouse.md

@@ -35,7 +35,7 @@ This reflects a simple shoe box with transmission losses
 
    * - indoorTemperature
      - °C
-     -
+     - 
 
 ```
 

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

@@ -115,6 +115,7 @@ public void setiBAng(ComparableQuantity<Angle> 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)