ChaProEV 1.3.2__tar.gz → 1.3.3__tar.gz

{chaproev-1.3.2/src/ChaProEV.egg-info → chaproev-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ChaProEV
-Version: 1.3.2
+Version: 1.3.3
 Summary: ChaProEV: Charging Profiles of Electric Vehicles
 Author-email: Omar Usmani <Omar.Usmani@TNO.nl>
 Project-URL: Homepage, https://github.com/TNO/ChaProEV
@@ -12,7 +12,7 @@ Description-Content-Type: text/markdown
 License-File: LICENCE
 Requires-Dist: bs4>=0.0.2
 Requires-Dist: cdsapi>=0.7.4
-Requires-Dist: ETS_CookBook>=1.1.2
+Requires-Dist: ETS_CookBook>=1.2.4
 Requires-Dist: matplotlib>=3.9.2
 Requires-Dist: numpy>=2.1.3
 Requires-Dist: pandas>=2.2.3

{chaproev-1.3.2 → chaproev-1.3.3}/pyproject.toml

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

{chaproev-1.3.2 → chaproev-1.3.3}/requirements.txt

@@ -1,6 +1,6 @@
 bs4>=0.0.2
 cdsapi>=0.7.4
-ETS_CookBook>=1.1.2
+ETS_CookBook>=1.2.4
 matplotlib>=3.9.2
 numpy>=2.1.3
 pandas>=2.2.3

{chaproev-1.3.2 → chaproev-1.3.3}/src/ChaProEV/ChaProEV.py

@@ -7,9 +7,9 @@ import typing as ty
 from itertools import repeat
 from multiprocessing import Pool
 
-import tqdm
 from box import Box
 from ETS_CookBook import ETS_CookBook as cook
+from tqdm.rich import tqdm
 
 try:
     import writing  # type: ignore
@@ -103,7 +103,7 @@ def run_ChaProEV(case_name: str) -> None:
         progress_bars_parameters.scenario_run_description
     )
     if display_scenario_run:
