Skip to content

Commit

Permalink
-Imports all the deprecated util classes to restore master
Browse files Browse the repository at this point in the history
  • Loading branch information
@denstre
denstre committed Aug 26, 2020
1 parent 1c124dd commit 35e8667
Show file tree
Hide file tree
Showing 57 changed files with 107 additions and 107 deletions.
2 changes: 1 addition & 1 deletion src/main/java/edu/ie3/datamodel/io/factory/input/CylindricalStorageInputFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import edu.ie3.datamodel.models.input.OperatorInput;
import edu.ie3.datamodel.models.input.thermal.CylindricalStorageInput;
import edu.ie3.datamodel.models.input.thermal.ThermalBusInput;
import edu.ie3.util.quantities.interfaces.SpecificHeatCapacity;
import edu.ie3.util.quantities.dep.interfaces.SpecificHeatCapacity;
import java.util.UUID;
import javax.measure.quantity.Temperature;
import javax.measure.quantity.Volume;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/edu/ie3/datamodel/io/factory/input/ThermalHouseInputFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import edu.ie3.datamodel.models.input.OperatorInput;
import edu.ie3.datamodel.models.input.thermal.ThermalBusInput;
import edu.ie3.datamodel.models.input.thermal.ThermalHouseInput;
import edu.ie3.util.quantities.interfaces.HeatCapacity;
import edu.ie3.util.quantities.interfaces.ThermalConductance;
import edu.ie3.util.quantities.dep.interfaces.HeatCapacity;
import edu.ie3.util.quantities.dep.interfaces.ThermalConductance;
import java.util.UUID;
import tec.uom.se.ComparableQuantity;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/ie3/datamodel/io/factory/input/participant/BmInputFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import edu.ie3.datamodel.models.input.system.BmInput;
import edu.ie3.datamodel.models.input.system.characteristic.ReactivePowerCharacteristic;
import edu.ie3.datamodel.models.input.system.type.BmTypeInput;
import edu.ie3.util.quantities.interfaces.EnergyPrice;
import edu.ie3.util.quantities.dep.interfaces.EnergyPrice;
import java.util.UUID;
import tec.uom.se.ComparableQuantity;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/ie3/datamodel/io/factory/timeseries/TimeBasedWeatherValueFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import edu.ie3.datamodel.models.timeseries.individual.TimeBasedValue;
import edu.ie3.datamodel.models.value.WeatherValue;
import edu.ie3.util.TimeUtil;
import edu.ie3.util.quantities.interfaces.Irradiation;
import edu.ie3.util.quantities.dep.interfaces.Irradiation;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Collections;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/edu/ie3/datamodel/io/factory/typeinput/LineTypeInputFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import edu.ie3.datamodel.io.factory.SimpleEntityData;
import edu.ie3.datamodel.models.StandardUnits;
import edu.ie3.datamodel.models.input.connector.type.LineTypeInput;
import edu.ie3.util.quantities.interfaces.SpecificConductance;
import edu.ie3.util.quantities.interfaces.SpecificResistance;
import edu.ie3.util.quantities.dep.interfaces.SpecificConductance;
import edu.ie3.util.quantities.dep.interfaces.SpecificResistance;
import java.util.Collections;
import java.util.List;
import java.util.Set;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
import edu.ie3.datamodel.models.StandardUnits;
import edu.ie3.datamodel.models.input.system.characteristic.WecCharacteristicInput;
import edu.ie3.datamodel.models.input.system.type.*;
import edu.ie3.util.quantities.interfaces.Currency;
import edu.ie3.util.quantities.interfaces.DimensionlessRate;
import edu.ie3.util.quantities.interfaces.EnergyPrice;
import edu.ie3.util.quantities.interfaces.SpecificEnergy;
import edu.ie3.util.quantities.dep.interfaces.Currency;
import edu.ie3.util.quantities.dep.interfaces.DimensionlessRate;
import edu.ie3.util.quantities.dep.interfaces.EnergyPrice;
import edu.ie3.util.quantities.dep.interfaces.SpecificEnergy;
import java.util.Collections;
import java.util.List;
import java.util.Set;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/edu/ie3/datamodel/models/StandardUnits.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
*/
package edu.ie3.datamodel.models;

