Implementing reviewer's requests.

Author: staudtMarius

docs/readthedocs/io/csvfiles.md

@@ -122,33 +122,34 @@ This is the UUID from the example above `2fcb3e53-b94a-4b96-bea4-c469e499f1a1`.
 The following keys are supported until now:
 ```{list-table}
    :widths: auto
+   :class: wrapping
    :header-rows: 1
 
    * - Key
-     - Information and supported head line
+     - Information and supported head line.
    * - c
      - An energy price (e.g. in €/MWh; c stands for charge).
        Permissible head line: ``time,price``
    * - p
-     - Active power
+     - Active power.
        Permissible head line: ``time,p``
    * - pq
-     - Active and reactive power
+     - Active and reactive power.
        Permissible head line: ``time,p,q``
    * - h
-     - Heat power demand
+     - Heat power demand.
        Permissible head line: ``time,h``
    * - ph
-     - Active and heat power
+     - Active and heat power.
        Permissible head line: ``time,p,h``
    * - pqh
-     - Active, reactive and heat power
+     - Active, reactive and heat power.
        Permissible head line: ``time,p,q,h``
    * - v
-     - Voltage mangnitude in pu and angle in °
+     - Voltage mangnitude in pu and angle in °.
        Permissible head line: ``time,vMag,vAng``
    * - weather
-     - Weather information
+     - Weather information.
        Permissible head line: ``time,coordinate,direct_irradiation,diffuse_irradiation,temperature,wind_velocity,wind_direction``
 
 ```

docs/readthedocs/models/input/additionaldata/timeseries.md

@@ -32,12 +32,10 @@ The following different values are available:
      - Electrical active and reactive power
      
    * - `HeatAndPValue`
-     - | Combination of thermal power (e.g. in kW) 
-       | and electrical active power (e.g. in kW)
+     - Combination of thermal power (e.g. in kW) <br> and electrical active power (e.g. in kW)
      
    * - `HeatAndSValue`
-     - | Combination of thermal power (e.g. in kW) 
-       | and electrical active and reactive power (e.g. in kW and kVAr)
+     -  Combination of thermal power (e.g. in kW) <br> and electrical active and reactive power (e.g. in kW and kVAr)
      
    * - `EnergyPriceValue`
      - Wholesale market price (e.g. in € / MWh)
@@ -52,7 +50,7 @@ The following different values are available:
      - Combination of wind direction and wind velocity
    
    * - `VoltageValue`
-     - Combination of voltage magnitude in pu and angle in °
+     - Combination of voltage magnitude in p.u. and angle in °
    
    * - `WeatherValue`
      - Combination of irradiance, temperature and wind information

src/main/java/edu/ie3/datamodel/io/factory/timeseries/TimeBasedSimpleValueFactory.java

@@ -11,12 +11,12 @@
 import edu.ie3.datamodel.models.StandardUnits;
 import edu.ie3.datamodel.models.timeseries.individual.TimeBasedValue;
 import edu.ie3.datamodel.models.value.*;
