Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Bug fix for EnergyOptimisationAssetTest

Rich Turner3ebbdb8e0998
diff --git a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimiser.java b/manager/src/main/java/org/openremote/manager/energy/EnergyOptimiser.java
index c3e101417..621ee12bf 100644
--- a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimiser.java
+++ b/manager/src/main/java/org/openremote/manager/energy/EnergyOptimiser.java
@@ -434,10 +434,10 @@ public class EnergyOptimiser {
List<Pair<Integer, Double>> pastIntervalPowerDeltas = new ArrayList<>();
int k = interval;
- while (k < powerSetpoints.length && energySpace < 0 && energySpace <= energySpaceMin) {
+ while (k < powerSetpoints.length && energySpace > 0 && energySpace >= energySpaceMin) {
- double futureEnergySpace = energyLevelCalculator.apply(k) - energyLevelMins[k];
- energySpace = Math.max(energySpace, -futureEnergySpace);
+ double futureEnergySpace = energyLevelMaxs[k] - energyLevelCalculator.apply(k);
+ energySpace = Math.min(energySpace, futureEnergySpace);
k++;
}
@@ -495,7 +495,7 @@ public class EnergyOptimiser {
if (expPowerCapacity < 0 && expPowerCapacity < pastCostAndPower[2]) {
// We can export in the optimum range
- energySpace += -1d * energySurplus;
+ energySpace += (-1d * expPowerCapacity * intervalSize);
pastIntervalPowerDeltas.add(new Pair<>(pastInterval, expPowerCapacity));
}
@@ -624,7 +624,7 @@ public class EnergyOptimiser {
if (impPowerCapacity > 0 && impPowerCapacity > pastCostAndPower[1]) {
// We can import in the optimum range
- energySurplus += energySpace;
+ energySurplus += (impPowerCapacity * intervalSize);
pastAndFutureIntervalPowerDeltas.add(new Pair<>(pastInterval, impPowerCapacity));
}
diff --git a/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy b/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy
index 52df4c4c5..ddd08c0ae 100644
--- a/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy
@@ -16,6 +16,7 @@ import org.openremote.model.asset.impl.ElectricitySupplierAsset
import org.openremote.model.attribute.AttributeEvent
import org.openremote.model.attribute.AttributeRef
import org.openremote.model.datapoint.DatapointInterval
+import org.openremote.model.util.Pair
import org.openremote.test.ManagerContainerTrait
import org.openremote.test.setup.ManagerTestSetup
import spock.lang.Specification
@@ -55,7 +56,9 @@ class EnergyOptimisationAssetTest extends Specification implements ManagerContai
def spyOptimisationService = Spy(EnergyOptimisationService) {
scheduleOptimisation(_ as String, _ as EnergyOptimiser) >> {
// Don't use the scheduler as we will manually trigger the optimisation for testing
- optimisationAssetId, optimiser -> return null
+ optimisationAssetId, optimiser ->
+ it.assetEnergyOptimiserMap.put(optimisationAssetId, new Pair<>(optimiser, null))
+ return null
}
}