Skip to content

Pbl data merge #209

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

Open
naudloomans wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Pbl data merge #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
757dd50
update pbl data loader
naudloomans Nov 13, 2025
5e9d59a
Merge branch 'main' into PBL_data
naudloomans Nov 14, 2025
d7ceb77
Functions set to public to access from project interface
naudloomans Nov 14, 2025
a40734b
Merge branch 'main' into PBL_data_merge
naudloomans Dec 4, 2025
f965131
Create Building_data.java
naudloomans Dec 4, 2025
63c1530
Error in commit
naudloomans Dec 4, 2025
0b2462a
Working version of savings through PBL schillabels
naudloomans Dec 4, 2025
a424c76
Merge branch 'main' into PBL_data_merge
naudloomans Dec 9, 2025
51d8079
final version mannually calibrated to 3 nbhs
naudloomans Dec 12, 2025
6e580d5
Merge branch 'main' into PBL_data_merge
AteZenmo Dec 18, 2025
f8c3192
m3pa refactor was reversed -> reversed back to what it should be again.
AteZenmo Dec 19, 2025
9f28659
Merge branch 'main' into PBL_data_merge
AteZenmo Jan 12, 2026
2e68309
Merge branch 'main' into PBL_data_merge
AteZenmo Jan 12, 2026
5e3566e
pbl updates IN PROGRESS
AteZenmo Jan 13, 2026
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
10 changes: 10 additions & 0 deletions Zero_Interface-Loader.alpx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,16 @@
<Id>1762351349700</Id>
<Name><![CDATA[J_RemainingTotalsManager]]></Name>
</JavaClass>
<JavaClass>
<Id>1768318918209</Id>
<Name><![CDATA[PBL_SpaceHeating_data]]></Name>
<Folder>1754045711603</Folder>
</JavaClass>
<JavaClass>
<Id>1768318961854</Id>
<Name><![CDATA[PBL_DHWAndCooking_data]]></Name>
<Folder>1754045711603</Folder>
</JavaClass>
</JavaClasses>
<RequiredLibraryReference>
<LibraryName>zero_engine</LibraryName>
Expand Down
1 change: 1 addition & 0 deletions _alp/Agents/AVGC_data/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,6 @@
dataAVGC.p_avgAnnualTravelDistanceCompanyCar_km = p_avgAnnualTravelDistanceCompanyCar_km;
dataAVGC.p_avgAnnualTravelDistanceVan_km = p_avgAnnualTravelDistanceVan_km;
dataAVGC.p_avgAnnualTravelDistanceTruck_km = p_avgAnnualTravelDistanceTruck_km;
dataAVGC.p_minAnnualTravelDistanceSurveyVehicle_km = p_minAnnualTravelDistanceSurveyVehicle_km;
/*ALCODEEND*/}

49 changes: 37 additions & 12 deletions _alp/Agents/AVGC_data/Levels/Level.level.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<Id>1726584205542</Id>
<Name><![CDATA[txt_avgCompanies]]></Name>
<X>40</X>
<Y>280</Y>
<Y>440</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand Down Expand Up @@ -286,7 +286,7 @@
<Id>1726584205558</Id>
<Name><![CDATA[txt_Heatassets]]></Name>
<X>40</X>
<Y>470</Y>
<Y>630</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand All @@ -311,7 +311,7 @@
<Id>1726584205560</Id>
<Name><![CDATA[txt_avgPV]]></Name>
<X>40</X>
<Y>990</Y>
<Y>1150</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand All @@ -336,7 +336,7 @@
<Id>1726584205562</Id>
<Name><![CDATA[txt_avgBat]]></Name>
<X>40</X>
<Y>1095</Y>
<Y>1255</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand Down Expand Up @@ -386,7 +386,7 @@
<Id>1726584205566</Id>
<Name><![CDATA[txt_heatpumps]]></Name>
<X>60</X>
<Y>490</Y>
<Y>650</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand All @@ -411,7 +411,7 @@
<Id>1726584205568</Id>
<Name><![CDATA[txt_gasburners]]></Name>
<X>60</X>
<Y>620</Y>
<Y>780</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand All @@ -436,7 +436,7 @@
<Id>1726584205570</Id>
<Name><![CDATA[txt_hydrogenburners]]></Name>
<X>60</X>
<Y>710</Y>
<Y>870</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand Down Expand Up @@ -539,7 +539,7 @@
<Id>1726743791200</Id>
<Name><![CDATA[text]]></Name>
<X>40</X>
<Y>1160</Y>
<Y>1320</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand Down Expand Up @@ -589,7 +589,7 @@
<Id>1745316061345</Id>
<Name><![CDATA[txt_CHP]]></Name>
<X>60</X>
<Y>800</Y>
<Y>960</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand All @@ -614,7 +614,7 @@
<Id>1747314897311</Id>
<Name><![CDATA[txt_districtHeatingDeliverySet]]></Name>
<X>60</X>
<Y>890</Y>
<Y>1050</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand All @@ -639,7 +639,7 @@
<Id>1751906160194</Id>
<Name><![CDATA[txt_avgHeatBuffer]]></Name>
<X>560</X>
<Y>980</Y>
<Y>1020</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand All @@ -664,7 +664,7 @@
<Id>1751906173848</Id>
<Name><![CDATA[txt_avgPT]]></Name>
<X>560</X>
<Y>900</Y>
<Y>940</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand Down Expand Up @@ -710,4 +710,29 @@
</Font>
<Alignment>LEFT</Alignment>
</Text>
<Text>
<Id>1768315329120</Id>
<Name><![CDATA[txt_thermalModelParameters]]></Name>
<X>40</X>
<Y>280</Y>
<Label>
<X>0</X>
<Y>-10</Y>
</Label>
<PublicFlag>true</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>false</ShowLabel>
<DrawMode>SHAPE_DRAW_2D</DrawMode>
<EmbeddedIcon>false</EmbeddedIcon>
<Z>0</Z>
<Rotation>0.0</Rotation>
<Color>-16777216</Color>
<Text><![CDATA[Thermal model parameters]]></Text>
<Font>
<Name><![CDATA[SansSerif]]></Name>
<Size>12</Size>
<Style>0</Style>
</Font>
<Alignment>LEFT</Alignment>
</Text>
</Presentation>
Loading