+import edu.ie3.datamodel.utils.Try;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+import javax.measure.quantity.Angle;
+import tech.units.indriya.ComparableQuantity;
 
 public class TimeBasedSimpleValueFactory<V extends Value>
     extends TimeBasedValueFactory<SimpleTimeBasedValueData<V>, V> {
@@ -72,16 +72,10 @@ protected TimeBasedValue<V> buildModel(SimpleTimeBasedValueData<V> data) {
     } else if (PValue.class.isAssignableFrom(data.getTargetClass())) {
       value = (V) new PValue(data.getQuantity(ACTIVE_POWER, ACTIVE_POWER_IN));
     } else if (VoltageValue.class.isAssignableFrom(data.getTargetClass())) {
+      Optional<ComparableQuantity<Angle>> angleOption =
+          Try.of(() -> data.getQuantity(VANG, VOLTAGE_ANGLE), FactoryException.class).getData();
 
-      try {
-        value =
-            (V)
-                new VoltageValue(
-                    data.getQuantity(VMAG, VOLTAGE_MAGNITUDE),
-                    data.getQuantity(VANG, VOLTAGE_ANGLE));
-      } catch (FactoryException e) {
-        value = (V) new VoltageValue(data.getQuantity(VMAG, VOLTAGE_MAGNITUDE));
-      }
+      value = (V) new VoltageValue(data.getQuantity(VMAG, VOLTAGE_MAGNITUDE), angleOption);
     } else {
       throw new FactoryException(
           "The given factory cannot handle target class '" + data.getTargetClass() + "'.");
@@ -106,6 +100,8 @@ protected List<Set<String>> getFields(Class<?> entityClass) {
       minConstructorParams.addAll(Arrays.asList(ACTIVE_POWER, REACTIVE_POWER));
     } else if (PValue.class.isAssignableFrom(entityClass)) {
       minConstructorParams.add(ACTIVE_POWER);
+    } else if (VoltageValue.class.isAssignableFrom(entityClass)) {
+      minConstructorParams.addAll(List.of(VMAG, VANG));
     } else {
       throw new FactoryException(
           "The given factory cannot handle target class '" + entityClass + "'.");

src/main/java/edu/ie3/datamodel/models/value/VoltageValue.java

@@ -27,22 +27,23 @@ public class VoltageValue implements Value {
 
   /**
    * @param magnitude of the voltage in p.u.
-   * @param angle of the voltage in degree
+   * @param angleOption option for the angle of this voltage in degree
    */
   public VoltageValue(
-      ComparableQuantity<Dimensionless> magnitude, ComparableQuantity<Angle> angle) {
+      ComparableQuantity<Dimensionless> magnitude,
+      Optional<ComparableQuantity<Angle>> angleOption) {
     this.magnitude = magnitude;
-    this.angle = angle;
+    this.angle = angleOption.orElse(Quantities.getQuantity(0.0, VOLTAGE_ANGLE));
   }
 
   /**
-   * This constructor will set the angle to 0°
-   *
    * @param magnitude of the voltage in p.u.
+   * @param angle of the voltage in degree
    */
-  public VoltageValue(ComparableQuantity<Dimensionless> magnitude) {
+  public VoltageValue(
+      ComparableQuantity<Dimensionless> magnitude, ComparableQuantity<Angle> angle) {
     this.magnitude = magnitude;
-    this.angle = Quantities.getQuantity(0.0, VOLTAGE_ANGLE);
+    this.angle = angle;
   }
 
   public Optional<ComparableQuantity<Dimensionless>> getMagnitude() {
@@ -65,8 +66,8 @@ public Optional<ComparableQuantity<Dimensionless>> getImagPart() {
     double mag = magnitude.to(PU).getValue().doubleValue();
     double ang = angle.to(DEGREE_GEOM).getValue().doubleValue();
 
-    double eInPu = mag * sin(toRadians(ang));
-    return Optional.of(Quantities.getQuantity(eInPu, PU));
+    double fInPu = mag * sin(toRadians(ang));
+    return Optional.of(Quantities.getQuantity(fInPu, PU));
   }
 
   @Override

src/test/groovy/edu/ie3/datamodel/models/value/VoltageValueTest.groovy

@@ -7,10 +7,10 @@ package edu.ie3.datamodel.models.value
 
 import static edu.ie3.util.quantities.PowerSystemUnits.*
 
+import edu.ie3.util.quantities.QuantityUtil
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-
 class VoltageValueTest extends Specification {
 
   def "A VoltageValue should return the real part correctly"() {
@@ -19,13 +19,13 @@ class VoltageValueTest extends Specification {
 
     then:
     actual.isPresent()
-    actual.get() =~ expected
+    QuantityUtil.isEquivalentAbs(actual.get(), expected, 1e-3)
 
     where:
     value                                                                                    | expected
     new VoltageValue(Quantities.getQuantity(1, PU), Quantities.getQuantity(0, DEGREE_GEOM))  | Quantities.getQuantity(1, PU)
     new VoltageValue(Quantities.getQuantity(1, PU), Quantities.getQuantity(45, DEGREE_GEOM)) | Quantities.getQuantity(0.7071067811865476, PU)
-    new VoltageValue(Quantities.getQuantity(1, PU), Quantities.getQuantity(90, DEGREE_GEOM)) | Quantities.getQuantity(6.123233995736766E-17, PU) // ~0pu
+    new VoltageValue(Quantities.getQuantity(1, PU), Quantities.getQuantity(90, DEGREE_GEOM)) | Quantities.getQuantity(0, PU)
   }
 
 
@@ -35,7 +35,7 @@ class VoltageValueTest extends Specification {
 
     then:
     actual.isPresent()
-    actual.get() =~ expected
+    QuantityUtil.isEquivalentAbs(actual.get(), expected, 1e-3)
 
     where:
     value                                                                                    | expected