Skip to content

Create J_EAFlex functions now specify managements #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Luc-Sol wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Create J_EAFlex functions now specify managements #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a99d71d
Create J_EAFlex functions now specify managements
Luc-Sol Jun 11, 2026
859b793
Merge branch 'main' into Create_EA_functions_rewrite
Luc-Sol Jun 11, 2026
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
2 changes: 1 addition & 1 deletion _alp/Agents/UI_company/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@
}

// Add a management for the chosen heating type
GC.f_addHeatManagement(selectedHeatingType, false);
GC.f_addHeatManagement(selectedHeatingType, false, GC.f_getHeatingPreferences());
/*ALCODEEND*/}

double f_setGCCapacity(GridConnection GC,double setGridConnectionCapacity_kW,String type)
Expand Down
76 changes: 49 additions & 27 deletions _alp/Agents/Zero_Loader/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,7 @@ else if (surveyGC.getHeat().getHeatingTypes().size() == 0) {
return heatingType;
/*ALCODEEND*/}

J_EAEV f_addElectricVehicle(GridConnection parentGC,OL_EnergyAssetType vehicle_type,boolean isDefaultVehicle,double annualTravelDistance_km,double maxChargingPower_kW)
J_EAEV f_addElectricVehicle(GridConnection parentGC,OL_EnergyAssetType vehicle_type,boolean isDefaultVehicle,double annualTravelDistance_km,double maxChargingPower_kW,OL_ChargingAttitude chargingAttitude)
{/*ALCODESTART::1726584205827*/
double storageCapacity_kWh = 0;
double energyConsumption_kWhpkm = 0;
Expand Down Expand Up @@ -1346,6 +1346,20 @@ else if (vehicle_type == OL_EnergyAssetType.ELECTRIC_VAN){
electricVehicle.getTripTracker().setAnnualDistance_km(avgc_data.p_avgAnnualTravelDistanceVan_km);
}

if (parentGC.f_getChargingManagement() == null) {
parentGC.f_addChargingManagement(chargingAttitude);
}
else {
if (parentGC.f_getCurrentChargingType() != chargingAttitude) {
throw new RuntimeException( String.format("Tried to add EV with charging attitude %s to GC %s with charging type %s",
chargingAttitude,
parentGC.p_gridConnectionID,
parentGC.f_getCurrentChargingType()
)
);
}
}

return electricVehicle;
/*ALCODEEND*/}

