rahadi94 · rahadi94 · Aug 15, 2025 · Aug 15, 2025 · Aug 15, 2025 · Aug 15, 2025
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ __pycache__/
 *.csv
 *.pkl
 *.pstat
+*.pdf
 
 # macOS files
 .DS_Store
@@ -21,10 +22,14 @@ __pycache__/
 /Utilities/raw_output/
 /Results/raw_output/
 /Cache/
+/new_notebooks_EVCH/
 
 # Root level data files
 chargingdata.csv
 experience.csv
 file.csv
 investment_results_Facility_1_2019-06-03.csv
-investment_results_Facility_KoeBogen_2019-06-03.csv
+investment_results_Facility_KoeBogen_2019-06-03.csv
+
+!/Cache/pv_loads.pkl
+!/Cache/pv_loads.pkl
diff --git a/Cache/pv_loads.pkl b/Cache/pv_loads.pkl
diff --git a/Cache/scaled_baseload.pkl b/Cache/scaled_baseload.pkl
diff --git a/EV_Charging_Clusters/Cache/pv_loads.pkl b/EV_Charging_Clusters/Cache/pv_loads.pkl
diff --git a/EV_Charging_Clusters/Cache/scaled_baseload.pkl b/EV_Charging_Clusters/Cache/scaled_baseload.pkl
diff --git a/EV_Charging_Clusters/Data/ACN_Caltech_Charging_Data/acndata_sessions_COMBINED_API.csv b/EV_Charging_Clusters/Data/ACN_Caltech_Charging_Data/acndata_sessions_COMBINED_API.csv
diff --git a/EV_Charging_Clusters/Data/PV_Data/pv_profiles_EU.csv b/EV_Charging_Clusters/Data/PV_Data/pv_profiles_EU.csv
diff --git a/Environment/helper/logging/__init__.py b/Environment/helper/logging/__init__.py
diff --git a/Infrastructure/ev_charger.py b/Infrastructure/ev_charger.py
@@ -1,7 +1,7 @@
 import simpy
 from simpy import Container
 
-from Environment.log import lg
+from resources.logging.log import lg
 
 
 class EVCharger:

diff --git a/Infrastructure/grid.py b/Infrastructure/grid.py
@@ -1,6 +1,6 @@
 import simpy
 
-from Environment.helper.configuration.configuration import Configuration
+from resources.configuration.configuration import Configuration
 
 
 class GridCapacity:

diff --git a/Infrastructure/parking_lot.py b/Infrastructure/parking_lot.py
@@ -1,6 +1,6 @@
 import simpy
 from simpy import Resource
-from Environment.log import lg
+from resources.logging.log import lg
 
 
 class ParkingLot:

diff --git a/Learning_agents/Learning_Pricing.py → Learning_experiments/Learning_Pricing.py b/Learning_agents/Learning_Pricing.py → Learning_experiments/Learning_Pricing.py
@@ -1,14 +1,14 @@
-from Environment.helper.configuration.configuration import Configuration
-from Deep_Reinforcement_Learning_Algorithms_with_PyTorch_master.agents.actor_critic_agents.SAC import (
+from resources.configuration.configuration import Configuration
+from Utilities.RL_Agents.agents.actor_critic_agents.SAC import (
     SAC,
 )
-from Environment.helper.configuration.SAC_configuration import (
+from resources.configuration.SAC_configuration import (
     config,
     pricing_config,
 )
 from Utilities.RL_environments.rl_pricing_env import PricingEnv
 from Utilities.sim_input_processing import sample_week
-from Environment.log import lg
+from resources.logging.log import lg
 import pandas as pd
 import numpy as np
 
@@ -56,7 +56,7 @@ def run_experiments():
     pricing_agent = SAC(pricing_config)
     training_results = pd.DataFrame([])
     episode = 1
-    NUMBER_EPISODES = 501
+    NUMBER_EPISODES = 21
     if Configuration.instance().pricing_mode == "perfect_info":
         NUMBER_EPISODES = 1
     output = []
@@ -146,8 +146,8 @@ def run_experiments():
         pricing_agent.episode_number += 1
         if not Configuration.instance().evaluation_after_training:
             training_results = pd.concat([training_results, df])
-            training_results.to_csv(
-                f"Utilities/raw_output/training_results_{pricing_agent.config.name}.csv"
+            training_results.to_csv(Configuration.instance().OUTPUT_DATA_PATH+
+                f"training_results_{pricing_agent.config.name}.csv"
             )
         output.append(df["profit"].values[0])
     # print(output)

diff --git a/Learning_agents/RL_main_discrete.py → Learning_experiments/RL_main_discrete.py b/Learning_agents/RL_main_discrete.py → Learning_experiments/RL_main_discrete.py
diff --git a/Operations/ChargingAlgorithms.py b/Operations/ChargingAlgorithms.py
@@ -1,8 +1,8 @@
 import numpy as np
 from docplex.mp.model import Model
 
-from Environment.helper.configuration.configuration import Configuration
-from Environment.log import lg
+from resources.configuration.configuration import Configuration
+from resources.logging.log import lg
 
 
 # Uncontrolled charging (ignores all infrastructure)

diff --git a/Operations/IntegratedAlgorithms.py b/Operations/IntegratedAlgorithms.py
@@ -1,7 +1,7 @@
-from Environment.log import lg
+from resources.logging.log import lg
 from docplex.mp.model import Model
 import numpy as np
-from Environment.helper.configuration.configuration import Configuration
+from resources.configuration.configuration import Configuration
 
 
 # TODO: myopic and multi-period optimal routing and charging (as implemented in ICIS paper but with specified lookahead window (e.g., 8 planning periods, which is 2h))

diff --git a/Operations/NonLinearAlgorithms.py b/Operations/NonLinearAlgorithms.py
@@ -2,7 +2,7 @@
 # from pyoptsparse import SLSQP, Optimization, pyOpt_objective
 import numpy as np
 
-from Environment.helper.configuration.configuration import Configuration
+from resources.configuration.configuration import Configuration
 from scipy.optimize import minimize
 import numpy as np
 

diff --git a/Operations/RoutingAlgorithms.py b/Operations/RoutingAlgorithms.py
@@ -1,4 +1,4 @@
-from Environment.log import lg
+from resources.logging.log import lg
 import random
 
 

diff --git a/Operations/StorageAlgorithms.py b/Operations/StorageAlgorithms.py
@@ -1,5 +1,5 @@
 # Contains algorithms for battery storage operations
-from Environment.log import lg
+from resources.logging.log import lg
 import numpy as np
 
 

diff --git a/Operations/operator.py b/Operations/operator.py
@@ -1,10 +1,10 @@
 import simpy
-from Environment.helper.configuration.configuration import Configuration
+from resources.configuration.configuration import Configuration
 import Operations.ChargingAlgorithms as charge_algos
 import Operations.RoutingAlgorithms as route_algos
 import Operations.IntegratedAlgorithms as integrate_algos
 import Operations.StorageAlgorithms as store_algos
-from Environment.log import lg
+from resources.logging.log import lg
 import numpy as np
 import pandas as pd
 

diff --git a/Preferences/EV_user_decision_making.py b/Preferences/EV_user_decision_making.py
@@ -1,7 +1,7 @@
 # First party modules
 # from pyoptsparse import SLSQP, Optimization
 
-from Environment.helper.configuration.configuration import Configuration
+from resources.configuration.configuration import Configuration
 
 power_degree = Configuration.instance().degree_of_power_in_price_function
 

diff --git a/Preferences/vehicle.py b/Preferences/vehicle.py
@@ -1,7 +1,7 @@
-from Environment.log import lg
+from resources.logging.log import lg
 import numpy as np
 
-from Environment.helper.configuration.configuration import Configuration
+from resources.configuration.configuration import Configuration
 from Preferences.EV_user_decision_making import ev_decision_making
 import pandas as pd
 

diff --git a/Results/Monitoring.py b/Results/Monitoring.py
diff --git a/Results/raw_output/empty.py b/Results/raw_output/empty.py
diff --git a/Environment/_Archive/__init__.py → Simulation/__init__.py b/Environment/_Archive/__init__.py → Simulation/__init__.py
diff --git a/Environment/model.py → Simulation/model.py b/Environment/model.py → Simulation/model.py
@@ -1,5 +1,5 @@
-from Environment.helper.configuration.configuration import Configuration
-from Environment.log import lg
+from resources.configuration.configuration import Configuration
+from resources.logging.log import lg
 from Infrastructure.grid import GridCapacity
 from Infrastructure.parking_lot import ParkingLot
 from Operations.operator import Operator

diff --git a/Environment/__init__.py → Utilities/RL_Agents/__init__.py b/Environment/__init__.py → Utilities/RL_Agents/__init__.py
diff --git a/..._with_PyTorch_master/agents/Base_Agent.py → Utilities/RL_Agents/agents/Base_Agent.py b/..._with_PyTorch_master/agents/Base_Agent.py → Utilities/RL_Agents/agents/Base_Agent.py
@@ -6,7 +6,7 @@
 import numpy as np
 import torch
 import time
-from Environment.log import lg
+from resources.logging.log import lg
 
 # import tensorflow as tf
 from nn_builder.pytorch.NN import NN

diff --git a/..._PyTorch_master/agents/DQN_agents/DDQN.py → ...ities/RL_Agents/agents/DQN_agents/DDQN.py b/..._PyTorch_master/agents/DQN_agents/DDQN.py → ...ities/RL_Agents/agents/DQN_agents/DDQN.py
diff --git a/...h_PyTorch_master/agents/DQN_agents/DQN.py → Utilities/RL_Agents/agents/DQN_agents/DQN.py b/...h_PyTorch_master/agents/DQN_agents/DQN.py → Utilities/RL_Agents/agents/DQN_agents/DQN.py
diff --git a/...ms_with_PyTorch_master/agents/HER_Base.py → Utilities/RL_Agents/agents/HER_Base.py b/...ms_with_PyTorch_master/agents/HER_Base.py → Utilities/RL_Agents/agents/HER_Base.py
diff --git a/...hms_with_PyTorch_master/agents/Trainer.py → Utilities/RL_Agents/agents/Trainer.py b/...hms_with_PyTorch_master/agents/Trainer.py → Utilities/RL_Agents/agents/Trainer.py
diff --git a/...master/agents/actor_critic_agents/DDPG.py → ...Agents/agents/actor_critic_agents/DDPG.py b/...master/agents/actor_critic_agents/DDPG.py → ...Agents/agents/actor_critic_agents/DDPG.py
diff --git a/..._master/agents/actor_critic_agents/SAC.py → ..._Agents/agents/actor_critic_agents/SAC.py b/..._master/agents/actor_critic_agents/SAC.py → ..._Agents/agents/actor_critic_agents/SAC.py
@@ -1,10 +1,10 @@
-from Deep_Reinforcement_Learning_Algorithms_with_PyTorch_master.agents.Base_Agent import (
+from Utilities.RL_Agents.agents.Base_Agent import (
     Base_Agent,
 )
-from Deep_Reinforcement_Learning_Algorithms_with_PyTorch_master.utilities.OU_Noise import (
+from Utilities.RL_Agents.utilities.OU_Noise import (
     OU_Noise,
 )
-from Deep_Reinforcement_Learning_Algorithms_with_PyTorch_master.utilities.data_structures.Replay_Buffer import (
+from Utilities.RL_Agents.utilities.data_structures.Replay_Buffer import (
     Replay_Buffer,
 )
 from torch.optim import Adam
@@ -551,5 +551,5 @@ def save_models(self):
             # torch.save(self.critic_local.state_dict(), f'Results/critic_{self.config.name}')
             # torch.save(self.critic_local_2.state_dict(), f'Results/critic_2_{self.config.name}')
             torch.save(
-                self.actor_local.state_dict(), f"Results/actor_{self.config.name}"
+                self.actor_local.state_dict(), f"data/output/actor_{self.config.name}"
             )
diff --git a/...n_strategies/Base_Exploration_Strategy.py → ...n_strategies/Base_Exploration_Strategy.py b/...n_strategies/Base_Exploration_Strategy.py → ...n_strategies/Base_Exploration_Strategy.py
diff --git a/..._strategies/Epsilon_Greedy_Exploration.py → ..._strategies/Epsilon_Greedy_Exploration.py b/..._strategies/Epsilon_Greedy_Exploration.py → ..._strategies/Epsilon_Greedy_Exploration.py
diff --git a/...ration_strategies/Gaussian_Exploration.py → ...ration_strategies/Gaussian_Exploration.py b/...ration_strategies/Gaussian_Exploration.py → ...ration_strategies/Gaussian_Exploration.py
diff --git a/...ration_strategies/OU_Noise_Exploration.py → ...ration_strategies/OU_Noise_Exploration.py b/...ration_strategies/OU_Noise_Exploration.py → ...ration_strategies/OU_Noise_Exploration.py
diff --git a/...rch_master/utilities/Deepmind_RMS_Prop.py → .../RL_Agents/utilities/Deepmind_RMS_Prop.py b/...rch_master/utilities/Deepmind_RMS_Prop.py → .../RL_Agents/utilities/Deepmind_RMS_Prop.py
diff --git a/...PyTorch_master/utilities/Memory_Shaper.py → ...ties/RL_Agents/utilities/Memory_Shaper.py b/...PyTorch_master/utilities/Memory_Shaper.py → ...ties/RL_Agents/utilities/Memory_Shaper.py
diff --git a/...with_PyTorch_master/utilities/OU_Noise.py → Utilities/RL_Agents/utilities/OU_Noise.py b/...with_PyTorch_master/utilities/OU_Noise.py → Utilities/RL_Agents/utilities/OU_Noise.py
diff --git a/...tilities/Parallel_Experience_Generator.py → ...tilities/Parallel_Experience_Generator.py b/...tilities/Parallel_Experience_Generator.py → ...tilities/Parallel_Experience_Generator.py
diff --git a/...Torch_master/utilities/PyTorch-logo-2.jpg → ...es/RL_Agents/utilities/PyTorch-logo-2.jpg b/...Torch_master/utilities/PyTorch-logo-2.jpg → ...es/RL_Agents/utilities/PyTorch-logo-2.jpg
diff --git a/...th_PyTorch_master/utilities/RL_image.jpeg → Utilities/RL_Agents/utilities/RL_image.jpeg b/...th_PyTorch_master/utilities/RL_image.jpeg → Utilities/RL_Agents/utilities/RL_image.jpeg
diff --git a/...h_PyTorch_master/utilities/Tensorboard.py → Utilities/RL_Agents/utilities/Tensorboard.py b/...h_PyTorch_master/utilities/Tensorboard.py → Utilities/RL_Agents/utilities/Tensorboard.py
diff --git a/...rch_master/utilities/Utility_Functions.py → .../RL_Agents/utilities/Utility_Functions.py b/...rch_master/utilities/Utility_Functions.py → .../RL_Agents/utilities/Utility_Functions.py
diff --git a/...ructures/Action_Balanced_Replay_Buffer.py → ...ructures/Action_Balanced_Replay_Buffer.py b/...ructures/Action_Balanced_Replay_Buffer.py → ...ructures/Action_Balanced_Replay_Buffer.py
diff --git a/...aster/utilities/data_structures/Config.py → ...gents/utilities/data_structures/Config.py b/...aster/utilities/data_structures/Config.py → ...gents/utilities/data_structures/Config.py
diff --git a/...master/utilities/data_structures/Deque.py → ...Agents/utilities/data_structures/Deque.py b/...master/utilities/data_structures/Deque.py → ...Agents/utilities/data_structures/Deque.py
diff --git a/...ter/utilities/data_structures/Max_Heap.py → ...nts/utilities/data_structures/Max_Heap.py b/...ter/utilities/data_structures/Max_Heap.py → ...nts/utilities/data_structures/Max_Heap.py
diff --git a/..._master/utilities/data_structures/Node.py → ..._Agents/utilities/data_structures/Node.py b/..._master/utilities/data_structures/Node.py → ..._Agents/utilities/data_structures/Node.py
diff --git a/...a_structures/Prioritised_Replay_Buffer.py → ...a_structures/Prioritised_Replay_Buffer.py b/...a_structures/Prioritised_Replay_Buffer.py → ...a_structures/Prioritised_Replay_Buffer.py
diff --git a/...tilities/data_structures/Replay_Buffer.py → ...tilities/data_structures/Replay_Buffer.py b/...tilities/data_structures/Replay_Buffer.py → ...tilities/data_structures/Replay_Buffer.py
diff --git a/...ties/data_structures/Tanh_Distribution.py → ...ties/data_structures/Tanh_Distribution.py b/...ties/data_structures/Tanh_Distribution.py → ...ties/data_structures/Tanh_Distribution.py
diff --git a/...tilities/grammar_algorithms/k_Sequitur.py → ...tilities/grammar_algorithms/k_Sequitur.py b/...tilities/grammar_algorithms/k_Sequitur.py → ...tilities/grammar_algorithms/k_Sequitur.py
diff --git a/Utilities/RL_environments/rl_pricing_env.py b/Utilities/RL_environments/rl_pricing_env.py
@@ -4,7 +4,7 @@
 import logging
 import pandas as pd
 
-from Environment.helper.configuration.configuration import Configuration
+from resources.configuration.configuration import Configuration
 
 k = 5
 

diff --git a/Utilities/ex_ante_visualization.py b/Utilities/ex_ante_visualization.py
@@ -39,7 +39,7 @@ def set_plotting_style(palette="mako"):
 
 
 def plot_full_sim_horizon_combined_load_sink_curve(
-    palette="mako", hue=None, visuals_save_path="visuals_output/", post_fix=""
+    palette="mako", hue=None, visuals_save_path=Configuration.instance().OUTPUT_VIZ_PATH, post_fix=""
 ):
     """
     Plots load curve in 1-timestep (i.e., 1 minute) resolution over entire sim horizon
@@ -137,7 +137,7 @@ def plot_full_sim_horizon_combined_load_sink_curve(
 
 
 def plot_full_sim_horizon_combined_load_source_curve(
-    palette="mako", hue=None, visuals_save_path="visuals_output/"
+    palette="mako", hue=None, visuals_save_path=Configuration.instance().OUTPUT_VIZ_PATH
 ):
     """
     Plots load curve in 1-timestep (i.e., 1 minute) resolution over entire sim horizon
@@ -218,7 +218,7 @@ def plot_full_sim_horizon_combined_load_source_curve(
 
 
 def plot_full_sim_horizon_combined_load_source_curve_4(
-    palette="mako", hue=None, visuals_save_path="visuals_output/"
+    palette="mako", hue=None, visuals_save_path=Configuration.instance().OUTPUT_VIZ_PATH
 ):
     """
     Plots load curve in 1-timestep (i.e., 1 minute) resolution over entire sim horizon

diff --git a/..._EVCH/00_ACN_Charging_Data_Analysis.ipynb → ...books/00_ACN_Charging_Data_Analysis.ipynb b/..._EVCH/00_ACN_Charging_Data_Analysis.ipynb → ...books/00_ACN_Charging_Data_Analysis.ipynb
diff --git a/...EVCH/00_APCOA_Parking_Data_Analysis.ipynb → ...ooks/00_APCOA_Parking_Data_Analysis.ipynb b/...EVCH/00_APCOA_Parking_Data_Analysis.ipynb → ...ooks/00_APCOA_Parking_Data_Analysis.ipynb
diff --git a/...0_APCOA_Parking_Data_Raw_Processing.ipynb → ...0_APCOA_Parking_Data_Raw_Processing.ipynb b/...0_APCOA_Parking_Data_Raw_Processing.ipynb → ...0_APCOA_Parking_Data_Raw_Processing.ipynb
diff --git a/...VCH/00_ArtInvest_Load_Data_Analysis.ipynb → ...oks/00_ArtInvest_Load_Data_Analysis.ipynb b/...VCH/00_ArtInvest_Load_Data_Analysis.ipynb → ...oks/00_ArtInvest_Load_Data_Analysis.ipynb
diff --git a/...H/01_Parking+Charging_Data_Blending.ipynb → ...s/01_Parking+Charging_Data_Blending.ipynb b/...H/01_Parking+Charging_Data_Blending.ipynb → ...s/01_Parking+Charging_Data_Blending.ipynb
diff --git a/...EVCH/02_Parking+Charging_Clustering.ipynb → ...ooks/02_Parking+Charging_Clustering.ipynb b/...EVCH/02_Parking+Charging_Clustering.ipynb → ...ooks/02_Parking+Charging_Clustering.ipynb
diff --git a/new_notebooks_EVCH/03_Sampling_Events.ipynb → Utilities/notebooks/03_Sampling_Events.ipynb b/new_notebooks_EVCH/03_Sampling_Events.ipynb → Utilities/notebooks/03_Sampling_Events.ipynb
diff --git a/Utilities/raw_output/empty.py b/Utilities/raw_output/empty.py
diff --git a/Utilities/sim_input_processing.py b/Utilities/sim_input_processing.py
@@ -10,7 +10,8 @@
 from sklearn.neighbors import KernelDensity
 #######################################################################################
 ### COMBINED ROUTINES
-from Environment.log import lg
+from resources.configuration.configuration import Configuration
+from resources.logging.log import lg
 from Utilities.generate_random_demand import generate_random_demand
 
 
@@ -412,7 +413,7 @@ def get_sim_charging_requests(
         elif n_days and candidate_days and not limit_requests_to_capa:
 
             raise ValueError("Not Currently Implemented ")
-        parking_charging_preferences.to_csv('Utilities/raw_output/parking_data.csv')
+        parking_charging_preferences.to_csv(Configuration.instance().OUTPUT_DATA_PATH+'/parking_data.csv')
 
     return parking_charging_preferences
 

diff --git a/...es/visuals_output/sim_input_processing.py → Utilities/sim_input_processing_utility.py b/...es/visuals_output/sim_input_processing.py → Utilities/sim_input_processing_utility.py
diff --git a/Utilities/sim_output_processing.py b/Utilities/sim_output_processing.py
@@ -4,7 +4,7 @@
 import pandas as pd
 from datetime import timedelta
 
-from Environment.helper.configuration.configuration import Configuration
+from resources.configuration.configuration import Configuration
 
 
 def get_requests(raw_output_save_path, post_fix=""):