From 1fb296fe9a4d8fad4b35e59c9ab3833fc5bcdc34 Mon Sep 17 00:00:00 2001 From: Ate Hempenius Date: Mon, 29 Sep 2025 18:01:05 +0200 Subject: [PATCH 1/4] new GTO chart added --- _alp/Agents/ChartGTO/AOC.ChartGTO.xml | 166 ++++ _alp/Agents/ChartGTO/Code/Functions.java | 160 ++++ _alp/Agents/ChartGTO/Code/Functions.xml | 75 ++ _alp/Agents/ChartGTO/Levels/Level.level.xml | 763 ++++++++++++++++++ _alp/Agents/ChartGTO/Variables.xml | 47 ++ .../ChartGespreksLeidraad/Code/Functions.java | 4 +- .../Code/Functions.java | 40 +- .../Code/Functions.xml | 20 - .../ChartNetbelasting/Code/Functions.java | 4 +- .../Agents/ChartProfielen/Code/Functions.java | 4 +- _alp/Agents/UI_Results/Code/Functions.java | 38 +- _alp/Agents/UI_Results/Code/Functions.xml | 44 +- _alp/Agents/UI_Results/EmbeddedObjects.xml | 49 ++ _alp/Agents/UI_Results/Levels/Level.level.xml | 179 ++-- _alp/Agents/UI_Results/Variables.xml | 2 +- results_UI.alpx | 8 + 16 files changed, 1473 insertions(+), 130 deletions(-) create mode 100644 _alp/Agents/ChartGTO/AOC.ChartGTO.xml create mode 100644 _alp/Agents/ChartGTO/Code/Functions.java create mode 100644 _alp/Agents/ChartGTO/Code/Functions.xml create mode 100644 _alp/Agents/ChartGTO/Levels/Level.level.xml create mode 100644 _alp/Agents/ChartGTO/Variables.xml diff --git a/_alp/Agents/ChartGTO/AOC.ChartGTO.xml b/_alp/Agents/ChartGTO/AOC.ChartGTO.xml new file mode 100644 index 0000000..2d33e16 --- /dev/null +++ b/_alp/Agents/ChartGTO/AOC.ChartGTO.xml @@ -0,0 +1,166 @@ + + + 1726820490242 + + 1755764711838 + + digital_twin_results + ChartArea + + false + + 1726820490248 + + + + + Generic parameter: + + ENTITY + 100 + false + 100 + true + + -4144960 + null + + true + true + false + + + MPS + + + + METER + + + + METER + + + + METER + + + + false + + + SECOND + + CONTINUOUS + 500 + 500 + 0 + 100 + 100 + MOORE + USER_DEF + USER_DEF + 2 + 50 + 0.95 + 10 + + + true + 1704197349979 + true + 1726905600000 + + + HOUR + + + + HOUR + + + + 1726820490245 + + 0 + -150 + false + false + false + SHAPE_DRAW_2D3D + 100 + 0 + BASED_ON_LENGTH + 10 + METER + 10 + true + + 1726820490249 + 1726820490243 + + + + + 1726820490243 + + 50 + -50 + + false + true + true + false + COLLECTION_OF_LINKS + true + Object + SOLID + 1 + -16777216 + UNDER_AGENTS + NONE + END + + + + + 1726828321730 + + 50 + -100 + + false + true + true + + digital_twin_results + UI_Results + + + + + + 1726820490249 + + 0 + 0 + + true + true + false + SHAPE_DRAW_2D3D + 0 + DIM_NON_CURRENT + + + + diff --git a/_alp/Agents/ChartGTO/Code/Functions.java b/_alp/Agents/ChartGTO/Code/Functions.java new file mode 100644 index 0000000..3b26b9d --- /dev/null +++ b/_alp/Agents/ChartGTO/Code/Functions.java @@ -0,0 +1,160 @@ +double f_setChartGTO() +{/*ALCODESTART::1726830495435*/ +I_EnergyData data = uI_Results.f_getSelectedObjectData(); + +//Set selected object display +uI_Results.f_setSelectedObjectDisplay(230, 60, true); + +//At least for now grid nodes are not supported +if(uI_Results.v_selectedObjectScope != OL_ResultScope.ENERGYCOOP){ + f_setWarningScreen(true); + return; +} + +//Reset chart +f_resetChart(); + +//Set Charts +EnergyCoop energyCoop = (EnergyCoop)data.getLiveData().parentAgent; +f_setGTOBarChart(energyCoop); + +/*ALCODEEND*/} + +double f_resetChart() +{/*ALCODESTART::1727107912139*/ +chart_GTO.removeAll(); +chart_peakIndividual.removeAll(); +chart_peakCollective.removeAll(); +chart_GTV.removeAll(); +gr_GTOChart.setVisible(false); // Needed to refresh the graph +/*ALCODEEND*/} + +double f_setGTOBarChart(EnergyCoop COOP) +{/*ALCODESTART::1759139695551*/ +double originalGTO_kW = 0; +double originalPeakIndividual_kW = 0; +double originalPeakCollective_kW = 0; +double originalTotalGTV_kW = 0; + +double scenarioDeltaGTO_kW = 0; +double scenarioDeltaPeakIndividual_kW = 0; +double scenarioDeltaPeakCollective_kW = 0; +double scenarioDeltaTotalGTV_kW = 0; + +//Get the values +if(rb_GTO_delivery_or_feedin.getValue() == 0){//Delivery + originalGTO_kW = COOP.f_getGroupContractDeliveryCapacity_kW(COOP.v_originalRapidRunData); + originalPeakIndividual_kW = COOP.v_cumulativeIndividualPeakDeliveryOriginal_kW; + originalPeakCollective_kW = max(0, COOP.v_originalRapidRunData.getPeakDelivery_kW()); + originalTotalGTV_kW = COOP.v_originalRapidRunData.connectionMetaData.contractedDeliveryCapacity_kW; + + scenarioDeltaGTO_kW = COOP.f_getGroupContractDeliveryCapacity_kW(COOP.v_rapidRunData) - originalGTO_kW; + scenarioDeltaPeakIndividual_kW = COOP.v_cumulativeIndividualPeakDelivery_kW - originalPeakIndividual_kW; + scenarioDeltaPeakCollective_kW = max(0, COOP.v_rapidRunData.getPeakDelivery_kW()) - originalPeakCollective_kW; + scenarioDeltaTotalGTV_kW = COOP.v_rapidRunData.connectionMetaData.contractedDeliveryCapacity_kW - originalTotalGTV_kW; +} +else if(rb_GTO_delivery_or_feedin.getValue() == 1){//Feedin + originalGTO_kW = COOP.f_getGroupContractFeedinCapacity_kW(COOP.v_originalRapidRunData); + originalPeakIndividual_kW = COOP.v_cumulativeIndividualPeakFeedinOriginal_kW; + originalPeakCollective_kW = max(0, COOP.v_originalRapidRunData.getPeakFeedin_kW()); + originalTotalGTV_kW = COOP.v_originalRapidRunData.connectionMetaData.contractedFeedinCapacity_kW; + + scenarioDeltaGTO_kW = COOP.f_getGroupContractFeedinCapacity_kW(COOP.v_rapidRunData) - originalGTO_kW; + scenarioDeltaPeakIndividual_kW = COOP.v_cumulativeIndividualPeakFeedin_kW - originalPeakIndividual_kW; + scenarioDeltaPeakCollective_kW = max(0, COOP.v_rapidRunData.getPeakFeedin_kW()) - originalPeakCollective_kW; + scenarioDeltaTotalGTV_kW = COOP.v_rapidRunData.connectionMetaData.contractedFeedinCapacity_kW - originalTotalGTV_kW; +} + + +//Check wheter scenario should be smalles bar or original -> adjust accordingly (smaller bar is upfront, so difference can always be seen) +Pair dataValues_chartGTO_kW = new Pair(originalGTO_kW, scenarioDeltaGTO_kW); +Pair colors_chartGTO = new Pair(v_originalValueColor, v_scenarioDeltaValueColor); +Pair legendLabels_chartGTO = new Pair("Huidige situatie", "Scenario"); +if(scenarioDeltaGTO_kW < 0){ + dataValues_chartGTO_kW = new Pair(originalGTO_kW + scenarioDeltaGTO_kW, -1*scenarioDeltaGTO_kW); + colors_chartGTO = new Pair(v_scenarioDeltaValueColor, v_originalValueColor); + legendLabels_chartGTO = new Pair("Scenario", "Huidige situatie"); +} + +Pair dataValues_chartPeakIndividual_kW = new Pair(originalPeakIndividual_kW, scenarioDeltaPeakIndividual_kW); +Pair colors_chartPeakIndividual = new Pair(v_originalValueColor, v_scenarioDeltaValueColor); +Pair legendLabels_chartPeakIndividual = new Pair("Huidige situatie", "Scenario"); +if(scenarioDeltaPeakIndividual_kW < 0){ + dataValues_chartPeakIndividual_kW = new Pair(originalPeakIndividual_kW + scenarioDeltaPeakIndividual_kW, -1*scenarioDeltaPeakIndividual_kW); + colors_chartPeakIndividual = new Pair(v_scenarioDeltaValueColor, v_originalValueColor); + legendLabels_chartPeakIndividual = new Pair("Scenario", "Huidige situatie"); +} + +Pair dataValues_chartPeakCollective_kW = new Pair(originalPeakCollective_kW, scenarioDeltaPeakCollective_kW); +Pair colors_chartPeakCollective = new Pair(v_originalValueColor, v_scenarioDeltaValueColor); +Pair legendLabels_chartPeakCollective = new Pair("Huidige situatie", "Scenario"); +if(scenarioDeltaPeakCollective_kW < 0){ + dataValues_chartPeakCollective_kW = new Pair(originalPeakCollective_kW + scenarioDeltaPeakCollective_kW, -1*scenarioDeltaPeakCollective_kW); + colors_chartPeakCollective = new Pair(v_scenarioDeltaValueColor, v_originalValueColor); + legendLabels_chartPeakCollective = new Pair("Scenario", "Huidige situatie"); +} + +Pair dataValues_chartGTV_kW = new Pair(originalTotalGTV_kW, scenarioDeltaTotalGTV_kW); +Pair colors_chartGTV = new Pair(v_originalValueColor, v_scenarioDeltaValueColor); +Pair legendLabels_chartGTV = new Pair("Huidige situatie", "Scenario"); +if(scenarioDeltaTotalGTV_kW < 0){ + dataValues_chartGTV_kW = new Pair(originalTotalGTV_kW + scenarioDeltaTotalGTV_kW, -1*scenarioDeltaTotalGTV_kW); + colors_chartGTV = new Pair(v_scenarioDeltaValueColor, v_originalValueColor); + legendLabels_chartGTV = new Pair("Scenario", "Huidige situatie"); +} + +//Create data items +DataItem first_DataItem_GTO_kW = new DataItem(); +DataItem second_DataItem_GTO_kW = new DataItem(); +DataItem first_DataItem_PeakIndividual_kW = new DataItem(); +DataItem second_DataItem_PeakIndividual_kW = new DataItem(); +DataItem first_DataItem_PeakCollective_kW = new DataItem(); +DataItem second_DataItem_PeakCollective_kW = new DataItem(); +DataItem first_DataItem_GTV_kW = new DataItem(); +DataItem second_DataItem_GTV_kW = new DataItem(); + + +//Set data item values +first_DataItem_GTO_kW.setValue(dataValues_chartGTO_kW.getFirst()); +second_DataItem_GTO_kW.setValue(dataValues_chartGTO_kW.getSecond()); +first_DataItem_PeakIndividual_kW.setValue(dataValues_chartPeakIndividual_kW.getFirst()); +second_DataItem_PeakIndividual_kW.setValue(dataValues_chartPeakIndividual_kW.getSecond()); +first_DataItem_PeakCollective_kW.setValue(dataValues_chartPeakCollective_kW.getFirst()); +second_DataItem_PeakCollective_kW.setValue(dataValues_chartPeakCollective_kW.getSecond()); +first_DataItem_GTV_kW.setValue(dataValues_chartGTV_kW.getFirst()); +second_DataItem_GTV_kW.setValue(dataValues_chartGTV_kW.getSecond()); +traceln("dataValues_chartGTV_kW.getFirst(): " + dataValues_chartGTV_kW.getFirst()); +traceln("dataValues_chartGTV_kW.getSecond(): " + dataValues_chartGTV_kW.getSecond()); + +//Scale axis to same value for all 4 stack charts +double[] chartHeights_kW = {dataValues_chartGTO_kW.getFirst() + dataValues_chartGTO_kW.getSecond(), + dataValues_chartPeakIndividual_kW.getFirst() + dataValues_chartPeakIndividual_kW.getSecond(), + dataValues_chartPeakCollective_kW.getFirst() + dataValues_chartPeakCollective_kW.getSecond(), + dataValues_chartGTV_kW.getFirst() + dataValues_chartGTV_kW.getSecond()}; +double chartScale_kW = max(chartHeights_kW); +chart_GTO.setFixedScale(chartScale_kW); +chart_peakIndividual.setFixedScale(chartScale_kW); +chart_peakCollective.setFixedScale(chartScale_kW); +chart_GTV.setFixedScale(chartScale_kW); + + +chart_GTO.addDataItem(first_DataItem_GTO_kW, legendLabels_chartGTO.getFirst(), colors_chartGTO.getFirst()); +chart_GTO.addDataItem(second_DataItem_GTO_kW, legendLabels_chartGTO.getSecond(), colors_chartGTO.getSecond()); + +chart_peakIndividual.addDataItem(first_DataItem_PeakIndividual_kW, legendLabels_chartPeakIndividual.getFirst(), colors_chartPeakIndividual.getFirst()); +chart_peakIndividual.addDataItem(second_DataItem_PeakIndividual_kW, legendLabels_chartPeakIndividual.getSecond(), colors_chartPeakIndividual.getSecond()); + +chart_peakCollective.addDataItem(first_DataItem_PeakCollective_kW, legendLabels_chartPeakCollective.getFirst(), colors_chartPeakCollective.getFirst()); +chart_peakCollective.addDataItem(second_DataItem_PeakCollective_kW, legendLabels_chartPeakCollective.getSecond(), colors_chartPeakCollective.getSecond()); + +chart_GTV.addDataItem(first_DataItem_GTV_kW, legendLabels_chartGTV.getFirst(), colors_chartGTV.getFirst()); +chart_GTV.addDataItem(second_DataItem_GTV_kW, legendLabels_chartGTV.getSecond(), colors_chartGTV.getSecond()); + +gr_GTOChart.setVisible(true); // Needed to refresh the graph +/*ALCODEEND*/} + +double f_setWarningScreen(boolean showWarningScreen) +{/*ALCODESTART::1759139897063*/ +gr_warningScreen.setVisible(showWarningScreen); +/*ALCODEEND*/} + diff --git a/_alp/Agents/ChartGTO/Code/Functions.xml b/_alp/Agents/ChartGTO/Code/Functions.xml new file mode 100644 index 0000000..1f666c5 --- /dev/null +++ b/_alp/Agents/ChartGTO/Code/Functions.xml @@ -0,0 +1,75 @@ + + + + VOID + double + 1726830495435 + + -300 + 390 + + false + true + true + + + + VOID + double + 1727107912139 + + -280 + 410 + + false + true + true + + + + VOID + double + 1759139695551 + + -280 + 430 + + false + true + true + + + + + + + + VOID + double + 1759139897063 + + 1180 + 760 + + false + true + true + + + + + + + diff --git a/_alp/Agents/ChartGTO/Levels/Level.level.xml b/_alp/Agents/ChartGTO/Levels/Level.level.xml new file mode 100644 index 0000000..5912529 --- /dev/null +++ b/_alp/Agents/ChartGTO/Levels/Level.level.xml @@ -0,0 +1,763 @@ + + + + 1759139878343 + + 1360 + 380 + + true + false + false + true + SHAPE_DRAW_2D3D + 230 + 410 + false + 0 + 0.0 + + + 1759139878345 + + -230 + -330 + + true + true + false + SHAPE_DRAW_2D3D + int click = 0; + false + 0 + 10 + 1 + v_lineWidth + -1644806 + v_lineColor + null + SOLID + 460 + 660 + 0.0 + -1644806 + null + + + 1759139878347 + + 10 + -110 + + true + true + false + SHAPE_DRAW_2D + false + 0 + 0.0 + -16777216 + + + + 20 + + + CENTER + + + + + 1759140737813 + + 0 + 0 + + true + true + false + SHAPE_DRAW_2D3D + false + 0 + 0.0 + + + false + 1759139801472 + + 140 + 100 + + true + true + false + SHAPE_DRAW_2D3D + + false + -16777216 + true + f_setChartGTO(); + + + + HORIZONTAL + + + false + + + + 1726829026455 + + 0 + 0 + + true + true + false + SHAPE_DRAW_2D3D + false + 0 + 10 + 1 + v_lineWidth + -1644806 + v_lineColor + null + SOLID + 460 + 50 + 0.0 + -657931 + null + + + 1726825366299 + + 235 + 10 + + true + true + false + SHAPE_DRAW_2D + false + 0 + 0.0 + -16777216 + + + + 26 + + + CENTER + + + 1759139801461 + + 230 + 190 + + true + true + false + SHAPE_DRAW_2D + false + 0 + 0.0 + -16777216 + + + + 28 + + + CENTER + + + 1759152946788 + + 370 + 450 + + true + true + false + SHAPE_DRAW_2D3D + false + 0 + 0.0 + + + 1759152951045 + + -340 + -20 + + true + true + false + SHAPE_DRAW_2D + false + 0 + 270.0 + -16777216 + + + + 12 + + + CENTER + + + 1759152946794 + + -95 + -140 + + true + true + false + SHAPE_DRAW_2D3D + true + + 1759152946792 + true + 1759219200000 + + + HOUR + + + + HOUR + + + false + 260 + 270 + + + + 50 + 10 + 80 + 230 + -1 + -16777216 + + + + SOUTH + -16777216 + 50 + + + DEFAULT + NONE + -12566464 + + false + + 1759152946790 + 0 + -16744320 + Title + + + 1759152946791 + 0 + -23296 + Title 1 + + 1 + AUTO + + UP + 0.5 + + + + 1759152946812 + + -175 + -140 + + true + true + false + SHAPE_DRAW_2D3D + true + + 1759152946810 + true + 1759219200000 + + + HOUR + + + + HOUR + + + false + 260 + 270 + + + + 50 + 10 + 80 + 230 + -1 + -16777216 + + + + SOUTH + -16777216 + 50 + + + DEFAULT + NONE + -12566464 + + false + + 1759152946808 + 0 + -16744320 + Title + + + 1759152946809 + 0 + -23296 + Title 1 + + 1 + AUTO + + UP + 0.5 + + + + 1759152946806 + + -255 + -140 + + true + true + false + SHAPE_DRAW_2D3D + true + + 1759152946804 + true + 1759219200000 + + + HOUR + + + + HOUR + + + false + 260 + 270 + + + + 50 + 10 + 80 + 230 + -1 + -16777216 + + + + SOUTH + -16777216 + 50 + + + DEFAULT + NONE + -12566464 + + false + + 1759152946802 + 0 + -16744320 + Title + + + 1759152946803 + 0 + -23296 + Title 1 + + 1 + AUTO + + UP + 0.5 + + + + 1759152946800 + + -325 + -140 + + true + true + false + SHAPE_DRAW_2D3D + true + + 1759152946798 + true + 1759219200000 + + + HOUR + + + + HOUR + + + false + 260 + 270 + + + + 40 + 10 + 80 + 230 + -1 + -16777216 + + + + SOUTH + -16777216 + 50 + + + DEFAULT + DEFAULT + -12566464 + + false + + 1759152946796 + 0 + -16744320 + Title + + + 1759152946797 + 0 + -23296 + Title 1 + + 1 + AUTO + + UP + 0.5 + + + + 1759153473603 + + -245 + -160 + + true + true + false + SHAPE_DRAW_2D + false + 0 + 0.0 + -16777216 + + + + 12 + + + CENTER + + + 1759153514057 + + -165 + -170 + + true + true + false + SHAPE_DRAW_2D + false + 0 + 0.0 + -16777216 + + + + 12 + + + CENTER + + + 1759153559312 + + -85 + -170 + + true + true + false + SHAPE_DRAW_2D + false + 0 + 0.0 + -16777216 + + + + 12 + + + CENTER + + + 1759153585306 + + -5 + -170 + + true + true + false + SHAPE_DRAW_2D + false + 0 + 0.0 + -16777216 + + + + 12 + + + CENTER + + + 1759158788607 + + -220 + 145 + + true + true + false + SHAPE_DRAW_2D3D + false + 0 + 0.0 + + + 1759158771135 + + -55 + -10 + + true + true + false + SHAPE_DRAW_2D3D + false + 0 + 10 + 0 + + null + SOLID + 7 + 40 + 0.0 + -16744320 + v_originalValueColor + null + + + 1759158771137 + + -40 + -17 + + true + true + false + SHAPE_DRAW_2D + false + 0 + 0.0 + -16777216 + + + + 12 + + + LEFT + + + 1759158771139 + + -55 + 10 + + true + true + false + SHAPE_DRAW_2D3D + false + 0 + 10 + 0 + + null + SOLID + 7 + 40 + 0.0 + -23296 + v_scenarioDeltaValueColor + null + + + 1759158771141 + + -40 + 2.5 + + true + true + false + SHAPE_DRAW_2D + false + 0 + 0.0 + -16777216 + + + + 12 + + + LEFT + + + + + + + + diff --git a/_alp/Agents/ChartGTO/Variables.xml b/_alp/Agents/ChartGTO/Variables.xml new file mode 100644 index 0000000..2550571 --- /dev/null +++ b/_alp/Agents/ChartGTO/Variables.xml @@ -0,0 +1,47 @@ + + + + 1759158936218 + + -280 + 490 + + false + true + true + + + + + + + + + 1759158984689 + + -280 + 510 + + false + true + true + + + + + + + + diff --git a/_alp/Agents/ChartGespreksLeidraad/Code/Functions.java b/_alp/Agents/ChartGespreksLeidraad/Code/Functions.java index e45489c..46ccdc7 100644 --- a/_alp/Agents/ChartGespreksLeidraad/Code/Functions.java +++ b/_alp/Agents/ChartGespreksLeidraad/Code/Functions.java @@ -745,8 +745,8 @@ else if(production_MWh > consumption_MWh){ feedinCapacityColor = uI_Results.v_electricityCapacityColor_known; //And: add group contract values - DataSet groupContractCapacityDelivery_kW = uI_Results.f_createFlatDataset(0, 8760, ((EnergyCoop)dataObject.getRapidRunData().parentAgent).f_getGroupContractDeliveryCapacity_kW()); - DataSet groupContractCapacityFeedin_kW = uI_Results.f_createFlatDataset(0, 8760, -((EnergyCoop)dataObject.getRapidRunData().parentAgent).f_getGroupContractFeedinCapacity_kW()); + DataSet groupContractCapacityDelivery_kW = uI_Results.f_createFlatDataset(0, 8760, ((EnergyCoop)dataObject.getRapidRunData().parentAgent).f_getGroupContractDeliveryCapacity_kW(dataObject.getRapidRunData())); + DataSet groupContractCapacityFeedin_kW = uI_Results.f_createFlatDataset(0, 8760, -((EnergyCoop)dataObject.getRapidRunData().parentAgent).f_getGroupContractFeedinCapacity_kW(dataObject.getRapidRunData())); plot_jaar.addDataSet(groupContractCapacityDelivery_kW, "Groeps GTV afname", uI_Results.v_groupGTVColor, true, false, Chart.InterpolationType.INTERPOLATION_LINEAR, 1, Chart.PointStyle.POINT_NONE); plot_jaar.addDataSet(groupContractCapacityFeedin_kW, "Groeps GTV teruglevering", uI_Results.v_groupGTVColor, true, false, Chart.InterpolationType.INTERPOLATION_LINEAR, 1, Chart.PointStyle.POINT_NONE); diff --git a/_alp/Agents/ChartGespreksleidraadBedrijven/Code/Functions.java b/_alp/Agents/ChartGespreksleidraadBedrijven/Code/Functions.java index e72efbb..e03adbe 100644 --- a/_alp/Agents/ChartGespreksleidraadBedrijven/Code/Functions.java +++ b/_alp/Agents/ChartGespreksleidraadBedrijven/Code/Functions.java @@ -25,12 +25,7 @@ f_setChartsGespreksleidraadBedrijven2(data); } else if (rb_gespreksleidraadBedrijvenChartType.getValue()==2) { gr_GSLDSummary3.setVisible(true); - if(uI_Results.b_showGroupContractValues && uI_Results.v_selectedObjectScope == OL_ResultScope.ENERGYCOOP){ - f_setGroupContractChart((EnergyCoop)data.getRapidRunData().parentAgent); - } - else{ - f_setChartsGespreksleidraadBedrijven3(data); - } + f_setChartsGespreksleidraadBedrijven3(data); } /*ALCODEEND*/} @@ -176,39 +171,6 @@ else if(rb_GSLDSummary3_delivery_or_feedin.getValue() == 1){//Feedin /*ALCODEEND*/} -double f_setGroupContractChart(EnergyCoop COOP) -{/*ALCODESTART::1740754239000*/ -chart_barChartGSLDSummary3.removeAll(); - -t_titleGespreksleidraadBedrijven3.setText("Groepscontract capaciteit"); - -DataItem totalGTV_kW = new DataItem(); -DataItem totalGTVgroupcontract_kW = new DataItem(); -DataItem peakIndividual_kW = new DataItem(); -DataItem peakCollective_kW = new DataItem(); -String text_peakType = ""; -if(rb_GSLDSummary3_delivery_or_feedin.getValue() == 0){//Delivery - totalGTV_kW.setValue(COOP.v_liveConnectionMetaData.contractedDeliveryCapacity_kW); - totalGTVgroupcontract_kW.setValue(COOP.f_getGroupContractDeliveryCapacity_kW()); - peakIndividual_kW.setValue(COOP.v_cumulativeIndividualPeakDelivery_kW); - peakCollective_kW.setValue(COOP.v_rapidRunData.getPeakDelivery_kW()); - text_peakType = "levering"; -} -else if(rb_GSLDSummary3_delivery_or_feedin.getValue() == 1){//Feedin - totalGTV_kW.setValue(COOP.v_liveConnectionMetaData.contractedFeedinCapacity_kW); - totalGTVgroupcontract_kW.setValue(COOP.f_getGroupContractFeedinCapacity_kW()); - peakIndividual_kW.setValue(COOP.v_cumulativeIndividualPeakFeedin_kW); - peakCollective_kW.setValue(COOP.v_rapidRunData.getPeakFeedin_kW()); - text_peakType = "teruglevering"; -} - - -chart_barChartGSLDSummary3.addDataItem(totalGTV_kW,"Totaal GTV Cumulatief " + text_peakType,darkMagenta); -chart_barChartGSLDSummary3.addDataItem(peakIndividual_kW,"Piek " + text_peakType + " individueel",orange); -chart_barChartGSLDSummary3.addDataItem(peakCollective_kW,"Piek " + text_peakType + " collectief",green); -chart_barChartGSLDSummary3.addDataItem(totalGTVgroupcontract_kW,"GTV Groepscontract " + text_peakType, darkBlue); -/*ALCODEEND*/} - double f_setWarningScreen(boolean showWarningScreen) {/*ALCODESTART::1741342546947*/ gr_warningScreen.setVisible(showWarningScreen); diff --git a/_alp/Agents/ChartGespreksleidraadBedrijven/Code/Functions.xml b/_alp/Agents/ChartGespreksleidraadBedrijven/Code/Functions.xml index 84fff25..54f3ad0 100644 --- a/_alp/Agents/ChartGespreksleidraadBedrijven/Code/Functions.xml +++ b/_alp/Agents/ChartGespreksleidraadBedrijven/Code/Functions.xml @@ -132,26 +132,6 @@ - - VOID - double - 1740754239000 - - 990 - 900 - - false - true - true - - - - - - VOID double diff --git a/_alp/Agents/ChartNetbelasting/Code/Functions.java b/_alp/Agents/ChartNetbelasting/Code/Functions.java index cd4ab7c..6317bdc 100644 --- a/_alp/Agents/ChartNetbelasting/Code/Functions.java +++ b/_alp/Agents/ChartNetbelasting/Code/Functions.java @@ -115,8 +115,8 @@ else if(uI_Results.v_selectedObjectScope == OL_ResultScope.ENERGYCOOP){ if(uI_Results.b_showGroupContractValues){ //And: add group contract values - DataSet groupContractCapacityDelivery_kW = uI_Results.f_createFlatDataset(0, 8760, ((EnergyCoop)dataObject.getRapidRunData().parentAgent).f_getGroupContractDeliveryCapacity_kW() / divisionAmountForCorrectUnit); - DataSet groupContractCapacityFeedin_kW = uI_Results.f_createFlatDataset(0, 8760, -((EnergyCoop)dataObject.getRapidRunData().parentAgent).f_getGroupContractFeedinCapacity_kW() / divisionAmountForCorrectUnit); + DataSet groupContractCapacityDelivery_kW = uI_Results.f_createFlatDataset(0, 8760, ((EnergyCoop)dataObject.getRapidRunData().parentAgent).f_getGroupContractDeliveryCapacity_kW(dataObject.getRapidRunData()) / divisionAmountForCorrectUnit); + DataSet groupContractCapacityFeedin_kW = uI_Results.f_createFlatDataset(0, 8760, -((EnergyCoop)dataObject.getRapidRunData().parentAgent).f_getGroupContractFeedinCapacity_kW(dataObject.getRapidRunData()) / divisionAmountForCorrectUnit); plot_jaar.addDataSet(groupContractCapacityDelivery_kW, "Groeps GTV afname", uI_Results.v_groupGTVColor, true, false, Chart.InterpolationType.INTERPOLATION_LINEAR, 1, Chart.PointStyle.POINT_NONE); plot_jaar.addDataSet(groupContractCapacityFeedin_kW, "Groeps GTV teruglevering", uI_Results.v_groupGTVColor, true, false, Chart.InterpolationType.INTERPOLATION_LINEAR, 1, Chart.PointStyle.POINT_NONE); diff --git a/_alp/Agents/ChartProfielen/Code/Functions.java b/_alp/Agents/ChartProfielen/Code/Functions.java index 6ede82b..fb0dcb7 100644 --- a/_alp/Agents/ChartProfielen/Code/Functions.java +++ b/_alp/Agents/ChartProfielen/Code/Functions.java @@ -720,8 +720,8 @@ AreaCollection f_resetCharts() if (dataObject.getScope() == OL_ResultScope.ENERGYCOOP ) { if(uI_Results.b_showGroupContractValues) { - plot_netload_week.addDataSet(uI_Results.f_createFlatDataset(startTime_h, 168, ((EnergyCoop)dataObject.getRapidRunData().parentAgent).f_getGroupContractDeliveryCapacity_kW()), "Groeps GTV afname", uI_Results.v_groupGTVColor, true, false, Chart.InterpolationType.INTERPOLATION_LINEAR, 1, Chart.PointStyle.POINT_NONE); - plot_netload_week.addDataSet(uI_Results.f_createFlatDataset(startTime_h, 168, ((EnergyCoop)dataObject.getRapidRunData().parentAgent).f_getGroupContractFeedinCapacity_kW()), "Groeps GTV teruglevering", uI_Results.v_groupGTVColor, true, false, Chart.InterpolationType.INTERPOLATION_LINEAR, 1, Chart.PointStyle.POINT_NONE); + plot_netload_week.addDataSet(uI_Results.f_createFlatDataset(startTime_h, 168, ((EnergyCoop)dataObject.getRapidRunData().parentAgent).f_getGroupContractDeliveryCapacity_kW(dataObject.getRapidRunData())), "Groeps GTV afname", uI_Results.v_groupGTVColor, true, false, Chart.InterpolationType.INTERPOLATION_LINEAR, 1, Chart.PointStyle.POINT_NONE); + plot_netload_week.addDataSet(uI_Results.f_createFlatDataset(startTime_h, 168, ((EnergyCoop)dataObject.getRapidRunData().parentAgent).f_getGroupContractFeedinCapacity_kW(dataObject.getRapidRunData())), "Groeps GTV teruglevering", uI_Results.v_groupGTVColor, true, false, Chart.InterpolationType.INTERPOLATION_LINEAR, 1, Chart.PointStyle.POINT_NONE); } if (b_subdivideEnergyCoopFlows) { List memberGridConnections = ((EnergyCoop)dataObject.getRapidRunData().parentAgent).f_getAllChildMemberGridConnections(); diff --git a/_alp/Agents/UI_Results/Code/Functions.java b/_alp/Agents/UI_Results/Code/Functions.java index fe17aab..f7282af 100644 --- a/_alp/Agents/UI_Results/Code/Functions.java +++ b/_alp/Agents/UI_Results/Code/Functions.java @@ -9,6 +9,7 @@ gr_chartKPISummary_presentation.setVisible(false); gr_chartBatteries_presentation.setVisible(false); gr_chartEconomicKPIs_presentation.setVisible(false); +gr_chartGTO_presentation.setVisible(false); switch (v_selectedChartType) { case PROFIEL: @@ -43,6 +44,10 @@ gr_chartEconomicKPIs_presentation.setVisible(true); chartEconomicKPIs.f_setChartEconomicKPIs(); break; + case GTO: + gr_chartGTO_presentation.setVisible(true); + chartGTO.f_setChartGTO(); + break; } if(b_showKPISummary){ @@ -167,7 +172,7 @@ chartGespreksleidraadBedrijven.f_styleBackground(backgroundColor, lineColor, lineWidth, lineStyle); chartBatteries.f_styleBackground(backgroundColor, lineColor, lineWidth, lineStyle); chartEconomicKPIs.f_styleBackground(backgroundColor, lineColor, lineWidth, lineStyle); - +chartGTO.f_styleBackground(backgroundColor, lineColor, lineWidth, lineStyle); /*ALCODEEND*/} double f_styleResultsUIHeader(Color backgroundColor,Color lineColor,double lineWidth,LineStyle lineStyle) @@ -261,13 +266,14 @@ I_EnergyData f_getSelectedObjectData() rb_DEFAULT_AND_BATTERY.setVisible(false); rb_DEFAULT_AND_BATTERY_AND_GESPREKSLEIDRAADBEDRIJVEN.setVisible(false); rb_DEFAULT_AND_BATTERY_AND_ECONOMIC.setVisible(false); +rb_DEFAULT_AND_GESPREKSLEIDRAADBEDRIJVEN_AND_GTO.setVisible(false); rb_DEFAULT.setEnabled(false); rb_DEFAULT_AND_GESPREKSLEIDRAAD.setEnabled(false); rb_DEFAULT_AND_GESPREKSLEIDRAADBEDRIJVEN.setEnabled(false); rb_DEFAULT_AND_BATTERY.setEnabled(false); rb_DEFAULT_AND_BATTERY_AND_GESPREKSLEIDRAADBEDRIJVEN.setEnabled(false); rb_DEFAULT_AND_BATTERY_AND_ECONOMIC.setEnabled(false); - +rb_DEFAULT_AND_GESPREKSLEIDRAADBEDRIJVEN_AND_GTO.setEnabled(false); switch(v_selectedRadioButtonSetup){ case DEFAULT: @@ -288,6 +294,9 @@ I_EnergyData f_getSelectedObjectData() case DEFAULT_AND_BATTERY_AND_ECONOMIC: v_selectedRadioButton = rb_DEFAULT_AND_BATTERY_AND_ECONOMIC; break; +case DEFAULT_AND_GESPREKSLEIDRAADBEDRIJVEN_AND_GTO: + v_selectedRadioButton = rb_DEFAULT_AND_GESPREKSLEIDRAADBEDRIJVEN_AND_GTO; + break; case OFF: f_setResultsUIHeader(null, null, false); break; @@ -486,12 +495,7 @@ DataSet f_createFlatDataset(double startTime_hr,double duration_hr,double value) v_selectedObjectScope = v_selectedObjectInterface.getScope(); f_setSelectedObjectText(null); -if(b_enableGroupContractMode && v_selectedObjectScope == OL_ResultScope.ENERGYCOOP){ - cb_EhubConfig.setSelected(false, true); -} -else{ - f_showCorrectChart(); -} +f_showCorrectChart(); /*ALCODEEND*/} double f_setSelectedObjectText(String customSelectedObjectText) @@ -701,3 +705,21 @@ DataSet f_createNewDataSetDividedByValue(DataSet inputDataSet,double dividedByVa gr_chartEconomicKPIs_presentation.setVisible(visible); /*ALCODEEND*/} +double f_setChartGTO_presentation(Integer location_x,Integer location_y,boolean visible) +{/*ALCODESTART::1759140579703*/ +//Set the location and visibility of the Batteries charts presentation + +//Set x axis +if(location_x != null){ + gr_chartGTO_presentation.setX(location_x); +} + +//Set y axis +if(location_y != null){ + gr_chartGTO_presentation.setY(location_y); +} + +//Set visibility +gr_chartGTO_presentation.setVisible(visible); +/*ALCODEEND*/} + diff --git a/_alp/Agents/UI_Results/Code/Functions.xml b/_alp/Agents/UI_Results/Code/Functions.xml index e53c419..e1f18f3 100644 --- a/_alp/Agents/UI_Results/Code/Functions.xml +++ b/_alp/Agents/UI_Results/Code/Functions.xml @@ -6,7 +6,7 @@ 1714902615653 820 - 300 + 310 + + VOID + double + 1759140579703 + + 1570 + 510 + + false + true + true + + + + + + + + + + + + + + diff --git a/_alp/Agents/UI_Results/EmbeddedObjects.xml b/_alp/Agents/UI_Results/EmbeddedObjects.xml index 6490b81..f656fc1 100644 --- a/_alp/Agents/UI_Results/EmbeddedObjects.xml +++ b/_alp/Agents/UI_Results/EmbeddedObjects.xml @@ -330,6 +330,55 @@ ONE_AGENT_PER_DATABASE_RECORD + + 1726828320023 + + 820 + 280 + + false + true + true + 1759140371710 + + digital_twin_results + ChartGTO + + + + digital_twin_results + ChartGTO + 1726820490248 + + + + false + + + + ARRAY_LIST_BASED + true + XYZ + + + + + + + + + + SPECIFIED_NUMBER + + 1704197349969 + + + ONE_AGENT_PER_DATABASE_RECORD + + 1726828320023 diff --git a/_alp/Agents/UI_Results/Levels/Level.level.xml b/_alp/Agents/UI_Results/Levels/Level.level.xml index 457de5f..79311ac 100644 --- a/_alp/Agents/UI_Results/Levels/Level.level.xml +++ b/_alp/Agents/UI_Results/Levels/Level.level.xml @@ -375,7 +375,7 @@ f_showCorrectChart(); true false SHAPE_DRAW_2D3D - + false -16777216 -60 @@ -639,6 +639,93 @@ f_showCorrectChart(); LEFT + + false + 1759140133308 + + -50 + -510 + + true + true + false + SHAPE_DRAW_2D3D + + false + -16777216 + -60 + -87 + false + //Set correct chart +switch(rb_DEFAULT_AND_GESPREKSLEIDRAADBEDRIJVEN_AND_GTO.getValue()){ + +case 0: + v_selectedChartType = PROFIEL; + break; +case 1: + v_selectedChartType = DIAGRAM; + break; +case 2: + v_selectedChartType = BELASTING; + break; +case 3: + v_selectedChartType = SANKEY; + break; +case 4: + v_selectedChartType = GESPREKSLEIDRAAD_BEDRIJVEN; + break; +case 5: + v_selectedChartType = GTO; + break; +} + +if(b_showKPISummary){ + checkbox_KPISummary.setSelected(false, true); +} + +f_showCorrectChart(); + + + + VERTICAL + + + + + + + false + + + + 1759140183239 + + -50 + -530 + + false + true + false + true + SHAPE_DRAW_2D + false + 0 + 0.0 + -16777216 + + + + 12 + + + LEFT + @@ -775,6 +862,48 @@ f_showCorrectChart(); LEFT + + 1759140390521 + + 800 + 380 + + true + true + false + true + SHAPE_DRAW_2D3D + false + 0 + 0.0 + + + 1759140371710 + + -800 + -380 + + true + true + false + SHAPE_DRAW_2D3D + false + 0 + 0.0 + AUTOMATICALLY_CALCULATED + 1000 + 1000000000 + 0.0 + 0.0 + + + 1755704238580 @@ -1367,7 +1496,7 @@ else{ null SOLID 380 - 540 + 560 0.0 -1 null @@ -1569,52 +1698,6 @@ else{ - - false - 1743501981947 - - 1540 - 710 - - true - true - false - SHAPE_DRAW_2D3D - - false - -16777216 - 5 - -50 - v_selectedObjectScope == OL_ResultScope.ENERGYCOOP && b_enableGroupContractMode - true - v_selectedObjectScope == OL_ResultScope.ENERGYCOOP && b_enableGroupContractMode - if(cb_EhubConfig.isSelected()){ - if(checkbox_KPISummary.isSelected()){ - checkbox_KPISummary.setSelected(false, true); - } - - v_selectedChartType = OL_ChartTypes.GESPREKSLEIDRAAD_BEDRIJVEN; - getRadioButtons().setValue(100, false); - chartGespreksleidraadBedrijven.getRb_gespreksleidraadBedrijvenChartType().setValue(2, true); - f_showCorrectChart(); -} -else{ - if(getRadioButtons().getValue() == 100){ - getRadioButtons().setValue(0, true); - } - f_showCorrectChart(); -} - - - - Toon groepscontract waarde - true - b_showGroupContractValues - - 1746102328913 diff --git a/_alp/Agents/UI_Results/Variables.xml b/_alp/Agents/UI_Results/Variables.xml index 80b67bb..8a4232f 100644 --- a/_alp/Agents/UI_Results/Variables.xml +++ b/_alp/Agents/UI_Results/Variables.xml @@ -1228,7 +1228,7 @@ 1742221996041 1600 - 630 + 650