Expand Down Expand Up @@ -1398,6 +1412,11 @@ else if (vehicle_type == OL_EnergyAssetType.PETROLEUM_FUEL_VAN){
double initialStateOfCharge_fr = 0.5;
storage = new J_EAStorageElectric(parentGC, storagePower_kw, storageCapacity_kWh, initialStateOfCharge_fr, energyModel.p_timeParameters);
//traceln("Battery with StorageCapacity_kWh: %s", storageCapacity_kWh);
if (parentGC.f_getBatteryManagement() == null) {
I_BatteryManagement batteryManagement = new J_BatteryManagementSelfConsumption( parentGC, energyModel.p_timeParameters );
parentGC.f_setBatteryManagement(batteryManagement);
}

break;

case STORAGE_HEAT:
Expand All @@ -1411,7 +1430,8 @@ else if (vehicle_type == OL_EnergyAssetType.PETROLEUM_FUEL_VAN){
//in short ->
double heatCapacity_JpK = storageCapacity_kWh*3.6e6 / (maxTemperature_degC - minTemperature_degC);
new J_EAStorageHeat(parentGC, storageType, storagePower_kw, lossFactor_WpK, energyModel.p_timeParameters, initialTemperature_degC, minTemperature_degC, maxTemperature_degC, setTemperature_degC, heatCapacity_JpK, OL_AmbientTempType.AMBIENT_AIR );


// TODO: Add management?
break;

case STORAGE_GAS:
Expand Down Expand Up @@ -1474,8 +1494,8 @@ else if (vehicle_type == OL_EnergyAssetType.PETROLEUM_FUEL_VAN){
//Add heat demand profile
OL_GridConnectionHeatingType heatingType = avgc_data.p_avgCompanyHeatingMethod;
double maxHeatOutputPower_kW = f_createHeatProfileFromAnnualGasTotal(companyGC, heatingType, yearlyGasDemand_m3, ratioGasUsedForHeating);
f_addHeatAsset(companyGC, heatingType, maxHeatOutputPower_kW);
companyGC.f_addHeatManagement(heatingType, false);
f_addHeatAsset(companyGC, heatingType, maxHeatOutputPower_kW, null);
//companyGC.f_addHeatManagement(heatingType, false);

//Set current scenario heating type
current_scenario_list.setCurrentHeatingType(heatingType);
Expand Down Expand Up @@ -1709,7 +1729,7 @@ String f_createChargerPolygon(double lat,double lon)
boolean V1GCapable = true; //randomTrue(avgc_data.p_v1gProbability);
boolean V2GCapable = true; //randomTrue(avgc_data.p_v2gProbability);
chargingStation.f_setChargePoint(new J_ChargePoint(V1GCapable, V2GCapable, maxPowerPerSocket_kW));
chargingStation.f_setChargingManagement(new J_ChargingManagementSimple(chargingStation, energyModel.p_timeParameters));
//chargingStation.f_setChargingManagement(new J_ChargingManagementSimple(chargingStation, energyModel.p_timeParameters));

//Create chargingsession/vehicles
if(dataChargingStation.vehicle_type() == OL_EnergyAssetType.CHARGER){
Expand All @@ -1727,7 +1747,7 @@ String f_createChargerPolygon(double lat,double lon)
}
else{
for(int k = 0; k < numberOfSockets*avgc_data.p_defaultNrOfVehiclesPerChargerSocket; k++ ){
f_addElectricVehicle(chargingStation, dataChargingStation.vehicle_type(), true, 0, maxPowerPerSocket_kW);
f_addElectricVehicle(chargingStation, dataChargingStation.vehicle_type(), true, 0, maxPowerPerSocket_kW, OL_ChargingAttitude.SIMPLE);
}
}

Expand Down Expand Up @@ -2383,7 +2403,7 @@ else if (gridConnection.getSupply().getPvInstalledKwp() != null && gridConnectio

if (battery_power_kW > 0 && battery_capacity_kWh > 0) {
f_addStorage(companyGC, battery_power_kW, battery_capacity_kWh, OL_EnergyAssetType.STORAGE_ELECTRIC);
companyGC.f_setBatteryManagement(new J_BatteryManagementSelfConsumption(companyGC, energyModel.p_timeParameters));
//companyGC.f_setBatteryManagement(new J_BatteryManagementSelfConsumption(companyGC, energyModel.p_timeParameters));
}
}

Expand Down Expand Up @@ -2443,7 +2463,7 @@ else if (gridConnection.getSupply().getPvInstalledKwp() != null && gridConnectio

if (createElectricEA){ // Check if electric demand EA should be created
for (int j = 0; j< nbEVCarsComute; j++){
f_addElectricVehicle(companyGC, OL_EnergyAssetType.ELECTRIC_VEHICLE, isDefaultVehicle, 0, maxChargingPower_kW);
f_addElectricVehicle(companyGC, OL_EnergyAssetType.ELECTRIC_VEHICLE, isDefaultVehicle, 0, maxChargingPower_kW, OL_ChargingAttitude.SIMPLE);
}
}

Expand Down Expand Up @@ -2507,7 +2527,7 @@ else if (gridConnection.getSupply().getPvInstalledKwp() != null && gridConnectio
//create EV
if (createElectricEA){ // Check if electric demand EA should be created
for (int j = 0; j< nbEVCars; j++){
f_addElectricVehicle(companyGC, OL_EnergyAssetType.ELECTRIC_VEHICLE, isDefaultVehicle, annualTravelDistance_km, maxChargingPower_kW);
f_addElectricVehicle(companyGC, OL_EnergyAssetType.ELECTRIC_VEHICLE, isDefaultVehicle, annualTravelDistance_km, maxChargingPower_kW, OL_ChargingAttitude.SIMPLE);
}
}

Expand Down Expand Up @@ -2568,7 +2588,7 @@ else if (gridConnection.getSupply().getPvInstalledKwp() != null && gridConnectio
//create electric vehicles
if (createElectricEA){ // Check if electric demand EA should be created
for (int j = 0; j< nbEVVans; j++){
f_addElectricVehicle(companyGC, OL_EnergyAssetType.ELECTRIC_VAN, isDefaultVehicle, annualTravelDistance_km, maxChargingPower_kW);
f_addElectricVehicle(companyGC, OL_EnergyAssetType.ELECTRIC_VAN, isDefaultVehicle, annualTravelDistance_km, maxChargingPower_kW, OL_ChargingAttitude.SIMPLE);
}
}

Expand Down Expand Up @@ -2629,7 +2649,7 @@ else if (gridConnection.getSupply().getPvInstalledKwp() != null && gridConnectio
//create electric vehicles
if (createElectricEA){ // Check if electric demand EA should be created
for (int j = 0; j< nbEVTrucks; j++){
f_addElectricVehicle(companyGC, OL_EnergyAssetType.ELECTRIC_TRUCK, isDefaultVehicle, annualTravelDistance_km, maxChargingPower_kW);
f_addElectricVehicle(companyGC, OL_EnergyAssetType.ELECTRIC_TRUCK, isDefaultVehicle, annualTravelDistance_km, maxChargingPower_kW, OL_ChargingAttitude.SIMPLE);
}
}

Expand All @@ -2650,9 +2670,9 @@ else if (gridConnection.getSupply().getPvInstalledKwp() != null && gridConnectio
}

//Set Default charging management if EV is present
if(companyGC.c_electricVehicles.size() + companyGC.c_chargingSessions.size() > 0){
companyGC.f_addChargingManagement(OL_ChargingAttitude.SIMPLE);
}
//if(companyGC.c_electricVehicles.size() + companyGC.c_chargingSessions.size() > 0){
//companyGC.f_addChargingManagement(OL_ChargingAttitude.SIMPLE);
//}

//Add tractors
f_createPetroleumFuelTractors(companyGC, gridConnection.getTransport().getAgriculture());
Expand Down Expand Up @@ -2798,7 +2818,7 @@ boolean f_createElectricityTimeSeriesAssets(GridConnection gridConnection,com.ze
existingBuilding.p_floorSurfaceArea_m2 += connectingBuildingData.address_floor_surface_m2();
/*ALCODEEND*/}

double f_addHeatAsset(GridConnection parentGC,OL_GridConnectionHeatingType heatAssetType,double maxHeatOutputPower_kW)
double f_addHeatAsset(GridConnection parentGC,OL_GridConnectionHeatingType heatAssetType,double maxHeatOutputPower_kW,J_HeatingPreferences heatingPreferences)
{/*ALCODESTART::1745336570663*/
//Initialize parameters
double heatOutputCapacityGasBurner_kW;
Expand Down Expand Up @@ -2887,6 +2907,10 @@ boolean f_createElectricityTimeSeriesAssets(GridConnection gridConnection,com.ze
default:
traceln("HEATING TYPE NOT FOUND FOR GC: " + parentGC);
}


//Add heating management and set the heating preferences
parentGC.f_addHeatManagement(heatAssetType, false, heatingPreferences);
/*ALCODEEND*/}

GridNode f_createHeatGridNode()
Expand Down Expand Up @@ -3882,7 +3906,7 @@ OL_GridConnectionHeatingType f_heatingSurveyCompany(GridConnection engineGC,com.

// Create EA conversions
if (peakHeatConsumption_kW != null) {
f_addHeatAsset(engineGC, heatingType, peakHeatConsumption_kW);
f_addHeatAsset(engineGC, heatingType, peakHeatConsumption_kW, null);
}

if (surveyGC.getStorage() != null && surveyGC.getStorage().getHasThermalStorage() != null) {
Expand All @@ -3894,10 +3918,10 @@ OL_GridConnectionHeatingType f_heatingSurveyCompany(GridConnection engineGC,com.
}

// Heating management (needs: heatingType & assets such as building thermal model or profiles, survey companies never have a thermal building mdoel)
boolean isGhost = heatingType != OL_GridConnectionHeatingType.NONE && peakHeatConsumption_kW == null;
//boolean isGhost = heatingType != OL_GridConnectionHeatingType.NONE && peakHeatConsumption_kW == null;

//Add heating management
engineGC.f_addHeatManagement(heatingType, isGhost);
//engineGC.f_addHeatManagement(heatingType, isGhost);
}

return heatingType;
Expand Down Expand Up @@ -4455,12 +4479,12 @@ else if (surveyGC.getHeat() != null && surveyGC.getHeat().getAnnualDistrictHeati
//Oprit? -> only then you should have a chance to start with EV (public ev is not supported by sliders, public chargepoint is then used instead)
if( house.p_eigenOprit){
if (randomTrue( avgc_data.p_shareOfElectricVehicleOwnership)){
J_EAEV ev = f_addElectricVehicle(house, OL_EnergyAssetType.ELECTRIC_VEHICLE, true, 0, 0);
J_EAEV ev = f_addElectricVehicle(house, OL_EnergyAssetType.ELECTRIC_VEHICLE, true, 0, 0, OL_ChargingAttitude.SIMPLE);
ev.getTripTracker().setAnnualDistance_km(ev.getTripTracker().getAnnualDistance_km()*tripTrackerScaling);
//Set Default charging management
if(house.f_getCurrentChargingType() == OL_ChargingAttitude.NONE){
house.f_addChargingManagement(OL_ChargingAttitude.SIMPLE);
}
//if(house.f_getCurrentChargingType() == OL_ChargingAttitude.NONE){
//house.f_addChargingManagement(OL_ChargingAttitude.SIMPLE);
//}
}
else{
J_EAFuelVehicle petroleumFuelVehicle = f_addPetroleumFuelVehicle(house, OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE, true, 0);
Expand Down Expand Up @@ -5067,7 +5091,7 @@ else if(numberOfResidents > 5){
}
}

//Get the house heating preferences
// Set the house heating preferences
J_HeatingPreferences heatingPreferences = f_getHouseHeatingPreferences();

f_addBuildingHeatModel(house, house.p_floorSurfaceArea_m2, spaceHeatingDemand_kwhpa, heatingPreferences);
Expand Down Expand Up @@ -5099,14 +5123,12 @@ else if(numberOfResidents > 5){
}

//Add heating asset
f_addHeatAsset(house, heatingType, maxHeatOutputPower_kW);
f_addHeatAsset(house, heatingType, maxHeatOutputPower_kW, heatingPreferences);

//Add heating management and set the heating preferences
house.f_addHeatManagement(heatingType, false);
house.f_setHeatingPreferences(heatingPreferences);

//For calibrating AVG data PBL loss factor
totalSpaceHeatDemand_kwhpa += spaceHeatingDemand_kwhpa;

/*ALCODEEND*/}

int f_estimateHouseNmbrResidents()
Expand Down
9 changes: 9 additions & 0 deletions _alp/Agents/Zero_Loader/Code/Functions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,10 @@
<Name><![CDATA[maxChargingPower_kW]]></Name>
<Type><![CDATA[double]]></Type>
</Parameter>
<Parameter>
<Name><![CDATA[chargingAttitude]]></Name>
<Type><![CDATA[OL_ChargingAttitude]]></Type>
</Parameter>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="public" StaticFunction="false">
Expand Down Expand Up @@ -1053,6 +1057,7 @@ verbruik = levering + productie - teruglevering]]></Description>
<ReturnType>double</ReturnType>
<Id>1745336570663</Id>
<Name><![CDATA[f_addHeatAsset]]></Name>
<Description><![CDATA[This function adds heating to a gridconnection. It takes a heatingType and a maximal required output power as arguments. Depending on the heating type one or multiple assets are created. A heat management is also added to the GC. The choice is made in f_addHeatManagement and its defaults are found in the energy model in c_defaultHeatingStrategies.]]></Description>
<X>1320</X>
<Y>460</Y>
<Label>
Expand All @@ -1074,6 +1079,10 @@ verbruik = levering + productie - teruglevering]]></Description>
<Name><![CDATA[maxHeatOutputPower_kW]]></Name>
<Type><![CDATA[double]]></Type>
</Parameter>
<Parameter>
<Name><![CDATA[heatingPreferences]]></Name>
<Type><![CDATA[J_HeatingPreferences]]></Type>
</Parameter>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="default" StaticFunction="false">
Expand Down
12 changes: 6 additions & 6 deletions _alp/Agents/tabHeating/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ int f_setHeatingSystemsWithCompanyUI(List<GCUtility> gcList,double targetHeatPum

new J_EAConversionHeatDeliverySet(house, peakHeatDemand_kW, efficiency, zero_Interface.energyModel.p_timeParameters, outputTemperature_degC);

house.f_addHeatManagement(OL_GridConnectionHeatingType.DISTRICTHEAT, false);
house.f_addHeatManagement(OL_GridConnectionHeatingType.DISTRICTHEAT, false, house.f_getHeatingPreferences());
}

//Update variable to change to custom scenario
Expand All @@ -286,7 +286,7 @@ int f_setHeatingSystemsWithCompanyUI(List<GCUtility> gcList,double targetHeatPum
//add gasburner
double peakHeatDemand_kW = f_calculatePeakHeatDemand_kW(house);
new J_EAConversionGasBurner(house, peakHeatDemand_kW, zero_Interface.energyModel.avgc_data.p_avgEfficiencyGasBurner_fr, zero_Interface.energyModel.p_timeParameters, 90);
house.f_addHeatManagement(OL_GridConnectionHeatingType.GAS_BURNER, false);
house.f_addHeatManagement(OL_GridConnectionHeatingType.GAS_BURNER, false, house.f_getHeatingPreferences());

/*
J_EAConsumption heatDemandAsset = findFirst(house.c_consumptionAssets, j_ea -> j_ea.getEAType() == OL_EnergyAssetType.HEAT_DEMAND);
Expand Down Expand Up @@ -398,7 +398,7 @@ else if (house.p_BuildingThermalAsset != null){
OL_AmbientTempType.HEAT_GRID
);
heatpump.updateParameters(inputTemperature_degC, outputTemperature_degC);
house.f_addHeatManagement(OL_GridConnectionHeatingType.LT_DISTRICTHEAT, false);
house.f_addHeatManagement(OL_GridConnectionHeatingType.LT_DISTRICTHEAT, false, house.f_getHeatingPreferences());
}

//Update variable to change to custom scenario
Expand All @@ -420,7 +420,7 @@ else if (house.p_BuildingThermalAsset != null){
house.f_removeAllHeatingAssets();
double peakHeatDemand_kW = f_calculatePeakHeatDemand_kW(house);
new J_EAConversionGasBurner(house, peakHeatDemand_kW, zero_Interface.energyModel.avgc_data.p_avgEfficiencyGasBurner_fr, zero_Interface.energyModel.p_timeParameters, zero_Interface.energyModel.avgc_data.p_avgOutputTemperatureGasBurner_degC);
house.f_addHeatManagement(OL_GridConnectionHeatingType.GAS_BURNER, false);
house.f_addHeatManagement(OL_GridConnectionHeatingType.GAS_BURNER, false, house.f_getHeatingPreferences());
}

//Update variable to change to custom scenario
Expand Down Expand Up @@ -961,7 +961,7 @@ else if (changedSliderHeatingType != OL_GridConnectionHeatingType.LT_DISTRICTHEA
//Change the current heating type to the new one
changingGC.f_removeAllHeatingAssets();
f_addHeatAsset(changingGC, changedSliderHeatingType, f_calculatePeakHeatDemand_kW(changingGC));
changingGC.f_addHeatManagement(changedSliderHeatingType, false);
changingGC.f_addHeatManagement(changedSliderHeatingType, false, changingGC.f_getHeatingPreferences());
currentNumberOfChangedHeatingType ++;
}
}
Expand Down Expand Up @@ -994,7 +994,7 @@ else if(changedSliderHeatingType == OL_GridConnectionHeatingType.LT_DISTRICTHEAT
}
changingGC.f_removeAllHeatingAssets();
f_addHeatAsset(changingGC, newHeatingType, f_calculatePeakHeatDemand_kW(changingGC));
changingGC.f_addHeatManagement(newHeatingType, false);
changingGC.f_addHeatManagement(newHeatingType, false, changingGC.f_getHeatingPreferences());
currentNumberOfChangedHeatingType--;
}
}
Expand Down
8 changes: 4 additions & 4 deletions _alp/ModelResources.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,14 @@
<Location>FILE_SYSTEM</Location>
</Resource>
<Resource>
<Id>1776931922142</Id>
<Path>vallum-production-861-41ea4ca-all.jar</Path>
<Id>1777376766232</Id>
<Path>icon_arrow.png</Path>
<ReferencedFromUserCode>false</ReferencedFromUserCode>
<Location>FILE_SYSTEM</Location>
</Resource>
<Resource>
<Id>1777376766232</Id>
<Path>icon_arrow.png</Path>
<Id>1781162633429</Id>
<Path>vallum-main-863-c779e37-all.jar</Path>
<ReferencedFromUserCode>false</ReferencedFromUserCode>
<Location>FILE_SYSTEM</Location>
</Resource>
Expand Down