Skip to content

Removed option list OL_ProfileType #187

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
Aug 13, 2025
Merged

Removed option list OL_ProfileType #187

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
91c687b
OL_ProfileType is removed, now uses OL_AssetFlowCategories instead
GillisHommen Aug 12, 2025
dfd8b12
removed default values of flowsMap variables from anylogic xml (prope…
GillisHommen Aug 12, 2025
9f00470
further cleanup, optionlist ActorType removed, optionlists for contra…
GillisHommen Aug 12, 2025
d3750ae
small refactor of connectToJ_EA in GridConnection agent
GillisHommen Aug 12, 2025
d7f3cf8
Refactor and documentation of curtailment function in J_EAProduction.
GillisHommen Aug 12, 2025
2036acb
Merge branch 'main' into removeOptionListProfileType
GillisHommen Aug 12, 2025
9f5df58
somehow the Class.J_EAProduction.java file had gotten lost...
GillisHommen Aug 12, 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
234 changes: 3 additions & 231 deletions Zero_engine.alpx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,14 +253,6 @@
<Id>1673867715990</Id>
<Name><![CDATA[ELECTRIC_HOB]]></Name>
</Option>
<Option>
<Id>1676965109301</Id>
<Name><![CDATA[CURTAILER]]></Name>
</Option>
<Option>
<Id>1678469475524</Id>
<Name><![CDATA[CURTAILER_HEAT]]></Name>
</Option>
<Option>
<Id>1676383232204</Id>
<Name><![CDATA[RESIDUALHEATHT]]></Name>
Expand Down Expand Up @@ -361,6 +353,7 @@
<OptionList>
<Id>1659525715752</Id>
<Name><![CDATA[OL_EAConversionTypes]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<Option>
<Id>1659535854305</Id>
<Name><![CDATA[HEATPUMP]]></Name>
Expand Down Expand Up @@ -403,63 +396,6 @@
<Name><![CDATA[WINDMILL]]></Name>
</Option>
</OptionList>
<OptionList>
<Id>1659525736586</Id>
<Name><![CDATA[OL_EAConsumptionTypes]]></Name>
<Option>
<Id>1659535824593</Id>
<Name><![CDATA[ELECTRICITY]]></Name>
</Option>
<Option>
<Id>1659535830792</Id>
<Name><![CDATA[HEAT]]></Name>
</Option>
</OptionList>
<OptionList>
<Id>1659525748543</Id>
<Name><![CDATA[OL_EAStorageTypes]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<Option>
<Id>1659535943908</Id>
<Name><![CDATA[ELECTRIC_BATTERY]]></Name>
</Option>
<Option>
<Id>1659535950717</Id>
<Name><![CDATA[ELECTRIC_VEHICLE]]></Name>
</Option>
<Option>
<Id>1659535949187</Id>
<Name><![CDATA[HEATMODEL_BUILDING]]></Name>
</Option>
<Option>
<Id>1674311988696</Id>
<Name><![CDATA[HEATBUFFER]]></Name>
</Option>
<Option>
<Id>1684917094693</Id>
<Name><![CDATA[GAS]]></Name>
</Option>
</OptionList>
<OptionList>
<Id>1659535485693</Id>
<Name><![CDATA[OL_EACategories]]></Name>
<Option>
<Id>1659535486263</Id>
<Name><![CDATA[CONSUMPTION]]></Name>
</Option>
<Option>
<Id>1659535492572</Id>
<Name><![CDATA[CONVERSION]]></Name>
</Option>
<Option>
<Id>1659535495564</Id>
<Name><![CDATA[PRODUCTION]]></Name>
</Option>
<Option>
<Id>1659535498309</Id>
<Name><![CDATA[STORAGE]]></Name>
</Option>
</OptionList>
<OptionList>
<Id>1659701773383</Id>
<Name><![CDATA[OL_AreaType]]></Name>
Expand Down Expand Up @@ -517,175 +453,10 @@
<Name><![CDATA[Other]]></Name>
</Option>
</OptionList>
<OptionList>
<Id>1659950471000</Id>
<Name><![CDATA[OL_EAPresetProductionAssets]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<Option>
<Id>1659950531538</Id>
<Name><![CDATA[House_solarpanels_S]]></Name>
</Option>
<Option>
<Id>1659950534060</Id>
<Name><![CDATA[House_solarpanels_M]]></Name>
</Option>
<Option>
<Id>1659950555546</Id>
<Name><![CDATA[House_solarpanels_L]]></Name>
</Option>
<Option>
<Id>1659950562453</Id>
<Name><![CDATA[Windmill_3MW]]></Name>
</Option>
<Option>
<Id>1659950566729</Id>
<Name><![CDATA[Windmill_5MW]]></Name>
</Option>
<Option>
<Id>1659950570261</Id>
<Name><![CDATA[Windmill_7MW]]></Name>
</Option>
<Option>
<Id>1659970013275</Id>
<Name><![CDATA[Solarpanels_0MW]]></Name>
</Option>
<Option>
<Id>1667995960684</Id>
<Name><![CDATA[Solarpanels_1MW]]></Name>
</Option>
<Option>
<Id>1667995977424</Id>
<Name><![CDATA[Solarpanels_2MW]]></Name>
</Option>
<Option>
<Id>1667995970571</Id>
<Name><![CDATA[Solarpanels_3MW]]></Name>
</Option>
<Option>
<Id>1667995986536</Id>
<Name><![CDATA[Solarpanels_4MW]]></Name>
</Option>
<Option>
<Id>1667996880047</Id>
<Name><![CDATA[Solarpanels_5MW]]></Name>
</Option>
<Option>
<Id>1667995988427</Id>
<Name><![CDATA[Solarpanels_10MW]]></Name>
</Option>
<Option>
<Id>1667995990541</Id>
<Name><![CDATA[Building_solarpanels_0kWp]]></Name>
</Option>
<Option>
<Id>1667996008098</Id>
<Name><![CDATA[Building_solarpanels_1kWp]]></Name>
</Option>
<Option>
<Id>1667996006832</Id>
<Name><![CDATA[Building_solarpanels_2kWp]]></Name>
</Option>
<Option>
<Id>1667996013583</Id>
<Name><![CDATA[Building_solarpanels_3kWp]]></Name>
</Option>
<Option>
<Id>1667996015832</Id>
<Name><![CDATA[Building_solarpanels_4kWp]]></Name>
</Option>
<Option>
<Id>1667996018938</Id>
<Name><![CDATA[Building_solarpanels_5kWp]]></Name>
</Option>
<Option>
<Id>1667996020759</Id>
<Name><![CDATA[Building_solarpanels_10kWp]]></Name>
</Option>
</OptionList>
<OptionList>
<Id>1660055228680</Id>
<Name><![CDATA[OL_EAPresetStorageAssets]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<Option>
<Id>1660055281773</Id>
<Name><![CDATA[House_battery]]></Name>
</Option>
<Option>
<Id>1660055281774</Id>
<Name><![CDATA[House_heatmodel_A]]></Name>
</Option>
<Option>
<Id>1660055281775</Id>
<Name><![CDATA[House_heatmodel_B]]></Name>
</Option>
<Option>
<Id>1660055281776</Id>
<Name><![CDATA[House_heatmodel_C]]></Name>
</Option>
<Option>
<Id>1660055281777</Id>
<Name><![CDATA[House_heatmodel_D]]></Name>
</Option>
<Option>
<Id>1660055281778</Id>
<Name><![CDATA[House_heatmodel_E]]></Name>
</Option>
<Option>
<Id>1660055281779</Id>
<Name><![CDATA[House_heatmodel_F]]></Name>
</Option>
<Option>
<Id>1660055281780</Id>
<Name><![CDATA[House_heatmodel_G]]></Name>
</Option>
<Option>
<Id>1660055281781</Id>
<Name><![CDATA[EV]]></Name>
</Option>
<Option>
<Id>1660055439251</Id>
<Name><![CDATA[District_Heating_heat_buffer_HT_S]]></Name>
</Option>
<Option>
<Id>1664536366729</Id>
<Name><![CDATA[District_Heating_network_HT_S]]></Name>
</Option>
<Option>
<Id>1664541052353</Id>
<Name><![CDATA[District_Heating_network_MT_S]]></Name>
</Option>
<Option>
<Id>1666959280721</Id>
<Name><![CDATA[Grid_battery_1MWh]]></Name>
</Option>
<Option>
<Id>1667757454119</Id>
<Name><![CDATA[EHGV]]></Name>
</Option>
<Option>
<Id>1667464089952</Id>
<Name><![CDATA[Grid_battery_10MWh]]></Name>
</Option>
<Option>
<Id>1667995942136</Id>
<Name><![CDATA[Grid_battery_0MWh]]></Name>
</Option>
<Option>
<Id>1667996898857</Id>
<Name><![CDATA[Grid_battery_5MWh]]></Name>
</Option>
<Option>
<Id>1668594477547</Id>
<Name><![CDATA[EHGV_x50]]></Name>
</Option>
<Option>
<Id>1676893732560</Id>
<Name><![CDATA[Store_heatmodel_A]]></Name>
</Option>
</OptionList>
<OptionList>
<Id>1660226249511</Id>
<Name><![CDATA[OL_ActorType]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<Option>
<Id>1660226249512</Id>
<Name><![CDATA[CONNECTIONOWNER]]></Name>
Expand Down Expand Up @@ -1066,6 +837,7 @@
<OptionList>
<Id>1718560423698</Id>
<Name><![CDATA[OL_ProfileAssetType]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<Option>
<Id>1718560423699</Id>
<Name><![CDATA[ELECTRICITYBASELOAD]]></Name>
Expand Down
1 change: 1 addition & 0 deletions _alp/Agents/Actor/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

@since: Sprint 6
@author: Gillis]]></Description>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>60</X>
<Y>90</Y>
<Label>
Expand Down
4 changes: 2 additions & 2 deletions _alp/Agents/ConnectionOwner/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1426,8 +1426,8 @@
<Variable Class="Parameter">
<Id>1702915036278</Id>
<Name><![CDATA[p_connectionOwnerType]]></Name>
<X>180</X>
<Y>90</Y>
<X>60</X>
<Y>140</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down
7 changes: 6 additions & 1 deletion _alp/Agents/EnergyCoop/AOC.EnergyCoop.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,12 @@ v_liveConnectionMetaData = new J_ConnectionMetaData(this);
v_liveAssetsMetaData = new J_AssetsMetaData(this);
v_liveData.connectionMetaData = v_liveConnectionMetaData;
v_liveData.assetsMetaData = v_liveAssetsMetaData;
energyModel.c_actors.add(this);]]></StartupCode>
energyModel.c_actors.add(this);

fm_currentProductionFlows_kW = new J_FlowsMap();
fm_currentConsumptionFlows_kW = new J_FlowsMap();
fm_currentBalanceFlows_kW = new J_FlowsMap();
fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);]]></StartupCode>
<Generic>false</Generic>
<GenericParameter>
<Id>1660731375014</Id>
Expand Down
5 changes: 5 additions & 0 deletions _alp/Agents/EnergyCoop/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1468,6 +1468,11 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
//v_liveAssetsMetaData = new J_AssetsMetaData(this);
v_liveData.connectionMetaData = v_liveConnectionMetaData;
v_liveData.assetsMetaData = v_liveAssetsMetaData;

