Skip to content

armgit / core

Public Imported from GitHub
0

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

EnergyOptimiser bug fixes

Rich Turner870f1a56e5cd
diff --git a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java b/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java
index 638076173..bc33ed9b7 100644
--- a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java
+++ b/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java
@@ -146,7 +146,14 @@ public class EnergyOptimisationService extends RouteBuilder implements Container
}
protected void processAssetChange(PersistenceEvent<EnergyOptimisationAsset> persistenceEvent) {
+ LOG.info("Processing optimisation asset change: " + persistenceEvent);
+ stopOptimisation(persistenceEvent.getEntity().getId());
+ if (persistenceEvent.getCause() != PersistenceEvent.Cause.DELETE) {
+ if (!persistenceEvent.getEntity().isOptimisationDisabled().orElse(false)) {
+ startOptimisation(persistenceEvent.getEntity());
+ }
+ }
}
protected void onAssetAttributeEvent(AttributeEvent attributeEvent) {
@@ -161,8 +168,7 @@ public class EnergyOptimisationService extends RouteBuilder implements Container
try {
EnergyOptimiser optimiser = new EnergyOptimiser(intervalSize, ((double) financialWeighting) / 100);
- ScheduledFuture<?> runScheduler = scheduleOptimisation(optimisationAsset.getId(), optimiser);
- assetEnergyOptimiserMap.put(optimisationAsset.getId(), new Pair<>(optimiser, runScheduler));
+ scheduleOptimisation(optimisationAsset.getId(), optimiser);
} catch (IllegalArgumentException e) {
LOG.log(Level.SEVERE, "Failed to start energy optimiser for asset: " + optimisationAsset, e);
}
@@ -203,18 +209,21 @@ public class EnergyOptimisationService extends RouteBuilder implements Container
long currentMillis = timerService.getCurrentTimeMillis();
Instant optimisationStartTime = getOptimisationStartTime(currentMillis, periodSeconds);
- // Execute first optimisation at this period to initialise the system
- runOptimisation(optimisationAssetId, optimisationStartTime);
-
// Schedule subsequent runs
- long offsetSeconds = (long) (Math.random() * 30);
+ long offsetSeconds = (long) (Math.random() * 30) + periodSeconds;
Duration startDuration = Duration.between(Instant.ofEpochMilli(currentMillis), optimisationStartTime.plus(offsetSeconds, ChronoUnit.SECONDS));
- return executorService.scheduleAtFixedRate(() ->
+ ScheduledFuture<?> runScheduler = executorService.scheduleAtFixedRate(() ->
runOptimisation(optimisationAssetId, Instant.ofEpochMilli(timerService.getCurrentTimeMillis()).truncatedTo(ChronoUnit.MINUTES)),
startDuration.getSeconds(),
periodSeconds,
TimeUnit.SECONDS);
+
+ assetEnergyOptimiserMap.put(optimisationAssetId, new Pair<>(optimiser, runScheduler));
+
+ // Execute first optimisation at the period that started previous to now
+ runOptimisation(optimisationAssetId, optimisationStartTime);
+ return runScheduler;
}
/**
@@ -350,10 +359,10 @@ public class EnergyOptimisationService extends RouteBuilder implements Container
count.incrementAndGet();
});
- if (LOG.isLoggable(Level.FINEST)) {
- LOG.finest(getLogPrefix(optimisationAssetId) + "Found plain consumer and producer child assets count=" + count.get());
- LOG.finest("Calculated net power of consumers and producers: " + Arrays.toString(powerNets));
- LOG.finest("Getting supply costs for each interval");
+ if (LOG.isLoggable(Level.FINER)) {
+ LOG.finer(getLogPrefix(optimisationAssetId) + "Found plain consumer and producer child assets count=" + count.get());
+ LOG.finer("Calculated net power of consumers and producers: " + Arrays.toString(powerNets));
+ LOG.finer("Getting supply costs for each interval");
}
// Get supplier costs for each interval
@@ -384,7 +393,7 @@ public class EnergyOptimisationService extends RouteBuilder implements Container
}
}
- if (LOG.isLoggable(Level.FINEST)) {
+ if (LOG.isLoggable(Level.FINER)) {
LOG.finer(getLogPrefix(optimisationAssetId) + "Import costs: " + Arrays.toString(costsImport));
LOG.finer(getLogPrefix(optimisationAssetId) + "Export costs: " + Arrays.toString(costsExport));
}
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 b4ee35a7e..c3e101417 100644
--- a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimiser.java
+++ b/manager/src/main/java/org/openremote/manager/energy/EnergyOptimiser.java
@@ -442,7 +442,7 @@ public class EnergyOptimiser {
}
- if (energySpace > 0 && energySpace < energySpaceMax && exportCostAndPower != null) {
+ if (energySpace < energySpaceMax && exportCostAndPower != null) {
// Can't maximise on opportunity without exporting earlier on so can this be done
// in a cost effective way
int i = interval - 1;
@@ -572,7 +572,7 @@ public class EnergyOptimiser {
}
- if (energySurplus > 0 && energySurplus < energySurplusMax && importCostAndPower != null) {
+ if (energySurplus < energySurplusMax && importCostAndPower != null) {
// Can't maximise on opportunity without importing earlier on so can this be done
// in a cost effective way
int i = interval - 1;
@@ -612,7 +612,7 @@ public class EnergyOptimiser {
// We have spare energy capacity and power check if we don't violate energy max for any future imports
k = pastInterval;
- while (k < powerSetpoints.length && energySurplus > 0 && energySpace >= energySpaceMin) {
+ while (k < powerSetpoints.length && energySpace > 0 && energySpace >= energySpaceMin) {
double futureEnergySpace = energyLevelMaxs[k] - energyLevelCalculator.apply(k);
energySpace = Math.min(energySpace, futureEnergySpace);
@@ -624,7 +624,7 @@ public class EnergyOptimiser {
if (impPowerCapacity > 0 && impPowerCapacity > pastCostAndPower[1]) {
// We can import in the optimum range
- energySurplus += energySurplus;
+ energySurplus += energySpace;
pastAndFutureIntervalPowerDeltas.add(new Pair<>(pastInterval, impPowerCapacity));
}