ChaProEV 1.1.8__tar.gz → 1.2.0__tar.gz

{chaproev-1.1.8 → chaproev-1.2.0}/ChaProEV.toml

@@ -257,4 +257,8 @@ produce = true
 display_scenario_run = true
 scenario_run_description =  'Scenarios started'
 display_saving_pool_run = true
-saving_pool_run_description =  'Saving extra end outputs started'
+saving_pool_run_description =  'Saving extra end outputs started'
+
+[discharge]
+no_discharge_efficiency_output = 'No discharge'
+no_charge_efficiency_output = 'No charge'

{chaproev-1.1.8/src/ChaProEV.egg-info → chaproev-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ChaProEV
-Version: 1.1.8
+Version: 1.2.0
 Summary: ChaProEV: Charging Profiles of Electric Vehicles
 Author-email: Omar Usmani <Omar.Usmani@TNO.nl>
 Project-URL: Homepage, https://github.com/TNO/ChaProEV

{chaproev-1.1.8 → chaproev-1.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'ChaProEV'
-version = '1.1.8'
+version = '1.2.0'
 authors = [
   { name='Omar Usmani', email='Omar.Usmani@TNO.nl' },
 ]

{chaproev-1.1.8 → chaproev-1.2.0}/scenarios/Mopo/XX_bus.toml

@@ -70,7 +70,7 @@ charging_power = 600  # kW
 charger_efficiency = 0.85
 latitude = 52
 longitude = 6.2
-base_charging_price = 0.25  # €/kWh
+charging_price = 0.25  # €/kWh
 charging_desirability = 1
 # An indicator (0-1) of how much people like to charge at this location
 percentage_in_location_at_run_start = 1
@@ -78,6 +78,11 @@ percentage_in_location_at_run_start = 1
 # compute_start_location_split in mobility_module below)
 vehicle_discharge_power = 400 # kW
 proportion_of_discharge_to_network = 0.9
+time_modulation_factors = [
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+] # Starts at midinight
 [locations.bus_route_start]
 vehicle = 'bus'
 connectivity = 1
@@ -85,7 +90,7 @@ charging_power = 600  # kW
 charger_efficiency = 0.85
 latitude = 52
 longitude = 6.2
-base_charging_price = 0.25  # €/kWh
+charging_price = 0.25  # €/kWh
 charging_desirability = 1
 # An indicator (0-1) of how much people like to charge at this location
 percentage_in_location_at_run_start = 1
@@ -93,6 +98,11 @@ percentage_in_location_at_run_start = 1
 # compute_start_location_split in mobility_module below)
 vehicle_discharge_power = 0 # kW
 proportion_of_discharge_to_network = 0.9
+time_modulation_factors = [
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+] # Starts at midinight
 [locations.bus_route_end]
 vehicle = 'bus'
 connectivity = 1
@@ -100,7 +110,7 @@ charging_power = 600  # kW
 charger_efficiency = 0.85
 latitude = 52
 longitude = 6.2
-base_charging_price = 0.25  # €/kWh
+charging_price = 0.25  # €/kWh
 charging_desirability = 1
 # An indicator (0-1) of how much people like to charge at this location
 percentage_in_location_at_run_start = 1
@@ -108,6 +118,11 @@ percentage_in_location_at_run_start = 1
 # compute_start_location_split in mobility_module below)
 vehicle_discharge_power = 0 # kW
 proportion_of_discharge_to_network = 0.9
+time_modulation_factors = [
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+] # Starts at midinight
 
 [legs]
 # You can add legs here by copying existing legs,
@@ -555,6 +570,8 @@ fitting_polynomial_order = 6
 
 
 [charging]
+price_reaction_exponent = 0 # 0.5
+desirability_reaction_exponent = 0 # 1
 
 [charging_sessions]
 resolution = 1 # subdivisions from main unit of time

{chaproev-1.1.8 → chaproev-1.2.0}/scenarios/Mopo/XX_car.toml

@@ -70,7 +70,7 @@ charging_power = 8.9  # kW
 charger_efficiency = 0.77
 latitude = 52
 longitude = 6.2
-base_charging_price = 0.25  # €/kWh
+charging_price = 0.25  # €/kWh
 charging_desirability = 1
 # An indicator (0-1) of how much people like to charge at this location
 percentage_in_location_at_run_start = 1
@@ -78,6 +78,12 @@ percentage_in_location_at_run_start = 1
 # compute_start_location_split in mobility_module below)
 vehicle_discharge_power = 4.2 # kW
 proportion_of_discharge_to_network = 0.6
+time_modulation_factors = [
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    # 1, 1, 0.25, 0.25, 0.5, 0.5, 1, 1,
+] # Starts at midinight
 [locations.work]
 vehicle = 'car'
 connectivity = 0.25
@@ -85,7 +91,7 @@ charging_power = 11  # kW
 charger_efficiency = 0.85
 latitude = 52.1
 longitude = 5.8
-base_charging_price = 0  # €/kWh
+charging_price = 0.15  # €/kWh
 charging_desirability = 1
 # An indicator (0-1) of how much people like to charge at this location
 percentage_in_location_at_run_start = 0
@@ -93,6 +99,11 @@ percentage_in_location_at_run_start = 0
 # compute_start_location_split in mobility_module below)
 vehicle_discharge_power = 6.6 # kW
 proportion_of_discharge_to_network = 0.7
+time_modulation_factors = [
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+] # Starts at midinight
 [locations.leisure]
 vehicle = 'car'
 connectivity = 0.25
@@ -100,7 +111,7 @@ charging_power = 22  # kW
 charger_efficiency = 0.85
 latitude = 52.1
 longitude = 6.2
-base_charging_price = 0.35  # €/kWh
+charging_price = 0.35  # €/kWh
 charging_desirability = 0.25
 # An indicator (0-1) of how much people like to charge at this location
 percentage_in_location_at_run_start = 0
@@ -108,6 +119,12 @@ percentage_in_location_at_run_start = 0
 # compute_start_location_split in mobility_module below)
 vehicle_discharge_power = 0 # kW
 proportion_of_discharge_to_network = 0.7
+time_modulation_factors = [
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    # 1, 1, 0.5, 0.5, 0.5, 0.5, 1, 1,
+] # Starts at midinight
 [locations.weekend]
 vehicle = 'car'
 connectivity = 0.1
@@ -115,7 +132,7 @@ charging_power = 22  # kW
 charger_efficiency = 0.89
 latitude = 51.8
 longitude = 6.2
-base_charging_price = 0.35  # €/kWh
+charging_price = 0.35  # €/kWh
 charging_desirability = 0.1
 # An indicator (0-1) of how much people like to charge at this location
 percentage_in_location_at_run_start = 0
@@ -123,6 +140,12 @@ percentage_in_location_at_run_start = 0
 # compute_start_location_split in mobility_module below)
 vehicle_discharge_power = 0 # kW
 proportion_of_discharge_to_network = 0.9
+time_modulation_factors = [
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    # 1, 1, 0.25, 0.25, 0.25, 0.25, 1, 1,
+] # Starts at midinight
 [locations.holiday]
 vehicle = 'car'
 connectivity = 1
@@ -130,7 +153,7 @@ charging_power = 22  # kW
 charger_efficiency = 0.89
 latitude = 53.0
 longitude = 6.2
-base_charging_price = 0.35  # €/kWh
+charging_price = 0.35  # €/kWh
 charging_desirability = 0.2
 # An indicator (0-1) of how much people like to charge at this location
 percentage_in_location_at_run_start = 0
@@ -138,6 +161,12 @@ percentage_in_location_at_run_start = 0
 # compute_start_location_split in mobility_module below)
 vehicle_discharge_power = 11 # kW
 proportion_of_discharge_to_network = 0.9
+time_modulation_factors = [
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    # 1, 1, 0.5, 0.5, 0.75, 0.75, 1, 1,
+] # Starts at midinight
 
 [legs]
 # You can add legs here by copying existing legs,
@@ -715,6 +744,8 @@ fitting_polynomial_order = 6
 
 
 [charging]
+price_reaction_exponent =  0 # 0.5
+desirability_reaction_exponent = 0 # 1
 
 [charging_sessions]
 resolution = 1 # subdivisions from main unit of time

{chaproev-1.1.8 → chaproev-1.2.0}/scenarios/Mopo/XX_truck.toml

@@ -70,7 +70,7 @@ charging_power = 200  # kW
 charger_efficiency = 0.85
 latitude = 52
 longitude = 6.2
-base_charging_price = 0.25  # €/kWh
+charging_price = 0.25  # €/kWh
 charging_desirability = 1
 # An indicator (0-1) of how much people like to charge at this location
 percentage_in_location_at_run_start = 1
@@ -78,6 +78,11 @@ percentage_in_location_at_run_start = 1
 # compute_start_location_split in mobility_module below)
 vehicle_discharge_power = 150 # kW
 proportion_of_discharge_to_network = 0.9
+time_modulation_factors = [
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+] # Starts at midinight
 [locations.truck_customer]
 vehicle = 'truck'
 connectivity = 0.1
@@ -85,7 +90,7 @@ charging_power = 200  # kW
 charger_efficiency = 0.85
 latitude = 52
 longitude = 6.2
-base_charging_price = 0.25  # €/kWh
+charging_price = 0.25  # €/kWh
 charging_desirability = 1
 # An indicator (0-1) of how much people like to charge at this location
 percentage_in_location_at_run_start = 1
@@ -93,6 +98,11 @@ percentage_in_location_at_run_start = 1
 # compute_start_location_split in mobility_module below)
 vehicle_discharge_power = 0 # kW
 proportion_of_discharge_to_network = 0.9
+time_modulation_factors = [
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+] # Starts at midinight
 
 [legs]
 # You can add legs here by copying existing legs,
@@ -413,6 +423,8 @@ fitting_polynomial_order = 6
 
 
 [charging]
+price_reaction_exponent = 0 # 0.5
+desirability_reaction_exponent = 0 # 1
 
 [charging_sessions]
 resolution = 1 # subdivisions from main unit of time

{chaproev-1.1.8 → chaproev-1.2.0}/scenarios/Mopo/XX_van.toml

@@ -70,7 +70,7 @@ charging_power = 200  # kW
 charger_efficiency = 0.85
 latitude = 52
 longitude = 6.2
-base_charging_price = 0.25  # €/kWh
+charging_price = 0.25  # €/kWh
 charging_desirability = 1
 # An indicator (0-1) of how much people like to charge at this location
 percentage_in_location_at_run_start = 1
@@ -78,6 +78,11 @@ percentage_in_location_at_run_start = 1
 # compute_start_location_split in mobility_module below)
 vehicle_discharge_power = 100 # kW
 proportion_of_discharge_to_network = 0.9
+time_modulation_factors = [
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+] # Starts at midinight
 [locations.van_customer]
 vehicle = 'van'
 connectivity = 0.1
@@ -85,7 +90,7 @@ charging_power = 200  # kW
 charger_efficiency = 0.85
 latitude = 52
 longitude = 6.2
-base_charging_price = 0.25  # €/kWh
+charging_price = 0.25  # €/kWh
 charging_desirability = 1
 # An indicator (0-1) of how much people like to charge at this location
 percentage_in_location_at_run_start = 1
@@ -93,6 +98,11 @@ percentage_in_location_at_run_start = 1
 # compute_start_location_split in mobility_module below)
 vehicle_discharge_power = 0 # kW
 proportion_of_discharge_to_network = 0.9
+time_modulation_factors = [
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+] # Starts at midinight
 
 
 [legs]
@@ -433,6 +443,8 @@ fitting_polynomial_order = 6
 
 
 [charging]
+price_reaction_exponent = 0 # 0.5
+desirability_reaction_exponent = 0 # 1
 
 [charging_sessions]
 resolution = 1 # subdivisions from main unit of time

{chaproev-1.1.8 → chaproev-1.2.0}/src/ChaProEV/ChaProEV.py

@@ -246,6 +246,7 @@ def car_home_parking(case_name: str, general_parameters: Box) -> None:
                 own_driveway_percentage * own_driveway_values[quantity]
                 + (1 - own_driveway_percentage) * on_street_values[quantity]
             )
+        for quantity in combined_values_to_vehicles_from_sessions.columns:
             combined_values_to_vehicles_from_sessions[quantity] = (
                 own_driveway_percentage
                 * own_driveway_values_to_vehicles_from_sessions[quantity]
@@ -261,11 +262,11 @@ def car_home_parking(case_name: str, general_parameters: Box) -> None:
         sessions_values_columns: ty.List[str] = (
             home_type_parameters.sessions_values_columns
         )
-        for sessions_values_column in sessions_values_columns:
+        for quantity in sessions_values_columns:
             charging_sessions_own_driveway_values[
-                sessions_values_column
+                quantity
             ] *= own_driveway_percentage
-            charging_sessions_on_street_values[sessions_values_column] *= (
+            charging_sessions_on_street_values[quantity] *= (
                 1 - own_driveway_percentage
             )
 
@@ -342,7 +343,7 @@ def fleet_profiles(
 
     fleet_split: pd.DataFrame = pd.read_csv(
         f'{input_folder}/{fleet_file_name}'
-    ).set_index('Variant name')
+    ).set_index('Scenario')
 
     total_fleet_thousands: float = float(
         fleet_split.loc[scenario_name]['Total Fleet (thousands)']
@@ -382,7 +383,7 @@ def fleet_profiles(
                     )
                     .reset_index()
                     .set_index(profiles_index)
-                    .astype(float)
+                    # .astype(float)
                 )
                 fleet_profile: pd.DataFrame = pd.DataFrame(
                     columns=fleet_headers, index=reference_profile.index
@@ -403,6 +404,16 @@ def fleet_profiles(
                     fleet_profile['Discharge Power to Network (MW)']
                     / fleet_profile['Vehicle Discharge Power (MW)']
                 )
+                fleet_profile[
+                    'Effective discharge efficiency'
+                ] = fleet_profile['Effective discharge efficiency'].fillna(
+                    general_parameters.discharge.no_discharge_efficiency_output
+                )
+                fleet_profile['Effective charging efficiency'] = fleet_profile[
+                    'Effective charging efficiency'
+                ].fillna(
+                    general_parameters.discharge.no_charge_efficiency_output
+                )
                 fleet_profile.to_pickle(
                     f'{output_folder}/{scenario_name}_profile_fleet.pkl'
                 )
@@ -436,6 +447,16 @@ def fleet_profiles(
                     fleet_sessions['Discharge Power to Network (MW)']
                     / fleet_sessions['Vehicle Discharge Power (MW)']
                 )
+                fleet_sessions[
+                    'Effective discharge efficiency'
+                ] = fleet_sessions['Effective discharge efficiency'].fillna(
+                    general_parameters.discharge.no_discharge_efficiency_output
+                )
+                fleet_sessions[
+                    'Effective charging efficiency'
+                ] = fleet_sessions['Effective charging efficiency'].fillna(
+                    general_parameters.discharge.no_charge_efficiency_output
+                )
 
     fleet_consumption_table.to_pickle(
         f'{output_folder}/{scenario_name}_{consumption_table_name}_fleet.pkl'
@@ -529,6 +550,12 @@ def make_profile_display_dataframe(
         profile_dataframe['Discharge Power to Network (kW)']
         / profile_dataframe['Vehicle Discharge Power (kW)']
     )
+    profile_dataframe['Effective discharge efficiency'] = profile_dataframe[
+        'Effective discharge efficiency'
+    ].fillna(general_parameters.discharge.no_discharge_efficiency_output)
+    profile_dataframe['Effective charging efficiency'] = profile_dataframe[
+        'Effective charging efficiency'
+    ].fillna(general_parameters.discharge.no_charge_efficiency_output)
     profile_dataframe.to_pickle(f'{output_folder}/{scenario.name}_profile.pkl')
 
 
@@ -572,6 +599,17 @@ def make_sessions_display_dataframes(
         / display_charging_sessions['Vehicle Discharge Power (kW)']
     )
 
+    display_charging_sessions['Effective discharge efficiency'] = (
+        display_charging_sessions['Effective discharge efficiency'].fillna(
+            general_parameters.discharge.no_discharge_efficiency_output
+        )
+    )
+    display_charging_sessions['Effective charging efficiency'] = (
+        display_charging_sessions['Effective charging efficiency'].fillna(
+            general_parameters.discharge.no_charge_efficiency_output
+        )
+    )
+
     display_charging_sessions.to_pickle(
         f'{output_folder}/{scenario.name}_charging_sessions.pkl'
     )
@@ -612,7 +650,7 @@ def run_scenario(
         general_parameters,
     )
 
-    consumption.get_consumption_data(
+    consumption_table: pd.DataFrame = consumption.get_consumption_data(
         run_mobility_matrix,
         run_next_leg_kilometers,
         run_next_leg_kilometers_cumulative,
@@ -641,6 +679,7 @@ def run_scenario(
             total_battery_space_per_location,
             charge_drawn_by_vehicles,
             charge_drawn_from_network,
+            charging_costs,
         ) = charging.get_charging_profile(
             location_split,
             run_mobility_matrix,
@@ -695,6 +734,89 @@ def run_scenario(
     if do_fleet_tables:
         fleet_profiles(case_name, scenario_name, general_parameters)
 
+    display_run_totals, display_fleet_run_totals = make_display_totals(
+        charging_costs,
+        charge_drawn_from_network,
+        charge_drawn_by_vehicles,
+        consumption_table,
+        scenario,
+        general_parameters,
+        case_name,
+    )
+    # print(scenario.name)
+    # print(display_run_totals)
+    # print(display_fleet_run_totals)
+
+
+def make_display_totals(
+    charging_costs: pd.DataFrame,
+    charge_drawn_from_network: pd.DataFrame,
+    charge_drawn_by_vehicles: pd.DataFrame,
+    consumption_table: pd.DataFrame,
+    scenario: Box,
+    general_parameters: Box,
+    case_name: str,
+) -> ty.Tuple[pd.Series, pd.Series]:
+    display_range: pd.DatetimeIndex = run_time.get_time_range(
+        scenario, general_parameters
+    )[2]
+    display_run_charging_costs: float = (
+        charging_costs.loc[display_range].sum().sum()
+    )
+    display_run_charge_from_network: float = (
+        charge_drawn_from_network.loc[display_range].sum().sum()
+    )
+    display_run_charge_drwan_by_vehicles: float = (
+        charge_drawn_by_vehicles.loc[display_range].sum().sum()
+    )
+    display_run_kilometrage: float = consumption_table.loc[display_range][
+        'Kilometers'
+    ].sum()
+    display_run_totals: pd.Series = pd.Series()
+    display_run_totals['Kilometers'] = display_run_kilometrage
+    display_run_totals['Charge drawn by vehicles (kWh)'] = (
+        display_run_charge_drwan_by_vehicles
+    )
+    display_run_totals['Charge drawn from network (kWh)'] = (
+        display_run_charge_from_network
+    )
+    display_run_totals['Charging costs (€)'] = display_run_charging_costs
+    input_root: str = general_parameters.files.input_root
+    input_folder: str = f'{input_root}/{case_name}'
+    fleet_file_name: str = general_parameters.profile_dataframe.fleet_file_name
+    fleet_split: pd.DataFrame = pd.read_csv(
+        f'{input_folder}/{fleet_file_name}'
+    ).set_index('Scenario')
+
+    total_electric_fleet_thousands: float = float(
+        fleet_split.loc[scenario.name]['Total Fleet (thousands)']
+        * fleet_split.loc[scenario.name]['electricity proportion']
+    )
+    display_fleet_run_totals: pd.Series = pd.Series()
+    display_fleet_run_totals['Thousand Kilometers'] = (
+        display_run_kilometrage * total_electric_fleet_thousands
+    )
+    display_fleet_run_totals['Charge drawn by vehicles (MWh)'] = (
+        display_run_charge_drwan_by_vehicles * total_electric_fleet_thousands
+    )
+    display_fleet_run_totals['Charge drawn from network (MWh)'] = (
+        display_run_charge_from_network * total_electric_fleet_thousands
+    )
+    display_fleet_run_totals['Charging costs (thousand €)'] = (
+        display_run_charging_costs * total_electric_fleet_thousands
+    )
+    output_root: str = general_parameters.files.output_root
+    output_folder: str = f'{output_root}/{case_name}'
+    display_run_totals.to_pickle(
+        f'{output_folder}/{scenario.name}_display_run_totals.pkl'
+    )
+    display_fleet_run_totals.to_pickle(
+        f'{output_folder}/{scenario.name}'
+        f'_display_electric_fleet_run_totals.pkl'
+    )
+
+    return display_run_totals, display_fleet_run_totals
+
 
 # @cook.function_timer
 def load_scenarios(case_name: str) -> ty.List[Box]:
@@ -780,6 +902,7 @@ if __name__ == '__main__':
     case_name = 'Mopo'
 
     run_ChaProEV(case_name)
+
     # print('Add sessions into next day')
     # print('Iterate through sessions and send remainder to next session')
     # print('Compute session first pass')

{chaproev-1.1.8 → chaproev-1.2.0}/src/ChaProEV/charging.py

@@ -34,6 +34,91 @@ except ModuleNotFoundError:
 # we are importing again
 
 
+def get_time_modulation(
+    run_range: pd.DatetimeIndex, scenario: Box, general_parameters: Box
+) -> pd.DataFrame:
+    time_modulation: pd.DataFrame = pd.DataFrame(
+        np.ones((len(run_range), len(scenario.locations))),
+        columns=scenario.locations,
+        index=run_range,
+    )
+    for location in scenario.locations:
+        time_modulation_factors: ty.List[float] = scenario.locations[
+            location
+        ].time_modulation_factors
+        for hour_index, time_modulation_factor in enumerate(
+            time_modulation_factors
+        ):
+            time_modulation.loc[
+                pd.to_datetime(time_modulation.index).hour == hour_index,
+                location,
+            ] = time_modulation_factor
+
+    return time_modulation
+
+
+def get_charging_modulation(
+    run_range: pd.DatetimeIndex,
+    scenario: Box,
+    general_parameters: Box,
+) -> pd.DataFrame:
+    charging_modulation: pd.DataFrame = get_time_modulation(
+        run_range, scenario, general_parameters
+    )
+
+    location_prices: ty.List[float] = [
+        scenario.locations[location_tested].charging_price
+        for location_tested in scenario.locations
+    ]
+
+    if scenario.charging.price_reaction_exponent > 0:
+        location_price_factor: pd.Series = pd.Series(
+            [
+                (
+                    (min(location_prices) / (location_price))
+                    ** scenario.charging.price_reaction_exponent
+                    if location_price > 0
+                    else 1
+                )
+                for location_price in location_prices
+            ],
+            index=scenario.locations,
+        )
+    else:
+        location_price_factor = pd.Series(
+            np.ones(len(scenario.locations)), index=scenario.locations
+        )
+
+    location_desirabilities: ty.List[float] = [
+        scenario.locations[location_tested].charging_desirability
+        for location_tested in scenario.locations
+    ]
+
+    if scenario.charging.desirability_reaction_exponent > 0:
+        location_desirability_factor: pd.Series = pd.Series(
+            [
+                (
+                    (location_desirability / max(location_desirabilities))
+                    ** scenario.charging.desirability_reaction_exponent
+                )
+                for location_desirability in location_desirabilities
+            ],
+            index=scenario.locations,
+        )
+    else:
+        location_desirability_factor = pd.Series(
+            np.ones(len(scenario.locations)), index=scenario.locations
+        )
+
+    for location in scenario.locations:
+        charging_modulation[location] *= (
+            location_price_factor[location]
+            * location_desirability_factor[location]
+        )
+
+    return charging_modulation
+
+
 def get_charging_framework(
     location_split: pd.DataFrame,
     run_mobility_matrix: pd.DataFrame,
@@ -52,12 +137,15 @@ def get_charging_framework(
     pd.Series,
     pd.DataFrame,
     pd.DataFrame,
+    pd.DataFrame,
 ]:
     '''
     Produces the structures we want for the charging profiles
     '''
 
-    run_range = run_time.get_time_range(scenario, general_parameters)[0]
+    run_range: pd.DatetimeIndex = run_time.get_time_range(
+        scenario, general_parameters
+    )[0]
 
     vehicle_parameters: Box = scenario.vehicle
     vehicle_name: str = vehicle_parameters.name
@@ -149,6 +237,9 @@ def get_charging_framework(
         columns=[float(0)],
         index=mobility_locations_index,
     )
+    charging_modulation: pd.DataFrame = get_charging_modulation(
+        run_range, scenario, general_parameters
+    )
 
     return (
         battery_spaces,
@@ -162,6 +253,7 @@ def get_charging_framework(
         run_departures_impact_gaps,
         travelling_battery_spaces,
         total_battery_space_per_location,
+        charging_modulation,
     )
 
 
@@ -546,6 +638,7 @@ def compute_charging_events(
     scenario: Box,
     general_parameters: Box,
     location_names: ty.List[str],
+    charging_modulation: pd.DataFrame,
 ) -> ty.Tuple[ty.Dict[str, pd.DataFrame], pd.DataFrame, pd.DataFrame]:
 
     zero_threshold: float = general_parameters.numbers.zero_threshold
@@ -561,7 +654,13 @@ def compute_charging_events(
         )
 
         percent_charging: float = charging_location_parameters.connectivity
-        max_charge: float = charging_location_parameters.charging_power
+        location_charging_power: float = (
+            charging_location_parameters.charging_power
+        )
+        location_modulated_charging_power: float = (
+            location_charging_power
+            * float(charging_modulation.loc[time_tag][charging_location])
+        )
 
         # This variable is useful if new battery spaces
         # are added within this charging procedure
@@ -570,7 +669,7 @@ def compute_charging_events(
         ].columns.values
         charge_drawn_per_charging_vehicle: np.ndarray = np.array(
             [
-                min(this_battery_space, max_charge)
+                min(this_battery_space, location_modulated_charging_power)
                 for this_battery_space in original_battery_spaces
             ]
         )
@@ -580,7 +679,7 @@ def compute_charging_events(
 
         vehicles_charging: ty.Any = (
             percent_charging * battery_spaces[charging_location].loc[time_tag]
-        )  # It is a flaot, but MyPy does not get it
+        )  # It is a float, but MyPy does not get it
 
         charge_drawn_by_vehicles_this_time_tag_per_battery_space: (
             pd.Series[float] | pd.DataFrame
@@ -807,6 +906,7 @@ def copy_day_type_profiles_to_whole_run(
         run_departures_impact_gaps,
         spillover_travelling_battery_spaces,
         total_battery_space_per_location,
+        charging_modulation,
     ) = get_charging_framework(
         location_split,
         run_mobility_matrix,
@@ -973,6 +1073,7 @@ def copy_day_type_profiles_to_whole_run(
                     scenario,
                     general_parameters,
                     location_names,
+                    charging_modulation,
                 )
 
                 spillover_battery_spaces_after_charging: pd.Series = (
@@ -1047,6 +1148,7 @@ def write_output(
     total_battery_space_per_location: pd.DataFrame,
     charge_drawn_by_vehicles: pd.DataFrame,
     charge_drawn_from_network: pd.DataFrame,
+    charging_costs: pd.DataFrame,
     scenario: Box,
     case_name: str,
     maximal_delivered_power_per_location: pd.DataFrame,
@@ -1104,6 +1206,9 @@ def write_output(
         charge_drawn_from_network.to_pickle(
             f'{output_folder}/{scenario.name}_charge_drawn_from_network.pkl'
         )
+        charging_costs.to_pickle(
+            f'{output_folder}/{scenario.name}_charging_costs.pkl'
+        )
 
     charge_drawn_from_network_total: pd.DataFrame = pd.DataFrame(
         index=charge_drawn_from_network.index
@@ -1111,6 +1216,8 @@ def write_output(
     charge_drawn_from_network_total['Total Charge Drawn (kWh)'] = (
         charge_drawn_from_network.sum(axis=1)
     )
+
+    charging_costs_total: pd.Series = charging_costs.sum(axis=1)
     percentage_of_maximal_delivered_power_used_per_location: pd.DataFrame = (
         pd.DataFrame(index=charge_drawn_from_network.index)
     )
@@ -1119,6 +1226,9 @@ def write_output(
             f'{output_folder}/{scenario.name}_'
             'charge_drawn_from_network_total.pkl'
         )
+        charging_costs_total.to_pickle(
+            f'{output_folder}/{scenario.name}_total_charging_costs.pkl'
+        )
 
     if pickle_interim_files:
         total_battery_space_per_location.to_pickle(
@@ -1224,7 +1334,11 @@ def get_charging_profile(
     case_name: str,
     general_parameters: Box,
 ) -> ty.Tuple[
-    ty.Dict[str, pd.DataFrame], pd.DataFrame, pd.DataFrame, pd.DataFrame
+    ty.Dict[str, pd.DataFrame],
+    pd.DataFrame,
+    pd.DataFrame,
+    pd.DataFrame,
+    pd.DataFrame,
 ]:
     '''
     This is the main function of the charging module.
@@ -1243,6 +1357,7 @@ def get_charging_profile(
         run_departures_impact_gaps,
         travelling_battery_spaces,
         total_battery_space_per_location,
+        charging_modulation,
     ) = get_charging_framework(
         location_split,
         run_mobility_matrix,
@@ -1383,6 +1498,7 @@ def get_charging_profile(
                 scenario,
                 general_parameters,
                 location_names,
+                charging_modulation,
             )
 
             if use_day_types_in_charge_computing and (
@@ -1428,11 +1544,15 @@ def get_charging_profile(
         total_battery_space_per_location[location_name] = (
             location_total_battery_space
         )
+    charging_costs: pd.DataFrame = charge_drawn_from_network.copy()
+    for location in scenario.locations:
+        charging_costs[location] *= scenario.locations[location].charging_price
     write_output(
         battery_spaces,
         total_battery_space_per_location,
         charge_drawn_by_vehicles,
         charge_drawn_from_network,
+        charging_costs,
         scenario,
         case_name,
         maximal_delivered_power_per_location,
@@ -1445,6 +1565,7 @@ def get_charging_profile(
         total_battery_space_per_location,
         charge_drawn_by_vehicles,
         charge_drawn_from_network,
+        charging_costs,
     )
 
 
@@ -1747,15 +1868,15 @@ def get_profile_from_sessions(
 # def shift to next session (do this wile not setisfied?)
 if __name__ == '__main__':
     case_name = 'Mopo'
-    test_scenario_name = 'XX_car'
+    scenario_name = 'XX_car'
     general_parameters_file_name = 'ChaProEV.toml'
     general_parameters = Box(
         cook.parameters_from_TOML(general_parameters_file_name)
     )
-    scenario_file_name: str = (
-        f'scenarios/{case_name}/{test_scenario_name}.toml'
-    )
+    scenario_file_name: str = f'scenarios/{case_name}/{scenario_name}.toml'
     scenario = Box(cook.parameters_from_TOML(scenario_file_name))
+    scenario.name = scenario_name
+
     run_charging_sessions_dataframe: pd.DataFrame = pd.read_pickle(
         'output/Mopo/XX_car_run_charging_sessions.pkl'
     )
@@ -1777,25 +1898,12 @@ if __name__ == '__main__':
         general_parameters,
         case_name,
     )
-    print(
-        charging_profile_to_vehicle_from_sessions,
-        charging_profile_from_network_from_sessions,
-    )
 
-    # print(charging_sessions_with_charged_amounts)
-    # print(charging_sessions_with_charged_amounts.info())
-    # exit()
     charging_sessions_with_charged_amounts['Start time'] = (
         charging_sessions_with_charged_amounts['Start time'].astype(
             'datetime64[ns]'
         )
     )
-    sessions_2018 = charging_sessions_with_charged_amounts.loc[
-        charging_sessions_with_charged_amounts['Start time'].dt.year == 2018
-    ]
-    print(sessions_2018['Charging Power to Vehicles (kW)'].sum())
-    print(sessions_2018['Charging Power from Network (kW)'].sum())
-    print(sessions_2018)
 
     case_name = 'Mopo'
     scenario_name = 'XX_car'
@@ -1810,7 +1918,7 @@ if __name__ == '__main__':
     )
     file_parameters: Box = general_parameters.files
     output_folder: str = f'{file_parameters.output_root}/{case_name}'
-    location_split_table_name: str = f'{test_scenario_name}_location_split'
+    location_split_table_name: str = f'{scenario_name}_location_split'
     location_split: pd.DataFrame = pd.read_pickle(
         f'{output_folder}/{location_split_table_name}.pkl'
     )
@@ -1831,6 +1939,7 @@ if __name__ == '__main__':
         charge_drawn_by_vehicles,
         charge_drawn_from_network,
         total_battery_space_per_location,
+        charging_costs,
     ) = get_charging_profile(
         location_split,
         run_mobility_matrix,

{chaproev-1.1.8 → chaproev-1.2.0}/src/ChaProEV/consumption.py

@@ -28,7 +28,7 @@ def create_consumption_tables(
     scenario: Box,
     case_name: str,
     general_parameters: Box,
-) -> None:
+) -> pd.DataFrame:
     '''
     Creates the consumption tables
     '''
@@ -168,6 +168,7 @@ def create_consumption_tables(
         yearly_consumption_table.to_pickle(
             f'{output_folder}/{scenario_name}_yearly_consumption_table.pkl'
         )
+    return consumption_table
 
 
 def get_energy_for_next_leg(
@@ -215,8 +216,8 @@ def get_consumption_data(
     scenario: Box,
     case_name: str,
     general_parameters: Box,
-) -> None:
-    create_consumption_tables(
+) -> pd.DataFrame:
+    consumption_table = create_consumption_tables(
         run_mobility_matrix, scenario, case_name, general_parameters
     )
     get_energy_for_next_leg(
@@ -226,6 +227,7 @@ def get_consumption_data(
         case_name,
         general_parameters,
     )
+    return consumption_table
 
 
 if __name__ == '__main__':
@@ -251,7 +253,7 @@ if __name__ == '__main__':
         f'{output_folder}/{scenario_name}_'
         'next_leg_kilometers_cumulative.pkl',
     )
-    get_consumption_data(
+    consumption_table: pd.DataFrame = get_consumption_data(
         run_mobility_matrix,
         next_leg_kilometers,
         next_leg_kilometers_cumulative,

{chaproev-1.1.8 → chaproev-1.2.0}/src/ChaProEV/define.py

@@ -721,8 +721,8 @@ class Location:
         )
         location.latitude: float = this_location_parameters.latitude
         location.longitude: float = this_location_parameters.longitude
-        location.base_charging_price: float = (
-            this_location_parameters.base_charging_price
+        location.charging_price: float = (
+            this_location_parameters.charging_price
         )
         location.charging_desirability: float = (
             this_location_parameters.charging_desirability

{chaproev-1.1.8 → chaproev-1.2.0/src/ChaProEV.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ChaProEV
-Version: 1.1.8
+Version: 1.2.0
 Summary: ChaProEV: Charging Profiles of Electric Vehicles
 Author-email: Omar Usmani <Omar.Usmani@TNO.nl>
 Project-URL: Homepage, https://github.com/TNO/ChaProEV

{chaproev-1.1.8 → chaproev-1.2.0}/tests/test_charge_and_consumption.py

@@ -52,7 +52,7 @@ def test_charge_and_consumption() -> None:
         )
         charge_drawn_in_test: float = (
             charge_drawn_by_vehicles_dataframe_in_test[
-                'Total Charge Drawn (kW)'
+                'Total Charge Drawn (kWh)'
             ].sum()
         )
 

{chaproev-1.1.8 → chaproev-1.2.0}/tests/test_empty_values.py

@@ -16,6 +16,7 @@ def test_empty_values() -> None:
                     f'{folder_to_test}/{test_file}'
                 )
                 print(test_dataframe)
+                print(test_file)
                 assert not test_dataframe.isnull().values.any()