Skip to content

Charging requests #232

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 15 commits into from
Dec 18, 2025
Merged

Charging requests #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8f19196
Introduced the new Interface I_ChargingRequests
Luc-Sol Nov 28, 2025
c61d179
Merge branch 'main' into ChargingRequests
AteZenmo Dec 4, 2025
025d5b5
time data, in progress
AteZenmo Dec 5, 2025
d09121f
Merge branch 'main' into ChargingRequests
AteZenmo Dec 5, 2025
0e549ff
timedata split in two: parameters and variables
AteZenmo Dec 5, 2025
8e3964f
J_ChargingSession -> J_EAChargingSession. interface implemented for E…
AteZenmo Dec 8, 2025
142d692
Merge branch 'main' into ChargingRequests
AteZenmo Dec 9, 2025
9c75fcc
updates IN PROGRESS!
AteZenmo Dec 11, 2025
985b01d
charge points refactor
AteZenmo Dec 12, 2025
c1dd656
update chargerequests added to managements
AteZenmo Dec 12, 2025
bb806dc
p_chargePoint on gc canvas. is input for chargingmanagement.manageCha…
AteZenmo Dec 12, 2025
0e1a854
final fixes
AteZenmo Dec 17, 2025
dde0265
availability fixes
AteZenmo Dec 17, 2025
0d58ea4
availability added to constructor of vehicles
AteZenmo Dec 18, 2025
8c4f432
remove ev from chargepoint as well if it was registered when deleting ev
AteZenmo Dec 18, 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
70 changes: 52 additions & 18 deletions Zero_engine.alpx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,13 +698,17 @@
<Name><![CDATA[MAX_POWER]]></Name>
</Option>
<Option>
<Id>1755703015841</Id>
<Name><![CDATA[CUSTOM]]></Name>
<Id>1765536978989</Id>
<Name><![CDATA[OFF_PEAK_INTERVAL]]></Name>
</Option>
<Option>
<Id>1762853393712</Id>
<Name><![CDATA[NONE]]></Name>
</Option>
<Option>
<Id>1755703015841</Id>
<Name><![CDATA[CUSTOM]]></Name>
</Option>
</OptionList>
<OptionList>
<Id>1668693527446</Id>
Expand Down Expand Up @@ -1117,6 +1121,7 @@
<Folder>
<Id>1752681631114</Id>
<Name><![CDATA[GIS]]></Name>
<ParentId>1752677832758</ParentId>
</Folder>
<Folder>
<Id>1752681639768</Id>
Expand Down Expand Up @@ -1164,6 +1169,11 @@
<Name><![CDATA[AggregatorBatteryManagement]]></Name>
<ParentId>1762850958928</ParentId>
</Folder>
<Folder>
<Id>1764938574089</Id>
<Name><![CDATA[Globals]]></Name>
<ParentId>1752680962144</ParentId>
</Folder>
</Folders>
<ActiveObjectClasses/>
<DifferentialEquationsMethod>EULER</DifferentialEquationsMethod>
Expand Down Expand Up @@ -1537,17 +1547,6 @@
<Name><![CDATA[J_EAAirco]]></Name>
<Folder>1752677832758</Folder>
</JavaClass>
<JavaClass>
<Id>1749649002419</Id>
<Name><![CDATA[J_ChargingSession]]></Name>
<Folder>1752680962144</Folder>
</JavaClass>
<JavaClass>
<Id>1749651263461</Id>
<Name><![CDATA[J_EACharger]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<Folder>1752677832758</Folder>
</JavaClass>
<JavaClass>
<Id>1752677257516</Id>
<Name><![CDATA[I_BatteryManagement]]></Name>
Expand Down Expand Up @@ -1714,11 +1713,6 @@
<Name><![CDATA[J_BatteryManagementSelfConsumption]]></Name>
<Folder>1762850659543</Folder>
</JavaClass>
<JavaClass>
<Id>1755171209007</Id>
<Name><![CDATA[J_EAChargePoint]]></Name>
<Folder>1752677832758</Folder>
</JavaClass>
<JavaClass>
<Id>1755518393955</Id>
<Name><![CDATA[J_ChargingManagementMaxAvailablePower]]></Name>
Expand Down Expand Up @@ -1802,6 +1796,46 @@
<JavaClass>
<Id>1763570262548</Id>
<Name><![CDATA[J_GlobalParameters]]></Name>
<Folder>1764938574089</Folder>
</JavaClass>
<JavaClass>
<Id>1764337491572</Id>
<Name><![CDATA[I_ChargingRequest]]></Name>
<Folder>1762850586274</Folder>
</JavaClass>
<JavaClass>
<Id>1764936717326</Id>
<Name><![CDATA[J_TimeVariables]]></Name>
<Folder>1752680962144</Folder>
</JavaClass>
<JavaClass>
<Id>1764936749914</Id>
<Name><![CDATA[J_TimeParameters]]></Name>
<Folder>1752680962144</Folder>
</JavaClass>
<JavaClass>
<Id>1765192207409</Id>
<Name><![CDATA[J_EAChargingSession]]></Name>
<Folder>1752677832758</Folder>
</JavaClass>
<JavaClass>
<Id>1765383541339</Id>
<Name><![CDATA[J_ChargePoint]]></Name>
<Folder>1762850586274</Folder>
</JavaClass>
<JavaClass>
<Id>1765537283263</Id>
<Name><![CDATA[J_ChargingManagementGridBalancing]]></Name>
<Folder>1762850586274</Folder>
</JavaClass>
<JavaClass>
<Id>1765878809347</Id>
<Name><![CDATA[I_ChargePointRegistration]]></Name>
<Folder>1762850586274</Folder>
</JavaClass>
<JavaClass>
<Id>1765901157331</Id>
<Name><![CDATA[J_ChargingSessionData]]></Name>
<Folder>1752680962144</Folder>
</JavaClass>
</JavaClasses>
Expand Down
32 changes: 19 additions & 13 deletions _alp/Agents/EnergyModel/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,20 +129,23 @@
v_totalBatteryEnergyUsed_MWh = 0;

for(J_EA ea : c_energyAssets) { // Single loop of all assets without using c_EVs and c_storageAssets
if( ea instanceof J_EAStorageElectric ) {
J_EAStorageElectric e = (J_EAStorageElectric)ea;
v_totalBatteryDischargeAmount_MWh += e.getTotalDischargeAmount_kWh() / 1000;
v_totalBatteryChargeAmount_MWh += e.getTotalChargeAmount_kWh() / 1000;
v_totalBatteryEnergyUsed_MWh += e.getEnergyUsed_kWh() / 1000;
if( ea instanceof J_EAStorageElectric storageElectric) {
v_totalBatteryDischargeAmount_MWh += storageElectric.getTotalDischargeAmount_kWh() / 1000;
v_totalBatteryChargeAmount_MWh += storageElectric.getTotalChargeAmount_kWh() / 1000;
v_totalBatteryEnergyUsed_MWh += storageElectric.getEnergyUsed_kWh() / 1000;
}

if( ea instanceof J_EAEV ) {
J_EAEV e = (J_EAEV)ea;
v_totalBatteryDischargeAmount_MWh += e.getTotalDischargeAmount_kWh() / 1000;
v_totalBatteryChargeAmount_MWh += e.getTotalChargeAmount_kWh() / 1000;
v_totalBatteryEnergyUsed_MWh += e.getEnergyUsed_kWh() / 1000;
if( ea instanceof J_EAEV ev) {
v_totalBatteryDischargeAmount_MWh += ev.getTotalDischargeAmount_kWh() / 1000;
v_totalBatteryChargeAmount_MWh += ev.getTotalChargeAmount_kWh() / 1000;
v_totalBatteryEnergyUsed_MWh += ev.getEnergyUsed_kWh() / 1000;
}

if( ea instanceof J_EAChargingSession cs) {
v_totalBatteryDischargeAmount_MWh += cs.getTotalDischargeAmount_kWh() / 1000;
v_totalBatteryChargeAmount_MWh += cs.getTotalChargeAmount_kWh() / 1000;
v_totalBatteryEnergyUsed_MWh += cs.getEnergyUsed_kWh() / 1000;
}
}

//Calculate delta stored energy in battery for energy balance check
Expand Down Expand Up @@ -267,8 +270,8 @@

GC.c_tripTrackers.forEach(tt->{
tt.storeAndResetState();
tt.setStartIndex(p_runStartTime_h);
tt.prepareNextActivity(p_runStartTime_h*60);
tt.setStartIndex(p_runStartTime_h, GC.f_getChargePoint());
//tt.prepareNextActivity(p_runStartTime_h*60, GC.f_getChargePoint());
});
if (GC instanceof GCHouse) {
if (((GCHouse)GC).p_cookingTracker != null) {
Expand Down Expand Up @@ -407,7 +410,7 @@
GC.f_resetStatesAfterRapidRun();
GC.c_tripTrackers.forEach(tt->{
tt.restoreState();
tt.prepareNextActivity((t_h-p_runStartTime_h)*60);
//tt.prepareNextActivity((t_h-p_runStartTime_h)*60, GC.f_getChargePoint());
});
//GC.c_tripTrackers.forEach(tt->tt.prepareNextActivity((t_h-p_runStartTime_h)*60));
if (GC instanceof GCHouse) {
Expand Down Expand Up @@ -484,6 +487,9 @@
//Update t_h
t_h = p_runStartTime_h + v_timeStepsElapsed * p_timeStep_h;

//Update time variables
J_TimeVariables.updateTimeVariables(v_timeStepsElapsed);

// Update tijdreeksen in leesbare variabelen
f_updateTimeseries(t_h);

Expand Down
58 changes: 57 additions & 1 deletion _alp/Agents/EnergyModel/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1998,6 +1998,62 @@
</ParameterEditor>
</Properties>
</Variable>
<Variable Class="Parameter">
<Id>1765189970308</Id>
<Name><![CDATA[p_timeVariables]]></Name>
<X>-610</X>
<Y>330</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true" ModificatorType="STATIC">
<Type><![CDATA[J_TimeVariables]]></Type>
<UnitType>NONE</UnitType>
<SdArray>false</SdArray>
<DefaultValue Class="CodeValue">
<Code><![CDATA[new J_TimeVariables()]]></Code>
</DefaultValue>
<ParameterEditor>
<Id>1765189970306</Id>
<EditorContolType>TEXT_BOX</EditorContolType>
<MinSliderValue>0</MinSliderValue>
<MaxSliderValue>100</MaxSliderValue>
<DelimeterType>NO_DELIMETER</DelimeterType>
</ParameterEditor>
</Properties>
</Variable>
<Variable Class="Parameter">
<Id>1765189991043</Id>
<Name><![CDATA[p_timeParameters]]></Name>
<X>-610</X>
<Y>310</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true" ModificatorType="STATIC">
<Type><![CDATA[J_TimeParameters]]></Type>
<UnitType>NONE</UnitType>
<SdArray>false</SdArray>
<DefaultValue Class="CodeValue">
<Code><![CDATA[new J_TimeParameters()]]></Code>
</DefaultValue>
<ParameterEditor>
<Id>1765189991041</Id>
<EditorContolType>TEXT_BOX</EditorContolType>
<MinSliderValue>0</MinSliderValue>
<MaxSliderValue>100</MaxSliderValue>
<DelimeterType>NO_DELIMETER</DelimeterType>
</ParameterEditor>
</Properties>
</Variable>
<Variable Class="CollectionVariable">
<Id>1663238323139</Id>
<Name><![CDATA[c_connectionOwners]]></Name>
Expand Down Expand Up @@ -2322,7 +2378,7 @@
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
<CollectionClass>ArrayList</CollectionClass>
<ElementClass>List&lt;J_ChargingSession&gt;</ElementClass>
<ElementClass>List&lt;J_ChargingSessionData&gt;</ElementClass>
<ValueElementClass>String</ValueElementClass>
</Properties>
</Variable>
Expand Down
3 changes: 0 additions & 3 deletions _alp/Agents/GCPublicCharger/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ else if( e.profileType == OL_ProfileAssetType.ELECTRICITYBASELOAD){
{/*ALCODESTART::1726749088568*/
//Manage charging
f_manageEVCharging();

f_manageChargePoints();

/*ALCODEEND*/}

double f_operateChargerNew()
Expand Down
6 changes: 3 additions & 3 deletions _alp/Agents/GCPublicCharger/Code/Functions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<Id>1717956478582</Id>
<Name><![CDATA[f_operateFixedAssets_overwrite]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>910</X>
<Y>200</Y>
<X>1250</X>
<Y>270</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -23,7 +23,7 @@
<Id>1726749088568</Id>
<Name><![CDATA[f_operateFlexAssets_overwrite]]></Name>
<X>910</X>
<Y>220</Y>
<Y>280</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down
Loading