Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
56 changes: 29 additions & 27 deletions _alp/Agents/EnergyDataViewer/Code/Functions.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,32 +53,34 @@

double f_fillEnergyDataViewer(I_EnergyData data)
{/*ALCODESTART::1741792546533*/
v_engineAgent = data.getRapidRunData().parentAgent;
//Number of connected gcs
//v_numberOfGridconnections = 1;
v_engineAgent = data;

//Set active energyCarriers
v_activeConsumptionEnergyCarriers = data.getLiveData().activeConsumptionEnergyCarriers;
v_activeProductionEnergyCarriers = data.getLiveData().activeProductionEnergyCarriers;

//Update active asset booleans
//f_updateLiveActiveAssetBooleans(data);
v_activeAssetFlows = data.getLiveData().assetsMetaData.activeAssetFlows;

//Update variables
f_updateVariables(data);
//Set live and rapidrun EnumSets for EnergyCarriers and AssetFlowCategories
v_liveConsumptionEnergyCarriers = data.getLiveData().activeConsumptionEnergyCarriers;
v_liveProductionEnergyCarriers = data.getLiveData().activeProductionEnergyCarriers;
v_liveAssetFlowCategories = data.getLiveData().assetsMetaData.activeAssetFlows;

//Update variables
f_updateLiveDatasets(data);

//Update variables
f_updateWeeklyDatasets(data);
if (data.getRapidRunData() != null) {
v_rapidRunConsumptionEnergyCarriers = data.getRapidRunData().activeConsumptionEnergyCarriers;
v_rapidRunProductionEnergyCarriers = data.getRapidRunData().activeProductionEnergyCarriers;
v_rapidRunAssetFlowCategories = data.getRapidRunData().assetsMetaData.activeAssetFlows;

//Update variables
f_updateYearlyDatasets(data);
//Update variables
f_updateVariables(data);

//Update variables
f_updateWeeklyDatasets(data);

//Update variables
f_updateYearlyDatasets(data);

//Get duurkromme
f_updateLoadDurationCurve(data);
}

//Get duurkromme
f_updateLoadDurationCurve(data);
/*ALCODEEND*/}

double f_updateVariables(I_EnergyData data)
Expand Down Expand Up @@ -112,10 +114,10 @@
fm_totalImports_MWh.clear();
fm_totalExports_MWh.clear();