-        pool_inputs = tqdm.tqdm(
+        pool_inputs = tqdm(
             pool_inputs,
             desc=scenario_run_description,
             total=len(scenarios),
@@ -125,7 +125,7 @@ if __name__ == '__main__':
     # This is a case name, which is the grouping of all your scenarios.
     # This is principally used to label your output files.
     # case_name: str = 'Mopo'
-    case_name: str = 'cumulative_test'
+    case_name: str = 'Mopo'
     run_ChaProEV(case_name)
 
     # print('Add sessions into next day')

{chaproev-1.3.2 → chaproev-1.3.3}/src/ChaProEV/charging.py

@@ -5,6 +5,7 @@ import numpy as np
 import pandas as pd
 from box import Box
 from ETS_CookBook import ETS_CookBook as cook
+from rich import print
 
 try:
     import run_time  # type: ignore

{chaproev-1.3.2 → chaproev-1.3.3}/src/ChaProEV/consumption.py

@@ -230,8 +230,8 @@ def get_consumption_data(
 
 if __name__ == '__main__':
     general_parameters_file_name: str = 'ChaProEV.toml'
-    general_parameters: Box = (
-        cook.parameters_from_TOML(general_parameters_file_name)
+    general_parameters: Box = cook.parameters_from_TOML(
+        general_parameters_file_name
     )
     case_name = 'Mopo'
     scenario_name: str = 'XX_car'

{chaproev-1.3.2 → chaproev-1.3.3}/src/ChaProEV/mobility.py

@@ -20,6 +20,7 @@ import numpy as np
 import pandas as pd
 from box import Box
 from ETS_CookBook import ETS_CookBook as cook
+from rich import print
 
 try:
     import run_time  # type: ignore
@@ -122,35 +123,23 @@ class NextDayStartChargingSession:
         location_power_to_network: float,
     ) -> None:
 
-        self.start_time: datetime.datetime = (
-            next_day_start_session_start
-        )
-        self.end_time: datetime.datetime = (
-            next_day_start_session_end
-        )
+        self.start_time: datetime.datetime = next_day_start_session_start
+        self.end_time: datetime.datetime = next_day_start_session_end
         self.location: str = day_start_location
 
         self.previous_leg_consumption: float = (
             previous_leg_consumption * group_size
         )
-        self.next_leg_consumption: float = (
-            next_leg_consumption * group_size
-        )
-        self.connectivity: float = (
-            location_connectivity * group_size
-        )
-        self.power_to_vehicle: float = (
-            location_power_to_vehicle * group_size
-        )
+        self.next_leg_consumption: float = next_leg_consumption * group_size
+        self.connectivity: float = location_connectivity * group_size
+        self.power_to_vehicle: float = location_power_to_vehicle * group_size
         self.power_from_network: float = (
             location_power_from_network * group_size
         )
         self.power_from_vehicle: float = (
             location_power_from_vehicle * group_size
         )
-        self.power_to_network: float = (
-            location_power_to_network * group_size
-        )
+        self.power_to_network: float = location_power_to_network * group_size
 
 
 def get_run_charging_sessions(
@@ -1445,7 +1434,6 @@ def get_run_trip_probabilities(
     Gets a DataFrame containing the trip probabilities for the whole run.
     '''
 
-    # moo = datetime.datetime.now()
     day_types: list[str] = scenario.mobility_module.day_types
     scenario_vehicle: str = scenario.vehicle.name
     trip_list: list[str] = []
@@ -1461,8 +1449,6 @@ def get_run_trip_probabilities(
         scenario, general_parameters
     )[0]
 
-    # print((datetime.datetime.now() - moo).total_seconds())
-    # moo = datetime.datetime.now()
     run_trip_probabilities: pd.DataFrame = pd.DataFrame(index=run_range)
     run_trip_probabilities.index.name = 'Time Tag'
 
@@ -1470,38 +1456,28 @@ def get_run_trip_probabilities(
         run_trip_probabilities, scenario, general_parameters
     )
 
-    # print((datetime.datetime.now() - moo).total_seconds())
-    # moo = datetime.datetime.now()
     trip_probabilities_per_day_type: pd.DataFrame = (
         get_trip_probabilities_per_day_type(
             scenario, case_name, general_parameters
         )
     )
 
-    # print((datetime.datetime.now() - moo).total_seconds())
-    # moo = datetime.datetime.now()
-
     for trip in trip_list:
         for day_type in day_types:
             run_trip_probabilities.loc[
                 run_trip_probabilities['Day Type'] == day_type, trip
             ] = trip_probabilities_per_day_type.loc[trip, day_type]
-    # print((datetime.datetime.now() - moo).total_seconds())
-    # moo = datetime.datetime.now()
 
     table_name: str = f'{scenario.name}_run_trip_probabilities'
     pickle_interim_files: bool = general_parameters.interim_files.pickle
     if pickle_interim_files:
         run_trip_probabilities.to_pickle(f'{output_folder}/{table_name}.pkl')
-    # print((datetime.datetime.now() - moo).total_seconds())
-    # moo = datetime.datetime.now()
 
     vehicle_name: str = scenario.vehicle.name
     if vehicle_name == 'car':
         run_trip_probabilities = car_holiday_departures_returns_corrections(
             run_trip_probabilities, scenario, case_name, general_parameters
         )
-    # print('Weekend corrs', (datetime.datetime.now() - moo).total_seconds())
 
     return run_trip_probabilities
 

{chaproev-1.3.2 → chaproev-1.3.3}/src/ChaProEV/run_time.py

@@ -22,6 +22,7 @@ import numpy as np
 import pandas as pd
 from box import Box
 from ETS_CookBook import ETS_CookBook as cook
+from rich import print
 
 
 def get_run_duration(
@@ -437,8 +438,8 @@ if __name__ == '__main__':
     scenario: Box = cook.parameters_from_TOML(scenario_file_name)
     scenario.name = test_scenario_name
     general_parameters_file_name: str = 'ChaProEV.toml'
-    general_parameters: Box = (
-        cook.parameters_from_TOML(general_parameters_file_name)
+    general_parameters: Box = cook.parameters_from_TOML(
+        general_parameters_file_name
     )
     run_range, run_hour_numbers, display_range = get_time_range(
         scenario, general_parameters

{chaproev-1.3.2 → chaproev-1.3.3}/src/ChaProEV/scenarios_module.py

@@ -8,6 +8,7 @@ import os
 import pandas as pd
 from box import Box
 from ETS_CookBook import ETS_CookBook as cook
+from rich import print
 
 try:
     import define  # type: ignore
@@ -80,7 +81,7 @@ def run_scenario(
     scenario: Box, case_name: str, general_parameters: Box
 ) -> None:
     scenario_name: str = scenario.name
-    print(scenario_name)
+    print(f'Running scenario {scenario_name}')
     location_connections, legs, locations, trips = (
         define.declare_all_instances(scenario, case_name, general_parameters)
     )

{chaproev-1.3.2 → chaproev-1.3.3}/src/ChaProEV/writing.py

@@ -14,9 +14,10 @@ from itertools import repeat
 from multiprocessing import Pool
 
 import pandas as pd
-import tqdm
+from tqdm.rich import tqdm
 from box import Box
 from ETS_CookBook import ETS_CookBook as cook
+from rich import print
 
 
 @cook.function_timer
@@ -76,7 +77,7 @@ def extra_end_outputs(case_name: str, general_parameters: Box) -> None:
         progress_bars_parameters.saving_pool_run_description
     )
     if display_saving_pool_run:
-        saving_pool_inputs = tqdm.tqdm(
+        saving_pool_inputs = tqdm(
             saving_pool_inputs,
             desc=saving_pool_run_description,
             total=len(tables_to_save),

{chaproev-1.3.2 → chaproev-1.3.3/src/ChaProEV.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ChaProEV
-Version: 1.3.2
+Version: 1.3.3
 Summary: ChaProEV: Charging Profiles of Electric Vehicles
 Author-email: Omar Usmani <Omar.Usmani@TNO.nl>
 Project-URL: Homepage, https://github.com/TNO/ChaProEV
@@ -12,7 +12,7 @@ Description-Content-Type: text/markdown
 License-File: LICENCE
 Requires-Dist: bs4>=0.0.2
 Requires-Dist: cdsapi>=0.7.4
-Requires-Dist: ETS_CookBook>=1.1.2
+Requires-Dist: ETS_CookBook>=1.2.4
 Requires-Dist: matplotlib>=3.9.2
 Requires-Dist: numpy>=2.1.3
 Requires-Dist: pandas>=2.2.3

{chaproev-1.3.2 → chaproev-1.3.3}/src/ChaProEV.egg-info/SOURCES.txt

@@ -95,11 +95,10 @@ non-road/Mopo/growth_factors.csv
 non-road/Mopo/scenario_demands.csv
 non-road/Mopo/scenarios.toml
 scenarios/Mopo/Latvia_car_own_driveway_2050.toml
-scenarios/Mopo/Netherlands_urban_car.toml
+scenarios/Mopo/Netherlands_urban_car_2030.toml
 scenarios/Mopo/Switzerland_car_own_driveway_2050.toml
 scenarios/Mopo/XX_bus.toml
 scenarios/Mopo/XX_car.toml
-scenarios/Mopo/XX_car_test.toml
 scenarios/Mopo/XX_truck.toml
 scenarios/Mopo/XX_van.toml
 scenarios/bus_test/XX_bus.toml
@@ -141,6 +140,7 @@ test_bus_moility_matrices/bus_weekend_in_workweek.csv
 tests/test_battery_space.py
 tests/test_charge_and_consumption.py
 tests/test_empty_values.py
+tests/test_enough_power_next_leg.py
 tests/test_same_output.py
 variants/Mopo.toml
 variants/Mopo/XX_car.csv

{chaproev-1.3.2 → chaproev-1.3.3}/src/ChaProEV.egg-info/requires.txt

@@ -1,6 +1,6 @@
 bs4>=0.0.2
 cdsapi>=0.7.4
-ETS_CookBook>=1.1.2
+ETS_CookBook>=1.2.4
 matplotlib>=3.9.2
 numpy>=2.1.3
 pandas>=2.2.3

{chaproev-1.3.2 → chaproev-1.3.3}/tests/test_battery_space.py

@@ -1,6 +1,6 @@
 import os
-import typing as ty
 
+import box
 import pandas as pd
 from ETS_CookBook import ETS_CookBook as cook
 
@@ -9,25 +9,20 @@ def test_battery_space() -> None:
 
     case_name: str = 'Mopo'
     general_parameters_file: str = 'ChaProEV.toml'
-    general_parameters: ty.Dict = cook.parameters_from_TOML(
+    general_parameters: box.Box = cook.parameters_from_TOML(
         general_parameters_file
     )
-    save_interim_files: bool = general_parameters['interim_files']['pickle']
+    save_interim_files: bool = general_parameters.interim_files.pickle
 
     if save_interim_files:
-        scenario_files: ty.List[str] = os.listdir(f'scenarios/{case_name}')
-        scenario_names: ty.List[str] = []
+        scenario_files: list[str] = os.listdir(f'scenarios/{case_name}')
+        scenario_names: list[str] = []
 
         for scenario_file in scenario_files:
             file_extension: str = scenario_file.split('.')[1]
             if file_extension == 'toml':
                 scenario_names.append(scenario_file.split('.')[0])
-        # scenario_names = [
-        #         'XX_truck',
-        #         'XX_van',
-        #         'XX_bus',
-        #     'XX_car'
-        # ]
+
         for scenario_name in scenario_names:
             location_split: pd.DataFrame = pd.read_pickle(
                 f'output/{case_name}/{scenario_name}_location_split.pkl'

{chaproev-1.3.2 → chaproev-1.3.3}/tests/test_charge_and_consumption.py

@@ -1,5 +1,4 @@
 import datetime
-import typing as ty
 
 import numpy as np
 import pandas as pd
@@ -36,7 +35,7 @@ def test_charge_and_consumption() -> None:
     test_range: pd.DatetimeIndex = pd.date_range(
         start=test_start_date, end=test_end_date, freq='1h', inclusive='both'
     )
-    test_scenarios: ty.List[str] = [
+    test_scenarios: list[str] = [
         'XX_bus',
         'XX_van',
         'XX_truck',

chaproev-1.3.3/tests/test_enough_power_next_leg.py

@@ -0,0 +1,44 @@
+import os
+
+import pandas as pd
+import pytest
+from rich import print
+
+
+def test_enough_power_next_leg() -> None:
+
+    case_name: str = 'Mopo'
+
+    folder_to_test: str = f'output/{case_name}'
+
+    profile_names: list[str] = [
+        test_file.split('.')[0]
+        for test_file in os.listdir(folder_to_test)
+        if (test_file.split('.')[1] == 'pkl')
+        and (test_file.split('.')[0].endswith('_profile'))
+    ]
+
+    profiles: list[pd.DataFrame] = [
+        pd.read_pickle(f'{folder_to_test}/{profile_name}.pkl')
+        for profile_name in profile_names
+    ]
+
+    for profile, profile_name in zip(profiles, profile_names):
+
+        print(profile_name)
+
+        for_next_leg_header: str = 'Demand for next leg (kWh) (from network)'
+        for_next_leg: pd.Series = profile[for_next_leg_header]
+
+        supply_power_header: str = 'Charging Power from Network (kW)'
+        supply_power: pd.Series = profile[supply_power_header]
+
+        power_gaps: pd.Series = supply_power - for_next_leg
+        power_gaps[power_gaps > 0] = 0
+
+        total_gap: float = power_gaps.sum()
+        assert total_gap == pytest.approx(0)
+
+
+if __name__ == '__main__':
+    test_enough_power_next_leg()

{chaproev-1.3.2 → chaproev-1.3.3}/tests/test_same_output.py

@@ -1,6 +1,4 @@
 import os
-import typing as ty
-
 import pandas as pd
 
 
@@ -11,7 +9,7 @@ def test_all_files() -> None:
     folder_to_test: str = f'output/{case_name}'
     reference_folder: str = 'reference_run'
 
-    test_quantities: ty.List[str] = [
+    test_quantities: list[str] = [
         test_file.split('.')[0]
         for test_file in os.listdir(folder_to_test)
         if test_file.split('.')[1] == 'pkl'