From cd36a3e72be0ed272dec1e41515263150e24c74b Mon Sep 17 00:00:00 2001 From: Ate Hempenius Date: Tue, 12 Aug 2025 17:09:36 +0200 Subject: [PATCH 1/3] additional getter functions added needed for new setup UI_Tabs and removal of certain GCHouse code --- _alp/Agents/EnergyCoop/Code/Functions.java | 5 ++ _alp/Agents/EnergyCoop/Code/Functions.xml | 16 ++++ _alp/Agents/EnergyModel/Code/Functions.java | 5 ++ _alp/Agents/EnergyModel/Code/Functions.xml | 16 ++++ .../GCHouse/Code/AdditionalClassCode.java | 13 ---- _alp/Agents/GCHouse/Code/Functions.java | 75 +------------------ _alp/Agents/GCHouse/Code/Functions.xml | 50 +++++-------- _alp/Agents/GCHouse/Variables.xml | 16 ++-- .../Agents/GridConnection/Code/Functions.java | 7 -- _alp/Agents/GridConnection/Code/Functions.xml | 2 +- 10 files changed, 71 insertions(+), 134 deletions(-) diff --git a/_alp/Agents/EnergyCoop/Code/Functions.java b/_alp/Agents/EnergyCoop/Code/Functions.java index 131a2c25..b555aef5 100644 --- a/_alp/Agents/EnergyCoop/Code/Functions.java +++ b/_alp/Agents/EnergyCoop/Code/Functions.java @@ -1571,3 +1571,8 @@ EnergyCoop f_addAssetFlow(OL_AssetFlowCategories AC) /*ALCODEEND*/} +List f_getMemberGridConnectionsCollectionPointer() +{/*ALCODESTART::1754908113703*/ +return this.c_memberGridConnections; // This should NOT be a copy, it should be a pointer!! +/*ALCODEEND*/} + diff --git a/_alp/Agents/EnergyCoop/Code/Functions.xml b/_alp/Agents/EnergyCoop/Code/Functions.xml index eb6d5d35..3adb49dd 100644 --- a/_alp/Agents/EnergyCoop/Code/Functions.xml +++ b/_alp/Agents/EnergyCoop/Code/Functions.xml @@ -689,4 +689,20 @@ true + + RETURNS_VALUE + List<GridConnection> + 1754908113703 + + 1440 + 450 + + false + true + true + + diff --git a/_alp/Agents/EnergyModel/Code/Functions.java b/_alp/Agents/EnergyModel/Code/Functions.java index cbe44827..a3b8ba2c 100644 --- a/_alp/Agents/EnergyModel/Code/Functions.java +++ b/_alp/Agents/EnergyModel/Code/Functions.java @@ -1125,3 +1125,8 @@ EnergyCoop f_addAssetFlow(OL_AssetFlowCategories AC) } /*ALCODEEND*/} +List f_getGridConnectionsCollectionPointer() +{/*ALCODESTART::1754908171225*/ +return this.c_gridConnections; +/*ALCODEEND*/} + diff --git a/_alp/Agents/EnergyModel/Code/Functions.xml b/_alp/Agents/EnergyModel/Code/Functions.xml index 1b3b9043..263f9228 100644 --- a/_alp/Agents/EnergyModel/Code/Functions.xml +++ b/_alp/Agents/EnergyModel/Code/Functions.xml @@ -650,4 +650,20 @@ + + RETURNS_VALUE + List<GridConnection> + 1754908171225 + + 1580 + 920 + + false + true + true + + diff --git a/_alp/Agents/GCHouse/Code/AdditionalClassCode.java b/_alp/Agents/GCHouse/Code/AdditionalClassCode.java index 2170f4e1..a3ffc46e 100644 --- a/_alp/Agents/GCHouse/Code/AdditionalClassCode.java +++ b/_alp/Agents/GCHouse/Code/AdditionalClassCode.java @@ -10,11 +10,6 @@ public void f_removeTheJ_EA(J_EA j_ea){ f_removeTheJ_EA_house(j_ea); } -/*@Override -public void f_operateFixedConsumptionAssets(){ - f_operateFixedConsumptionAssets_overwrite(); -}*/ - @Override public void f_operateFlexAssets(){ f_operateFlexAssets_overwrite(); @@ -25,12 +20,4 @@ public void f_manageCharging(){ f_manageCharging_overwrite(); } -/*@Override -public void f_chargeOnPrice(double a, double b){ - f_chargeOnPrice_overwrite(a,b); -}*/ -@Override -public void f_simpleCharging(){ - f_simpleCharging_overwrite(); -} diff --git a/_alp/Agents/GCHouse/Code/Functions.java b/_alp/Agents/GCHouse/Code/Functions.java index 91a4bcdd..5bd2818f 100644 --- a/_alp/Agents/GCHouse/Code/Functions.java +++ b/_alp/Agents/GCHouse/Code/Functions.java @@ -11,7 +11,7 @@ f_manageHeating(); -if( p_householdEV != null){ +if( c_electricVehicles.size() > 0){ double availableCapacityFromBatteries = p_batteryAsset == null ? 0 : p_batteryAsset.getCapacityAvailable_kW(); double availableChargingCapacity = v_liveConnectionMetaData.contractedDeliveryCapacity_kW + availableCapacityFromBatteries - fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY); //f_maxPowerCharging( max(0, availableChargingCapacity)); @@ -218,7 +218,7 @@ else if (lastLoopsPriceLevel.equals("low") && powerAvailableAtLastLoop_kW > p_mi double availableCapacityFromBatteries = p_batteryAsset == null ? 0 : p_batteryAsset.getCapacityAvailable_kW(); //double availableChargingCapacity = v_allowedCapacity_kW + availableCapacityFromBatteries - v_currentPowerElectricity_kW; double availableChargingCapacity = v_liveConnectionMetaData.contractedDeliveryCapacity_kW + availableCapacityFromBatteries - fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY); -v_vehicleSOC_fr = p_householdEV.getCurrentStateOfCharge_fr(); +//v_vehicleSOC_fr = p_householdEV.getCurrentStateOfCharge_fr(); switch (p_chargingAttitudeVehicles) { case SIMPLE: @@ -341,60 +341,8 @@ else if ( v_batterySOC_fr < 0.6 && v_currentPowerElectricity_kW < 1 && v_current double f_connectTo_J_EA_House(J_EA j_ea) {/*ALCODESTART::1693300820997*/ -/* -if (j_ea instanceof J_EAConversion) { - if (j_ea.energyAssetType == OL_EnergyAssetType.GAS_BURNER || j_ea instanceof J_EAConversionHeatPump || j_ea instanceof J_EAConversionHeatDeliverySet || j_ea instanceof J_EAConversionElectricHeater ) { - switch (p_heatingType) { - case HEATPUMP_AIR: - p_primaryHeatingAsset = (J_EAConversion)j_ea; - break; - case HEATPUMP_GASPEAK: - p_primaryHeatingAsset = p_primaryHeatingAsset == null && j_ea instanceof J_EAConversionHeatPump? (J_EAConversion)j_ea : p_primaryHeatingAsset; - p_secondaryHeatingAsset = p_secondaryHeatingAsset == null && j_ea instanceof J_EAConversionGasBurner? (J_EAConversion)j_ea : p_secondaryHeatingAsset; - break; - case HEATPUMP_BOILERPEAK: // ambigue wat we met boiler bedoelen; eboiler of grootschalige DH_boiler = gasburner! - p_primaryHeatingAsset = p_primaryHeatingAsset == null && j_ea instanceof J_EAConversionHeatPump? (J_EAConversion)j_ea : p_primaryHeatingAsset; - p_secondaryHeatingAsset = p_secondaryHeatingAsset == null && j_ea instanceof J_EAConversionGasBurner? (J_EAConversion)j_ea : p_secondaryHeatingAsset; - p_secondaryHeatingAsset = p_secondaryHeatingAsset == null && j_ea instanceof J_EAConversionElectricHeater? (J_EAConversion)j_ea : p_secondaryHeatingAsset; - break; - case GASBURNER: - p_primaryHeatingAsset = p_primaryHeatingAsset == null && j_ea instanceof J_EAConversionGasBurner? (J_EAConversion)j_ea : p_primaryHeatingAsset; - p_secondaryHeatingAsset = p_secondaryHeatingAsset == null && j_ea instanceof J_EAConversionGasCHP? (J_EAConversion)j_ea : p_secondaryHeatingAsset; - break; - case DISTRICTHEAT: - if( j_ea instanceof J_EAConversionHeatDeliverySet ){ - p_primaryHeatingAsset = (J_EAConversion)j_ea; - //traceln("Assigning heat delivery set as primary heating asset for house!"); - } - else { - p_secondaryHeatingAsset = (J_EAConversion)j_ea; - // set water/water heatpump source energy-asset - - //if( j_ea instanceof J_EAConversionHeatPump && ((J_EAConversionHeatPump)j_ea).getAmbientTempType().equals("WATER") && p_primaryHeatingAsset instanceof J_EAConversionHeatDeliverySet ) { - //((J_EAConversionHeatPump)j_ea).p_linkedSourceEnergyAsset = p_primaryHeatingAsset; - //j_ea.updateAmbientTemperature( ((J_EAConversionHeatPump)j_ea).p_linkedSourceEnergyAsset.getCurrentTemperature() ); - //} - - } - break; - case LT_DISTRICTHEAT: - p_primaryHeatingAsset = (J_EAConversion)j_ea; - break; - default: throw new IllegalStateException("Invalid HeatingType: " + p_heatingType); - } - } -} -*/ - -if (j_ea instanceof J_EAEV) { - if (p_householdEV != null){ - throw new RuntimeException(String.format("Exception: trying to assign 2 EVs to a household!! --> one of them will not charge! ")); - } - p_householdEV = (J_EAEV)j_ea; -} if (j_ea instanceof J_EAAirco) { p_airco = (J_EAAirco)j_ea; - //c_electricHeatpumpAssets.add(j_ea); } /*ALCODEEND*/} @@ -408,21 +356,6 @@ else if ( v_batterySOC_fr < 0.6 && v_currentPowerElectricity_kW < 1 && v_current traceln("Placeholder function f_setEnergyLabel called! Nothing will happen."); /*ALCODEEND*/} -double f_removeCurrentHeatingSystem() -{/*ALCODESTART::1726129903799*/ -p_heatingType = OL_GridConnectionHeatingType.NONE; -p_primaryHeatingAsset.removeEnergyAsset(); -if ( p_secondaryHeatingAsset != null){ - p_secondaryHeatingAsset.removeEnergyAsset(); -} -if ( p_tertiaryHeatingAsset != null){ - p_tertiaryHeatingAsset.removeEnergyAsset(); -} -if ( p_heatBuffer != null){ - p_heatBuffer.removeEnergyAsset(); -} -/*ALCODEEND*/} - double f_manageCookingTracker() {/*ALCODESTART::1726334759211*/ // Add heat from cooking assets to house @@ -482,12 +415,8 @@ else if ( v_batterySOC_fr < 0.6 && v_currentPowerElectricity_kW < 1 && v_current double f_removeTheJ_EA_house(J_EA j_ea) {/*ALCODESTART::1749722407831*/ -if (j_ea instanceof J_EAEV) { - p_householdEV = null; -} if (j_ea instanceof J_EAAirco) { p_airco = null; - //c_electricHeatpumpAssets.remove(j_ea); } /*ALCODEEND*/} diff --git a/_alp/Agents/GCHouse/Code/Functions.xml b/_alp/Agents/GCHouse/Code/Functions.xml index 1b859245..ea9d7f2d 100644 --- a/_alp/Agents/GCHouse/Code/Functions.xml +++ b/_alp/Agents/GCHouse/Code/Functions.xml @@ -22,8 +22,8 @@ 1669203453155 true - 940 - -90 + 1290 + 1190