From c39f767b12e8bbb0de306d706f67237fa57ac4e0 Mon Sep 17 00:00:00 2001
From: Ate Hempenius <ate@zenmo.com>
Date: Wed, 30 Apr 2025 17:08:01 +0200
Subject: [PATCH] Bugfix voor de energycarriers boekhouding in het model

Tijdens de model simulatie het is nu mogelijk om compleet nieuwe energy carriers toe te voegen. Door middel van bijvoorbeeld het toevoegen van een waterstof auto voordat er waterstof consumptie was. Verder andere boekhouding bugs opgelost.
---
 .../ConnectionOwner/AOC.ConnectionOwner.xml   |  3 -
 _alp/Agents/EnergyCoop/Code/Functions.java    | 27 +++++--
 _alp/Agents/EnergyModel/Code/Functions.java   | 47 +++++++-----
 _alp/Agents/EnergyModel/Code/Functions.xml    | 22 +++++-
 .../Agents/GCNeighborhood/Code/Functions.java | 42 +++++++----
 .../Agents/GridConnection/Code/Functions.java | 73 ++++++++++++-------
 _alp/Classes/Class.J_RapidRunData.java        | 62 ++++++++--------
 7 files changed, 177 insertions(+), 99 deletions(-)

diff --git a/_alp/Agents/ConnectionOwner/AOC.ConnectionOwner.xml b/_alp/Agents/ConnectionOwner/AOC.ConnectionOwner.xml
index 2c32c145..fe077c75 100644
--- a/_alp/Agents/ConnectionOwner/AOC.ConnectionOwner.xml
+++ b/_alp/Agents/ConnectionOwner/AOC.ConnectionOwner.xml
@@ -20,9 +20,6 @@
 		<Parameter>
 			<Name><![CDATA[p_actorGroup]]></Name>
 		</Parameter>
-		<Parameter>
-			<Name><![CDATA[b_dataSharingAgreed]]></Name>
-		</Parameter>
 	</Parameters>
 	<StartupCode><![CDATA[energyModel.c_actors.add(this);
 energyModel.c_connectionOwners.add(this);]]></StartupCode>
diff --git a/_alp/Agents/EnergyCoop/Code/Functions.java b/_alp/Agents/EnergyCoop/Code/Functions.java
index ccb966f7..985872a7 100644
--- a/_alp/Agents/EnergyCoop/Code/Functions.java
+++ b/_alp/Agents/EnergyCoop/Code/Functions.java
@@ -1514,9 +1514,14 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
 double currentExport_kW = 0.0;
 for (OL_EnergyCarriers EC : v_activeEnergyCarriers) {
 	double currentBalance_kW = fm_currentBalanceFlows_kW.get(EC);
-	currentImport_kW += max( 0, currentBalance_kW );
-	currentExport_kW += max( 0, -currentBalance_kW );
 	v_rapidRunData.am_totalBalanceAccumulators_kW.get(EC).addStep(  currentBalance_kW );
+	
+	if(v_activeConsumptionEnergyCarriers.contains(EC)){
+		currentImport_kW += max( 0, currentBalance_kW );
+	}
+	if(v_activeProductionEnergyCarriers.contains(EC)){
+		currentExport_kW += max( 0, -currentBalance_kW );
+	}
 }
 
 // Daytime totals. Use overal-total minus daytime total to get nighttime totals.
@@ -1524,8 +1529,13 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
 	
 	for (OL_EnergyCarriers EC : v_activeEnergyCarriers) {
 		double currentBalance_kW = fm_currentBalanceFlows_kW.get(EC);
-		v_rapidRunData.am_daytimeImports_kW.get(EC).addStep(max( 0, currentBalance_kW ));
-		v_rapidRunData.am_daytimeExports_kW.get(EC).addStep(max( 0, -currentBalance_kW ));
+
+		if(v_activeConsumptionEnergyCarriers.contains(EC)){
+			v_rapidRunData.am_daytimeImports_kW.get(EC).addStep(max( 0, currentBalance_kW ));
+		}
+		if(v_activeProductionEnergyCarriers.contains(EC)){
+			v_rapidRunData.am_daytimeExports_kW.get(EC).addStep(max( 0, -currentBalance_kW ));
+		}
 	}
 	
 	v_rapidRunData.acc_daytimeElectricityProduction_kW.addStep(fm_currentProductionFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) );
