Skip to content

Commit 2e3e29e

Browse files
GillisHommenGillisHommen
committed
Merge branch 'main' into serialisation_with_private_fields
2 parents 6d3e96c + ee32e3f commit 2e3e29e

File tree

6 files changed

+385
-67
lines changed

6 files changed

+385
-67
lines changed

‎_alp/Agents/EnergyCoop/Code/Functions.java‎

Lines changed: 191 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,12 +1137,19 @@
11371137
f_collectGridConnectionLiveData();
11381138

11391139
boolean allGCHaveRapidRun = true;
1140+
boolean allGCHaveOriginalRapidRun = true;
11401141
for(GridConnection GC : c_memberGridConnections){
11411142
if(GC.v_rapidRunData == null && GC.v_isActive){
11421143
allGCHaveRapidRun = false;
1144+
}
1145+
if(GC.v_originalRapidRunData == null && GC.v_isActive){
1146+
allGCHaveOriginalRapidRun = false;
1147+
}
1148+
if(!allGCHaveRapidRun && !allGCHaveOriginalRapidRun){
11431149
break;
11441150
}
11451151
}
1152+
11461153
if(allGCHaveRapidRun){
11471154

11481155
//Create rapid run data class used to store combined values of the members
@@ -1154,11 +1161,23 @@
11541161
//Calculate KPIs
11551162
f_calculateKPIs();
11561163
}
1164+
1165+
if(allGCHaveOriginalRapidRun){
1166+
1167+
//Create rapid run data class used to store combined values of the members
1168+
f_createAndInitializeOriginalRapidRunDataClass();
1169+
1170+
//Collect current totals
1171+
f_collectGridConnectionOriginalRapidRunData();
1172+
1173+
//Calculate orignial KPIs
1174+
f_getOriginalCumulativeIndividualGCValues();
1175+
}
11571176
/*ALCODEEND*/}
11581177

1159-
double f_getGroupContractDeliveryCapacity_kW()
1178+
double f_getGroupContractDeliveryCapacity_kW(J_RapidRunData rapidRunData)
11601179
{/*ALCODESTART::1740059187265*/
1161-
DataSet data_netbelastingDuurkromme_kW = v_rapidRunData.getLoadDurationCurves(energyModel).ds_loadDurationCurveTotal_kW;
1180+
DataSet data_netbelastingDuurkromme_kW = rapidRunData.getLoadDurationCurves(energyModel).ds_loadDurationCurveTotal_kW;
11621181
int arraySize = data_netbelastingDuurkromme_kW.size();
11631182
if (arraySize < 8760/energyModel.p_timeStep_h){
11641183
traceln("GroupContractDeliveryCapacity is zero because simulation is less than a full year long!");
@@ -1168,9 +1187,9 @@
11681187
}
11691188
/*ALCODEEND*/}
11701189

