Skip to content

Serialisation with private fields #205

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
merged 6 commits into from
Oct 6, 2025
Merged

Serialisation with private fields #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d2033d6
Various changes to make serialisation with private fields possible
GillisHommen Sep 25, 2025
d7d69f3
Further mixin cleanup
GillisHommen Sep 25, 2025
2af30a4
Removed default value of v_enableCurtailment for deserialisation
GillisHommen Sep 29, 2025
e6a2f7b
Returned visibility of energyCoop GC lists to private
GillisHommen Sep 29, 2025
6d3e96c
Merge branch 'main' into serialisation_with_private_fields
GillisHommen Sep 29, 2025
2e3e29e
Merge branch 'main' into serialisation_with_private_fields
GillisHommen Oct 6, 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
8 changes: 4 additions & 4 deletions _alp/Agents/EnergyCoop/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2036,7 +2036,7 @@
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
<Properties SaveInSnapshot="true" AccessType="default" StaticVariable="false">
<CollectionClass>ArrayList</CollectionClass>
<ElementClass>Actor</ElementClass>
<ValueElementClass>Object</ValueElementClass>
Expand All @@ -2054,7 +2054,7 @@
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
<Properties SaveInSnapshot="true" AccessType="default" StaticVariable="false">
<CollectionClass>ArrayList</CollectionClass>
<ElementClass>Actor</ElementClass>
<ValueElementClass>Object</ValueElementClass>
Expand All @@ -2072,7 +2072,7 @@
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
<Properties SaveInSnapshot="true" AccessType="private" StaticVariable="false">
<CollectionClass>ArrayList</CollectionClass>
<ElementClass>GridConnection</ElementClass>
<ValueElementClass>Object</ValueElementClass>
Expand All @@ -2090,7 +2090,7 @@
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
<Properties SaveInSnapshot="true" AccessType="private" StaticVariable="false">
<CollectionClass>ArrayList</CollectionClass>
<ElementClass>GridConnection</ElementClass>
<ValueElementClass>Object</ValueElementClass>
Expand Down
164 changes: 131 additions & 33 deletions _alp/Agents/EnergyModel/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,15 +401,16 @@
}
}

f_setInitialValues();

v_isRapidRun = false;

double duration = System.currentTimeMillis() - startTime1;

traceln("*** headless run duration: "+ duration/1000 + " s ***");

traceln("Live-sim t_h after rapidRun: %s", t_h);
if (b_isDeserialised) {
traceln("Anylogic Model time(HOUR): %s", time(HOUR));
}
c_profiles.forEach(p -> p.updateValue(t_h));
c_forecasts.forEach(p -> p.initializeForecast(t_h));

Expand Down Expand Up @@ -495,11 +496,17 @@
double topLevelElectricGridCapacity_kW = 0;
boolean topLevelGridCapacitiesKnown = true;

// First make all links between GridNodes
// First make all links between GridNodes
for( GridNode GN : pop_gridNodes ) {
GN.f_connectToParentNode();
}

// First clear lists (needed after deserialisation)
c_gridNodeExecutionList.clear();
c_gridNodeExecutionListReverse.clear();
c_gridNodesTopLevel.clear();
c_gridNodesNotTopLevel.clear();

