diff --git a/_alp/Agents/EnergyCoop/AOC.EnergyCoop.xml b/_alp/Agents/EnergyCoop/AOC.EnergyCoop.xml index b076ed1a..53232444 100644 --- a/_alp/Agents/EnergyCoop/AOC.EnergyCoop.xml +++ b/_alp/Agents/EnergyCoop/AOC.EnergyCoop.xml @@ -37,12 +37,16 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; I_EnergyData - +energyModel.c_actors.add(this);]]> false 1660731375014 diff --git a/_alp/Agents/EnergyCoop/Code/Functions.java b/_alp/Agents/EnergyCoop/Code/Functions.java index 41bb63a5..60448c50 100644 --- a/_alp/Agents/EnergyCoop/Code/Functions.java +++ b/_alp/Agents/EnergyCoop/Code/Functions.java @@ -1594,3 +1594,12 @@ HashSet f_getAllChildCustomerGridConnections_recursion(HashSettrue + + VOID + double + 1753348770752 + + 980 + 70 + + false + true + true + + diff --git a/_alp/Agents/EnergyCoop/Variables.xml b/_alp/Agents/EnergyCoop/Variables.xml index 85f89a7f..b5bc3dc7 100644 --- a/_alp/Agents/EnergyCoop/Variables.xml +++ b/_alp/Agents/EnergyCoop/Variables.xml @@ -1239,9 +1239,6 @@ AccessType="public" StaticVariable="false"> ]]> - - - @@ -1283,9 +1280,6 @@ AccessType="public" StaticVariable="false"> ]]> - - - diff --git a/_alp/Agents/EnergyModel/AOC.EnergyModel.xml b/_alp/Agents/EnergyModel/AOC.EnergyModel.xml index 6981e5f5..ec80701c 100644 --- a/_alp/Agents/EnergyModel/AOC.EnergyModel.xml +++ b/_alp/Agents/EnergyModel/AOC.EnergyModel.xml @@ -51,7 +51,11 @@ import com.querydsl.core.types.dsl.TimeExpression; //import zero_engine.J_EAConsumption; ]]> I_EnergyData - f_getActiveGridConnections() f_buildGridNodeTree(); c_gridConnections.forEach(GC -> GC.f_initialize()); +// Only relevant for deserialisation: +c_pausedGridConnections.forEach(GC -> GC.f_initialize()); + pop_connectionOwners.forEach(CO -> CO.f_initialize()); pop_energyCoops.forEach(EC -> EC.f_initialize()); // Not yet robust when there is no supplier initialized! @@ -711,7 +714,8 @@ J_ProfilePointer f_findProfile(String assetName) {/*ALCODESTART::1727193246625*/ J_ProfilePointer profilePointer = findFirst(c_profiles, p -> p.name.equals(assetName)); //traceln("J_EAConsumption with name %s found profile asset: %s", assetName, profilePointer); -if (profilePointer == null) { +if (profilePointer == null) { + traceln("No profilePointer with name %s found", assetName); throw new RuntimeException(String.format("Consumption or production asset without valid profile!") ); } return profilePointer; @@ -982,6 +986,7 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC) } } if( e instanceof J_EABuilding ) { + //traceln("v_currentSolarPowerNormalized_r: %s", v_currentSolarPowerNormalized_r); ((J_EABuilding)e).updateSolarRadiation(v_currentSolarPowerNormalized_r*1000); } } diff --git a/_alp/Agents/EnergyModel/EmbeddedObjects.xml b/_alp/Agents/EnergyModel/EmbeddedObjects.xml index 0233f1a2..f1297f42 100644 --- a/_alp/Agents/EnergyModel/EmbeddedObjects.xml +++ b/_alp/Agents/EnergyModel/EmbeddedObjects.xml @@ -244,6 +244,9 @@ + + + true @@ -1138,6 +1141,15 @@ + + + + + + + + + true @@ -1297,6 +1309,9 @@ + + + true @@ -1453,6 +1468,9 @@ + + + true @@ -1648,6 +1666,9 @@ + + + true @@ -1801,6 +1822,9 @@ + + + true @@ -1954,6 +1978,9 @@ + + + true @@ -2110,6 +2137,9 @@ + + + true @@ -2236,6 +2266,15 @@ + + + + + + + + + true @@ -2327,6 +2366,15 @@ + + + + + + + + + true @@ -2421,6 +2469,15 @@ + + + + + + + + + true @@ -2611,6 +2668,9 @@ + + + true @@ -2798,6 +2858,9 @@ + + + true diff --git a/_alp/Agents/EnergyModel/Variables.xml b/_alp/Agents/EnergyModel/Variables.xml index b79cc51b..2ddcca65 100644 --- a/_alp/Agents/EnergyModel/Variables.xml +++ b/_alp/Agents/EnergyModel/Variables.xml @@ -1309,9 +1309,6 @@ AccessType="public" StaticVariable="false"> ]]> - - - @@ -1331,9 +1328,6 @@ AccessType="public" StaticVariable="false"> ]]> - - - @@ -1353,9 +1347,6 @@ AccessType="public" StaticVariable="false"> ]]> - - - @@ -2219,7 +2210,7 @@ false true true - + ArrayList J_EA String @@ -2365,7 +2356,7 @@ false true true - + ArrayList GridConnection String @@ -2383,7 +2374,7 @@ false true true - + ArrayList J_ProfilePointer String @@ -2443,4 +2434,22 @@ String + + 1753361227218 + + 240 + -110 + + false + true + true + + ArrayList + GIS_Object + String + + diff --git a/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml b/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml index 2b2b6a8e..d8117e27 100644 --- a/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml +++ b/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml @@ -105,6 +105,9 @@ + + + false diff --git a/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml b/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml index b44453d6..208c528b 100644 --- a/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml +++ b/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml @@ -106,6 +106,9 @@ + + + false diff --git a/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml b/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml index 49b7c513..b3eb70d2 100644 --- a/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml +++ b/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml @@ -105,6 +105,9 @@ + + + false diff --git a/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml b/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml index 81903efd..a6b79c89 100644 --- a/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml +++ b/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml @@ -105,6 +105,9 @@ + + + false diff --git a/_alp/Agents/GCHouse/AOC.GCHouse.xml b/_alp/Agents/GCHouse/AOC.GCHouse.xml index 5834fb49..38378cce 100644 --- a/_alp/Agents/GCHouse/AOC.GCHouse.xml +++ b/_alp/Agents/GCHouse/AOC.GCHouse.xml @@ -105,6 +105,9 @@ + + + false diff --git a/_alp/Agents/GCHouse/Variables.xml b/_alp/Agents/GCHouse/Variables.xml index 5db0700c..a17259a5 100644 --- a/_alp/Agents/GCHouse/Variables.xml +++ b/_alp/Agents/GCHouse/Variables.xml @@ -226,9 +226,10 @@ 1704447555069 - + + true 1460 - 110 + -40 1704447555071 - + + true 1460 - 90 + -20 + + 1753354062572 + + 1460 + 108 + + false + true + true + + + NONE + false + + + + + 1753354062570 + TEXT_BOX + 0 + 100 + NO_DELIMETER + + + + + 1753354182380 + + 1460 + 90 + + false + true + true + + + NONE + false + + + + + 1753354182378 + TEXT_BOX + 0 + 100 + NO_DELIMETER + + + diff --git a/_alp/Agents/GCIndustry/AOC.GCIndustry.xml b/_alp/Agents/GCIndustry/AOC.GCIndustry.xml index d16f4f0e..854db486 100644 --- a/_alp/Agents/GCIndustry/AOC.GCIndustry.xml +++ b/_alp/Agents/GCIndustry/AOC.GCIndustry.xml @@ -106,6 +106,9 @@ + + + false diff --git a/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml b/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml index 3be9e6b4..c7f5613a 100644 --- a/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml +++ b/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml @@ -105,6 +105,9 @@ + + + false diff --git a/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml b/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml index e8a6dff0..01d197db 100644 --- a/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml +++ b/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml @@ -105,6 +105,9 @@ + + + false diff --git a/_alp/Agents/GCUtility/AOC.GCUtility.xml b/_alp/Agents/GCUtility/AOC.GCUtility.xml index 2700594e..1c658623 100644 --- a/_alp/Agents/GCUtility/AOC.GCUtility.xml +++ b/_alp/Agents/GCUtility/AOC.GCUtility.xml @@ -105,6 +105,9 @@ + + + false diff --git a/_alp/Agents/GIS_Building/AOC.GIS_Building.xml b/_alp/Agents/GIS_Building/AOC.GIS_Building.xml index c4d56b06..20574502 100644 --- a/_alp/Agents/GIS_Building/AOC.GIS_Building.xml +++ b/_alp/Agents/GIS_Building/AOC.GIS_Building.xml @@ -42,6 +42,15 @@ + + + + + + + + + false diff --git a/_alp/Agents/GIS_Object/AOC.GIS_Object.xml b/_alp/Agents/GIS_Object/AOC.GIS_Object.xml index 42e32d4e..ec08a798 100644 --- a/_alp/Agents/GIS_Object/AOC.GIS_Object.xml +++ b/_alp/Agents/GIS_Object/AOC.GIS_Object.xml @@ -3,7 +3,26 @@ 1667726338857 + 1752681631114 + false 1667726338855 @@ -101,6 +120,7 @@ 1667726338852 + true 50 -50