@@ -1539,8 +1549,13 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
 if (!energyModel.b_isWeekday) { // 
 	for (OL_EnergyCarriers EC : v_activeEnergyCarriers) {
 		double currentBalance_kW = fm_currentBalanceFlows_kW.get(EC);
-		v_rapidRunData.am_weekendImports_kW.get(EC).addStep(max( 0, currentBalance_kW ));
-		v_rapidRunData.am_weekendExports_kW.get(EC).addStep(max( 0, -currentBalance_kW ));
+
+		if(v_activeConsumptionEnergyCarriers.contains(EC)){
+			v_rapidRunData.am_weekendImports_kW.get(EC).addStep(max( 0, currentBalance_kW ));
+		}
+		if(v_activeProductionEnergyCarriers.contains(EC)){
+			v_rapidRunData.am_weekendExports_kW.get(EC).addStep(max( 0, -currentBalance_kW ));
+		}
 	}
 	
 	v_rapidRunData.acc_weekendElectricityProduction_kW.addStep(fm_currentProductionFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) );
diff --git a/_alp/Agents/EnergyModel/Code/Functions.java b/_alp/Agents/EnergyModel/Code/Functions.java
index bc8b95c5..405825d6 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.java
+++ b/_alp/Agents/EnergyModel/Code/Functions.java
@@ -1531,7 +1531,6 @@ ArrayList<GridConnection> f_getGridConnections()
 
 f_initializeLiveDataSets();
 
-//v_rapidRunData.initializeAccumulators(p_runEndTime_h - p_runStartTime_h, p_timeStep_h, v_activeEnergyCarriers, v_activeConsumptionEnergyCarriers, v_activeProductionEnergyCarriers); //f_initializeAccumulators();
 //f_initializeAccumulators();
 
 // Use parallelisation?
@@ -1794,28 +1793,19 @@ EnergyCoop f_removeEnergyCoop(EnergyCoop energyCoop)
 
 /*ALCODEEND*/}
 
-EnergyCoop f_addEnergyCarrier(OL_EnergyCarriers EC)
+EnergyCoop f_addConsumptionEnergyCarrier(OL_EnergyCarriers EC)
 {/*ALCODESTART::1740056275008*/
 v_activeEnergyCarriers.add(EC);
+v_activeConsumptionEnergyCarriers.add(EC);
 
 DataSet dsDemand = new DataSet( (int)(168 / p_timeStep_h) );
-DataSet dsSupply = new DataSet( (int)(168 / p_timeStep_h) );
+
 double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
 double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
 for (double t = startTime; t <= endTime; t += p_timeStep_h) {
 	dsDemand.add( t, 0);
-	dsSupply.add( t, 0);
 }
 v_liveData.dsm_liveDemand_kW.put( EC, dsDemand);
-v_liveData.dsm_liveSupply_kW.put( EC, dsSupply);
-/*
-dsm_dailyAverageDemandDataSets_kW.put( EC, new DataSet(365));
-dsm_dailyAverageSupplyDataSets_kW.put( EC, new DataSet(365));
-dsm_summerWeekDemandDataSets_kW.put( EC, new DataSet( (int)(168 / p_timeStep_h)));
-dsm_summerWeekSupplyDataSets_kW.put( EC, new DataSet( (int)(168 / p_timeStep_h)));
-dsm_winterWeekDemandDataSets_kW.put( EC, new DataSet( (int)(168 / p_timeStep_h)));
-dsm_winterWeekSupplyDataSets_kW.put( EC, new DataSet( (int)(168 / p_timeStep_h)));
-*/
 /*ALCODEEND*/}
 
 double f_rapidRunDataLogging()
@@ -1853,8 +1843,13 @@ EnergyCoop f_addEnergyCarrier(OL_EnergyCarriers EC)
 	
 	for (OL_EnergyCarriers EC : v_activeEnergyCarriers) {
 		double currentBalance_kW = fm_currentBalanceFlows_kW.get(EC);
-		v_rapidRunData.am_daytimeImports_kW.get(EC).addStep(max( 0, currentBalance_kW ));
-		v_rapidRunData.am_daytimeExports_kW.get(EC).addStep(max( 0, -currentBalance_kW ));
+		
+		if(v_activeConsumptionEnergyCarriers.contains(EC)){
+			v_rapidRunData.am_daytimeImports_kW.get(EC).addStep(max( 0, currentBalance_kW ));
+		}
+		if(v_activeProductionEnergyCarriers.contains(EC)){
+			v_rapidRunData.am_daytimeExports_kW.get(EC).addStep(max( 0, -currentBalance_kW ));
+		}
 	}
 	
 	v_rapidRunData.acc_daytimeElectricityProduction_kW.addStep(fm_currentProductionFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) );