1171-
double f_getGroupContractFeedinCapacity_kW()
1190+
double f_getGroupContractFeedinCapacity_kW(J_RapidRunData rapidRunData)
11721191
{/*ALCODESTART::1740059261369*/
1173-
DataSet data_netbelastingDuurkromme_kW = v_rapidRunData.getLoadDurationCurves(energyModel).ds_loadDurationCurveTotal_kW;
1192+
DataSet data_netbelastingDuurkromme_kW = rapidRunData.getLoadDurationCurves(energyModel).ds_loadDurationCurveTotal_kW;
11741193
int arraySize = data_netbelastingDuurkromme_kW.size();
11751194
if (arraySize < 8760/energyModel.p_timeStep_h){
11761195
traceln("GroupContractDeliveryCapacity is zero because simulation is less than a full year long!");
@@ -1195,6 +1214,10 @@
11951214
v_cumulativeIndividualPeakDelivery_kW = 0;
11961215
v_cumulativeIndividualPeakFeedin_kW = 0;
11971216

1217+
v_cumulativeIndividualPeakDeliveryOriginal_kW = 0;
1218+
v_cumulativeIndividualPeakFeedinOriginal_kW = 0;
1219+
1220+
11981221
//Loop over membered grid connections
11991222
for(GridConnection GC : c_memberGridConnections){
12001223
if(GC.v_isActive){
@@ -1205,6 +1228,11 @@
12051228
//Add all peaks for member grid connections
12061229
v_cumulativeIndividualPeakDelivery_kW += GC.v_rapidRunData.getPeakDelivery_kW();
12071230
v_cumulativeIndividualPeakFeedin_kW += GC.v_rapidRunData.getPeakFeedin_kW();
1231+
1232+
if(v_originalRapidRunData != null && GC.v_originalRapidRunData != null){
1233+
v_cumulativeIndividualPeakDeliveryOriginal_kW += GC.v_originalRapidRunData.getPeakDelivery_kW();
1234+
v_cumulativeIndividualPeakFeedinOriginal_kW += GC.v_originalRapidRunData.getPeakFeedin_kW();
1235+
}
12081236
}
12091237
}
12101238

@@ -1215,9 +1243,14 @@
12151243
if (a instanceof EnergyCoop) {
12161244
EnergyCoop EC = (EnergyCoop)a;
12171245
EC.f_getCumulativeIndividualGCValues();
1218-
v_cumulativeIndividualSelfconsumptionElectricity_MWh = EC.v_cumulativeIndividualSelfconsumptionElectricity_MWh;
1219-
v_cumulativeIndividualPeakDelivery_kW = EC.v_cumulativeIndividualPeakDelivery_kW;
1220-
v_cumulativeIndividualPeakFeedin_kW = EC.v_cumulativeIndividualPeakFeedin_kW;
1246+
v_cumulativeIndividualSelfconsumptionElectricity_MWh += EC.v_cumulativeIndividualSelfconsumptionElectricity_MWh;
1247+
v_cumulativeIndividualPeakDelivery_kW += EC.v_cumulativeIndividualPeakDelivery_kW;
1248+
v_cumulativeIndividualPeakFeedin_kW += EC.v_cumulativeIndividualPeakFeedin_kW;
1249+
1250+
if(v_originalRapidRunData != null && EC.v_originalRapidRunData != null){
1251+
v_cumulativeIndividualPeakDeliveryOriginal_kW += EC.v_cumulativeIndividualPeakDeliveryOriginal_kW;
1252+
v_cumulativeIndividualPeakFeedinOriginal_kW += EC.v_cumulativeIndividualPeakFeedinOriginal_kW;
1253+
}
12211254
}
12221255
}
12231256

@@ -1616,3 +1649,154 @@ ArrayList<GridConnection> f_getMemberGridConnectionsCollectionPointer()
16161649
f_aggregatorBatteryManagement_EnergyCoop();
16171650
/*ALCODEEND*/}
16181651

