Skip to content

Advanced EMS setting: Add margin to power consumption and power production forecast #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wborn merged 4 commits into from
Oct 7, 2026
Merged

Advanced EMS setting: Add margin to power consumption and power production forecast #117

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da7a7f3
Advanced EMS setting: Add margin to power consumption and production …
igorrutka Oct 5, 2026
38b0717
Apply spotless
igorrutka Oct 5, 2026
20f5fa8
Fixed virtual power limits and advanced settings attribute refresh
igorrutka Oct 6, 2026
2ff675e
Merge branch 'main' into ems-forecast-margin
igorrutka Oct 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 95 additions & 45 deletions ...in/java/org/openremote/extension/ems/manager/optimisationMethods/EmsOptimisationBeta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public class EmsOptimisationBeta implements OptimisationMethod {

// Default EMS power limit settings
private final int POWER_LIMIT_FLUCTUATION_MARGIN_PERCENTAGE_DEFAULT = 10;
private final int POWER_UNCERTAINTY_MARGIN_PERCENTAGE_DEFAULT = 2;

// Default battery settings
private final int BATTERY_ENERGY_LEVEL_PERCENTAGE_DEFAULT = 50;
Expand All @@ -63,10 +64,16 @@ public class EmsOptimisationBeta implements OptimisationMethod {
"powerLimitMaximumFluctuationMargin";
private final String POWER_LIMIT_MINIMUM_FLUCTUATION_MARGIN_ATTRIBUTE_NAME =
"powerLimitMinimumFluctuationMargin";
private final String POWER_CONSUMPTION_UNCERTAINTY_MARGIN_ATTRIBUTE_NAME =
"powerConsumptionUncertaintyMargin";
private final String POWER_PRODUCTION_UNCERTAINTY_MARGIN_ATTRIBUTE_NAME =
"powerProductionUncertaintyMargin";

private final String[][] advancedSettingsAttributesInfo = {
{POWER_LIMIT_MAXIMUM_FLUCTUATION_MARGIN_ATTRIBUTE_NAME, ValueType.POSITIVE_NUMBER.getName()},
{POWER_LIMIT_MINIMUM_FLUCTUATION_MARGIN_ATTRIBUTE_NAME, ValueType.POSITIVE_NUMBER.getName()}
{POWER_LIMIT_MINIMUM_FLUCTUATION_MARGIN_ATTRIBUTE_NAME, ValueType.POSITIVE_NUMBER.getName()},
{POWER_CONSUMPTION_UNCERTAINTY_MARGIN_ATTRIBUTE_NAME, ValueType.NUMBER.getName()},
Comment thread
igorrutka marked this conversation as resolved.
{POWER_PRODUCTION_UNCERTAINTY_MARGIN_ATTRIBUTE_NAME, ValueType.NUMBER.getName()}
};

@Override
Expand All @@ -88,23 +95,25 @@ private void runOptimisationMethodEms(String energyOptimisationAssetId, Services
String advancedSettingsAttributes =
energyOptimisationAsset.getAdvancedSettingsAttributes().orElse("");

if (advancedSettingsAttributes.isBlank()) {
StringBuilder advancedSettingsAttributesBody = new StringBuilder();
StringBuilder advancedSettingsAttributesBody = new StringBuilder();

String firstRow = String.format("Optimisation method '%s':\n", optimisationMethodName);
advancedSettingsAttributesBody.append(firstRow);
String firstRow = String.format("Optimisation method '%s':\n", optimisationMethodName);
advancedSettingsAttributesBody.append(firstRow);

for (String[] row : advancedSettingsAttributesInfo) {
advancedSettingsAttributesBody.append(String.join(",", row)).append("\n");
}
for (String[] row : advancedSettingsAttributesInfo) {
advancedSettingsAttributesBody.append(String.join(",", row)).append("\n");
}

String advancedSettingsAttributesNew = advancedSettingsAttributesBody.toString();

if (!advancedSettingsAttributes.equals(advancedSettingsAttributesNew)) {
services
.getAssetProcessingService()
.sendAttributeEvent(
new AttributeEvent(
energyOptimisationAssetId,
EmsEnergyOptimisationAsset.ADVANCED_SETTINGS_ATTRIBUTES,
advancedSettingsAttributesBody.toString()),
advancedSettingsAttributesNew),
getClass().getSimpleName());
}

Expand Down Expand Up @@ -419,8 +428,8 @@ private Map<String, Integer> batteryCalculateForecasts(
Collectors.toMap(ValueDatapoint::getTimestamp, dp -> ((Double) dp.getValue())));
}

// List to store the sum of total power consumption, production and flexible
List<Double> totalPowerConsumptionProductionFlexibleList = new ArrayList<>();
// List to store the sum of total power consumption and production
List<Double> totalPowerConsumptionProductionList = new ArrayList<>();

// Sum total power consumption and production
for (int i = 0; i < numberOfTimestamps; i++) {
Expand All @@ -429,16 +438,27 @@ private Map<String, Integer> batteryCalculateForecasts(

if (powerProduction != null) {
double sum = powerConsumption + powerProduction;
totalPowerConsumptionProductionFlexibleList.add(sum);
totalPowerConsumptionProductionList.add(sum);
} else {
totalPowerConsumptionProductionFlexibleList.add(powerConsumption);
totalPowerConsumptionProductionList.add(powerConsumption);
}
}

infoStr.append(
String.format(
"totalPowerConsumptionProductionFlexibleList = %s \n",
totalPowerConsumptionProductionFlexibleList));
"totalPowerConsumptionProductionList = %s \n", totalPowerConsumptionProductionList));

// List to store the sum of total power consumption, production and flexible
List<Double> totalPowerConsumptionProductionFlexibleList = new ArrayList<>();

// Add a margin to the summed consumption-production forecast. This accounts for possible
// underestimation of the forecast, which could lead to premature battery depletion
for (Double power : totalPowerConsumptionProductionList) {
double uncertaintyMargin = calculateForecastUncertaintyMargin(energyOptimisationAsset, power);
Comment thread
igorrutka marked this conversation as resolved.
double powerPlusMargin = power + uncertaintyMargin;

totalPowerConsumptionProductionFlexibleList.add(powerPlusMargin);
}

// Get power limit forecasts
List<ValueDatapoint<?>> energyOptimisationPowerLimitMaximumPredicted =
Expand All @@ -456,15 +476,24 @@ private Map<String, Integer> batteryCalculateForecasts(
EmsEnergyOptimisationAsset.POWER_LIMIT_MINIMUM_PROFILE_TOTAL.getName(),
assetDatapointQueryPeriodPredicted);

Map<Long, Double> powerLimitMaximumMap = new HashMap<>();
Map<Long, Double> powerLimitMinimumMap = new HashMap<>();
// Calculate virtual power limit forecast
Map<Long, Double> powerLimitMaximumVirtualList = new HashMap<>();
Map<Long, Double> powerLimitMinimumVirtualList = new HashMap<>();

for (ValueDatapoint<?> dp : energyOptimisationPowerLimitMaximumPredicted) {
powerLimitMaximumMap.put(dp.getTimestamp(), (Double) dp.getValue());
Double powerLimitMaximum = (Double) dp.getValue();
Double powerLimitMaximumVirtual =
calculatePowerLimitVirtual(energyOptimisationAsset, powerLimitMaximum, "max");

powerLimitMaximumVirtualList.put(dp.getTimestamp(), powerLimitMaximumVirtual);
}

for (ValueDatapoint<?> dp : energyOptimisationPowerLimitMinimumPredicted) {
powerLimitMinimumMap.put(dp.getTimestamp(), (Double) dp.getValue());
Double powerLimitMinimum = (Double) dp.getValue();
Double powerLimitMinimumVirtual =
calculatePowerLimitVirtual(energyOptimisationAsset, powerLimitMinimum, "min");

powerLimitMinimumVirtualList.put(dp.getTimestamp(), powerLimitMinimumVirtual);
}

List<Double> chargePowerAvailableTotalList = new ArrayList<>();
Expand Down Expand Up @@ -516,24 +545,15 @@ private Map<String, Integer> batteryCalculateForecasts(
continue;
}

List<Double> powerLimitMaximumVirtualList = new ArrayList<>();
List<Double> powerLimitMinimumVirtualList = new ArrayList<>();

// Calculate total available charge and discharge power
for (int i = 0; i < numberOfTimestamps; i++) {
long timestampMillis = timestampsMillisList.get(i);
double totalPower = totalPowerConsumptionProductionFlexibleList.get(i);

Double powerLimitMaximum = powerLimitMaximumMap.getOrDefault(timestampMillis, null);
Double powerLimitMinimum = powerLimitMinimumMap.getOrDefault(timestampMillis, null);

Double powerLimitMaximumVirtual =
calculatePowerLimitVirtual(energyOptimisationAsset, powerLimitMaximum, "max");
powerLimitMaximumVirtualList.getOrDefault(timestampMillis, null);
Double powerLimitMinimumVirtual =
calculatePowerLimitVirtual(energyOptimisationAsset, powerLimitMinimum, "min");

powerLimitMaximumVirtualList.add(powerLimitMaximumVirtual);
powerLimitMinimumVirtualList.add(powerLimitMinimumVirtual);
powerLimitMinimumVirtualList.getOrDefault(timestampMillis, null);

if (powerLimitMaximumVirtual != null) {
double chargePowerTotalAvailable = powerLimitMaximumVirtual - totalPower;
Expand Down Expand Up @@ -571,21 +591,6 @@ private Map<String, Integer> batteryCalculateForecasts(
// System.out.println("chargeNeededTotalList = " + chargeNeededTotalList);
// System.out.println("dischargeNeededTotalList = " + dischargeNeededTotalList);

List<Double> chargePowerAvailableBatteryList =
chargePowerAvailableTotalList.stream()
.map(x -> x > 0 ? Math.min(x, chargePowerMaximumBattery) : 0)
.toList();
List<Double> dischargePowerAvailableBatteryList =
dischargePowerAvailableTotalList.stream()
.map(x -> x < 0 ? Math.max(x, dischargePowerMaximumBattery) : 0)
.toList();

// System.out.println("chargeAvailableBatteryList = " +
// chargePowerAvailableBatteryList);
// System.out.println("dischargeAvailableBatteryList = " +
// dischargePowerAvailableBatteryList);
// System.out.println();

// Convert power to energy level percentage
List<Double> chargePercentageNeededTotalList = new ArrayList<>();
List<Double> dischargePercentageNeededTotalList = new ArrayList<>();
Expand All @@ -610,6 +615,21 @@ private Map<String, Integer> batteryCalculateForecasts(
// System.out.println("dischargePercentageNeededTotalList = " +
// dischargePercentageNeededTotalList);

List<Double> chargePowerAvailableBatteryList =
chargePowerAvailableTotalList.stream()
.map(x -> x > 0 ? Math.min(x, chargePowerMaximumBattery) : 0)
.toList();
List<Double> dischargePowerAvailableBatteryList =
dischargePowerAvailableTotalList.stream()
.map(x -> x < 0 ? Math.max(x, dischargePowerMaximumBattery) : 0)
.toList();

// System.out.println("chargeAvailableBatteryList = " +
// chargePowerAvailableBatteryList);
// System.out.println("dischargeAvailableBatteryList = " +
// dischargePowerAvailableBatteryList);
// System.out.println();

List<Double> chargePercentageAvailableBatteryList = new ArrayList<>();
List<Double> dischargePercentageAvailableBatteryList = new ArrayList<>();

Expand Down Expand Up @@ -2080,6 +2100,36 @@ private void batteryUpdatePowerSetpoints(
}
}

private double calculateForecastUncertaintyMargin(
EmsEnergyOptimisationAsset energyOptimisationAsset, Double power) {
if (power == null) {
return 0.0;
}

String uncertaintyMarginAttributeName = POWER_CONSUMPTION_UNCERTAINTY_MARGIN_ATTRIBUTE_NAME;

if (power < 0.0) {
uncertaintyMarginAttributeName = POWER_PRODUCTION_UNCERTAINTY_MARGIN_ATTRIBUTE_NAME;
}

Double uncertaintyMargin =
(Double)
energyOptimisationAsset
.getAttribute(uncertaintyMarginAttributeName)
.flatMap(Attribute::getValue)
.orElse(null);

if (uncertaintyMargin == null) {
uncertaintyMargin = power * POWER_UNCERTAINTY_MARGIN_PERCENTAGE_DEFAULT * 0.01;

if (uncertaintyMargin < 0.0) {
uncertaintyMargin = -uncertaintyMargin;
}
}

return round(Math.abs(uncertaintyMargin), 3);
}

private double calculatePowerFluctuationMargin(
EmsEnergyOptimisationAsset energyOptimisationAsset,
Double powerLimitProfileTotal,
Expand Down
Loading