import static edu.ie3.util.quantities.PowerSystemUnits.*;
import static edu.ie3.util.quantities.dep.PowerSystemUnits.*;

import edu.ie3.util.quantities.interfaces.*;
import edu.ie3.util.quantities.dep.interfaces.*;
import javax.measure.Unit;
import javax.measure.quantity.*;
import tec.uom.se.unit.MetricPrefix;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/ie3/datamodel/models/input/connector/Transformer3WInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
package edu.ie3.datamodel.models.input.connector;

import static edu.ie3.util.quantities.PowerSystemUnits.PU;
import static edu.ie3.util.quantities.dep.PowerSystemUnits.PU;

import edu.ie3.datamodel.io.extractor.HasType;
import edu.ie3.datamodel.models.OperationTime;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import edu.ie3.datamodel.models.StandardUnits;
import edu.ie3.datamodel.models.input.AssetTypeInput;
import edu.ie3.util.quantities.interfaces.SpecificConductance;
import edu.ie3.util.quantities.interfaces.SpecificResistance;
import edu.ie3.util.quantities.dep.interfaces.SpecificConductance;
import edu.ie3.util.quantities.dep.interfaces.SpecificResistance;
import java.util.Objects;
import java.util.UUID;
import javax.measure.quantity.ElectricCurrent;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/ie3/datamodel/models/input/system/BmInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import edu.ie3.datamodel.models.input.OperatorInput;
import edu.ie3.datamodel.models.input.system.characteristic.ReactivePowerCharacteristic;
import edu.ie3.datamodel.models.input.system.type.BmTypeInput;
import edu.ie3.util.quantities.interfaces.EnergyPrice;
import edu.ie3.util.quantities.dep.interfaces.EnergyPrice;
import java.util.Objects;
import java.util.UUID;
import tec.uom.se.ComparableQuantity;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/ie3/datamodel/models/input/system/characteristic/CosPhiFixed.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
package edu.ie3.datamodel.models.input.system.characteristic;

import static edu.ie3.util.quantities.PowerSystemUnits.PU;
import static edu.ie3.util.quantities.dep.PowerSystemUnits.PU;
import static java.util.Collections.unmodifiableSortedSet;

import edu.ie3.datamodel.exceptions.ParsingException;
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/edu/ie3/datamodel/models/input/system/characteristic/OlmCharacteristicInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
package edu.ie3.datamodel.models.input.system.characteristic;

import static edu.ie3.util.quantities.PowerSystemUnits.PU;
import static edu.ie3.util.quantities.dep.PowerSystemUnits.PU;
import static java.util.Collections.unmodifiableSortedSet;
import static tec.uom.se.unit.Units.METRE_PER_SECOND;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/edu/ie3/datamodel/models/input/system/type/BmTypeInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
package edu.ie3.datamodel.models.input.system.type;

import edu.ie3.datamodel.models.StandardUnits;
import edu.ie3.util.quantities.interfaces.Currency;
import edu.ie3.util.quantities.interfaces.DimensionlessRate;
import edu.ie3.util.quantities.interfaces.EnergyPrice;
import edu.ie3.util.quantities.dep.interfaces.Currency;
import edu.ie3.util.quantities.dep.interfaces.DimensionlessRate;
import edu.ie3.util.quantities.dep.interfaces.EnergyPrice;
import java.util.Objects;
import java.util.UUID;
import javax.measure.quantity.Dimensionless;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/edu/ie3/datamodel/models/input/system/type/ChpTypeInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
package edu.ie3.datamodel.models.input.system.type;

import edu.ie3.datamodel.models.StandardUnits;
import edu.ie3.util.quantities.interfaces.Currency;
import edu.ie3.util.quantities.interfaces.EnergyPrice;
import edu.ie3.util.quantities.dep.interfaces.Currency;
import edu.ie3.util.quantities.dep.interfaces.EnergyPrice;
import java.util.Objects;
import java.util.UUID;
import javax.measure.quantity.Dimensionless;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/edu/ie3/datamodel/models/input/system/type/EvTypeInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
package edu.ie3.datamodel.models.input.system.type;

