diff --git a/Zero_Interface-Loader.alpx b/Zero_Interface-Loader.alpx
index 40926715..9b6143d2 100644
--- a/Zero_Interface-Loader.alpx
+++ b/Zero_Interface-Loader.alpx
@@ -1,8 +1,8 @@
+ AnyLogicVersion="8.9.9.202606170507"
+ AlpVersion="8.9.9">
1658477103134
@@ -239,7 +239,6 @@
1.0
1.0
0.1
- DEFAULT
1658477089982
1920
@@ -488,6 +487,7 @@
404652e6-561a-404c-aab2-ab7415f40ef5
6fd6cd57-6dfe-4fc6-be0b-c74065351957
3325dc48-3ad4-41e3-836f-dfd0e98fe1ed
+ bb27038a-0f3a-48bb-b235-4a44066a14aa
3f69ef3d-706e-41a6-8af0-11658c5eef68
3f6fe405-e047-4304-91d6-6eee206d1106
820d2b51-5b4a-48e7-b0b6-e46418e3c0f2
@@ -543,5 +543,9 @@
1737c8c6-b526-4dd8-589e-ee4e205b06f4
6a43bef6-8b70-4253-a828-82c3ab399655
0a27038a-0f3a-48bb-b235-4a44066a1402
+ 0a9ec2c3-5e18-4c0a-a183-fd86d9d9a08b
+ 2216cdd0-177c-5678-9e88-dd8b95313334
+ 2216cdd0-177c-5678-9e88-dd8b95313335
+ 5b8ebeed-6b58-4c3a-8d5f-0958b1a90ce6
diff --git a/_alp/Agents/AVGC_data/AOC.AVGC_data.xml b/_alp/Agents/AVGC_data/AOC.AVGC_data.xml
index 816f31b6..488889b6 100644
--- a/_alp/Agents/AVGC_data/AOC.AVGC_data.xml
+++ b/_alp/Agents/AVGC_data/AOC.AVGC_data.xml
@@ -18,7 +18,12 @@
true
-4144960
- null
+
+ NONE
+ 0
+ 0
+ 0
+ 1
true
true
diff --git a/_alp/Agents/UI_Battery/AOC.UI_Battery.xml b/_alp/Agents/UI_Battery/AOC.UI_Battery.xml
index 63e7a323..87317227 100644
--- a/_alp/Agents/UI_Battery/AOC.UI_Battery.xml
+++ b/_alp/Agents/UI_Battery/AOC.UI_Battery.xml
@@ -20,7 +20,12 @@
true
-4144960
- null
+
+ NONE
+ 0
+ 0
+ 0
+ 1
true
true
diff --git a/_alp/Agents/UI_EnergyHub/AOC.UI_EnergyHub.xml b/_alp/Agents/UI_EnergyHub/AOC.UI_EnergyHub.xml
index 45802667..87d407dc 100644
--- a/_alp/Agents/UI_EnergyHub/AOC.UI_EnergyHub.xml
+++ b/_alp/Agents/UI_EnergyHub/AOC.UI_EnergyHub.xml
@@ -30,7 +30,12 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;]]>
true
-4144960
- null
+
+ NONE
+ 0
+ 0
+ 0
+ 1
true
true
diff --git a/_alp/Agents/UI_Hydrogen/AOC.UI_Hydrogen.xml b/_alp/Agents/UI_Hydrogen/AOC.UI_Hydrogen.xml
index 4e21542f..f724adb9 100644
--- a/_alp/Agents/UI_Hydrogen/AOC.UI_Hydrogen.xml
+++ b/_alp/Agents/UI_Hydrogen/AOC.UI_Hydrogen.xml
@@ -20,7 +20,12 @@
true
-4144960
- null
+
+ NONE
+ 0
+ 0
+ 0
+ 1
true
true
diff --git a/_alp/Agents/UI_Tabs/AOC.UI_Tabs.xml b/_alp/Agents/UI_Tabs/AOC.UI_Tabs.xml
index b884fcc1..4fc3e975 100644
--- a/_alp/Agents/UI_Tabs/AOC.UI_Tabs.xml
+++ b/_alp/Agents/UI_Tabs/AOC.UI_Tabs.xml
@@ -20,7 +20,12 @@
true
-4144960
- null
+
+ NONE
+ 0
+ 0
+ 0
+ 1
true
true
diff --git a/_alp/Agents/UI_company/AOC.UI_company.xml b/_alp/Agents/UI_company/AOC.UI_company.xml
index 209e9c26..79da5ee0 100644
--- a/_alp/Agents/UI_company/AOC.UI_company.xml
+++ b/_alp/Agents/UI_company/AOC.UI_company.xml
@@ -29,7 +29,12 @@ f_initializeDayToDisableRectanglesMap();]]>
true
-4144960
- null
+
+ NONE
+ 0
+ 0
+ 0
+ 1
true
true
diff --git a/_alp/Agents/UI_company/Code/Functions.java b/_alp/Agents/UI_company/Code/Functions.java
index a2ec751b..3e6f62d1 100644
--- a/_alp/Agents/UI_company/Code/Functions.java
+++ b/_alp/Agents/UI_company/Code/Functions.java
@@ -1469,31 +1469,21 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
//Find the current heat saving percentage
int currentHeatSavings = 0;
-J_EAConsumption consumptionEAHEAT = findFirst(p_gridConnection.c_consumptionAssets, consumptionAsset -> consumptionAsset.getEAType() == OL_EnergyAssetType.HEAT_DEMAND);
-if (consumptionEAHEAT != null){
- currentHeatSavings = roundToInt((consumptionEAHEAT.getConsumptionScaling_fr() - 1)*-100);
-}
-else{
- J_EAProfile profileEAHEAT = findFirst(p_gridConnection.c_profileAssets, profileAsset -> profileAsset.getEnergyCarrier() == OL_EnergyCarriers.HEAT);
- if (profileEAHEAT != null){
- currentHeatSavings = roundToInt((profileEAHEAT.getProfileScaling_fr() - 1)*-100);
- }
+J_EAProfile profileEAHEAT = findFirst(p_gridConnection.c_profileAssets, profileAsset -> profileAsset.getEnergyCarrier() == OL_EnergyCarriers.HEAT);
+if (profileEAHEAT != null){
+ currentHeatSavings = roundToInt((profileEAHEAT.getProfileScaling_fr() - 1)*-100);
}
+
//Find the current electricity savings percentage
int currentElectricitySavings = 0;
-J_EAConsumption consumptionEAELECTRIC = findFirst(p_gridConnection.c_consumptionAssets, consumptionAsset -> consumptionAsset.getEAType() == OL_EnergyAssetType.ELECTRICITY_DEMAND);
-if (consumptionEAELECTRIC != null){
- currentElectricitySavings = roundToInt((consumptionEAELECTRIC.getConsumptionScaling_fr() - 1)*-100);
-}
-else{
- J_EAProfile profileEAELECTRIC = findFirst(p_gridConnection.c_profileAssets, profileAsset -> profileAsset.getAssetFlowCategory() == OL_AssetFlowCategories.fixedConsumptionElectric_kW);
- if (profileEAELECTRIC != null){
- currentElectricitySavings = roundToInt((profileEAELECTRIC.getProfileScaling_fr() - 1)*-100);
- }
+J_EAProfile profileEAELECTRIC = findFirst(p_gridConnection.c_profileAssets, profileAsset -> profileAsset.getAssetFlowCategory() == OL_AssetFlowCategories.fixedConsumptionElectric_kW);
+if (profileEAELECTRIC != null){
+ currentElectricitySavings = roundToInt((profileEAELECTRIC.getProfileScaling_fr() - 1)*-100);
}
+
//Find the current Connection capacity (delivery)
double GCContractCapacityCurrent_Delivery = p_gridConnection.v_liveConnectionMetaData.getDefaultContractedDeliveryCapacity_kW();
@@ -1512,11 +1502,12 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
//Find the current PV capacity
int PVCapacityCurrent = 0;
-if (p_gridConnection.v_liveAssetsMetaData.activeAssetFlows.contains(OL_AssetFlowCategories.pvProductionElectric_kW)){
- J_EAProduction pvAsset = findFirst(p_gridConnection.c_productionAssets, p -> p.getEAType() == OL_EnergyAssetType.PHOTOVOLTAIC );
- PVCapacityCurrent = roundToInt(pvAsset.getCapacityElectric_kW());
+List pvAssets = findAll(p_gridConnection.c_productionAssets, p -> p.getEAType() == OL_EnergyAssetType.PHOTOVOLTAIC );
+for(J_EAProduction pvAsset : pvAssets){
+ PVCapacityCurrent += roundToInt(pvAsset.getCapacityElectric_kW());
}
+
//Find the current curtailment setting
boolean currentCurtailmentSetting = p_gridConnection.f_isAssetManagementActive(I_CurtailManagement.class);
diff --git a/_alp/Agents/Z_UnusedAgent/AOC.Z_UnusedAgent.xml b/_alp/Agents/Z_UnusedAgent/AOC.Z_UnusedAgent.xml
index c0fc2332..a0c72511 100644
--- a/_alp/Agents/Z_UnusedAgent/AOC.Z_UnusedAgent.xml
+++ b/_alp/Agents/Z_UnusedAgent/AOC.Z_UnusedAgent.xml
@@ -19,7 +19,12 @@
true
-4144960
- null
+
+ NONE
+ 0
+ 0
+ 0
+ 1
true
true
diff --git a/_alp/Agents/Zero_Interface/AOC.Zero_Interface.xml b/_alp/Agents/Zero_Interface/AOC.Zero_Interface.xml
index 11d49d44..9223b6c2 100644
--- a/_alp/Agents/Zero_Interface/AOC.Zero_Interface.xml
+++ b/_alp/Agents/Zero_Interface/AOC.Zero_Interface.xml
@@ -52,7 +52,12 @@ import javax.media.jai.widget.ViewportListener;
true
-4144960
- null
+
+ NONE
+ 0
+ 0
+ 0
+ 1
true
true
diff --git a/_alp/Agents/Zero_Interface/EmbeddedObjects.xml b/_alp/Agents/Zero_Interface/EmbeddedObjects.xml
index c9d01845..bc16e37c 100644
--- a/_alp/Agents/Zero_Interface/EmbeddedObjects.xml
+++ b/_alp/Agents/Zero_Interface/EmbeddedObjects.xml
@@ -434,7 +434,7 @@
EMPTY
- 0
+ 1658477069999
ONE_AGENT_PER_DATABASE_RECORD
diff --git a/_alp/Agents/Zero_Loader/AOC.Zero_Loader.xml b/_alp/Agents/Zero_Loader/AOC.Zero_Loader.xml
index 01d7bc8d..55ed6470 100644
--- a/_alp/Agents/Zero_Loader/AOC.Zero_Loader.xml
+++ b/_alp/Agents/Zero_Loader/AOC.Zero_Loader.xml
@@ -72,7 +72,12 @@ import com.zenmo.zummon.companysurvey.PVOrientation;]]>
true
-4144960
- null
+
+ NONE
+ 0
+ 0
+ 0
+ 1
true
true
diff --git a/_alp/Agents/tabArea/AOC.tabArea.xml b/_alp/Agents/tabArea/AOC.tabArea.xml
index 946b64a3..f2b9fa04 100644
--- a/_alp/Agents/tabArea/AOC.tabArea.xml
+++ b/_alp/Agents/tabArea/AOC.tabArea.xml
@@ -19,7 +19,12 @@
true
-4144960
- null
+
+ NONE
+ 0
+ 0
+ 0
+ 1
true
true
diff --git a/_alp/Agents/tabEHub/AOC.tabEHub.xml b/_alp/Agents/tabEHub/AOC.tabEHub.xml
index c5f37740..4496e5ee 100644
--- a/_alp/Agents/tabEHub/AOC.tabEHub.xml
+++ b/_alp/Agents/tabEHub/AOC.tabEHub.xml
@@ -24,7 +24,12 @@
true
-4144960
- null
+
+ NONE
+ 0
+ 0
+ 0
+ 1
true
true
diff --git a/_alp/Agents/tabElectricity/AOC.tabElectricity.xml b/_alp/Agents/tabElectricity/AOC.tabElectricity.xml
index e94dbe3b..50dfb162 100644
--- a/_alp/Agents/tabElectricity/AOC.tabElectricity.xml
+++ b/_alp/Agents/tabElectricity/AOC.tabElectricity.xml
@@ -25,7 +25,12 @@
true
-4144960
- null
+
+ NONE
+ 0
+ 0
+ 0
+ 1
true
true
diff --git a/_alp/Agents/tabHeating/AOC.tabHeating.xml b/_alp/Agents/tabHeating/AOC.tabHeating.xml
index 2b22f8b6..aa738fb2 100644
--- a/_alp/Agents/tabHeating/AOC.tabHeating.xml
+++ b/_alp/Agents/tabHeating/AOC.tabHeating.xml
@@ -25,7 +25,12 @@
true
-4144960
- null
+
+ NONE
+ 0
+ 0
+ 0
+ 1
true
true
diff --git a/_alp/Agents/tabMobility/AOC.tabMobility.xml b/_alp/Agents/tabMobility/AOC.tabMobility.xml
index 03a8e604..bb82cad3 100644
--- a/_alp/Agents/tabMobility/AOC.tabMobility.xml
+++ b/_alp/Agents/tabMobility/AOC.tabMobility.xml
@@ -26,7 +26,12 @@ import java.util.stream.Collectors;]]>
true
-4144960
- null
+
+ NONE
+ 0
+ 0
+ 0
+ 1
true
true