fm_currentProductionFlows_kW = new J_FlowsMap();
fm_currentConsumptionFlows_kW = new J_FlowsMap();
fm_currentBalanceFlows_kW = new J_FlowsMap();
fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);
/*ALCODEEND*/}

EnergyCoop f_addConsumptionEnergyCarrier(OL_EnergyCarriers EC)
Expand Down
12 changes: 0 additions & 12 deletions _alp/Agents/EnergyCoop/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,9 +1018,6 @@
AccessType="public"
StaticVariable="false">
<Type><![CDATA[J_FlowsMap]]></Type>
<InitialValue Class="CodeValue">
<Code><![CDATA[new J_FlowsMap()]]></Code>
</InitialValue>
</Properties>
</Variable>
<Variable Class="PlainVariable">
Expand All @@ -1040,9 +1037,6 @@
AccessType="public"
StaticVariable="false">
<Type><![CDATA[J_FlowsMap]]></Type>
<InitialValue Class="CodeValue">
<Code><![CDATA[new J_FlowsMap()]]></Code>
</InitialValue>
</Properties>
</Variable>
<Variable Class="PlainVariable">
Expand All @@ -1062,9 +1056,6 @@
AccessType="public"
StaticVariable="false">
<Type><![CDATA[J_FlowsMap]]></Type>
<InitialValue Class="CodeValue">
<Code><![CDATA[new J_FlowsMap()]]></Code>
</InitialValue>
</Properties>
</Variable>
<Variable Class="PlainVariable">
Expand Down Expand Up @@ -1572,9 +1563,6 @@
AccessType="public"
StaticVariable="false">
<Type><![CDATA[J_ValueMap]]></Type>
<InitialValue Class="CodeValue">
<Code><![CDATA[new J_ValueMap(OL_AssetFlowCategories.class)]]></Code>
</InitialValue>
</Properties>
</Variable>
<Variable Class="PlainVariable">
Expand Down
7 changes: 6 additions & 1 deletion _alp/Agents/EnergyModel/AOC.EnergyModel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ v_liveData = new J_LiveData(this);
v_liveConnectionMetaData = new J_ConnectionMetaData(this);
v_liveAssetsMetaData = new J_AssetsMetaData(this);
v_liveData.connectionMetaData = v_liveConnectionMetaData;
v_liveData.assetsMetaData = v_liveAssetsMetaData;]]></StartupCode>
v_liveData.assetsMetaData = v_liveAssetsMetaData;

fm_currentProductionFlows_kW = new J_FlowsMap();
fm_currentConsumptionFlows_kW = new J_FlowsMap();
fm_currentBalanceFlows_kW = new J_FlowsMap();
fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);]]></StartupCode>
<Generic>false</Generic>
<GenericParameter>
<Id>1658477103138</Id>
Expand Down
Loading