import edu.ie3.datamodel.models.StandardUnits;
import edu.ie3.util.quantities.interfaces.Currency;
import edu.ie3.util.quantities.interfaces.EnergyPrice;
import edu.ie3.util.quantities.interfaces.SpecificEnergy;
import edu.ie3.util.quantities.dep.interfaces.Currency;
import edu.ie3.util.quantities.dep.interfaces.EnergyPrice;
import edu.ie3.util.quantities.dep.interfaces.SpecificEnergy;
import java.util.Objects;
import java.util.UUID;
import javax.measure.quantity.Energy;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/edu/ie3/datamodel/models/input/system/type/HpTypeInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
package edu.ie3.datamodel.models.input.system.type;

import edu.ie3.datamodel.models.StandardUnits;
import edu.ie3.util.quantities.interfaces.Currency;
import edu.ie3.util.quantities.interfaces.EnergyPrice;
import edu.ie3.util.quantities.dep.interfaces.Currency;
import edu.ie3.util.quantities.dep.interfaces.EnergyPrice;
import java.util.Objects;
import java.util.UUID;
import javax.measure.quantity.Power;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/edu/ie3/datamodel/models/input/system/type/StorageTypeInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
package edu.ie3.datamodel.models.input.system.type;

import edu.ie3.datamodel.models.StandardUnits;
import edu.ie3.util.quantities.interfaces.Currency;
import edu.ie3.util.quantities.interfaces.DimensionlessRate;
import edu.ie3.util.quantities.interfaces.EnergyPrice;
import edu.ie3.util.quantities.dep.interfaces.Currency;
import edu.ie3.util.quantities.dep.interfaces.DimensionlessRate;
import edu.ie3.util.quantities.dep.interfaces.EnergyPrice;
import java.util.Objects;
import java.util.UUID;
import javax.measure.quantity.Dimensionless;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/edu/ie3/datamodel/models/input/system/type/SystemParticipantTypeInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
package edu.ie3.datamodel.models.input.system.type;

import edu.ie3.datamodel.models.input.AssetTypeInput;
import edu.ie3.util.quantities.interfaces.Currency;
import edu.ie3.util.quantities.interfaces.EnergyPrice;
import edu.ie3.util.quantities.dep.interfaces.Currency;
import edu.ie3.util.quantities.dep.interfaces.EnergyPrice;
import java.util.Objects;
import java.util.UUID;
import javax.measure.quantity.Power;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/edu/ie3/datamodel/models/input/system/type/WecTypeInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import edu.ie3.datamodel.models.StandardUnits;
import edu.ie3.datamodel.models.input.system.characteristic.WecCharacteristicInput;
import edu.ie3.util.quantities.interfaces.Currency;
import edu.ie3.util.quantities.interfaces.EnergyPrice;
import edu.ie3.util.quantities.dep.interfaces.Currency;
import edu.ie3.util.quantities.dep.interfaces.EnergyPrice;
import java.util.Objects;
import java.util.UUID;
import javax.measure.quantity.Area;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/ie3/datamodel/models/input/thermal/CylindricalStorageInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import edu.ie3.datamodel.models.OperationTime;
import edu.ie3.datamodel.models.StandardUnits;
import edu.ie3.datamodel.models.input.OperatorInput;
import edu.ie3.util.quantities.interfaces.SpecificHeatCapacity;
import edu.ie3.util.quantities.dep.interfaces.SpecificHeatCapacity;
import java.util.Objects;
import java.util.UUID;
import javax.measure.quantity.Temperature;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/edu/ie3/datamodel/models/input/thermal/ThermalHouseInput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import edu.ie3.datamodel.models.OperationTime;
import edu.ie3.datamodel.models.StandardUnits;
import edu.ie3.datamodel.models.input.OperatorInput;
import edu.ie3.util.quantities.interfaces.HeatCapacity;
import edu.ie3.util.quantities.interfaces.ThermalConductance;
import edu.ie3.util.quantities.dep.interfaces.HeatCapacity;
import edu.ie3.util.quantities.dep.interfaces.ThermalConductance;
import java.util.Objects;
import java.util.UUID;
import org.apache.commons.lang3.NotImplementedException;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/ie3/datamodel/models/value/EnergyPriceValue.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package edu.ie3.datamodel.models.value;

