Skip to content

Battery management restructure #174

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
AteZenmo merged 7 commits into from
Jul 22, 2025
Merged

Battery management restructure #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
75e4694
Refactoring & Cleanup
Luc-Sol Jul 15, 2025
8e72acc
replaced battery functions with classes
Luc-Sol Jul 17, 2025
7c52794
cleanup
Luc-Sol Jul 21, 2025
061870d
Added J_BatteryManagementOff
Luc-Sol Jul 22, 2025
149ed6a
bugfix: battery didnt take into account his previous power, for peaks…
AteZenmo Jul 22, 2025
d36ce23
anylogic plot rounding error bugfix for baseload
AteZenmo Jul 22, 2025
22146ce
Merge branch 'main' into BatteryManagementRestructure
AteZenmo Jul 22, 2025
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
166 changes: 137 additions & 29 deletions Zero_engine.alpx
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions _alp/Agents/A_SubTenant/AOC.A_SubTenant.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<ActiveObjectClass>
<Id>1658752695711</Id>
<Name><![CDATA[A_SubTenant]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<Folder>1752737189062</Folder>
<ExtendsReference>
<PackageName>zero_engine</PackageName>
<ClassName>Actor</ClassName>
Expand Down
1 change: 1 addition & 0 deletions _alp/Agents/Actor/AOC.Actor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<ActiveObjectClass>
<Id>1674662535386</Id>
<Name><![CDATA[Actor]]></Name>
<Folder>1752677829820</Folder>
<Generic>false</Generic>
<GenericParameter>
<Id>1674662535384</Id>
Expand Down
1 change: 1 addition & 0 deletions _alp/Agents/ConnectionOwner/AOC.ConnectionOwner.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<ActiveObjectClass>
<Id>1660224852394</Id>
<Name><![CDATA[ConnectionOwner]]></Name>
<Folder>1752677829820</Folder>
<Import><![CDATA[import com.fasterxml.jackson.databind.JsonNode;]]></Import>
<ExtendsReference>
<PackageName>zero_engine</PackageName>
Expand Down
1 change: 1 addition & 0 deletions _alp/Agents/ConnectionOwner/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1651,6 +1651,7 @@
<Variable Class="CollectionVariable">
<Id>1704196760553</Id>
<Name><![CDATA[c_subTenants]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>60</X>
<Y>440</Y>
<Label>
Expand Down
1 change: 1 addition & 0 deletions _alp/Agents/EnergyCoop/AOC.EnergyCoop.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<Id>1660731375016</Id>
<Name><![CDATA[EnergyCoop]]></Name>
<AdditionalClassCode xmlns:al="http://anylogic.com"/>
<Folder>1752677829820</Folder>
<Import><![CDATA[import com.fasterxml.jackson.databind.JsonNode;

import zeroPackage.ZeroMath;
Expand Down
6 changes: 3 additions & 3 deletions _alp/Agents/EnergyCoop/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@
//// Gather specific electricity flows from corresponding energy assets

//Baseload electricity
v_liveData.data_baseloadElectricityDemand_kW.add(currentTime_h, v_fixedConsumptionElectric_kW);
v_liveData.data_baseloadElectricityDemand_kW.add(currentTime_h, roundToDecimal(v_fixedConsumptionElectric_kW, 3));

//Cooking
v_liveData.data_cookingElectricityDemand_kW.add(currentTime_h, roundToDecimal(v_electricHobConsumption_kW, 3));
Expand Down Expand Up @@ -1489,7 +1489,7 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
v_liveData.data_gridCapacitySupply_kW.add(timeAxisValue, electricitySupplyCapacityLiveWeek_kW);
v_liveData.data_liveElectricityBalance_kW.add(timeAxisValue, netLoadLiveWeek_kW);

v_liveData.data_baseloadElectricityDemand_kW.add(timeAxisValue, baseloadElectricityDemandLiveWeek_kW);
v_liveData.data_baseloadElectricityDemand_kW.add(timeAxisValue, roundToDecimal(baseloadElectricityDemandLiveWeek_kW, 3));
v_liveData.data_heatPumpElectricityDemand_kW.add(timeAxisValue, roundToDecimal(electricityForHeatDemandLiveWeek_kW, 3));
v_liveData.data_electricVehicleDemand_kW.add(timeAxisValue, roundToDecimal(electricityForTransportDemandLiveWeek_kW, 3));
v_liveData.data_batteryCharging_kW.add(timeAxisValue, roundToDecimal(electricityForStorageDemandLiveWeek_kW, 3));
Expand Down Expand Up @@ -1712,7 +1712,7 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G

double f_connectCoopBattery()
{/*ALCODESTART::1742569887460*/
GCGridBattery coopBattery = findFirst(energyModel.GridBatteries, bat -> bat.p_batteryOperationMode == OL_BatteryOperationMode.BALANCE_COOP);
GCGridBattery coopBattery = findFirst(energyModel.GridBatteries, bat -> bat.p_batteryAlgorithm instanceof J_BatteryManagementPeakShaving && ((J_BatteryManagementPeakShaving)bat.p_batteryAlgorithm).getTargetType() == OL_ResultScope.ENERGYCOOP && ((J_BatteryManagementPeakShaving)bat.p_batteryAlgorithm).getTarget() == null);

if(coopBattery != null){
//Reset previous state
Expand Down
6 changes: 4 additions & 2 deletions _alp/Agents/EnergyModel/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,7 @@ J_ProfilePointer f_findProfile(String assetName)
//Demand

//Base load electricity
v_liveData.data_baseloadElectricityDemand_kW.add(currentTime_h, sum(c_gridConnections, x->x.v_fixedConsumptionElectric_kW));
v_liveData.data_baseloadElectricityDemand_kW.add(currentTime_h, roundToDecimal(sum(c_gridConnections, x->x.v_fixedConsumptionElectric_kW), 3));

//Heatpump consumption (electric)
v_liveData.data_heatPumpElectricityDemand_kW.add(currentTime_h, roundToDecimal(sum(c_gridConnections, x->x.v_heatPumpElectricityConsumption_kW), 3));
Expand Down Expand Up @@ -1073,7 +1073,9 @@ EnergyCoop f_removeEnergyCoop(EnergyCoop energyCoop)
// Removing this coop from the list of coops in the GC
for (GridConnection GC : energyCoop.f_getAllChildMemberGridConnections()) {
GC.c_parentCoops.remove(energyCoop);
if(GC instanceof GCGridBattery && GC.p_batteryOperationMode == OL_BatteryOperationMode.BALANCE_COOP){
if(GC instanceof GCGridBattery && GC.p_batteryAlgorithm instanceof J_BatteryManagementPeakShaving && ((J_BatteryManagementPeakShaving)GC.p_batteryAlgorithm).getTargetType() == OL_ResultScope.ENERGYCOOP){
((J_BatteryManagementPeakShaving)GC.p_batteryAlgorithm).setTarget(null);
((J_BatteryManagementPeakShaving)GC.p_batteryAlgorithm).setTargetType( OL_ResultScope.ENERGYCOOP );
GC.f_setActive(false);
}
}
Expand Down
60 changes: 30 additions & 30 deletions _alp/Agents/EnergyModel/EmbeddedObjects.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,6 @@
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryOperationMode]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -244,6 +241,9 @@
<Parameter>
<Name><![CDATA[p_parentNodeElectric]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAlgorithm]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down Expand Up @@ -1043,9 +1043,6 @@
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryOperationMode]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -1151,6 +1148,9 @@
<Parameter>
<Name><![CDATA[p_airco]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAlgorithm]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down Expand Up @@ -1238,9 +1238,6 @@
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryOperationMode]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -1310,6 +1307,9 @@
<Parameter>
<Name><![CDATA[p_parentNodeElectric]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAlgorithm]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down Expand Up @@ -1397,9 +1397,6 @@
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryOperationMode]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -1466,6 +1463,9 @@
<Parameter>
<Name><![CDATA[p_parentNodeElectric]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAlgorithm]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down Expand Up @@ -1556,9 +1556,6 @@
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryOperationMode]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -1661,6 +1658,9 @@
<Parameter>
<Name><![CDATA[p_parentNodeElectric]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAlgorithm]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down Expand Up @@ -1751,9 +1751,6 @@
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryOperationMode]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -1814,6 +1811,9 @@
<Parameter>
<Name><![CDATA[p_parentNodeElectric]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAlgorithm]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down Expand Up @@ -1901,9 +1901,6 @@
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryOperationMode]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -1967,6 +1964,9 @@
<Parameter>
<Name><![CDATA[p_parentNodeElectric]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAlgorithm]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down Expand Up @@ -2054,9 +2054,6 @@
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryOperationMode]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -2123,6 +2120,9 @@
<Parameter>
<Name><![CDATA[p_parentNodeElectric]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAlgorithm]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down Expand Up @@ -2528,9 +2528,6 @@
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryOperationMode]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -2627,6 +2624,9 @@
<Parameter>
<Name><![CDATA[p_isChargingCentre]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAlgorithm]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down Expand Up @@ -2718,9 +2718,6 @@
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryOperationMode]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -2814,6 +2811,9 @@
<Parameter>
<Name><![CDATA[p_parentNodeElectric]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAlgorithm]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down
1 change: 1 addition & 0 deletions _alp/Agents/EnergySupplier/AOC.EnergySupplier.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<ActiveObjectClass>
<Id>1660731377984</Id>
<Name><![CDATA[EnergySupplier]]></Name>
<Folder>1752677829820</Folder>
<ExtendsReference>
<PackageName>zero_engine</PackageName>
<ClassName>Actor</ClassName>
Expand Down
7 changes: 4 additions & 3 deletions _alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<Id>1663773810345</Id>
<Name><![CDATA[GCDistrictHeating]]></Name>
<AdditionalClassCode xmlns:al="http://anylogic.com"/>
<Folder>1752677823817</Folder>
<ExtendsReference>
<PackageName>zero_engine</PackageName>
<ClassName>GridConnection</ClassName>
Expand Down Expand Up @@ -38,9 +39,6 @@
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryOperationMode]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -104,6 +102,9 @@
<Parameter>
<Name><![CDATA[p_parentNodeElectric]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAlgorithm]]></Name>
</Parameter>
</Parameters>
<Generic>false</Generic>
<GenericParameter>
Expand Down
7 changes: 4 additions & 3 deletions _alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<Id>1663773857868</Id>
<Name><![CDATA[GCEnergyConversion]]></Name>
<AdditionalClassCode xmlns:al="http://anylogic.com"/>
<Folder>1752677823817</Folder>
<Import><![CDATA[import java.util.*;]]></Import>
<ExtendsReference>
<PackageName>zero_engine</PackageName>
Expand Down Expand Up @@ -42,9 +43,6 @@
<Parameter>
<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryOperationMode]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAsset]]></Name>
</Parameter>
Expand Down Expand Up @@ -105,6 +103,9 @@
<Parameter>
<Name><![CDATA[p_parentNodeElectric]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_batteryAlgorithm]]></Name>
</Parameter>
</Parameters>
<Generic>false</Generic>
<GenericParameter>
Expand Down
Loading