// Then build execution order list
for( GridNode GN : pop_gridNodes ) {
GridNode parentNode = findFirst(pop_gridNodes, p->p.p_gridNodeID.equals(GN.p_parentNodeID)); // Works as long as p_gridNodeID is not null. p_parentNodeID can be null no problemo.
Expand All @@ -524,6 +531,7 @@
c_gridNodeExecutionListReverse = c_gridNodeExecutionList;
Collections.reverse(c_gridNodeExecutionList);


//Set cumulative toplevel grid values as energyModel values
v_liveConnectionMetaData.physicalCapacity_kW = topLevelElectricGridCapacity_kW;
v_liveConnectionMetaData.contractedDeliveryCapacity_kW = topLevelElectricGridCapacity_kW;
Expand Down Expand Up @@ -563,15 +571,15 @@ ArrayList<GridConnection> f_getActiveGridConnections()
//v_hourOfYearStart=hourOfYearPerMonth[getMonth()] + (getDayOfMonth()-1)*24;
t_h = p_runStartTime_h;

Date startDate = date();
p_year = startDate.getYear() + 1900;

LocalDate localDate = LocalDate.of(p_year, 1, 1);
v_dayOfWeek1jan = DayOfWeek.from(localDate).getValue();
p_startOfWinterWeek_h = roundToInt(24 * (p_winterWeekNumber * 7 + (8-v_dayOfWeek1jan)%7)); // Week 49 is winterweek.
p_startOfSummerWeek_h = roundToInt(24 * (p_summerWeekNumber * 7 + (8-v_dayOfWeek1jan)%7)); // Week 18 is summerweek.


Date startDate = date();

p_year = startDate.getYear() + 1900;

int monthIdx = 0;
while ( t_h > hourOfYearPerMonth[monthIdx] ) {
Expand All @@ -586,6 +594,8 @@ ArrayList<GridConnection> f_getActiveGridConnections()
traceln("Month of year start: %s", monthIdx);
startDate.setMonth(monthIdx);
startDate.setDate(dayOfMonth);
startDate.setHours(0);
startDate.setMinutes(0);
traceln("Startdate: %s", startDate);
//startDate.set
getExperiment().getEngine().setStartDate(startDate);
Expand Down Expand Up @@ -639,10 +649,6 @@ ArrayList<GridConnection> f_getActiveGridConnections()
b_parallelizeConnectionOwners = true;
}

// set initial values
f_setInitialValues();


b_isInitialized = true;
/*ALCODEEND*/}

Expand Down Expand Up @@ -671,14 +677,6 @@ ArrayList<GridNode> f_getGridNodesNotTopLevel()
return this.c_gridNodesNotTopLevel;
/*ALCODEEND*/}

double f_setInitialValues()
{/*ALCODESTART::1722853692644*/
// Starting prices
//c_gridConnections.forEach(GC -> GC.v_electricityPriceLowPassed_eurpkWh = c_gridNodesTopLevel.get(0).v_currentParentNodalPrice_eurpkWh); // Initialize filtered prices for gridConnections, hoping to prevent or reduce initial settling excursions


/*ALCODEEND*/}

