Skip to content

Major update: Heating slider updates + Company UI refactor + scenario radiobutton refactor #184

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
Luc-Sol merged 16 commits into from
Oct 23, 2025
Merged

Major update: Heating slider updates + Company UI refactor + scenario radiobutton refactor #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a45c1f4
added the hybrid heatpump and district heating options to the sliders
AteZenmo Oct 13, 2025
44cdadb
updates to heating slider distribution
AteZenmo Oct 14, 2025
fbf11b8
Merge branch 'main' into heating_sliders_updates
AteZenmo Oct 14, 2025
3493afe
updates
AteZenmo Oct 14, 2025
63d25e5
bugfixes and updates
AteZenmo Oct 15, 2025
2e199f4
Merge branch 'main' into heating_sliders_updates
AteZenmo Oct 17, 2025
cedd61c
initial changes implemented. IN PROGRESS
AteZenmo Oct 17, 2025
b41f682
IN PROGRESS: companyUI refactor
AteZenmo Oct 20, 2025
1557438
companyui updates, in progress
AteZenmo Oct 20, 2025
83da253
companyUi updates
AteZenmo Oct 21, 2025
71440a7
scenario functionality refactor and updates
AteZenmo Oct 22, 2025
12c2687
update scenario functionalities + bugfixes companyUI
AteZenmo Oct 22, 2025
ccebd76
Bugfixes and final heating slider updates
AteZenmo Oct 22, 2025
9335d70
final bugfixes and updates
AteZenmo Oct 23, 2025
2a9d5a8
Merge branch 'main' into companyUI_refactor
AteZenmo Oct 23, 2025
f670135
Bugfixes
Luc-Sol Oct 23, 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
4 changes: 4 additions & 0 deletions Zero_Interface-Loader.alpx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,10 @@
<Id>1753884053162</Id>
<Name><![CDATA[J_ModelSave]]></Name>
</JavaClass>
<JavaClass>
<Id>1761122454908</Id>
<Name><![CDATA[J_SliderSettings_Residential]]></Name>
</JavaClass>
</JavaClasses>
<RequiredLibraryReference>
<LibraryName>zero_engine</LibraryName>
Expand Down
7 changes: 5 additions & 2 deletions _alp/Agents/AVGC_data/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1395,7 +1395,10 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
<Variable Class="Parameter">
<Id>1726584205714</Id>
<Name><![CDATA[p_avgOutputTemperatureHeatpump_degC]]></Name>
<Description><![CDATA[The avg output temperature of a heatpump in degC. Can be set manually, as an average 60 has been taken. ]]></Description>
<Description><![CDATA[https://www.milieucentraal.nl/energie-besparen/duurzaam-verwarmen-en-koelen/volledige-warmtepomp/?utm_source=chatgpt.com - max 45-55
https://warmtepomp-panel.nl/afgiftesysteem.html?utm_source=chatgpt.com -> 35 graden afgifte bij -10 graden.

-> Voor nu gemiddeld 40 genomen.]]></Description>
<X>70</X>
<Y>560</Y>
<Label>
Expand All @@ -1410,7 +1413,7 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
<UnitType>NONE</UnitType>
<SdArray>false</SdArray>
<DefaultValue Class="CodeValue">
<Code><![CDATA[60]]></Code>
<Code><![CDATA[40]]></Code>
</DefaultValue>
<ParameterEditor>
<Id>1726584205712</Id>
Expand Down
6 changes: 0 additions & 6 deletions _alp/Agents/UI_Battery/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,6 @@
AccessType="public"
StaticVariable="false">
<Type><![CDATA[double]]></Type>
<InitialValue Class="CodeValue">
<Code><![CDATA[-zero_Interface.energyModel.f_getGridNodesTopLevel().get(0).p_capacity_kW/1000]]></Code>
</InitialValue>
</Properties>
</Variable>
<Variable Class="PlainVariable">
Expand All @@ -127,9 +124,6 @@
AccessType="public"
StaticVariable="false">
<Type><![CDATA[double]]></Type>
<InitialValue Class="CodeValue">
<Code><![CDATA[zero_Interface.energyModel.f_getGridNodesTopLevel().get(0).p_capacity_kW/1000]]></Code>
</InitialValue>
</Properties>
</Variable>
<Variable Class="PlainVariable">
Expand Down
6 changes: 3 additions & 3 deletions _alp/Agents/UI_EnergyHub/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,9 +536,7 @@ else if (members.size() > 8) {
saveObject.c_scenarioMap_Future = zero_Interface.c_scenarioMap_Future;

List<LinkedHashMap<String, List<J_EAVehicle>>> c_additionalVehicleHashMaps = new ArrayList<LinkedHashMap<String, List<J_EAVehicle>>>();
for (UI_company companyUI : zero_Interface.c_companyUIs) {
c_additionalVehicleHashMaps.add(companyUI.c_additionalVehicles);
}

saveObject.c_additionalVehicleHashMaps = c_additionalVehicleHashMaps;

v_objectMapper = new ObjectMapper();
Expand Down Expand Up @@ -775,6 +773,7 @@ else if (members.size() > 8) {
zero_Interface.c_scenarioMap_Current = saveObject.c_scenarioMap_Current;
zero_Interface.c_scenarioMap_Future = saveObject.c_scenarioMap_Future;

/*
List<ConnectionOwner> c_COCompanies = findAll(zero_Interface.energyModel.pop_connectionOwners, p -> p.p_connectionOwnerType == OL_ConnectionOwnerType.COMPANY);

int i = 0;
Expand All @@ -786,6 +785,7 @@ else if (members.size() > 8) {
companyUI.f_setSelectedGCSliders();
i++;
}
*/

/*ALCODEEND*/}

6 changes: 0 additions & 6 deletions _alp/Agents/UI_Hydrogen/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@
AccessType="public"
StaticVariable="false">
<Type><![CDATA[double]]></Type>
<InitialValue Class="CodeValue">
<Code><![CDATA[-zero_Interface.energyModel.f_getGridNodesTopLevel().get(0).p_capacity_kW/1000]]></Code>
</InitialValue>
</Properties>
</Variable>
<Variable Class="PlainVariable">
Expand All @@ -61,9 +58,6 @@
AccessType="public"
StaticVariable="false">
<Type><![CDATA[double]]></Type>
<InitialValue Class="CodeValue">
<Code><![CDATA[zero_Interface.energyModel.f_getGridNodesTopLevel().get(0).p_capacity_kW/1000]]></Code>
</InitialValue>
</Properties>
</Variable>
<Variable Class="PlainVariable">
Expand Down
70 changes: 55 additions & 15 deletions _alp/Agents/UI_Tabs/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ else if(GC instanceof GCPublicCharger){

double f_initializeSliderGCPointers(List<GridConnection> activeGridConnections,List<GridConnection> pausedGridConnections)
{/*ALCODESTART::1754908006859*/
v_sliderGridConnections = activeGridConnections;
v_activeSliderGridConnections = activeGridConnections;

if(pausedGridConnections != null){
v_pausedSliderGridConnections = pausedGridConnections;
Expand All @@ -88,11 +88,11 @@ else if(GC instanceof GCPublicCharger){
f_showCorrectTab();
/*ALCODEEND*/}

List<GCHouse> f_getSliderGridConnections_houses()
List<GCHouse> f_getActiveSliderGridConnections_houses()
{/*ALCODESTART::1754919017244*/
List<GCHouse> houseGridConnections = new ArrayList<>();

for(GridConnection GC : v_sliderGridConnections){
for(GridConnection GC : v_activeSliderGridConnections){
if(GC instanceof GCHouse){
houseGridConnections.add((GCHouse)GC);
}
Expand All @@ -101,11 +101,11 @@ List<GCHouse> f_getSliderGridConnections_houses()
return houseGridConnections;
/*ALCODEEND*/}

List<GCUtility> f_getSliderGridConnections_utilities()
List<GCUtility> f_getActiveSliderGridConnections_utilities()
{/*ALCODESTART::1754922545766*/
List<GCUtility> utilityGridConnections = new ArrayList<>();

for(GridConnection GC : v_sliderGridConnections){
for(GridConnection GC : v_activeSliderGridConnections){
if(GC instanceof GCUtility){
utilityGridConnections.add((GCUtility)GC);
}
Expand All @@ -114,11 +114,11 @@ List<GCUtility> f_getSliderGridConnections_utilities()
return utilityGridConnections;
/*ALCODEEND*/}

List<GCGridBattery> f_getSliderGridConnections_gridBatteries()
List<GCGridBattery> f_getAllSliderGridConnections_gridBatteries()
{/*ALCODESTART::1754922546986*/
List<GCGridBattery> gridBatteryGridConnections = new ArrayList<>();

for(GridConnection GC : v_sliderGridConnections){
for(GridConnection GC : v_activeSliderGridConnections){
if(GC instanceof GCGridBattery){
gridBatteryGridConnections.add((GCGridBattery)GC);
}
Expand All @@ -137,7 +137,7 @@ List<GCPublicCharger> f_getSliderGridConnections_chargers()
{/*ALCODESTART::1754922547989*/
List<GCPublicCharger> chargerGridConnections = new ArrayList<>();

for(GridConnection GC : v_sliderGridConnections){
for(GridConnection GC : v_activeSliderGridConnections){
if(GC instanceof GCPublicCharger){
chargerGridConnections.add((GCPublicCharger)GC);
}
Expand All @@ -146,11 +146,11 @@ List<GCPublicCharger> f_getSliderGridConnections_chargers()
return chargerGridConnections;
/*ALCODEEND*/}

List<GCEnergyProduction> f_getSliderGridConnections_production()
List<GCEnergyProduction> f_getAllSliderGridConnections_production()
{/*ALCODESTART::1754922591622*/
List<GCEnergyProduction> productionGridConnections = new ArrayList<>();

for(GridConnection GC : v_sliderGridConnections){
for(GridConnection GC : v_activeSliderGridConnections){
if(GC instanceof GCEnergyProduction){
productionGridConnections.add((GCEnergyProduction)GC);
}
Expand Down Expand Up @@ -181,11 +181,11 @@ List<GCEnergyProduction> f_getSliderGridConnections_production()
}
/*ALCODEEND*/}

List<GridConnection> f_getSliderGridConnections_consumption()
List<GridConnection> f_getActiveSliderGridConnections_consumption()
{/*ALCODESTART::1754986474226*/
List<GridConnection> consumptionGridConnections = new ArrayList<>();

for(GridConnection GC : v_sliderGridConnections){
for(GridConnection GC : v_activeSliderGridConnections){
if(GC instanceof GCUtility){
consumptionGridConnections.add(GC);
}
Expand All @@ -197,9 +197,9 @@ else if(GC instanceof GCHouse){
return consumptionGridConnections;
/*ALCODEEND*/}

List<GridConnection> f_getSliderGridConnections_all()
List<GridConnection> f_getActiveSliderGridConnections_all()
{/*ALCODESTART::1754991155553*/
List<GridConnection> gridConnections = new ArrayList<>(v_sliderGridConnections);
List<GridConnection> gridConnections = new ArrayList<>(v_activeSliderGridConnections);

return gridConnections;
/*ALCODEEND*/}
Expand Down Expand Up @@ -239,7 +239,7 @@ List<GCPublicCharger> f_getAllSliderGridConnections_chargers()
{/*ALCODESTART::1758278620331*/
List<GCPublicCharger> chargerGridConnections = new ArrayList<>();

for(GridConnection GC : v_sliderGridConnections){
for(GridConnection GC : v_activeSliderGridConnections){
if(GC instanceof GCPublicCharger){
chargerGridConnections.add((GCPublicCharger)GC);
}
Expand All @@ -255,3 +255,43 @@ List<GCPublicCharger> f_getAllSliderGridConnections_chargers()
return chargerGridConnections;
/*ALCODEEND*/}

List<GridConnection> f_getAllSliderGridConnections_consumption()
{/*ALCODESTART::1761208715194*/
List<GridConnection> consumptionGridConnections = new ArrayList<>();

for(GridConnection GC : v_activeSliderGridConnections){
if(GC instanceof GCUtility){
consumptionGridConnections.add(GC);
}
else if(GC instanceof GCHouse){
consumptionGridConnections.add(GC);
}
}

for(GridConnection GC : v_pausedSliderGridConnections){
if(GC instanceof GCUtility){
consumptionGridConnections.add(GC);
}
else if(GC instanceof GCHouse){
consumptionGridConnections.add(GC);
}
}

return consumptionGridConnections;
/*ALCODEEND*/}

List<GridConnection> f_getPausedSliderGridConnections_all()
{/*ALCODESTART::1761208797812*/
List<GridConnection> gridConnections = new ArrayList<>(v_activeSliderGridConnections);

return gridConnections;
/*ALCODEEND*/}

List<GridConnection> f_getAllSliderGridConnections_all()
{/*ALCODESTART::1761208826669*/
List<GridConnection> gridConnections = new ArrayList<>(v_activeSliderGridConnections);
gridConnections.addAll(v_pausedSliderGridConnections);

return gridConnections;
/*ALCODEEND*/}

Loading