1652+
double f_collectGridConnectionOriginalRapidRunData()
1653+
{/*ALCODESTART::1759144507495*/
1654+
// Make collective profiles, electricity per timestep, other energy carriers per day!
1655+
1656+
for (GridConnection gc : c_memberGridConnections) {
1657+
if(gc.v_isActive){
1658+
// Totals
1659+
v_originalRapidRunData.am_totalBalanceAccumulators_kW.add(gc.v_originalRapidRunData.am_totalBalanceAccumulators_kW);
1660+
v_originalRapidRunData.am_dailyAverageConsumptionAccumulators_kW.add(gc.v_originalRapidRunData.am_dailyAverageConsumptionAccumulators_kW);
1661+
v_originalRapidRunData.am_dailyAverageProductionAccumulators_kW.add(gc.v_originalRapidRunData.am_dailyAverageProductionAccumulators_kW);
1662+
v_originalRapidRunData.acc_dailyAverageEnergyProduction_kW.add(gc.v_originalRapidRunData.acc_dailyAverageEnergyProduction_kW);
1663+
v_originalRapidRunData.acc_dailyAverageFinalEnergyConsumption_kW.add(gc.v_originalRapidRunData.acc_dailyAverageFinalEnergyConsumption_kW);
1664+
v_originalRapidRunData.acc_totalEnergyCurtailed_kW.add(gc.v_originalRapidRunData.acc_totalEnergyCurtailed_kW);
1665+
v_originalRapidRunData.acc_totalPrimaryEnergyProductionHeatpumps_kW.add(gc.v_originalRapidRunData.acc_totalPrimaryEnergyProductionHeatpumps_kW);
1666+
v_originalRapidRunData.am_assetFlowsAccumulators_kW.add(gc.v_originalRapidRunData.am_assetFlowsAccumulators_kW);
1667+
1668+
// Daytime
1669+
v_originalRapidRunData.acc_daytimeElectricityConsumption_kW.add(gc.v_originalRapidRunData.acc_daytimeElectricityConsumption_kW);
1670+
v_originalRapidRunData.acc_daytimeElectricityProduction_kW.add(gc.v_originalRapidRunData.acc_daytimeElectricityProduction_kW);
1671+
v_originalRapidRunData.acc_daytimeEnergyProduction_kW.add(gc.v_originalRapidRunData.acc_daytimeEnergyProduction_kW);
1672+
v_originalRapidRunData.acc_daytimeFinalEnergyConsumption_kW.add(gc.v_originalRapidRunData.acc_daytimeFinalEnergyConsumption_kW);
1673+
v_originalRapidRunData.am_daytimeImports_kW.add(gc.v_originalRapidRunData.am_daytimeImports_kW);
1674+
v_originalRapidRunData.am_daytimeExports_kW.add(gc.v_originalRapidRunData.am_daytimeExports_kW);
1675+
1676+
// Weekend
1677+
v_originalRapidRunData.acc_weekendElectricityConsumption_kW.add(gc.v_originalRapidRunData.acc_weekendElectricityConsumption_kW);
1678+
v_originalRapidRunData.acc_weekendElectricityProduction_kW.add(gc.v_originalRapidRunData.acc_weekendElectricityProduction_kW);
1679+
v_originalRapidRunData.acc_weekendEnergyProduction_kW.add(gc.v_originalRapidRunData.acc_weekendEnergyProduction_kW);
1680+
v_originalRapidRunData.acc_weekendFinalEnergyConsumption_kW.add(gc.v_originalRapidRunData.acc_weekendFinalEnergyConsumption_kW);
1681+
v_originalRapidRunData.am_weekendImports_kW.add(gc.v_originalRapidRunData.am_weekendImports_kW);
1682+
v_originalRapidRunData.am_weekendExports_kW.add(gc.v_originalRapidRunData.am_weekendExports_kW);
1683+
1684+
// Summerweek
1685+
v_originalRapidRunData.am_summerWeekBalanceAccumulators_kW.add(gc.v_originalRapidRunData.am_summerWeekBalanceAccumulators_kW);
1686+
v_originalRapidRunData.am_summerWeekConsumptionAccumulators_kW.add(gc.v_originalRapidRunData.am_summerWeekConsumptionAccumulators_kW);
1687+
v_originalRapidRunData.am_summerWeekProductionAccumulators_kW.add(gc.v_originalRapidRunData.am_summerWeekProductionAccumulators_kW);
1688+
v_originalRapidRunData.acc_summerWeekEnergyProduction_kW.add(gc.v_originalRapidRunData.acc_summerWeekEnergyProduction_kW);
1689+
v_originalRapidRunData.acc_summerWeekFinalEnergyConsumption_kW.add(gc.v_originalRapidRunData.acc_summerWeekFinalEnergyConsumption_kW);
1690+
v_originalRapidRunData.acc_summerWeekEnergyCurtailed_kW.add(gc.v_originalRapidRunData.acc_summerWeekEnergyCurtailed_kW);
1691+
v_originalRapidRunData.acc_summerWeekPrimaryEnergyProductionHeatpumps_kW.add(gc.v_originalRapidRunData.acc_summerWeekPrimaryEnergyProductionHeatpumps_kW);
1692+
v_originalRapidRunData.am_assetFlowsSummerWeek_kW.add(gc.v_originalRapidRunData.am_assetFlowsSummerWeek_kW);
1693+
1694+
// Winterweek
1695+
v_originalRapidRunData.am_winterWeekBalanceAccumulators_kW.add(gc.v_originalRapidRunData.am_winterWeekBalanceAccumulators_kW);
1696+
v_originalRapidRunData.am_winterWeekConsumptionAccumulators_kW.add(gc.v_originalRapidRunData.am_winterWeekConsumptionAccumulators_kW);
1697+
v_originalRapidRunData.am_winterWeekProductionAccumulators_kW.add(gc.v_originalRapidRunData.am_winterWeekProductionAccumulators_kW);
1698+
v_originalRapidRunData.acc_winterWeekEnergyProduction_kW.add(gc.v_originalRapidRunData.acc_winterWeekEnergyProduction_kW);
1699+
v_originalRapidRunData.acc_winterWeekFinalEnergyConsumption_kW.add(gc.v_originalRapidRunData.acc_winterWeekFinalEnergyConsumption_kW);
1700+
v_originalRapidRunData.acc_winterWeekEnergyCurtailed_kW.add(gc.v_originalRapidRunData.acc_winterWeekEnergyCurtailed_kW);
1701+
v_originalRapidRunData.acc_winterWeekPrimaryEnergyProductionHeatpumps_kW.add(gc.v_originalRapidRunData.acc_winterWeekPrimaryEnergyProductionHeatpumps_kW);
1702+
v_originalRapidRunData.am_assetFlowsWinterWeek_kW.add(gc.v_originalRapidRunData.am_assetFlowsWinterWeek_kW);
1703+
}
1704+
}
1705+
1706+
//Calculate cumulative asset capacities
1707+
f_getTotalInstalledCapacityOfAssets_originalRapidRun();
1708+
1709+
/*ALCODEEND*/}
1710+
1711+
double f_getTotalInstalledCapacityOfAssets_originalRapidRun()
1712+
{/*ALCODESTART::1759144507497*/
1713+
//Collect rapid run asset totals
1714+
v_originalRapidRunData.assetsMetaData.totalInstalledWindPower_kW = 0.0;
1715+
v_originalRapidRunData.assetsMetaData.totalInstalledPVPower_kW = 0.0;
1716+
v_originalRapidRunData.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh = 0.0;
1717+
1718+
//Add all battery storage capacities of gc
1719+
for(GridConnection GC : c_memberGridConnections){
1720+
if(GC.v_isActive){
1721+
v_originalRapidRunData.assetsMetaData.totalInstalledWindPower_kW += GC.v_originalRapidRunData.assetsMetaData.totalInstalledWindPower_kW;
1722+
v_originalRapidRunData.assetsMetaData.totalInstalledPVPower_kW += GC.v_originalRapidRunData.assetsMetaData.totalInstalledPVPower_kW;
1723+
v_originalRapidRunData.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh += GC.v_originalRapidRunData.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
1724+
}
1725+
}
1726+
1727+
//Do this also for the 'child' coops
1728+
for(Agent a : c_coopMembers ) { // Take 'behind the meter' production and consumption!
1729+
if (a instanceof EnergyCoop) {
1730+
EnergyCoop EC = (EnergyCoop)a;
1731+
EC.f_getTotalInstalledCapacityOfAssets_rapidRun();
1732+
v_originalRapidRunData.assetsMetaData.totalInstalledWindPower_kW += EC.v_originalRapidRunData.assetsMetaData.totalInstalledWindPower_kW;
1733+
v_originalRapidRunData.assetsMetaData.totalInstalledPVPower_kW += EC.v_originalRapidRunData.assetsMetaData.totalInstalledPVPower_kW;
1734+
v_originalRapidRunData.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh += EC.v_originalRapidRunData.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
1735+
}
1736+
}
1737+
/*ALCODEEND*/}
1738+
1739+
double f_createAndInitializeOriginalRapidRunDataClass()
1740+
{/*ALCODESTART::1759144507499*/
1741+
//Create rapid run data class used to collect rapid run data of other gc
1742+
v_originalRapidRunData = new J_RapidRunData(this);
1743+
v_originalRapidRunData.assetsMetaData = v_liveAssetsMetaData.getClone();
1744+
1745+
EnumSet<OL_EnergyCarriers> activeEnergyCarriers_rapidRun = EnumSet.copyOf(v_liveData.activeEnergyCarriers);
1746+
EnumSet<OL_EnergyCarriers> activeConsumptionEnergyCarriers_rapidRun = EnumSet.copyOf(v_liveData.activeConsumptionEnergyCarriers);
1747+
EnumSet<OL_EnergyCarriers> activeProductionEnergyCarriers_rapidRun = EnumSet.copyOf(v_liveData.activeProductionEnergyCarriers);
1748+
EnumSet<OL_AssetFlowCategories> activeAssetFlows_rapidRun = EnumSet.copyOf(v_liveAssetsMetaData.activeAssetFlows);
1749+
//Need to do this, for if the sliders have changed, otherwise potential errors/missing data ????
1750+
boolean storeTotalAssetFlows = true;
1751+
for(GridConnection GC : c_memberGridConnections){
1752+
if(GC.v_isActive){
1753+
activeEnergyCarriers_rapidRun.addAll(GC.v_originalRapidRunData.activeEnergyCarriers);
1754+
activeConsumptionEnergyCarriers_rapidRun.addAll(GC.v_originalRapidRunData.activeConsumptionEnergyCarriers);
1755+
activeProductionEnergyCarriers_rapidRun.addAll(GC.v_originalRapidRunData.activeProductionEnergyCarriers);
1756+
1757+
v_originalRapidRunData.assetsMetaData.activeAssetFlows.addAll(GC.v_originalRapidRunData.assetsMetaData.activeAssetFlows);
1758+
1759+
if(GC.v_rapidRunData.getStoreTotalAssetFlows() == false){
1760+
storeTotalAssetFlows = false;
1761+
}
1762+
}
1763+
}
1764+
1765+
//Adjust StoreTotalAssetFlows accordingly to the member data
1766+
v_originalRapidRunData.setStoreTotalAssetFlows(storeTotalAssetFlows);
1767+
1768+
//For now assumed to stay the same even after slider change: can't see rapid run graphs anyway after slider change
1769+
v_originalRapidRunData.connectionMetaData = v_liveConnectionMetaData.getClone();
1770+
1771+
//Initialize the rapid run data
1772+
v_originalRapidRunData.initializeAccumulators(energyModel.p_runEndTime_h - energyModel.p_runStartTime_h, energyModel.p_timeStep_h, activeEnergyCarriers_rapidRun, activeConsumptionEnergyCarriers_rapidRun, activeProductionEnergyCarriers_rapidRun, activeAssetFlows_rapidRun);
1773+
1774+
/*ALCODEEND*/}
1775+
1776+
double f_getOriginalCumulativeIndividualGCValues()
1777+
{/*ALCODESTART::1759155380190*/
1778+
v_cumulativeIndividualPeakDeliveryOriginal_kW = 0;
1779+
v_cumulativeIndividualPeakFeedinOriginal_kW = 0;
1780+
1781+
//Loop over membered grid connections
1782+
for(GridConnection GC : c_memberGridConnections){
1783+
if(GC.v_isActive){
1784+
//Add all peaks for member grid connections
1785+
v_cumulativeIndividualPeakDeliveryOriginal_kW += GC.v_originalRapidRunData.getPeakDelivery_kW();
1786+
v_cumulativeIndividualPeakFeedinOriginal_kW += GC.v_originalRapidRunData.getPeakFeedin_kW();
1787+
}
1788+
}
1789+
1790+
for(Agent a : c_coopMembers ) { // Take 'behind the meter' production and consumption!
1791+
if (a instanceof EnergyCoop) {
1792+
EnergyCoop EC = (EnergyCoop)a;
1793+
EC.f_getOriginalCumulativeIndividualGCValues();
1794+
1795+
if(v_originalRapidRunData != null && EC.v_originalRapidRunData != null){
1796+
v_cumulativeIndividualPeakDeliveryOriginal_kW += EC.v_cumulativeIndividualPeakDeliveryOriginal_kW;
1797+
v_cumulativeIndividualPeakFeedinOriginal_kW += EC.v_cumulativeIndividualPeakFeedinOriginal_kW;
1798+
}
1799+
}
1800+
}
1801+
/*ALCODEEND*/}
1802+