double f_initializePause()
{/*ALCODESTART::1722590514591*/
for (GridConnection GC : UtilityConnections) {
Expand Down Expand Up @@ -1040,15 +1038,15 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
double f_startAfterDeserialisation()
{/*ALCODESTART::1753963201170*/
// Reconstruct the LiveData class
v_liveData = new J_LiveData(this);
/*v_liveData = new J_LiveData(this);
v_liveData.activeEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
v_liveData.activeProductionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
v_liveData.activeConsumptionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);

//v_liveConnectionMetaData = new J_ConnectionMetaData(this);
//v_liveAssetsMetaData = new J_AssetsMetaData(this);
v_liveData.connectionMetaData = v_liveConnectionMetaData;
v_liveData.assetsMetaData = v_liveAssetsMetaData;
v_liveData.assetsMetaData = v_liveAssetsMetaData;*/

v_liveData.resetLiveDatasets(p_runStartTime_h, p_runStartTime_h, p_timeStep_h);

Expand All @@ -1059,14 +1057,14 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)

// Reconstruct the LiveData class in the EnergyCoops
for (EnergyCoop ec : pop_energyCoops) {
ec.v_liveData = new J_LiveData(ec);
/*ec.v_liveData = new J_LiveData(ec);
ec.v_liveData.activeEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
ec.v_liveData.activeProductionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
ec.v_liveData.activeConsumptionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);

ec.v_liveData.connectionMetaData = ec.v_liveConnectionMetaData;
ec.v_liveData.assetsMetaData = ec.v_liveAssetsMetaData;

*/
ec.v_liveData.resetLiveDatasets(p_runStartTime_h, p_runStartTime_h, p_timeStep_h);

ec.fm_currentProductionFlows_kW = new J_FlowsMap();
Expand All @@ -1079,35 +1077,62 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
List<GridConnection> allGridConnections = new ArrayList<>(c_gridConnections);
allGridConnections.addAll(c_pausedGridConnections);
for (GridConnection gc : allGridConnections) {
gc.v_liveData = new J_LiveData(gc);
/*gc.v_liveData = new J_LiveData(gc);
gc.v_liveData.activeEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
gc.v_liveData.activeProductionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);
gc.v_liveData.activeConsumptionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY);

gc.v_liveData.connectionMetaData = gc.v_liveConnectionMetaData;
gc.v_liveData.assetsMetaData = gc.v_liveAssetsMetaData;

*/
gc.v_liveData.resetLiveDatasets(p_runStartTime_h, p_runStartTime_h, p_timeStep_h);

gc.fm_currentProductionFlows_kW = new J_FlowsMap();
gc.fm_currentConsumptionFlows_kW = new J_FlowsMap();
gc.fm_currentBalanceFlows_kW = new J_FlowsMap();
gc.fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);

for (J_EA j_ea : gc.c_energyAssets) {
/*for (J_EA j_ea : gc.c_energyAssets) {
gc.f_addEnergyCarriersAndAssetCategoriesFromEA(j_ea);
}
}*/
}

//v_liveData.activeEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY, OL_EnergyCarriers.HEAT, OL_EnergyCarriers.METHANE, OL_EnergyCarriers.DIESEL);
//v_liveData.activeProductionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY, OL_EnergyCarriers.HEAT);
//v_liveData.activeConsumptionEnergyCarriers = EnumSet.of(OL_EnergyCarriers.ELECTRICITY, OL_EnergyCarriers.HEAT, OL_EnergyCarriers.METHANE, OL_EnergyCarriers.DIESEL);
//for (J_EA j_ea : c_energyAssets) {
//v_liveData.activeProductionEnergyCarriers.addAll(j_ea.activeProductionEnergyCarriers);
//v_liveData.activeConsumptionEnergyCarriers.addAll(j_ea.activeConsumptionEnergyCarriers);
//}
// Initialize time and date
//v_hourOfYearStart=hourOfYearPerMonth[getMonth()] + (getDayOfMonth()-1)*24;
t_h = p_runStartTime_h;

Date startDate = date();
p_year = startDate.getYear() + 1900;

LocalDate localDate = LocalDate.of(p_year, 1, 1);
v_dayOfWeek1jan = DayOfWeek.from(localDate).getValue();
p_startOfWinterWeek_h = roundToInt(24 * (p_winterWeekNumber * 7 + (8-v_dayOfWeek1jan)%7)); // Week 49 is winterweek.
p_startOfSummerWeek_h = roundToInt(24 * (p_summerWeekNumber * 7 + (8-v_dayOfWeek1jan)%7)); // Week 18 is summerweek.

int monthIdx = 0;
while ( t_h > hourOfYearPerMonth[monthIdx] ) {
monthIdx++;
if (monthIdx==hourOfYearPerMonth.length){
break;
}
}

int dayOfMonth = 1+(int)((t_h - hourOfYearPerMonth[monthIdx])/24.0);
traceln("Day of month start: %s", dayOfMonth);
traceln("Month of year start: %s", monthIdx);
startDate.setMonth(monthIdx);
startDate.setDate(dayOfMonth);
startDate.setHours(0);
startDate.setMinutes(0);
traceln("Startdate: %s", startDate);
//startDate.set
getExperiment().getEngine().setStartDate(startDate);

f_initializeForecasts();

f_initializeLiveDataSets();

b_isDeserialised = true;
/*ALCODEEND*/}

Pair<J_DataSetMap, J_DataSetMap> f_getPeakWeekDataSets()
Expand Down Expand Up @@ -1235,3 +1260,76 @@ Date f_getDate()
c_pausedGridConnections.forEach(GC -> GC.v_liveData.clearLiveDatasets());
/*ALCODEEND*/}

double f_initializeEngineAfterLoad()
{/*ALCODESTART::1758792939882*/
// Initialize time and date
//v_hourOfYearStart=hourOfYearPerMonth[getMonth()] + (getDayOfMonth()-1)*24;
t_h = p_runStartTime_h;

Date startDate = date();
p_year = startDate.getYear() + 1900;

LocalDate localDate = LocalDate.of(p_year, 1, 1);
v_dayOfWeek1jan = DayOfWeek.from(localDate).getValue();
p_startOfWinterWeek_h = roundToInt(24 * (p_winterWeekNumber * 7 + (8-v_dayOfWeek1jan)%7)); // Week 49 is winterweek.
p_startOfSummerWeek_h = roundToInt(24 * (p_summerWeekNumber * 7 + (8-v_dayOfWeek1jan)%7)); // Week 18 is summerweek.

int monthIdx = 0;
while ( t_h > hourOfYearPerMonth[monthIdx] ) {
monthIdx++;
if (monthIdx==hourOfYearPerMonth.length){
break;
}
}

int dayOfMonth = 1+(int)((t_h - hourOfYearPerMonth[monthIdx])/24.0);
traceln("Day of month start: %s", dayOfMonth);
traceln("Month of year start: %s", monthIdx);
startDate.setMonth(monthIdx);
startDate.setDate(dayOfMonth);
startDate.setHours(0);
startDate.setMinutes(0);
traceln("Startdate: %s", startDate);
//startDate.set
getExperiment().getEngine().setStartDate(startDate);



// Initialize all agents in the correct order, creating all connections. What about setting initial values? And how about repeated simulations?

/*f_buildGridNodeTree();
c_gridConnections.forEach(GC -> GC.f_initialize());

// Only relevant for deserialisation:
c_pausedGridConnections.forEach(GC -> GC.f_initialize());

pop_connectionOwners.forEach(CO -> CO.f_initialize());
pop_energyCoops.forEach(EC -> EC.f_initialize()); // Not yet robust when there is no supplier initialized!



// Initializing Live Data Class
v_liveAssetsMetaData.updateActiveAssetData(c_gridConnections);
for (GridConnection GC : c_gridConnections) {
v_liveData.activeEnergyCarriers.addAll(GC.v_liveData.activeEnergyCarriers);
v_liveData.activeConsumptionEnergyCarriers.addAll(GC.v_liveData.activeConsumptionEnergyCarriers);
v_liveData.activeProductionEnergyCarriers.addAll(GC.v_liveData.activeProductionEnergyCarriers);
}

// Loop over populations to check v_ispaused
f_initializePause();

for (GridNode GN : c_gridNodeExecutionList) {
GN.f_initializeGridnode();
}

v_liveData.connectionMetaData.contractedDeliveryCapacityKnown = false;
v_liveData.connectionMetaData.contractedFeedinCapacityKnown = false;
v_liveData.connectionMetaData.physicalCapacityKnown = false;
*/
f_initializeForecasts();

f_initializeLiveDataSets();

/*ALCODEEND*/}

38 changes: 19 additions & 19 deletions _alp/Agents/EnergyModel/Code/Functions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,23 +348,6 @@
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="private" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
<Id>1722853692644</Id>
<Name><![CDATA[f_setInitialValues]]></Name>
<Description><![CDATA[Function to set initial states at start of simulation.]]></Description>
<X>730</X>
<Y>173</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="default" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
Expand Down Expand Up @@ -603,8 +586,8 @@
<ReturnType>double</ReturnType>
<Id>1753963201170</Id>
<Name><![CDATA[f_startAfterDeserialisation]]></Name>
<X>1096</X>
<Y>-64</Y>
<X>860</X>
<Y>50</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -746,4 +729,21 @@
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="public" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
<Id>1758792939882</Id>
<Name><![CDATA[f_initializeEngineAfterLoad]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>870</X>
<Y>-30</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
</Functions>
Loading