diff --git a/_alp/Agents/GridConnection/Code/Functions.java b/_alp/Agents/GridConnection/Code/Functions.java index daccd161..6ce77323 100644 --- a/_alp/Agents/GridConnection/Code/Functions.java +++ b/_alp/Agents/GridConnection/Code/Functions.java @@ -548,7 +548,7 @@ OL_GridConnectionHeatingType f_getCurrentHeatingType() } /*ALCODEEND*/} -double f_addHeatManagement(OL_GridConnectionHeatingType heatingType,boolean isGhost) +double f_addHeatManagement(OL_GridConnectionHeatingType heatingType,boolean isGhost,J_HeatingPreferences heatingPreferences) {/*ALCODESTART::1754393382442*/ if (heatingType == OL_GridConnectionHeatingType.NONE) { return; @@ -578,9 +578,9 @@ OL_GridConnectionHeatingType f_getCurrentHeatingType() e.printStackTrace(); } -J_HeatingPreferences existingHeatingPreferences = f_getHeatingManagement() != null ? f_getHeatingManagement().getHeatingPreferences() : null; //Store the existing heating preferences +//J_HeatingPreferences existingHeatingPreferences = f_getHeatingManagement() != null ? f_getHeatingManagement().getHeatingPreferences() : null; //Store the existing heating preferences -heatingManagement.setHeatingPreferences(existingHeatingPreferences); // Reasign the existing heating preferences +heatingManagement.setHeatingPreferences(heatingPreferences); // Reasign the existing heating preferences f_setExternalAssetManagement(heatingManagement); /*ALCODEEND*/} @@ -1223,3 +1223,11 @@ boolean f_isAssetManagementActive(Class assetManag } /*ALCODEEND*/} +J_HeatingPreferences f_getHeatingPreferences() +{/*ALCODESTART::1781165937788*/ +if (f_getHeatingManagement() != null) { + return f_getHeatingManagement().getHeatingPreferences(); +} +return null; +/*ALCODEEND*/} + diff --git a/_alp/Agents/GridConnection/Code/Functions.xml b/_alp/Agents/GridConnection/Code/Functions.xml index 2d6e6631..a053ca3e 100644 --- a/_alp/Agents/GridConnection/Code/Functions.xml +++ b/_alp/Agents/GridConnection/Code/Functions.xml @@ -415,7 +415,7 @@ 1753969724598 645 - 360 + 380