Skip to content

Fix index bounds and current-quarter handling #3588

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

Open
Sn0w3y wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix index bounds and current-quarter handling #3588

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions ...idoptimizedcharge/src/io/openems/edge/controller/ess/gridoptimizedcharge/DelayCharge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,8 @@ protected static int calculateAvailEnergy(Integer[] quarterHourlyProduction, Int
int dailyEndIndex = DelayCharge.getAsZonedDateTime(targetMinute, clock).get(MINUTE_OF_DAY) / 15;

// Relevant quarter hours
int endIndex = dailyEndIndex - dailyStartIndex;
int endIndex = Math.min(dailyEndIndex - dailyStartIndex,
Math.min(quarterHourlyProduction.length, quarterHourlyConsumption.length));

float productionEnergyTotal = 0;
float consumptionEnergyTotal = 0;
Expand All @@ -558,7 +559,7 @@ protected static int calculateAvailEnergy(Integer[] quarterHourlyProduction, Int
* Summarize and calculate every quarterly power, if there is more than one
* quarter hour left
*/
if (endIndex > 0) {
if (endIndex > 1) {
List<Integer> productionList = Arrays.asList(quarterHourlyProduction).subList(1, endIndex);
List<Integer> consumptionList = Arrays.asList(quarterHourlyConsumption).subList(1, endIndex);

Expand All @@ -576,8 +577,12 @@ protected static int calculateAvailEnergy(Integer[] quarterHourlyProduction, Int
// Add energy of the first index separately to ignore the already passed energy
float timeOfQuarterLeft = ChronoUnit.SECONDS.between(now, predictionStartQuarterHour.plusMinutes(15)) / 60.0f
/ 60.0f;
var currentProduction = quarterHourlyProduction[0] == null ? 0 : quarterHourlyProduction[0];
var currentConsumption = quarterHourlyConsumption[0] == null ? 0 : quarterHourlyConsumption[0];
var currentProduction = quarterHourlyProduction.length > 0 && quarterHourlyProduction[0] != null
? quarterHourlyProduction[0]
: 0;
var currentConsumption = quarterHourlyConsumption.length > 0 && quarterHourlyConsumption[0] != null
? quarterHourlyConsumption[0]
: 0;
float leftProdEnergy = timeOfQuarterLeft * currentProduction;
float leftConsEnergy = timeOfQuarterLeft * currentConsumption;

Expand Down