Skip to content

Commit 93cf3ee

Browse files
danielfeismanndanielfeismann
authored
Merge pull request #558 from ie3-institute/df/#557-codacy
Handle codacy issues
2 parents ff1c410 + 629c6b9 commit 93cf3ee

12 files changed

+96
-79
lines changed

‎src/test/groovy/edu/ie3/simona/model/participant/BMModelTest.groovy‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@
66

77
package edu.ie3.simona.model.participant
88

9+
import static edu.ie3.util.quantities.PowerSystemUnits.*
10+
import static tech.units.indriya.unit.Units.CELSIUS
11+
import static tech.units.indriya.unit.Units.PERCENT
12+
913
import edu.ie3.datamodel.models.input.NodeInput
1014
import edu.ie3.datamodel.models.input.system.characteristic.CosPhiFixed
1115
import edu.ie3.datamodel.models.input.system.type.BmTypeInput
12-
import edu.ie3.simona.model.participant.BMModel
16+
1317
import edu.ie3.simona.model.participant.control.QControl
1418
import edu.ie3.util.quantities.interfaces.EnergyPrice
1519
import edu.ie3.util.scala.OperationInterval
@@ -21,9 +25,7 @@ import tech.units.indriya.quantity.Quantities
2125

2226
import java.time.ZonedDateTime
2327

24-
import static edu.ie3.util.quantities.PowerSystemUnits.*
25-
import static tech.units.indriya.unit.Units.CELSIUS
26-
import static tech.units.indriya.unit.Units.PERCENT
28+
2729

