Defactoring

.gitignore

@@ -1,9 +1,30 @@
-/Utilities/raw_output/price_history_ACN_state9_week1_ACN.csv
-/Utilities/raw_output/requests_ACN_state9_week1_ACN.csv
-/Utilities/raw_output/storage_ACN_state9_week1_ACN.csv
-/Utilities/raw_output/training_results_pricing_double_capa_500_2_average_power_m_200_m_post_tuning.csv
-/Utilities/raw_output/training_results_pricing_double_tra_500_2_average_power_m_200_m_post_tuning.csv
-/Utilities/raw_output/load.csv
-/Utilities/raw_output/parking_data.csv
-/Utilities/raw_output/CSs_ACN_state9_week1_ACN_pricing_double_tra_500_2_average_power_m_200_m_post_tuning.csv
-/Utilities/raw_output/empty.py
+# IDE and environment files
+/.idea/
+/.venv/
+
+# Python cache
+__pycache__/
+*.pyc
+
+# Log files
+*.log
+
+# Data files
+*.csv
+*.pkl
+*.pstat
+
+# macOS files
+.DS_Store
+
+# Output directories
+/Utilities/raw_output/
+/Results/raw_output/
+/Cache/
+
+# 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

Environment/helper/configuration/configuration.py

@@ -59,7 +59,7 @@ def __init__(self):
         self.price_sensitivity = price_sensitivity
         peak_penalty = "m"  # l, m, h
         self.adjust_peak_penalty(peak_penalty)
-        charging_algorithm = "average_power"  # average_power, least_laxity_first
+        charging_algorithm = "average_power"  # average_power, least_laxity_first, perfect_info
         self.charging_algorithm = charging_algorithm
         self.peak_penalty = peak_penalty
         PV = 500

Operations/ChargingAlgorithms.py

@@ -18,7 +18,12 @@
 # UNCONTROLLED CHARGING#
 
 
-def uncontrolled(env, connected_vehicles, charging_capacity, planning_period_length):
+def uncontrolled(env,
+    connected_vehicles,
+    charging_stations,
+    charging_capacity,
+    free_grid_capacity,
+    planning_period_length,):
     """
     :param env:
     :param requests:
@@ -348,7 +353,12 @@ def custom_priority(charging_stations, charging_capacity, free_grid_capacity):
 
 
 def equal_sharing(
-    charging_stations, charging_capacity, free_grid_capacity, free_battery_capacity
+    env,
+    connected_vehicles,
+    charging_stations,
+    charging_capacity,
+    free_grid_capacity,
+    planning_period_length,
 ):
     """
     Computes same-period charging power per each connected vehicle by cascading available grid power equally through the network
@@ -400,9 +410,10 @@ def equal_sharing(
 def average_power(
     env,
     connected_vehicles,
+    charging_stations,
     charging_capacity,
-    planning_period_length,
     free_grid_capacity,
+    planning_period_length,
 ):
     """
     :param env:

Operations/IntegratedAlgorithms.py

@@ -34,7 +34,7 @@ def perfect_info_charging_routing(
     mdl = Model("perfect_info_scaling")
     vehicle_range = []
     delta_time = 60
-    sim_duration = 5
+    sim_duration = 1
 
     for i in vehicles:
         vehicle_range.append(i.id)