@@ -1869,8 +1864,12 @@ EnergyCoop f_addEnergyCarrier(OL_EnergyCarriers EC)
 if (!b_isWeekday) { // 
 	for (OL_EnergyCarriers EC : v_activeEnergyCarriers) {
 		double currentBalance_kW = fm_currentBalanceFlows_kW.get(EC);
-		v_rapidRunData.am_weekendImports_kW.get(EC).addStep(max( 0, currentBalance_kW ));
-		v_rapidRunData.am_weekendExports_kW.get(EC).addStep(max( 0, -currentBalance_kW ));
+		if(v_activeConsumptionEnergyCarriers.contains(EC)){
+			v_rapidRunData.am_weekendImports_kW.get(EC).addStep(max( 0, currentBalance_kW ));
+		}
+		if(v_activeProductionEnergyCarriers.contains(EC)){
+			v_rapidRunData.am_weekendExports_kW.get(EC).addStep(max( 0, -currentBalance_kW ));
+		}
 	}
 	
 	v_rapidRunData.acc_weekendElectricityProduction_kW.addStep(fm_currentProductionFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) );
@@ -2026,3 +2025,17 @@ EnergyCoop f_addEnergyCarrier(OL_EnergyCarriers EC)
 
 /*ALCODEEND*/}
 
+EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
+{/*ALCODESTART::1746021439807*/
+v_activeEnergyCarriers.add(EC);
+v_activeProductionEnergyCarriers.add(EC);
+
+DataSet dsSupply = new DataSet( (int)(168 / p_timeStep_h) );
+double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
+double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
+for (double t = startTime; t <= endTime; t += p_timeStep_h) {
+	dsSupply.add( t, 0);
+}
+v_liveData.dsm_liveSupply_kW.put( EC, dsSupply);
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/EnergyModel/Code/Functions.xml b/_alp/Agents/EnergyModel/Code/Functions.xml
index 555e35b8..22807629 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.xml
+++ b/_alp/Agents/EnergyModel/Code/Functions.xml
@@ -634,7 +634,7 @@
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>EnergyCoop</ReturnType>
 		<Id>1740056275008</Id>
-		<Name><![CDATA[f_addEnergyCarrier]]></Name>
+		<Name><![CDATA[f_addConsumptionEnergyCarrier]]></Name>
 		<X>1680</X>
 		<Y>580</Y>
 		<Label>
@@ -682,4 +682,24 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>EnergyCoop</ReturnType>
+		<Id>1746021439807</Id>
+		<Name><![CDATA[f_addProductionEnergyCarrier]]></Name>
+		<X>1680</X>
+		<Y>600</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[EC]]></Name>
+			<Type><![CDATA[OL_EnergyCarriers]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/GCNeighborhood/Code/Functions.java b/_alp/Agents/GCNeighborhood/Code/Functions.java
index cdec01b8..0f825edf 100644
--- a/_alp/Agents/GCNeighborhood/Code/Functions.java
+++ b/_alp/Agents/GCNeighborhood/Code/Functions.java
@@ -288,34 +288,46 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
 
 double f_connectToJ_EA_default_overwrite(J_EA j_ea)
 {/*ALCODESTART::1730370456790*/
-for (OL_EnergyCarriers EC : j_ea.getActiveEnergyCarriers()) {
-	if (!v_activeEnergyCarriers.contains(EC)) {
+for (OL_EnergyCarriers EC : j_ea.getActiveConsumptionEnergyCarriers()) {
+	if (!v_activeConsumptionEnergyCarriers.contains(EC)) {
 		v_activeEnergyCarriers.add(EC);
-		
+		v_activeConsumptionEnergyCarriers.add(EC);
+			
 		if (energyModel.b_isInitialized) {
-			energyModel.f_addEnergyCarrier(EC);
+			//Add EC to energyModel
+			energyModel.f_addConsumptionEnergyCarrier(EC);
+			
+			//Initialize dataset
 			DataSet dsDemand = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
-			DataSet dsSupply = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
 			double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
 			double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
 			for (double t = startTime; t <= endTime; t += energyModel.p_timeStep_h) {
 				dsDemand.add( t, 0);
-				dsSupply.add( t, 0);
 			}
 			v_liveData.dsm_liveDemand_kW.put( EC, dsDemand);
-			v_liveData.dsm_liveSupply_kW.put( EC, dsSupply);
 		}
 	}
 }
 
-//Production EC
-for(OL_EnergyCarriers EC_production : j_ea.getActiveProductionEnergyCarriers()){
-	v_activeProductionEnergyCarriers.add(EC_production);
-}
-
-//Consumption EC
-for(OL_EnergyCarriers EC_consumption : j_ea.getActiveConsumptionEnergyCarriers()){
-	v_activeConsumptionEnergyCarriers.add(EC_consumption);
+for (OL_EnergyCarriers EC : j_ea.getActiveProductionEnergyCarriers()) {
+	if (!v_activeProductionEnergyCarriers.contains(EC)) {
+		v_activeEnergyCarriers.add(EC);
+		v_activeProductionEnergyCarriers.add(EC);		
+		if (energyModel.b_isInitialized) {
+		
+			//Add EC to energyModel
+			energyModel.f_addProductionEnergyCarrier(EC);
+			
+			//Initialize datasets
+			DataSet dsSupply = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
+			double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
+			double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
+			for (double t = startTime; t <= endTime; t += energyModel.p_timeStep_h) {
+				dsSupply.add( t, 0);
+			}
+			v_liveData.dsm_liveSupply_kW.put( EC, dsSupply);
+		}
+	}
 }
 
 
diff --git a/_alp/Agents/GridConnection/Code/Functions.java b/_alp/Agents/GridConnection/Code/Functions.java
index 4c2a0b6c..87a19f44 100644
--- a/_alp/Agents/GridConnection/Code/Functions.java
+++ b/_alp/Agents/GridConnection/Code/Functions.java
@@ -1079,38 +1079,48 @@ else if (p_primaryHeatingAsset== null && p_secondaryHeatingAsset != null && v_ha
 
 double f_connectToJ_EA_default(J_EA j_ea)
 {/*ALCODESTART::1692799608559*/
-for (OL_EnergyCarriers EC : j_ea.getActiveEnergyCarriers()) {
-	if (!v_activeEnergyCarriers.contains(EC)) {
+for (OL_EnergyCarriers EC : j_ea.getActiveConsumptionEnergyCarriers()) {
+	if (!v_activeConsumptionEnergyCarriers.contains(EC)) {
 		v_activeEnergyCarriers.add(EC);
-		
+		v_activeConsumptionEnergyCarriers.add(EC);
+			
 		if (energyModel.b_isInitialized) {
-			energyModel.f_addEnergyCarrier(EC);
+			//Add EC to energyModel
+			energyModel.f_addConsumptionEnergyCarrier(EC);
+			
+			//Initialize dataset
 			DataSet dsDemand = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
-			DataSet dsSupply = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
 			double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
 			double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
 			for (double t = startTime; t <= endTime; t += energyModel.p_timeStep_h) {
 				dsDemand.add( t, 0);
-				dsSupply.add( t, 0);
 			}
 			v_liveData.dsm_liveDemand_kW.put( EC, dsDemand);
-			v_liveData.dsm_liveSupply_kW.put( EC, dsSupply);
 		}
 	}
 }
 
-//Production EC
-for(OL_EnergyCarriers EC_production : j_ea.getActiveProductionEnergyCarriers()){
-	v_activeProductionEnergyCarriers.add(EC_production);
-}
-
-//Consumption EC
-for(OL_EnergyCarriers EC_consumption : j_ea.getActiveConsumptionEnergyCarriers()){
-	v_activeConsumptionEnergyCarriers.add(EC_consumption);
+for (OL_EnergyCarriers EC : j_ea.getActiveProductionEnergyCarriers()) {
+	if (!v_activeProductionEnergyCarriers.contains(EC)) {
+		v_activeEnergyCarriers.add(EC);
+		v_activeProductionEnergyCarriers.add(EC);		
+		if (energyModel.b_isInitialized) {
+		
+			//Add EC to energyModel
+			energyModel.f_addProductionEnergyCarrier(EC);
+			
+			//Initialize datasets
+			DataSet dsSupply = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
+			double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
+			double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
+			for (double t = startTime; t <= endTime; t += energyModel.p_timeStep_h) {
+				dsSupply.add( t, 0);
+			}
+			v_liveData.dsm_liveSupply_kW.put( EC, dsSupply);
+		}
+	}
 }
 
-
-
 energyModel.c_energyAssets.add(j_ea);
 c_energyAssets.add(j_ea);
 
@@ -1439,7 +1449,6 @@ else if (j_ea.getEAType() == OL_EnergyAssetType.WINDMILL) {
 
 f_initializeDataSets();
 
-//v_rapidRunData.initializeAccumulators(energyModel.p_runEndTime_h - energyModel.p_runStartTime_h, energyModel.p_timeStep_h, v_activeEnergyCarriers, v_activeConsumptionEnergyCarriers, v_activeProductionEnergyCarriers); //f_initializeAccumulators();
 for (OL_EnergyCarriers EC : v_activeEnergyCarriers){
 	energyModel.v_activeEnergyCarriers.add(EC);
 }
@@ -2235,9 +2244,14 @@ else if (flowsMap.get(EC) > 0){
 double currentExport_kW = 0.0;
 for (OL_EnergyCarriers EC : v_activeEnergyCarriers) {
 	double currentBalance_kW = fm_currentBalanceFlows_kW.get(EC);
-	currentImport_kW += max( 0, currentBalance_kW );
-	currentExport_kW += max( 0, -currentBalance_kW );
 	v_rapidRunData.am_totalBalanceAccumulators_kW.get(EC).addStep(  currentBalance_kW );
+	
+	if(v_activeConsumptionEnergyCarriers.contains(EC)){
+		currentImport_kW += max( 0, currentBalance_kW );
+	}
+	if(v_activeProductionEnergyCarriers.contains(EC)){
+		currentExport_kW += max( 0, -currentBalance_kW );
+	}
 }
 
 // Daytime totals. Use overal-total minus daytime total to get nighttime totals.
@@ -2245,8 +2259,12 @@ else if (flowsMap.get(EC) > 0){
 	
 	for (OL_EnergyCarriers EC : v_activeEnergyCarriers) {
 		double currentBalance_kW = fm_currentBalanceFlows_kW.get(EC);
-		v_rapidRunData.am_daytimeImports_kW.get(EC).addStep(max( 0, currentBalance_kW ));
-		v_rapidRunData.am_daytimeExports_kW.get(EC).addStep(max( 0, -currentBalance_kW ));
+		if(v_activeConsumptionEnergyCarriers.contains(EC)){
+			v_rapidRunData.am_daytimeImports_kW.get(EC).addStep(max( 0, currentBalance_kW ));
+		}
+		if(v_activeProductionEnergyCarriers.contains(EC)){
+			v_rapidRunData.am_daytimeExports_kW.get(EC).addStep(max( 0, -currentBalance_kW ));
+		}
 	}
 	
 	v_rapidRunData.acc_daytimeElectricityProduction_kW.addStep(fm_currentProductionFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) );
@@ -2260,10 +2278,13 @@ else if (flowsMap.get(EC) > 0){
 if (!energyModel.b_isWeekday) { // 
 	for (OL_EnergyCarriers EC : v_activeEnergyCarriers) {
 		double currentBalance_kW = fm_currentBalanceFlows_kW.get(EC);
-		v_rapidRunData.am_weekendImports_kW.get(EC).addStep(max( 0, currentBalance_kW ));
-		v_rapidRunData.am_weekendExports_kW.get(EC).addStep(max( 0, -currentBalance_kW ));
-	}
-	
+			if(v_activeConsumptionEnergyCarriers.contains(EC)){
+				v_rapidRunData.am_weekendImports_kW.get(EC).addStep(max( 0, currentBalance_kW ));
+			}
+			if(v_activeProductionEnergyCarriers.contains(EC)){
+				v_rapidRunData.am_weekendExports_kW.get(EC).addStep(max( 0, -currentBalance_kW ));
+			}
+		}
 	v_rapidRunData.acc_weekendElectricityProduction_kW.addStep(fm_currentProductionFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) );
 	v_rapidRunData.acc_weekendElectricityConsumption_kW.addStep(fm_currentConsumptionFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) );
 	v_rapidRunData.acc_weekendEnergyProduction_kW.addStep(v_currentPrimaryEnergyProduction_kW);
diff --git a/_alp/Classes/Class.J_RapidRunData.java b/_alp/Classes/Class.J_RapidRunData.java
index e531a5cb..81c7edd4 100644
--- a/_alp/Classes/Class.J_RapidRunData.java
+++ b/_alp/Classes/Class.J_RapidRunData.java
@@ -129,14 +129,14 @@ public J_RapidRunData(Agent parentAgent) {
     }
     
     public void initializeAccumulators(double simDuration_h, double timeStep_h, EnumSet<OL_EnergyCarriers> v_activeEnergyCarriers, EnumSet<OL_EnergyCarriers> v_activeConsumptionEnergyCarriers, EnumSet<OL_EnergyCarriers> v_activeProductionEnergyCarriers) {
-    	this.activeEnergyCarriers = v_activeEnergyCarriers;
-    	this.activeConsumptionEnergyCarriers = v_activeConsumptionEnergyCarriers;
-    	this.activeProductionEnergyCarriers = v_activeProductionEnergyCarriers;
+    	this.activeEnergyCarriers = EnumSet.copyOf(v_activeEnergyCarriers);
+    	this.activeConsumptionEnergyCarriers = EnumSet.copyOf(v_activeConsumptionEnergyCarriers);
+    	this.activeProductionEnergyCarriers = EnumSet.copyOf(v_activeProductionEnergyCarriers);
 	    //========== TOTAL ACCUMULATORS ==========//
-		am_totalBalanceAccumulators_kW.createEmptyAccumulators( v_activeEnergyCarriers, true, 24.0, simDuration_h );
+		am_totalBalanceAccumulators_kW.createEmptyAccumulators( this.activeEnergyCarriers, true, 24.0, simDuration_h );
 	    am_totalBalanceAccumulators_kW.put( OL_EnergyCarriers.ELECTRICITY, new ZeroAccumulator(true, timeStep_h, simDuration_h) );
-	    am_dailyAverageConsumptionAccumulators_kW.createEmptyAccumulators(v_activeConsumptionEnergyCarriers, true, 24.0, simDuration_h);
-	    am_dailyAverageProductionAccumulators_kW.createEmptyAccumulators(v_activeProductionEnergyCarriers, true, 24.0, simDuration_h);
+	    am_dailyAverageConsumptionAccumulators_kW.createEmptyAccumulators(this.activeConsumptionEnergyCarriers, true, 24.0, simDuration_h);
+	    am_dailyAverageProductionAccumulators_kW.createEmptyAccumulators(this.activeProductionEnergyCarriers, true, 24.0, simDuration_h);
 	
 	    acc_dailyAverageEnergyProduction_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
 	    acc_dailyAverageFinalEnergyConsumption_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
@@ -162,9 +162,9 @@ public void initializeAccumulators(double simDuration_h, double timeStep_h, Enum
 	    ts_dailyAverageBatteriesSOC_fr = new ZeroTimeSeries(24.0, simDuration_h);
 	    
 	    //========== SUMMER WEEK ACCUMULATORS ==========//
-	    am_summerWeekBalanceAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, timeStep_h, 168.0);
-	    am_summerWeekConsumptionAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, timeStep_h, 168.0);
-	    am_summerWeekProductionAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, timeStep_h, 168.0);
+	    am_summerWeekBalanceAccumulators_kW.createEmptyAccumulators(this.activeEnergyCarriers, true, timeStep_h, 168.0);
+	    am_summerWeekConsumptionAccumulators_kW.createEmptyAccumulators(this.activeConsumptionEnergyCarriers, true, timeStep_h, 168.0);
+	    am_summerWeekProductionAccumulators_kW.createEmptyAccumulators(this.activeProductionEnergyCarriers, true, timeStep_h, 168.0);
 	
 	    acc_summerWeekEnergyProduction_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
 	    acc_summerWeekFinalEnergyConsumption_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
@@ -193,9 +193,9 @@ public void initializeAccumulators(double simDuration_h, double timeStep_h, Enum
 	    ts_summerWeekBatteriesSOC_fr = new ZeroTimeSeries(timeStep_h, 168.0);
 	    
 	    //========== WINTER WEEK ACCUMULATORS ==========//
-	    am_winterWeekBalanceAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, timeStep_h, 168.0);
-	    am_winterWeekConsumptionAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, timeStep_h, 168.0);
-	    am_winterWeekProductionAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, timeStep_h, 168.0);
+	    am_winterWeekBalanceAccumulators_kW.createEmptyAccumulators(this.activeEnergyCarriers, true, timeStep_h, 168.0);
+	    am_winterWeekConsumptionAccumulators_kW.createEmptyAccumulators(this.activeConsumptionEnergyCarriers, true, timeStep_h, 168.0);
+	    am_winterWeekProductionAccumulators_kW.createEmptyAccumulators(this.activeProductionEnergyCarriers, true, timeStep_h, 168.0);
 	
 	    acc_winterWeekEnergyProduction_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
 	    acc_winterWeekFinalEnergyConsumption_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
@@ -224,8 +224,8 @@ public void initializeAccumulators(double simDuration_h, double timeStep_h, Enum
 	    ts_winterWeekBatteriesSOC_fr = new ZeroTimeSeries(timeStep_h, 168.0);
 	    
 	    //========== DAYTIME ACCUMULATORS ==========//
-	    am_daytimeImports_kW.createEmptyAccumulators( v_activeEnergyCarriers, false, timeStep_h, 0.5 * (simDuration_h));
-	    am_daytimeExports_kW.createEmptyAccumulators( v_activeEnergyCarriers, false, timeStep_h, 0.5 * (simDuration_h));
+	    am_daytimeImports_kW.createEmptyAccumulators( this.activeConsumptionEnergyCarriers, false, timeStep_h, 0.5 * (simDuration_h));
+	    am_daytimeExports_kW.createEmptyAccumulators( this.activeProductionEnergyCarriers, false, timeStep_h, 0.5 * (simDuration_h));
 	
 	    acc_daytimeEnergyProduction_kW = new ZeroAccumulator(false, timeStep_h, 0.5 * (simDuration_h));
 	    acc_daytimeFinalEnergyConsumption_kW = new ZeroAccumulator(false, timeStep_h,0.5 * (simDuration_h));
@@ -236,8 +236,8 @@ public void initializeAccumulators(double simDuration_h, double timeStep_h, Enum
 	    acc_daytimePrimaryEnergyProductionHeatpumps_kW = new ZeroAccumulator(false, timeStep_h, 0.5 * (simDuration_h));
 	    		
 	    //========== WEEKEND ACCUMULATORS ==========//
-	    am_weekendImports_kW.createEmptyAccumulators( v_activeEnergyCarriers, false, timeStep_h, 2 / 7  * (simDuration_h) + 48);
-	    am_weekendExports_kW.createEmptyAccumulators( v_activeEnergyCarriers, false, timeStep_h, 2 / 7 * (simDuration_h) + 48);
+	    am_weekendImports_kW.createEmptyAccumulators( this.activeConsumptionEnergyCarriers, false, timeStep_h, 2 / 7  * (simDuration_h) + 48);
+	    am_weekendExports_kW.createEmptyAccumulators( this.activeProductionEnergyCarriers, false, timeStep_h, 2 / 7 * (simDuration_h) + 48);
 	
 	    acc_weekendEnergyProduction_kW = new ZeroAccumulator(false, timeStep_h, 2 / 7  * (simDuration_h) + 48);
 	    acc_weekendFinalEnergyConsumption_kW = new ZeroAccumulator(false, timeStep_h,2 / 7  * (simDuration_h) + 48);
@@ -249,14 +249,14 @@ public void initializeAccumulators(double simDuration_h, double timeStep_h, Enum
     }
 
     public void resetAccumulators(double simDuration_h, double timeStep_h, EnumSet<OL_EnergyCarriers> v_activeEnergyCarriers, EnumSet<OL_EnergyCarriers> v_activeConsumptionEnergyCarriers, EnumSet<OL_EnergyCarriers> v_activeProductionEnergyCarriers) {
-    	this.activeEnergyCarriers = v_activeEnergyCarriers;
-    	this.activeConsumptionEnergyCarriers = v_activeConsumptionEnergyCarriers;
-    	this.activeProductionEnergyCarriers = v_activeProductionEnergyCarriers;
+    	this.activeEnergyCarriers = EnumSet.copyOf(v_activeEnergyCarriers);
+    	this.activeConsumptionEnergyCarriers = EnumSet.copyOf(v_activeConsumptionEnergyCarriers);
+    	this.activeProductionEnergyCarriers = EnumSet.copyOf(v_activeProductionEnergyCarriers);
     	//Total simulation
-		am_totalBalanceAccumulators_kW.createEmptyAccumulators( v_activeEnergyCarriers, true, 24.0, simDuration_h );
+		am_totalBalanceAccumulators_kW.createEmptyAccumulators( this.activeEnergyCarriers, true, 24.0, simDuration_h );
     	am_totalBalanceAccumulators_kW.put( OL_EnergyCarriers.ELECTRICITY, new ZeroAccumulator(true, timeStep_h, simDuration_h) );
-    	am_dailyAverageConsumptionAccumulators_kW.createEmptyAccumulators(v_activeConsumptionEnergyCarriers, true, 24.0, simDuration_h);
-    	am_dailyAverageProductionAccumulators_kW.createEmptyAccumulators(v_activeProductionEnergyCarriers, true, 24.0, simDuration_h);
+    	am_dailyAverageConsumptionAccumulators_kW.createEmptyAccumulators(this.activeConsumptionEnergyCarriers, true, 24.0, simDuration_h);
+    	am_dailyAverageProductionAccumulators_kW.createEmptyAccumulators(this.activeProductionEnergyCarriers, true, 24.0, simDuration_h);
 
     	acc_dailyAverageEnergyProduction_kW.reset();
     	acc_dailyAverageFinalEnergyConsumption_kW.reset();
@@ -282,9 +282,9 @@ public void resetAccumulators(double simDuration_h, double timeStep_h, EnumSet<O
         ts_dailyAverageBatteriesSOC_fr.reset();
         
     	//Summerweek
-    	am_summerWeekBalanceAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, timeStep_h, 24*7);
-    	am_summerWeekConsumptionAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, timeStep_h, 24*7);
-    	am_summerWeekProductionAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, timeStep_h, 24*7);
+    	am_summerWeekBalanceAccumulators_kW.createEmptyAccumulators(this.activeEnergyCarriers, true, timeStep_h, 24*7);
+    	am_summerWeekConsumptionAccumulators_kW.createEmptyAccumulators(this.activeConsumptionEnergyCarriers, true, timeStep_h, 24*7);
+    	am_summerWeekProductionAccumulators_kW.createEmptyAccumulators(this.activeProductionEnergyCarriers, true, timeStep_h, 24*7);
 
     	acc_summerWeekEnergyProduction_kW.reset();
     	acc_summerWeekFinalEnergyConsumption_kW.reset();
@@ -314,8 +314,8 @@ public void resetAccumulators(double simDuration_h, double timeStep_h, EnumSet<O
 	    
     	//Winterweek
     	am_winterWeekBalanceAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, timeStep_h, 24*7);
-    	am_winterWeekConsumptionAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, timeStep_h, 24*7);
-    	am_winterWeekProductionAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, timeStep_h, 24*7);
+    	am_winterWeekConsumptionAccumulators_kW.createEmptyAccumulators(this.activeConsumptionEnergyCarriers, true, timeStep_h, 24*7);
+    	am_winterWeekProductionAccumulators_kW.createEmptyAccumulators(this.activeProductionEnergyCarriers, true, timeStep_h, 24*7);
 
     	acc_winterWeekEnergyProduction_kW.reset();
     	acc_winterWeekFinalEnergyConsumption_kW.reset();
@@ -344,8 +344,8 @@ public void resetAccumulators(double simDuration_h, double timeStep_h, EnumSet<O
 	    ts_winterWeekBatteriesSOC_fr.reset();
 	    
     	// Daytime 
-    	am_daytimeImports_kW.createEmptyAccumulators( v_activeEnergyCarriers, false, timeStep_h, 0.5 * (simDuration_h));
-    	am_daytimeExports_kW.createEmptyAccumulators( v_activeEnergyCarriers, false, timeStep_h, 0.5 * (simDuration_h));
+    	am_daytimeImports_kW.createEmptyAccumulators( this.activeConsumptionEnergyCarriers, false, timeStep_h, 0.5 * (simDuration_h));
+    	am_daytimeExports_kW.createEmptyAccumulators( this.activeProductionEnergyCarriers, false, timeStep_h, 0.5 * (simDuration_h));
     	
     	acc_daytimeElectricityProduction_kW.reset();
     	acc_daytimeElectricityConsumption_kW.reset();
@@ -355,8 +355,8 @@ public void resetAccumulators(double simDuration_h, double timeStep_h, EnumSet<O
     	acc_daytimePrimaryEnergyProductionHeatpumps_kW.reset();
     	
     	// Weekend
-    	am_weekendImports_kW.createEmptyAccumulators( v_activeEnergyCarriers, false, timeStep_h, 2 / 7  * (simDuration_h) + 48);
-    	am_weekendExports_kW.createEmptyAccumulators( v_activeEnergyCarriers, false, timeStep_h, 2 / 7 * (simDuration_h) + 48);
+    	am_weekendImports_kW.createEmptyAccumulators( this.activeConsumptionEnergyCarriers, false, timeStep_h, 2 / 7  * (simDuration_h) + 48);
+    	am_weekendExports_kW.createEmptyAccumulators( this.activeProductionEnergyCarriers, false, timeStep_h, 2 / 7 * (simDuration_h) + 48);
 
     	acc_weekendElectricityProduction_kW.reset();
     	acc_weekendElectricityConsumption_kW.reset();