From 08a25013ce5b8d8a00570e5f17018d4ffe48356c Mon Sep 17 00:00:00 2001 From: GillisHommen Date: Wed, 31 Dec 2025 12:05:45 +0100 Subject: [PATCH 1/2] Pulled forward initialisation of Time/Date in engine, before creation of agents New tripTrackers now use v_dayofweek1jan to shift weekday/weekend trips, but v_dayofweek1jan was set too late previously, so it was always 0 when the triptracker was created. --- _alp/Agents/Zero_Loader/Code/Functions.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/_alp/Agents/Zero_Loader/Code/Functions.java b/_alp/Agents/Zero_Loader/Code/Functions.java index 48294de..6af9a0f 100644 --- a/_alp/Agents/Zero_Loader/Code/Functions.java +++ b/_alp/Agents/Zero_Loader/Code/Functions.java @@ -40,6 +40,11 @@ double f_configureEngine_default() {/*ALCODESTART::1726584205773*/ +//Engine time-date variables +energyModel.p_runStartTime_h = v_simStartHour_h; +energyModel.p_runEndTime_h = v_simStartHour_h + v_simDuration_h; +energyModel.f_initializeTimeDates(); + //Set basic input files energyModel.p_truckTripsCsv = inputCSVtruckTrips; energyModel.p_householdTripsCsv = inputCSVhouseholdTrips; @@ -68,8 +73,7 @@ f_createAdditionalGISObjects(); //Initialize the engine -energyModel.p_runStartTime_h = v_simStartHour_h; -energyModel.p_runEndTime_h = v_simStartHour_h + v_simDuration_h; + energyModel.f_initializeEngine(); /*ALCODEEND*/} From c51656f418509d56985afd4acb78bf315aa7039a Mon Sep 17 00:00:00 2001 From: GillisHommen Date: Mon, 5 Jan 2026 18:10:53 +0100 Subject: [PATCH 2/2] Re-order of f_initializeSpecificSliderGC() in f_configureEngine_default() --- _alp/Agents/Zero_Interface/Code/Functions.java | 9 ++++++--- _alp/Agents/Zero_Loader/Code/Functions.java | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/_alp/Agents/Zero_Interface/Code/Functions.java b/_alp/Agents/Zero_Interface/Code/Functions.java index af21abe..c804770 100644 --- a/_alp/Agents/Zero_Interface/Code/Functions.java +++ b/_alp/Agents/Zero_Interface/Code/Functions.java @@ -3727,9 +3727,12 @@ List f_getMainInterfaceSliderEAGCs() //Find the energy production slider gcs that are not specificly for the EnergyHub List electricityTabEASliderGCs_prod = findAll(energyModel.EnergyProductionSites, sliderProd -> - sliderProd.p_isSliderGC && - !sliderProd.p_gridConnectionID.equals(p_defaultEnergyHubSliderGCName_solarfarm) && - !sliderProd.p_gridConnectionID.equals(p_defaultEnergyHubSliderGCName_windfarm)); + sliderProd.p_isSliderGC && + !sliderProd.p_gridConnectionID.equals(p_defaultEnergyHubSliderGCName_solarfarm) && + !sliderProd.p_gridConnectionID.equals(p_defaultEnergyHubSliderGCName_windfarm)); + +//traceln("electricityTabEASliderGCs_prod.size(): %s", electricityTabEASliderGCs_prod.size()); + if(electricityTabEASliderGCs_prod.size() == 2){ electricityTabEASliderGCs.addAll(electricityTabEASliderGCs_prod); } diff --git a/_alp/Agents/Zero_Loader/Code/Functions.java b/_alp/Agents/Zero_Loader/Code/Functions.java index 6af9a0f..28cf1e4 100644 --- a/_alp/Agents/Zero_Loader/Code/Functions.java +++ b/_alp/Agents/Zero_Loader/Code/Functions.java @@ -50,9 +50,6 @@ energyModel.p_householdTripsCsv = inputCSVhouseholdTrips; energyModel.p_cookingPatternCsv = inputCSVcookingActivities; -//Initialize specific slider GC -f_initializeSpecificSliderGC(); - //Actors f_createActors(); @@ -63,6 +60,9 @@ f_removeObjectsNotInActiveNBH(); } +//Initialize specific slider GC +f_initializeSpecificSliderGC(); + //Grid nodes f_createGridNodes();