import edu.ie3.datamodel.models.StandardUnits;
import edu.ie3.util.quantities.interfaces.EnergyPrice;
import edu.ie3.util.quantities.dep.interfaces.EnergyPrice;
import java.util.Objects;
import tec.uom.se.ComparableQuantity;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/ie3/datamodel/models/value/IrradiationValue.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package edu.ie3.datamodel.models.value;

import edu.ie3.datamodel.models.StandardUnits;
import edu.ie3.util.quantities.interfaces.Irradiation;
import edu.ie3.util.quantities.dep.interfaces.Irradiation;
import java.util.Objects;
import tec.uom.se.ComparableQuantity;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/ie3/datamodel/models/value/WeatherValue.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
package edu.ie3.datamodel.models.value;

import edu.ie3.util.quantities.interfaces.Irradiation;
import edu.ie3.util.quantities.dep.interfaces.Irradiation;
import java.util.Objects;
import javax.measure.quantity.Angle;
import javax.measure.quantity.Speed;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/ie3/datamodel/models/voltagelevels/GermanVoltageLevelUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
package edu.ie3.datamodel.models.voltagelevels;

import static edu.ie3.util.quantities.PowerSystemUnits.KILOVOLT;
import static edu.ie3.util.quantities.dep.PowerSystemUnits.KILOVOLT;

import edu.ie3.datamodel.exceptions.VoltageLevelException;
import edu.ie3.util.interval.RightOpenInterval;
Expand Down
4 changes: 2 additions & 2 deletions src/test/groovy/edu/ie3/datamodel/io/factory/input/LineInputFactoryTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ package edu.ie3.datamodel.io.factory.input
import edu.ie3.datamodel.utils.GridAndGeoUtils
import org.locationtech.jts.geom.LineString

import static edu.ie3.util.quantities.PowerSystemUnits.METRE_PER_SECOND
import static edu.ie3.util.quantities.PowerSystemUnits.PU
import static edu.ie3.util.quantities.dep.PowerSystemUnits.METRE_PER_SECOND
import static edu.ie3.util.quantities.dep.PowerSystemUnits.PU

import edu.ie3.datamodel.models.StandardUnits
import edu.ie3.datamodel.models.input.NodeInput
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/ChpInputFactoryTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
package edu.ie3.datamodel.io.factory.input.participant

import static edu.ie3.util.quantities.PowerSystemUnits.PU
import static edu.ie3.util.quantities.dep.PowerSystemUnits.PU

import edu.ie3.datamodel.models.input.NodeInput
import edu.ie3.datamodel.models.input.OperatorInput
Expand Down
2 changes: 1 addition & 1 deletion .../groovy/edu/ie3/datamodel/io/factory/input/participant/FixedFeedInInputFactoryTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
package edu.ie3.datamodel.io.factory.input.participant

import static edu.ie3.util.quantities.PowerSystemUnits.PU
import static edu.ie3.util.quantities.dep.PowerSystemUnits.PU

import edu.ie3.datamodel.exceptions.FactoryException
import edu.ie3.datamodel.io.factory.input.NodeAssetInputEntityData
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/HpInputFactoryTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
package edu.ie3.datamodel.io.factory.input.participant

import static edu.ie3.util.quantities.PowerSystemUnits.PU
import static edu.ie3.util.quantities.dep.PowerSystemUnits.PU

import edu.ie3.datamodel.models.input.NodeInput
import edu.ie3.datamodel.models.input.OperatorInput
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/LoadInputFactoryTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package edu.ie3.datamodel.io.factory.input.participant

import edu.ie3.datamodel.io.factory.input.NodeAssetInputEntityData
import static edu.ie3.util.quantities.PowerSystemUnits.PU
import static edu.ie3.util.quantities.dep.PowerSystemUnits.PU

import edu.ie3.datamodel.models.BdewLoadProfile
import edu.ie3.datamodel.models.OperationTime
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/PvInputFactoryTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package edu.ie3.datamodel.io.factory.input.participant