‎_alp/Agents/EnergyCoop/Code/Functions.xml‎

Lines changed: 77 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348
<ReturnType>double</ReturnType>
349349
<Id>1739970817879</Id>
350350
<Name><![CDATA[f_collectGridConnectionRapidRunData]]></Name>
351-
<X>990</X>
351+
<X>1010</X>
352352
<Y>230</Y>
353353
<Label>
354354
<X>10</X>
@@ -393,6 +393,10 @@
393393
<PublicFlag>false</PublicFlag>
394394
<PresentationFlag>true</PresentationFlag>
395395
<ShowLabel>true</ShowLabel>
396+
<Parameter>
397+
<Name><![CDATA[rapidRunData]]></Name>
398+
<Type><![CDATA[J_RapidRunData]]></Type>
399+
</Parameter>
396400
<Body xmlns:al="http://anylogic.com"/>
397401
</Function>
398402
<Function AccessType="public" StaticFunction="false">
@@ -409,6 +413,10 @@
409413
<PublicFlag>false</PublicFlag>
410414
<PresentationFlag>true</PresentationFlag>
411415
<ShowLabel>true</ShowLabel>
416+
<Parameter>
417+
<Name><![CDATA[rapidRunData]]></Name>
418+
<Type><![CDATA[J_RapidRunData]]></Type>
419+
</Parameter>
412420
<Body xmlns:al="http://anylogic.com"/>
413421
</Function>
414422
<Function AccessType="default" StaticFunction="false">
@@ -417,7 +425,7 @@
417425
<Id>1740475013848</Id>
418426
<Name><![CDATA[f_getCumulativeIndividualGCValues]]></Name>
419427
<X>1430</X>
420-
<Y>730</Y>
428+
<Y>710</Y>
421429
<Label>
422430
<X>10</X>
423431
<Y>0</Y>
@@ -432,7 +440,7 @@
432440
<ReturnType>double</ReturnType>
433441
<Id>1740480839774</Id>
434442
<Name><![CDATA[f_getTotalInstalledCapacityOfAssets_rapidRun]]></Name>
435-
<X>1010</X>
443+
<X>1030</X>
436444
<Y>250</Y>
437445
<Label>
438446
<X>10</X>
@@ -716,7 +724,7 @@
716724
<Id>1756207893357</Id>
717725
<Name><![CDATA[f_aggregatorBatteryManagement_EnergyCoop]]></Name>
718726
<X>670</X>
719-
<Y>690</Y>
727+
<Y>710</Y>
720728
<Label>
721729
<X>10</X>
722730
<Y>0</Y>
@@ -752,7 +760,71 @@
752760
<Id>1756207893363</Id>
753761
<Name><![CDATA[f_aggregatorManagement_EnergyCoop]]></Name>
754762
<X>650</X>
755-
<Y>670</Y>
763+
<Y>690</Y>
764+
<Label>
765+
<X>10</X>
766+
<Y>0</Y>
767+
</Label>
768+
<PublicFlag>false</PublicFlag>
769+
<PresentationFlag>true</PresentationFlag>
770+
<ShowLabel>true</ShowLabel>
771+
<Body xmlns:al="http://anylogic.com"/>
772+
</Function>
773+
<Function AccessType="default" StaticFunction="false">
774+
<ReturnModificator>VOID</ReturnModificator>
775+
<ReturnType>double</ReturnType>
776+
<Id>1759144507495</Id>
777+
<Name><![CDATA[f_collectGridConnectionOriginalRapidRunData]]></Name>
778+
<X>1010</X>
779+
<Y>300</Y>
780+
<Label>
781+
<X>10</X>
782+
<Y>0</Y>
783+
</Label>
784+
<PublicFlag>false</PublicFlag>
785+
<PresentationFlag>true</PresentationFlag>
786+
<ShowLabel>true</ShowLabel>
787+
<Body xmlns:al="http://anylogic.com"/>
788+
</Function>
789+
<Function AccessType="default" StaticFunction="false">
790+
<ReturnModificator>VOID</ReturnModificator>
791+
<ReturnType>double</ReturnType>
792+
<Id>1759144507497</Id>
793+
<Name><![CDATA[f_getTotalInstalledCapacityOfAssets_originalRapidRun]]></Name>
794+
<X>1030</X>
795+
<Y>320</Y>
796+
<Label>
797+
<X>10</X>
798+
<Y>0</Y>
799+
</Label>
800+
<PublicFlag>false</PublicFlag>
801+
<PresentationFlag>true</PresentationFlag>
802+
<ShowLabel>true</ShowLabel>
803+
<Body xmlns:al="http://anylogic.com"/>
804+
</Function>
805+
<Function AccessType="default" StaticFunction="false">
806+
<ReturnModificator>VOID</ReturnModificator>
807+
<ReturnType>double</ReturnType>
808+
<Id>1759144507499</Id>
809+
<Name><![CDATA[f_createAndInitializeOriginalRapidRunDataClass]]></Name>
810+
<X>990</X>
811+
<Y>280</Y>
812+
<Label>
813+
<X>10</X>
814+
<Y>0</Y>
815+
</Label>
816+
<PublicFlag>false</PublicFlag>
817+
<PresentationFlag>true</PresentationFlag>
818+
<ShowLabel>true</ShowLabel>
819+
<Body xmlns:al="http://anylogic.com"/>
820+
</Function>
821+
<Function AccessType="default" StaticFunction="false">
822+
<ReturnModificator>VOID</ReturnModificator>
823+
<ReturnType>double</ReturnType>
824+
<Id>1759155380190</Id>
825+
<Name><![CDATA[f_getOriginalCumulativeIndividualGCValues]]></Name>
826+
<X>1430</X>
827+
<Y>925</Y>
756828
<Label>
757829
<X>10</X>
758830
<Y>0</Y>

‎_alp/Agents/EnergyCoop/Levels/Level.level.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<Id>1740403817351</Id>
117117
<Name><![CDATA[txt_cumulativeIndividualGCValues]]></Name>
118118
<X>1420</X>
119-
<Y>700</Y>
119+
<Y>680</Y>
120120
<Label>
121121
<X>0</X>
122122
<Y>-10</Y>

0 commit comments

Comments
 (0)