for (OL_EnergyCarriers energyCarrier : v_activeConsumptionEnergyCarriers) {
for (OL_EnergyCarriers energyCarrier : data.getRapidRunData().activeConsumptionEnergyCarriers) {
fm_totalImports_MWh.put( energyCarrier, data.getRapidRunData().getTotalImport_MWh(energyCarrier) );
}
for (OL_EnergyCarriers energyCarrier : v_activeProductionEnergyCarriers) {
for (OL_EnergyCarriers energyCarrier : data.getRapidRunData().activeProductionEnergyCarriers) {
fm_totalExports_MWh.put( energyCarrier, data.getRapidRunData().getTotalExport_MWh(energyCarrier) );
}

Expand All @@ -142,11 +144,11 @@
fm_summerWeekExports_MWh.clear();
fm_winterWeekExports_MWh.clear();

for (OL_EnergyCarriers energyCarrier : v_activeConsumptionEnergyCarriers) {
for (OL_EnergyCarriers energyCarrier : data.getRapidRunData().activeConsumptionEnergyCarriers) {
fm_summerWeekImports_MWh.put( energyCarrier, data.getRapidRunData().getSummerWeekImport_MWh(energyCarrier) );
fm_winterWeekImports_MWh.put( energyCarrier, data.getRapidRunData().getWinterWeekImport_MWh(energyCarrier) );
}
for (OL_EnergyCarriers energyCarrier : v_activeProductionEnergyCarriers) {
for (OL_EnergyCarriers energyCarrier : data.getRapidRunData().activeProductionEnergyCarriers) {
fm_summerWeekExports_MWh.put( energyCarrier, data.getRapidRunData().getSummerWeekExport_MWh(energyCarrier) );
fm_winterWeekExports_MWh.put( energyCarrier, data.getRapidRunData().getWinterWeekExport_MWh(energyCarrier) );
}
Expand Down Expand Up @@ -183,11 +185,11 @@
fm_daytimeExports_MWh.clear();
fm_nighttimeExports_MWh.clear();

for (OL_EnergyCarriers energyCarrier : v_activeConsumptionEnergyCarriers) {
for (OL_EnergyCarriers energyCarrier : data.getRapidRunData().activeConsumptionEnergyCarriers) {
fm_daytimeImports_MWh.put( energyCarrier, data.getRapidRunData().getDaytimeImport_MWh(energyCarrier) );
fm_nighttimeImports_MWh.put( energyCarrier, data.getRapidRunData().getNighttimeImport_MWh(energyCarrier) );
}
for (OL_EnergyCarriers energyCarrier : v_activeProductionEnergyCarriers) {
for (OL_EnergyCarriers energyCarrier : data.getRapidRunData().activeProductionEnergyCarriers) {
fm_daytimeExports_MWh.put( energyCarrier, data.getRapidRunData().getDaytimeExport_MWh(energyCarrier) );
fm_nighttimeExports_MWh.put( energyCarrier, data.getRapidRunData().getNighttimeExport_MWh(energyCarrier) );
}
Expand Down Expand Up @@ -224,11 +226,11 @@
fm_weekdayExports_MWh.clear();
fm_weekendExports_MWh.clear();

for (OL_EnergyCarriers energyCarrier : v_activeConsumptionEnergyCarriers) {
for (OL_EnergyCarriers energyCarrier : data.getRapidRunData().activeConsumptionEnergyCarriers) {
fm_weekdayImports_MWh.put( energyCarrier, data.getRapidRunData().getWeekdayImport_MWh(energyCarrier) );
fm_weekendImports_MWh.put( energyCarrier, data.getRapidRunData().getWeekendImport_MWh(energyCarrier) );
}
for (OL_EnergyCarriers energyCarrier : v_activeProductionEnergyCarriers) {
for (OL_EnergyCarriers energyCarrier : data.getRapidRunData().activeProductionEnergyCarriers) {
fm_weekdayExports_MWh.put( energyCarrier, data.getRapidRunData().getWeekdayExport_MWh(energyCarrier) );
fm_weekendExports_MWh.put( energyCarrier, data.getRapidRunData().getWeekendExport_MWh(energyCarrier) );
}
Expand Down
16 changes: 8 additions & 8 deletions _alp/Agents/EnergyDataViewer/Code/Functions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<Name><![CDATA[f_updatePreviousTotalsGC]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>1246</X>
<Y>-90</Y>
<Y>-70</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -59,7 +59,7 @@
<Id>1741792546535</Id>
<Name><![CDATA[f_updateVariables]]></Name>
<X>1246</X>
<Y>-230</Y>
<Y>-220</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -79,7 +79,7 @@
<Id>1741792546537</Id>
<Name><![CDATA[f_updateLiveDatasets]]></Name>
<X>1246</X>
<Y>-210</Y>
<Y>-200</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -99,7 +99,7 @@
<Id>1741792546539</Id>
<Name><![CDATA[f_updateWeeklyDatasets]]></Name>
<X>1246</X>
<Y>-190</Y>
<Y>-180</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -119,7 +119,7 @@
<Id>1741792546541</Id>
<Name><![CDATA[f_updateYearlyDatasets]]></Name>
<X>1246</X>
<Y>-170</Y>
<Y>-160</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -140,7 +140,7 @@
<Name><![CDATA[f_addTimeStepLiveDataSetsGC]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>1246</X>
<Y>-110</Y>
<Y>-90</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -160,7 +160,7 @@
<Id>1741792546545</Id>
<Name><![CDATA[f_updateLoadDurationCurve]]></Name>
<X>1246</X>
<Y>-150</Y>
<Y>-140</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -181,7 +181,7 @@
<Name><![CDATA[f_updateLiveActiveAssetBooleans]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>1246</X>
<Y>-130</Y>
<Y>-110</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down
Loading