Skip to content

Serialisation tests #131

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 6 commits into from
Jul 30, 2025
Merged

Serialisation tests #131

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
ef20605
Works until you add custom PV profiles (with additional tablefunctions)
GillisHommen Jul 24, 2025
a3ce87d
Placed (de-)serialisation functionality in Zero_Loader agent, project…
GillisHommen Jul 25, 2025
3dbfc79
Re-referencing ordered GC lists to newEnergyModel
GillisHommen Jul 28, 2025
1703ab8
Merge branch 'main' into SerialisationTests
GillisHommen Jul 28, 2025
64f67c6
Making clear the functionalities are not finished yet for other devel…
AteZenmo Jul 30, 2025
bfe5f67
Merge branch 'main' into SerialisationTests
AteZenmo Jul 30, 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
2 changes: 1 addition & 1 deletion _alp/Agents/Zero_Interface/Code/AdditionalClassCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ public ShapeCheckBox getCb_showFilterInterface(){
}
public ShapeComboBox getCb_filterOptions(){
return this.cb_filterOptions;
}
}
56 changes: 55 additions & 1 deletion _alp/Agents/Zero_Interface/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2091,6 +2091,8 @@ else if(c_manualFilterDeselectedGC.contains(clickedGC)){

double f_setStartView()
{/*ALCODESTART::1743518032245*/
//traceln("f_setStartView() reached!");

if(map_centre_latitude != null && map_centre_longitude != null && map_centre_latitude != 0 && map_centre_longitude != 0){
map.setCenterLatitude(map_centre_latitude);
map.setCenterLongitude(map_centre_longitude);
Expand Down Expand Up @@ -3128,7 +3130,7 @@ else if(maxLoad_fr_gc_feedin > maxLoad_fr_gc_delivery && gc.v_rapidRunData.conne
String[] RadioButtonOptions = RadioButtonOptions_list.toArray(String[]::new);

//Create the radiobutton and set the correct action.
rb_mapOverlay = new ShapeRadioButtonGroup(presentable, ispublic, x ,y, width, height, textColor, enabled, font, vertical, RadioButtonOptions){
rb_mapOverlay = new ShapeRadioButtonGroup(group_legenda.getPresentable(), ispublic, x ,y, width, height, textColor, enabled, font, vertical, RadioButtonOptions){
@Override
public void action() {
f_setMapOverlay();
Expand Down Expand Up @@ -3288,3 +3290,55 @@ public void action() {
}
/*ALCODEEND*/}

double f_updateOrderedListsAfterDeserialising(EnergyModel newEnergyModel)
{/*ALCODESTART::1753713001191*/
// Update references of GClists
for (int i=0; i< c_orderedPVSystemsHouses.size(); i++) {
String GCid = c_orderedPVSystemsHouses.get(i).p_gridConnectionID;
c_orderedPVSystemsHouses.set(i,findFirst(newEnergyModel.Houses, x->x.p_gridConnectionID == GCid));
}

for (int i=0; i< c_orderedPVSystemsCompanies.size(); i++) {
String GCid = c_orderedPVSystemsCompanies.get(i).p_gridConnectionID;
c_orderedPVSystemsCompanies.set(i,findFirst(newEnergyModel.UtilityConnections, x->x.p_gridConnectionID == GCid));
}

for (int i=0; i< c_orderedHeatingSystemsCompanies.size(); i++) {
String GCid = c_orderedHeatingSystemsCompanies.get(i).p_gridConnectionID;
c_orderedHeatingSystemsCompanies.set(i,findFirst(newEnergyModel.UtilityConnections, x->x.p_gridConnectionID == GCid));
}

for (int i=0; i< c_orderedHeatingSystemsHouses.size(); i++) {
String GCid = c_orderedHeatingSystemsHouses.get(i).p_gridConnectionID;
c_orderedHeatingSystemsHouses.set(i,findFirst(newEnergyModel.Houses, x->x.p_gridConnectionID == GCid));
}

for (int i=0; i< c_orderedPublicChargers.size(); i++) {
String GCid = c_orderedPublicChargers.get(i).p_gridConnectionID;
c_orderedPublicChargers.set(i,findFirst(newEnergyModel.PublicChargers, x->x.p_gridConnectionID == GCid));
}

// TODO: Update references of J_EAlists

/*ALCODEEND*/}

ArrayList<GridConnection> f_updateGClistAfterDeserialisation(ArrayList<? extends GridConnection> GClist,EnergyModel newEnergyModel)
{/*ALCODESTART::1753713085487*/
for (int i=0; i< GClist.size(); i++) {
String GCid = GClist.get(i).p_gridConnectionID;
GClist.set(i,findFirst(newEnergyModel.c_gridConnections, x->x.p_gridConnectionID == GCid));
}


/*ALCODEEND*/}

ArrayList<GridConnection> f_updateJ_EAlistAfterDeserialisation(ArrayList<J_EA> EAlist,EnergyModel newEnergyModel)
{/*ALCODESTART::1753713662613*/
for (int i=0; i< EAlist.size(); i++) {
String GCid = EAlist.get(i).getParentAgent();p_gridConnectionID;
EAlist.set(i,findFirst(newEnergyModel.c_gridConnections, x->x.p_gridConnectionID == GCid));
}


/*ALCODEEND*/}

88 changes: 79 additions & 9 deletions _alp/Agents/Zero_Interface/Code/Functions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
<Id>1714130288661</Id>
<Name><![CDATA[f_initialPVSystemsOrder]]></Name>
<X>85</X>
<Y>-680</Y>
<Y>-710</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -293,7 +293,7 @@
<Id>1714130342440</Id>
<Name><![CDATA[f_initialElectricVehiclesOrder]]></Name>
<X>85</X>
<Y>-660</Y>
<Y>-690</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -309,7 +309,7 @@
<Id>1714131269202</Id>
<Name><![CDATA[f_initialHeatingSystemsOrder]]></Name>
<X>85</X>
<Y>-640</Y>
<Y>-670</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -325,7 +325,7 @@
<Id>1714135623471</Id>
<Name><![CDATA[f_initalAssetOrdering]]></Name>
<X>70</X>
<Y>-700</Y>
<Y>-730</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -814,7 +814,7 @@
<Id>1729685968993</Id>
<Name><![CDATA[f_projectSpecificOrderedCollectionAdjustments]]></Name>
<X>420</X>
<Y>-650</Y>
<Y>-680</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -1578,7 +1578,7 @@
<Id>1749741185117</Id>
<Name><![CDATA[f_initialParkingSpacesOrder]]></Name>
<X>420</X>
<Y>-690</Y>
<Y>-720</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -1594,7 +1594,7 @@
<Id>1750247111856</Id>
<Name><![CDATA[f_initialChargerOrder]]></Name>
<X>420</X>
<Y>-670</Y>
<Y>-700</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -1798,7 +1798,7 @@
<Id>1750333147816</Id>
<Name><![CDATA[f_initialHouseholdOrder]]></Name>
<X>85</X>
<Y>-620</Y>
<Y>-650</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -1868,7 +1868,7 @@
</Parameter>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="default" StaticFunction="false">
<Function AccessType="public" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
<Id>1752836715726</Id>
Expand Down Expand Up @@ -2033,4 +2033,74 @@
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="default" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
<Id>1753713001191</Id>
<Name><![CDATA[f_updateOrderedListsAfterDeserialising]]></Name>
<X>70</X>
<Y>-630</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Parameter>
<Name><![CDATA[newEnergyModel]]></Name>
<Type><![CDATA[EnergyModel]]></Type>
</Parameter>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="default" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>ArrayList&lt;GridConnection&gt;</ReturnType>
<Id>1753713085487</Id>
<Name><![CDATA[f_updateGClistAfterDeserialisation]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>85</X>
<Y>-610</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Parameter>
<Name><![CDATA[GClist]]></Name>
<Type><![CDATA[ArrayList<? extends GridConnection>]]></Type>
</Parameter>
<Parameter>
<Name><![CDATA[newEnergyModel]]></Name>
<Type><![CDATA[EnergyModel]]></Type>
</Parameter>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="default" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>ArrayList&lt;GridConnection&gt;</ReturnType>
<Id>1753713662613</Id>
<Name><![CDATA[f_updateJ_EAlistAfterDeserialisation]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>100</X>
<Y>-590</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Parameter>
<Name><![CDATA[EAlist]]></Name>
<Type><![CDATA[ArrayList<J_EA>]]></Type>
</Parameter>
<Parameter>
<Name><![CDATA[newEnergyModel]]></Name>
<Type><![CDATA[EnergyModel]]></Type>
</Parameter>
<Body xmlns:al="http://anylogic.com"/>
</Function>
</Functions>
Loading