2830
/**
2931
* Test class that tries to cover all special cases of the current implementation of the {@link BMModel}
@@ -67,7 +69,7 @@ class BMModelTest extends Specification {
6769
bmType.getCosPhiRated(),
6870
"MockNode",
6971
true,
70-
bmType.getOpex() as ComparableQuantity<EnergyPrice>,
72+
bmType.opex as ComparableQuantity<EnergyPrice>,
7173
Quantities.getQuantity(0.051d, EURO_PER_KILOWATTHOUR),
7274
Quantities.getQuantity(5d, PERCENT_PER_HOUR))
7375
}
@@ -174,14 +176,14 @@ class BMModelTest extends Specification {
174176
bmType.getCosPhiRated(),
175177
"MockNode",
176178
true,
177-
bmType.getOpex() as ComparableQuantity<EnergyPrice>,
179+
bmType.opex as ComparableQuantity<EnergyPrice>,
178180
Quantities.getQuantity(feedInTariff, EURO_PER_KILOWATTHOUR),
179181
Quantities.getQuantity(5d, PERCENT_PER_HOUR))
180182

181183
def pElCalc = bmModel.calculateElOutput(usage, eff)
182184

183185
then: "compare in watts"
184-
Math.abs(pElCalc.toSystemUnit().getValue().doubleValue() - Quantities.getQuantity(pElSol, KILOWATT).toSystemUnit().getValue().doubleValue()) < 0.0001
186+
Math.abs(pElCalc.toSystemUnit().value.doubleValue() - Quantities.getQuantity(pElSol, KILOWATT).toSystemUnit().value.doubleValue()) < 0.0001
185187

186188
where:
187189
feedInTariff | usage | eff || pElSol
@@ -227,7 +229,7 @@ class BMModelTest extends Specification {
227229
bmType.getCosPhiRated(),
228230
"MockNode",
229231
costControlled,
230-
bmType.getOpex() as ComparableQuantity<EnergyPrice>,
232+
bmType.opex as ComparableQuantity<EnergyPrice>,
231233
Quantities.getQuantity(0.051d, EURO_PER_KILOWATTHOUR),
232234
Quantities.getQuantity(5d, PERCENT_PER_HOUR))
233235

@@ -238,7 +240,7 @@ class BMModelTest extends Specification {
238240
def powerCalc = bmModel.calculateActivePower(relevantData)
239241

240242
then: "compare in watts"
241-
Math.abs(powerCalc.toSystemUnit().getValue().doubleValue() - Quantities.getQuantity(powerSol, KILOWATT).toSystemUnit().getValue().doubleValue()) < 1e-12
243+
Math.abs(powerCalc.toSystemUnit().value.doubleValue() - Quantities.getQuantity(powerSol, KILOWATT).toSystemUnit().value.doubleValue()) < 1e-12
242244

243245
where:
244246
time | temp | costControlled | lastPower || powerSol

‎src/test/groovy/edu/ie3/simona/model/participant/ChpModelTest.groovy‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66

77
package edu.ie3.simona.model.participant
88

9+
import static edu.ie3.util.quantities.PowerSystemUnits.*
10+
import static tech.units.indriya.quantity.Quantities.getQuantity
11+
import static tech.units.indriya.unit.Units.CUBIC_METRE
12+
import static tech.units.indriya.unit.Units.PERCENT
13+
import static edu.ie3.util.quantities.QuantityUtil.equals
14+
915
import edu.ie3.datamodel.models.OperationTime
1016
import edu.ie3.datamodel.models.StandardUnits
1117
import edu.ie3.datamodel.models.input.OperatorInput
@@ -15,18 +21,11 @@ import edu.ie3.datamodel.models.input.system.type.ChpTypeInput
1521
import edu.ie3.datamodel.models.input.thermal.CylindricalStorageInput
1622
import edu.ie3.simona.model.participant.ChpModel.ChpState
1723
import edu.ie3.simona.model.thermal.CylindricalThermalStorage
18-
import edu.ie3.simona.model.thermal.CylindricalThermalStorage$
1924
import edu.ie3.util.scala.OperationInterval
2025
import spock.lang.Shared
2126
import spock.lang.Specification
2227
import spock.lang.Unroll
2328

24-
import static edu.ie3.util.quantities.PowerSystemUnits.*
25-
import static tech.units.indriya.quantity.Quantities.getQuantity
26-
import static tech.units.indriya.unit.Units.CUBIC_METRE
27-
import static tech.units.indriya.unit.Units.PERCENT
28-
import static edu.ie3.util.quantities.QuantityUtil.equals
29-
3029
class ChpModelTest extends Specification {
3130

3231
@Shared

‎src/test/groovy/edu/ie3/simona/model/participant/EvcsModelTest.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
package edu.ie3.simona.model.participant
88

9+
import static edu.ie3.util.quantities.PowerSystemUnits.*
10+
import static tech.units.indriya.unit.Units.MINUTE
11+
912
import edu.ie3.datamodel.models.input.system.characteristic.CosPhiFixed
1013
import edu.ie3.datamodel.models.input.system.type.evcslocation.EvcsLocationType
1114
import edu.ie3.simona.api.data.ev.model.EvModel
@@ -21,9 +24,6 @@ import edu.ie3.util.quantities.QuantityUtil
2124
import javax.measure.quantity.Power
2225
import scala.collection.immutable.Set
2326

24-
import static edu.ie3.util.quantities.PowerSystemUnits.*
25-
import static tech.units.indriya.unit.Units.MINUTE
26-
2727
class EvcsModelTest extends Specification {
2828

2929
static final double TESTING_TOLERANCE = 1e-10

‎src/test/groovy/edu/ie3/simona/model/participant/FixedFeedModelTest.groovy‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
package edu.ie3.simona.model.participant
88

9+
import static edu.ie3.util.quantities.PowerSystemUnits.*
10+
import static org.apache.commons.math3.util.FastMath.abs
11+
912
import edu.ie3.datamodel.models.OperationTime
1013
import edu.ie3.datamodel.models.input.NodeInput
1114
import edu.ie3.datamodel.models.input.OperatorInput
@@ -18,8 +21,7 @@ import edu.ie3.util.TimeUtil
1821
import spock.lang.Specification
1922
import tech.units.indriya.quantity.Quantities
2023

21-
import static edu.ie3.util.quantities.PowerSystemUnits.*
22-
import static org.apache.commons.math3.util.FastMath.abs
24+
2325

2426
class FixedFeedModelTest extends Specification {
2527

‎src/test/groovy/edu/ie3/simona/model/participant/HpModelTest.groovy‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66

77
package edu.ie3.simona.model.participant
88

9+
import static edu.ie3.util.quantities.PowerSystemUnits.KILOVOLTAMPERE
10+
import static edu.ie3.util.quantities.PowerSystemUnits.KILOWATT
11+
import static tech.units.indriya.quantity.Quantities.getQuantity
12+
import static tech.units.indriya.unit.Units.CELSIUS
13+
914
import edu.ie3.datamodel.models.OperationTime
1015
import edu.ie3.datamodel.models.StandardUnits
1116
import edu.ie3.datamodel.models.input.OperatorInput
@@ -22,10 +27,7 @@ import spock.lang.Shared
2227
import spock.lang.Specification
2328
import spock.lang.Unroll
2429

25-
import static edu.ie3.util.quantities.PowerSystemUnits.KILOVOLTAMPERE
26-
import static edu.ie3.util.quantities.PowerSystemUnits.KILOWATT
27-
import static tech.units.indriya.quantity.Quantities.getQuantity
28-
import static tech.units.indriya.unit.Units.CELSIUS
30+
2931

3032
class HpModelTest extends Specification {
3133

@@ -158,9 +160,9 @@ class HpModelTest extends Specification {
158160
thermalHouse)
159161

160162
then:
161-
hpModelCaseClass.sRated().getValue() == hpModelCaseObject.sRated().getValue()
163+
hpModelCaseClass.sRated().value == hpModelCaseObject.sRated().value
162164
hpModelCaseClass.cosPhiRated() == hpModelCaseObject.cosPhiRated()
163-
hpModelCaseClass.pThermal().getValue() == hpModelCaseObject.pThermal().getValue()
165+
hpModelCaseClass.pThermal().value == hpModelCaseObject.pThermal().value
164166
hpModelCaseClass.thermalHouse() == hpModelCaseObject.thermalHouse()
165167
}
166168
}

‎src/test/groovy/edu/ie3/simona/model/participant/PvModelIT.groovy‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66

77
package edu.ie3.simona.model.participant
88

9+
import static edu.ie3.util.quantities.PowerSystemUnits.MEGAWATT
10+
import static edu.ie3.util.quantities.PowerSystemUnits.PU
11+
import static java.util.Locale.US
12+
import static java.util.Locale.setDefault
13+
import static tech.units.indriya.quantity.Quantities.getQuantity
14+
import static tech.units.indriya.unit.Units.*
15+
916
import edu.ie3.datamodel.io.source.csv.CsvJointGridContainerSource
1017
import edu.ie3.datamodel.models.input.system.PvInput
1118
import edu.ie3.simona.model.SystemComponent
@@ -25,12 +32,7 @@ import javax.measure.quantity.Power
2532
import java.time.ZonedDateTime
2633
import java.util.zip.GZIPInputStream
2734

28-
import static edu.ie3.util.quantities.PowerSystemUnits.MEGAWATT
29-
import static edu.ie3.util.quantities.PowerSystemUnits.PU
30-
import static java.util.Locale.US
31-
import static java.util.Locale.setDefault
32-
import static tech.units.indriya.quantity.Quantities.getQuantity
33-
import static tech.units.indriya.unit.Units.*
35+
3436

3537
/**
3638
* A simple integration test that uses pre-calculated data to check if the pv model works as expected.
@@ -55,8 +57,8 @@ class PvModelIT extends Specification implements PvModelITHelper {
5557
setDefault(US)
5658

5759
pvModels = createPvModels()
58-
weatherMap = getWeatherData()
59-
resultsMap = getResultsData()
60+
weatherMap = weatherData
61+
resultsMap = resultsData
6062
}
6163

6264
def "8 pv panels full year test"() {
@@ -92,7 +94,7 @@ class PvModelIT extends Specification implements PvModelITHelper {
9294

9395
"collect the results and calculate the difference between the provided results and the calculated ones"
9496
double calc = model.calculatePower(0L, voltage, neededData).p().getValue().doubleValue()
95-
double sol = resultsMap.get(dateTime).get(modelId).getValue().doubleValue()
97+
double sol = resultsMap.get(dateTime).get(modelId).value.doubleValue()
9698

9799
testRes.add(Math.abs(calc - sol))
98100

‎src/test/groovy/edu/ie3/simona/model/participant/PvModelTest.groovy‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
package edu.ie3.simona.model.participant
88

9+
import static edu.ie3.util.quantities.PowerSystemUnits.*
10+
import static tech.units.indriya.quantity.Quantities.getQuantity
11+
912
import edu.ie3.datamodel.models.OperationTime
1013
import edu.ie3.datamodel.models.input.NodeInput
1114
import edu.ie3.datamodel.models.input.OperatorInput
@@ -31,8 +34,7 @@ import javax.measure.quantity.Dimensionless
3134
import javax.measure.quantity.Power
3235
import java.time.ZonedDateTime
3336

34-
import static edu.ie3.util.quantities.PowerSystemUnits.*
35-
import static tech.units.indriya.quantity.Quantities.getQuantity
37+
3638

3739
/**
3840
* Test class that tries to cover all special cases of the current implementation of the PvModel
@@ -97,19 +99,19 @@ class PvModelTest extends Specification {
9799
// build the PvModel
98100
double scalingFactor = 1.0d
99101
pvModel = PvModel.apply(
100-
pvInput.getUuid(),
101-
pvInput.getId(),
102+
pvInput.uuid,
103+
pvInput.id,
102104
OperationInterval.apply(0L, 86400L),
103105
scalingFactor,
104106
QControl.apply(pvInput.getqCharacteristics()),
105107
pvInput.getsRated() as ComparableQuantity<Power>,
106-
pvInput.getCosPhiRated(),
108+
pvInput.cosPhiRated,
107109
pvInput.getNode().getGeoPosition().getY(),
108110
pvInput.getNode().getGeoPosition().getX(),
109-
pvInput.getAlbedo(),
110-
pvInput.getEtaConv() as ComparableQuantity<Dimensionless>,
111-
getQuantity(Math.toRadians(pvInput.getAzimuth().getValue().doubleValue()), RADIAN),
112-
getQuantity(Math.toRadians(pvInput.getElevationAngle().getValue().doubleValue()), RADIAN),
111+
pvInput.albedo,
112+
pvInput.etaConv as ComparableQuantity<Dimensionless>,
113+
getQuantity(Math.toRadians(pvInput.azimuth.value.doubleValue()), RADIAN),
114+
getQuantity(Math.toRadians(pvInput.elevationAngle.value.doubleValue()), RADIAN),
113115
getQuantity(1d, SQUARE_METRE)
114116
)
115117
}
@@ -155,7 +157,7 @@ class PvModelTest extends Specification {
155157
Quantity<Angle> deltaCalc = pvModel.calcSunDeclinationDelta(dayAngleQuantity)
156158

157159
then:
158-
Math.abs(deltaCalc.getValue().doubleValue() - deltaSol) < 1e-15
160+
Math.abs(deltaCalc.value.doubleValue() - deltaSol) < 1e-15
159161

160162
where:
161163
j || deltaSol
@@ -175,7 +177,7 @@ class PvModelTest extends Specification {
175177
Quantity<Angle> omegaCalc = pvModel.calcHourAngleOmega(dateTime, dayAngleQuantity, longitudeQuantity)
176178

177179
then:
178-
Math.abs(omegaCalc.getValue().doubleValue() - omegaSol) < 1e-15
180+
Math.abs(omegaCalc.value.doubleValue() - omegaSol) < 1e-15
179181

180182
where:
181183
time | j | longitude || omegaSol

‎src/test/groovy/edu/ie3/simona/model/participant/SystemParticipantTest.groovy‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
package edu.ie3.simona.model.participant
88

9+
import static edu.ie3.util.quantities.PowerSystemUnits.*
10+
911
import edu.ie3.datamodel.models.input.system.characteristic.CosPhiFixed
1012
import edu.ie3.datamodel.models.input.system.characteristic.CosPhiP
1113
import edu.ie3.datamodel.models.input.system.characteristic.QV
@@ -18,7 +20,7 @@ import tech.units.indriya.quantity.Quantities
1820
import javax.measure.Quantity
1921
import javax.measure.quantity.Power
2022

21-
import static edu.ie3.util.quantities.PowerSystemUnits.*
23+
2224

2325
class SystemParticipantTest extends Specification {
2426

@@ -45,7 +47,7 @@ class SystemParticipantTest extends Specification {
4547
def qCalc = loadMock.calculateReactivePower(power, adjustedVoltage)
4648

4749
then: "compare the results in watt"
48-
Math.abs(qCalc.subtract(Quantities.getQuantity(qSol, KILOVAR)).getValue().doubleValue()) < 0.0001
50+
Math.abs(qCalc.subtract(Quantities.getQuantity(qSol, KILOVAR)).value.doubleValue()) < 0.0001
4951

5052
where:
5153
varCharacteristicString | pVal || qSol

‎src/test/groovy/edu/ie3/simona/model/participant/WecModelTest.groovy‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66

77
package edu.ie3.simona.model.participant
88

9+
import static edu.ie3.util.quantities.PowerSystemUnits.*
10+
import static edu.ie3.datamodel.models.StandardUnits.*
11+
import static edu.ie3.util.quantities.QuantityUtil.equals
12+
import static edu.ie3.simona.model.participant.WecModel.WecRelevantData
13+
import static tech.units.indriya.quantity.Quantities.getQuantity
14+
915
import edu.ie3.datamodel.models.OperationTime
1016
import edu.ie3.datamodel.models.input.NodeInput
1117
import edu.ie3.datamodel.models.input.OperatorInput
@@ -20,11 +26,7 @@ import spock.lang.Shared
2026
import spock.lang.Specification
2127
import spock.lang.Unroll
2228

23-
import static edu.ie3.util.quantities.PowerSystemUnits.*
24-
import static edu.ie3.datamodel.models.StandardUnits.*
25-
import static edu.ie3.util.quantities.QuantityUtil.equals
26-
import static edu.ie3.simona.model.participant.WecModel.WecRelevantData
27-
import static tech.units.indriya.quantity.Quantities.getQuantity
29+
2830

2931
class WecModelTest extends Specification {
3032

@@ -95,10 +97,10 @@ class WecModelTest extends Specification {
9597
wecModel.uuid() == inputModel.getUuid()
9698
wecModel.id() == inputModel.getId()
9799
wecModel.scalingFactor() == 1
98-
wecModel.sRated() == inputModel.getType().getsRated()
99-
wecModel.cosPhiRated() == inputModel.getType().getCosPhiRated()
100-
wecModel.rotorArea() == inputModel.getType().getRotorArea()
101-
wecModel.betzCurve() == new WecModel.WecCharacteristic$().apply(inputModel.getType().getCpCharacteristic())
100+
wecModel.sRated() == inputModel.type.sRated
101+
wecModel.cosPhiRated() == inputModel.type.cosPhiRated
102+
wecModel.rotorArea() == inputModel.type.rotorArea
103+
wecModel.betzCurve() == new WecModel.WecCharacteristic$().apply(inputModel.type.cpCharacteristic)
102104
}
103105

104106
@Unroll

‎src/test/groovy/edu/ie3/simona/model/participant/load/FixedLoadModelTest.groovy‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66

77
package edu.ie3.simona.model.participant.load
88

9+
import static edu.ie3.simona.model.participant.load.LoadReference.ActivePower
10+
import static edu.ie3.simona.model.participant.load.LoadReference.EnergyConsumption
11+
import static edu.ie3.util.quantities.PowerSystemUnits.*
12+
import static org.apache.commons.math3.util.FastMath.abs
13+
import static tech.units.indriya.unit.Units.WATT
14+
915
import edu.ie3.datamodel.models.profile.BdewStandardLoadProfile
1016
import edu.ie3.datamodel.models.OperationTime
1117
import edu.ie3.datamodel.models.input.NodeInput
@@ -19,11 +25,7 @@ import edu.ie3.util.TimeUtil
1925
import spock.lang.Specification
2026
import tech.units.indriya.quantity.Quantities
2127

22-
import static edu.ie3.simona.model.participant.load.LoadReference.ActivePower
23-
import static edu.ie3.simona.model.participant.load.LoadReference.EnergyConsumption
24-
import static edu.ie3.util.quantities.PowerSystemUnits.*
25-
import static org.apache.commons.math3.util.FastMath.abs
26-
import static tech.units.indriya.unit.Units.WATT
28+
2729

2830
class FixedLoadModelTest extends Specification {
2931
def loadInput =

0 commit comments

Comments
 (0)