import edu.ie3.datamodel.io.factory.input.NodeAssetInputEntityData
import static edu.ie3.util.quantities.PowerSystemUnits.PU
import static edu.ie3.util.quantities.dep.PowerSystemUnits.PU

import edu.ie3.datamodel.models.StandardUnits
import edu.ie3.datamodel.models.input.NodeInput
Expand Down
2 changes: 1 addition & 1 deletion ...test/groovy/edu/ie3/datamodel/io/factory/input/participant/StorageInputFactoryTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
package edu.ie3.datamodel.io.factory.input.participant

import static edu.ie3.util.quantities.PowerSystemUnits.PU
import static edu.ie3.util.quantities.dep.PowerSystemUnits.PU

import edu.ie3.datamodel.models.input.NodeInput
import edu.ie3.datamodel.models.input.OperatorInput
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/WecInputFactoryTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
package edu.ie3.datamodel.io.factory.input.participant

import static edu.ie3.util.quantities.PowerSystemUnits.PU
import static edu.ie3.util.quantities.dep.PowerSystemUnits.PU

import edu.ie3.datamodel.models.input.NodeInput
import edu.ie3.datamodel.models.input.OperatorInput
Expand Down
4 changes: 2 additions & 2 deletions ...roovy/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactoryTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*/
package edu.ie3.datamodel.io.factory.typeinput

import static edu.ie3.util.quantities.PowerSystemUnits.METRE_PER_SECOND
import static edu.ie3.util.quantities.PowerSystemUnits.PU
import static edu.ie3.util.quantities.dep.PowerSystemUnits.METRE_PER_SECOND
import static edu.ie3.util.quantities.dep.PowerSystemUnits.PU

import edu.ie3.datamodel.exceptions.FactoryException
import edu.ie3.datamodel.models.input.system.characteristic.CharacteristicPoint
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/edu/ie3/datamodel/io/processor/input/InputEntityProcessorTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import tec.uom.se.quantity.Quantities
import java.time.ZoneId
import java.time.ZonedDateTime

import static edu.ie3.util.quantities.PowerSystemUnits.PU
import static edu.ie3.util.quantities.dep.PowerSystemUnits.PU

/**
* Testing the function of processors
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/edu/ie3/datamodel/io/processor/result/ResultEntityProcessorTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import edu.ie3.datamodel.models.result.connector.Transformer2WResult
import edu.ie3.datamodel.models.result.connector.Transformer3WResult
import edu.ie3.datamodel.models.result.system.*
import edu.ie3.util.TimeTools
import edu.ie3.util.quantities.PowerSystemUnits
import edu.ie3.util.quantities.dep.PowerSystemUnits
import spock.lang.Shared
import spock.lang.Specification
import tec.uom.se.quantity.Quantities
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/edu/ie3/datamodel/models/CommonVoltageLevelTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
package edu.ie3.datamodel.models

import static edu.ie3.util.quantities.PowerSystemUnits.KILOVOLT
import static edu.ie3.util.quantities.dep.PowerSystemUnits.KILOVOLT
import static tec.uom.se.unit.Units.VOLT

import edu.ie3.datamodel.exceptions.VoltageLevelException
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/edu/ie3/datamodel/models/GermanVoltageLevelUtilsTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
package edu.ie3.datamodel.models

import static edu.ie3.util.quantities.PowerSystemUnits.KILOVOLT
import static edu.ie3.util.quantities.dep.PowerSystemUnits.KILOVOLT
import static edu.ie3.datamodel.models.voltagelevels.GermanVoltageLevelUtils.*

import edu.ie3.datamodel.models.voltagelevels.CommonVoltageLevel
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/edu/ie3/datamodel/models/input/system/BmInputTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import edu.ie3.test.common.SystemParticipantTestData
import spock.lang.Specification
import tec.uom.se.quantity.Quantities

import static edu.ie3.util.quantities.PowerSystemUnits.EURO_PER_MEGAWATTHOUR
import static edu.ie3.util.quantities.dep.PowerSystemUnits.EURO_PER_MEGAWATTHOUR

class BmInputTest extends Specification {

Expand Down

0 comments on commit 35e8667

Please sign in to comment.