ChaProEV 1.0.2__tar.gz → 1.0.3__tar.gz

{chaproev-1.0.2 → chaproev-1.0.3}/.gitignore

@@ -7,6 +7,3 @@ documentation/
 site/
 .venv/
 reference_run/
-reference_run 2/
-reference_run prev/
-reference_run X/

{chaproev-1.0.2 → chaproev-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ChaProEV
-Version: 1.0.2
+Version: 1.0.3
 Summary: ChaProEV: Charging Profiles of Electric Vehicles
 Author-email: Omar Usmani <Omar.Usmani@TNO.nl>
 Project-URL: Homepage, https://github.com/TNO/ChaProEV
@@ -154,7 +154,8 @@ The docmentation can be found [here](https://tno.github.io/ChaProEV/)
 
 ### **Driver**
 The primary driver for the publication and development of ChaProEV in this
-repository is the participation in the Mopo project (funded from 
+repository is the participation in the 
+[Mopo](https://www.tools-for-energy-system-modelling.org/) project (funded from 
 European Climate, 
 Infrastructure and Environment Executive Agency under the European Union’s 
 HORIZON Research and Innovation Actions under grant agreement N°101095998).

{chaproev-1.0.2 → chaproev-1.0.3}/README.md

@@ -51,7 +51,8 @@ The docmentation can be found [here](https://tno.github.io/ChaProEV/)
 
 ### **Driver**
 The primary driver for the publication and development of ChaProEV in this
-repository is the participation in the Mopo project (funded from 
+repository is the participation in the 
+[Mopo](https://www.tools-for-energy-system-modelling.org/) project (funded from 
 European Climate, 
 Infrastructure and Environment Executive Agency under the European Union’s 
 HORIZON Research and Innovation Actions under grant agreement N°101095998).

{chaproev-1.0.2 → chaproev-1.0.3}/pyproject.toml

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

{chaproev-1.0.2 → chaproev-1.0.3}/src/ChaProEV/define.py

@@ -1301,6 +1301,46 @@ class Trip:
                 'Arrivals amount'
             ].loc[start_location, end_location]
 
+        trip.next_leg_charge_to_vehicle: pd.DataFrame = (
+            trip.next_leg_kilometers.copy()
+        )
+        trip.next_leg_charge_from_network: pd.DataFrame = (
+            trip.next_leg_kilometers.copy()
+        )
+        trip.next_leg_charge_to_vehicle_cumulative: pd.DataFrame = (
+            trip.next_leg_kilometers_cumulative.copy()
+        )
+        trip.next_leg_charge_from_network_cumulative: pd.DataFrame = (
+            trip.next_leg_kilometers_cumulative.copy()
+        )
+
+        for location_name in trip.location_names:
+            vehicle_consumption_per_km: float = scenario['vehicle'][
+                'base_consumption_per_km'
+            ]['electricity_kWh']
+            charger_efficiency = scenario['locations'][location_name][
+                'charger_efficiency'
+            ]
+            draw_from_network_per_km: float = (
+                vehicle_consumption_per_km / charger_efficiency
+            )
+            trip.next_leg_charge_to_vehicle[location_name] = (
+                trip.next_leg_charge_to_vehicle[location_name]
+                * vehicle_consumption_per_km
+            )
+            trip.next_leg_charge_to_vehicle_cumulative[location_name] = (
+                trip.next_leg_charge_to_vehicle_cumulative[location_name]
+                * vehicle_consumption_per_km
+            )
+            trip.next_leg_charge_from_network[location_name] = (
+                trip.next_leg_charge_from_network[location_name]
+                * draw_from_network_per_km
+            )
+            trip.next_leg_charge_from_network_cumulative[location_name] = (
+                trip.next_leg_charge_from_network_cumulative[location_name]
+                * draw_from_network_per_km
+            )
+
         trip.run_next_leg_kilometers: pd.DataFrame = run_time.from_day_to_run(
             trip.next_leg_kilometers,
             run_time_tags,
@@ -1318,6 +1358,44 @@ class Trip:
             )
         )
 
+        trip.run_next_leg_charge_to_vehicle: pd.DataFrame = (
+            run_time.from_day_to_run(
+                trip.next_leg_charge_to_vehicle,
+                run_time_tags,
+                trip.day_start_hour,
+                scenario,
+                general_parameters,
+            )
+        )
+        trip.run_next_leg_charge_to_vehicle_cumulative: pd.DataFrame = (
+            run_time.from_day_to_run(
+                trip.next_leg_charge_to_vehicle_cumulative,
+                run_time_tags,
+                trip.day_start_hour,
+                scenario,
+                general_parameters,
+            )
+        )
+
+        trip.run_next_leg_charge_from_network: pd.DataFrame = (
+            run_time.from_day_to_run(
+                trip.next_leg_charge_from_network,
+                run_time_tags,
+                trip.day_start_hour,
+                scenario,
+                general_parameters,
+            )
+        )
+        trip.run_next_leg_charge_from_network_cumulative: pd.DataFrame = (
+            run_time.from_day_to_run(
+                trip.next_leg_charge_from_network_cumulative,
+                run_time_tags,
+                trip.day_start_hour,
+                scenario,
+                general_parameters,
+            )
+        )
+
 
 def declare_class_instances(
     Chosen_class: ty.Type, scenario: ty.Dict, general_parameters: ty.Dict
@@ -1450,6 +1528,41 @@ def declare_all_instances(
             f'{output_folder}/{scenario_name}_'
             f'{trip.name}_run_next_leg_kilometers_cumulative.pkl'
         )
+        trip.next_leg_charge_to_vehicle.to_pickle(
+            f'{output_folder}/{scenario_name}_'
+            f'{trip.name}_next_leg_charge_to_vehicle.pkl'
+        )
+        trip.next_leg_charge_from_network.to_pickle(
+            f'{output_folder}/{scenario_name}_'
+            f'{trip.name}_next_leg_charge_from_network.pkl'
+        )
+        trip.run_next_leg_charge_to_vehicle.to_pickle(
+            f'{output_folder}/{scenario_name}_'
+            f'{trip.name}_run_next_leg_charge_to_vehicle.pkl'
+        )
+        trip.run_next_leg_charge_from_network.to_pickle(
+            f'{output_folder}/{scenario_name}_'
+            f'{trip.name}_run_next_leg_charge_from_network.pkl'
+        )
+        trip.next_leg_charge_to_vehicle_cumulative.to_pickle(
+            f'{output_folder}/{scenario_name}_'
+            f'{trip.name}_next_leg_charge_to_vehicle_cumulative.pkl'
+        )
+        trip.next_leg_charge_from_network_cumulative.to_pickle(
+            f'{output_folder}/{scenario_name}_'
+            f'{trip.name}'
+            f'_next_leg_charge_from_network_cumulative.pkl'
+        )
+        trip.run_next_leg_charge_to_vehicle_cumulative.to_pickle(
+            f'{output_folder}/{scenario_name}_'
+            f'{trip.name}'
+            f'_run_next_leg_charge_to_vehicle_cumulative.pkl'
+        )
+        trip.run_next_leg_charge_from_network_cumulative.to_pickle(
+            f'{output_folder}/{scenario_name}_'
+            f'{trip.name}'
+            f'_run_next_leg_charge_from_network_cumulative.pkl'
+        )
         trip.location_split.to_pickle(
             f'{output_folder}/{scenario_name}_'
             f'{trip.name}_location_split.pkl'
@@ -1609,7 +1722,7 @@ if __name__ == '__main__':
         general_parameters_file_name
     )
     case_name = 'Mopo'
-    test_scenario_name: str = 'XX_bus'
+    test_scenario_name: str = 'XX_car'
     scenario_file_name: str = (
         f'scenarios/{case_name}/{test_scenario_name}.toml'
     )

{chaproev-1.0.2 → chaproev-1.0.3}/src/ChaProEV/mobility.py

@@ -1515,6 +1515,26 @@ def get_kilometers_for_next_leg(
         columns=location_names,
         index=run_trip_probabilities.index,
     )
+    run_next_leg_charge_to_vehicle: pd.DataFrame = pd.DataFrame(
+        np.zeros((len(run_trip_probabilities.index), len(location_names))),
+        columns=location_names,
+        index=run_trip_probabilities.index,
+    )
+    run_next_leg_charge_from_network: pd.DataFrame = pd.DataFrame(
+        np.zeros((len(run_trip_probabilities.index), len(location_names))),
+        columns=location_names,
+        index=run_trip_probabilities.index,
+    )
+    run_next_leg_charge_to_vehicle_cumulative: pd.DataFrame = pd.DataFrame(
+        np.zeros((len(run_trip_probabilities.index), len(location_names))),
+        columns=location_names,
+        index=run_trip_probabilities.index,
+    )
+    run_next_leg_charge_from_network_cumulative: pd.DataFrame = pd.DataFrame(
+        np.zeros((len(run_trip_probabilities.index), len(location_names))),
+        columns=location_names,
+        index=run_trip_probabilities.index,
+    )
 
     trip_parameters: ty.Dict = scenario['trips']
     trip_names: ty.List[str] = [
@@ -1533,18 +1553,67 @@ def get_kilometers_for_next_leg(
             f'run_next_leg_kilometers_cumulative.pkl',
         )
 
+        trip_run_next_leg_charge_to_vehicle: pd.DataFrame = pd.read_pickle(
+            f'{output_folder}/{scenario_name}_'
+            f'{trip_name}_run_next_leg_charge_to_vehicle.pkl'
+        )
+        trip_run_next_leg_charge_from_network: pd.DataFrame = pd.read_pickle(
+            f'{output_folder}/{scenario_name}_'
+            f'{trip_name}_run_next_leg_charge_from_network.pkl'
+        )
+        trip_run_next_leg_charge_to_vehicle_cumulative: pd.DataFrame = (
+            pd.read_pickle(
+                f'{output_folder}/{scenario_name}_'
+                f'{trip_name}_run_next_leg_charge_to_vehicle_cumulative.pkl'
+            )
+        )
+        trip_run_next_leg_charge_from_network_cumulative: pd.DataFrame = (
+            pd.read_pickle(
+                f'{output_folder}/{scenario_name}_'
+                f'{trip_name}_run_next_leg_charge_from_network_cumulative.pkl'
+            )
+        )
+
         this_trip_probabilities: pd.Series[float] = pd.Series(
             run_trip_probabilities[trip_name]
         )
+        for location_name in trip_run_next_leg_kilometers.columns:
 
-        run_next_leg_kilometers += trip_run_next_leg_kilometers.mul(
-            this_trip_probabilities, axis=0
-        )
-        run_next_leg_kilometers_cumulative += (
-            trip_run_next_leg_kilometers_cumulative.mul(
+            run_next_leg_kilometers[
+                location_name
+            ] += trip_run_next_leg_kilometers[location_name].mul(
+                this_trip_probabilities, axis=0
+            )
+            run_next_leg_kilometers_cumulative[
+                location_name
+            ] += trip_run_next_leg_kilometers_cumulative[location_name].mul(
+                this_trip_probabilities, axis=0
+            )
+            run_next_leg_charge_to_vehicle[
+                location_name
+            ] += trip_run_next_leg_charge_to_vehicle[location_name].mul(
+                this_trip_probabilities, axis=0
+            )
+
+            run_next_leg_charge_from_network[
+                location_name
+            ] += trip_run_next_leg_charge_from_network[location_name].mul(
+                this_trip_probabilities, axis=0
+            )
+            run_next_leg_charge_to_vehicle_cumulative[
+                location_name
+            ] += trip_run_next_leg_charge_to_vehicle_cumulative[
+                location_name
+            ].mul(
+                this_trip_probabilities, axis=0
+            )
+            run_next_leg_charge_from_network_cumulative[
+                location_name
+            ] += trip_run_next_leg_charge_from_network_cumulative[
+                location_name
+            ].mul(
                 this_trip_probabilities, axis=0
             )
-        )
 
     run_next_leg_kilometers.to_pickle(
         f'{output_folder}/{scenario_name}_next_leg_kilometers.pkl'
@@ -1552,6 +1621,20 @@ def get_kilometers_for_next_leg(
     run_next_leg_kilometers_cumulative.to_pickle(
         f'{output_folder}/{scenario_name}_next_leg_kilometers_cumulative.pkl'
     )
+    run_next_leg_charge_to_vehicle.to_pickle(
+        f'{output_folder}/{scenario_name}_next_leg_charge_to_vehicle.pkl'
+    )
+    run_next_leg_charge_from_network.to_pickle(
+        f'{output_folder}/{scenario_name}_next_leg_charge_from_network.pkl'
+    )
+    run_next_leg_charge_to_vehicle_cumulative.to_pickle(
+        f'{output_folder}/{scenario_name}'
+        f'_next_leg_charge_to_vehicle_cumulative.pkl'
+    )
+    run_next_leg_charge_from_network_cumulative.to_pickle(
+        f'{output_folder}/{scenario_name}'
+        f'_next_leg_charge_from_network_cumulative.pkl'
+    )
 
 
 def make_mobility_data(
@@ -1633,7 +1716,7 @@ def make_mobility_data(
 if __name__ == '__main__':
     start_time: datetime.datetime = datetime.datetime.now()
     case_name = 'Mopo'
-    test_scenario_name: str = 'XX_bus'
+    test_scenario_name: str = 'XX_car'
     scenario_file_name: str = (
         f'scenarios/{case_name}/{test_scenario_name}.toml'
     )

{chaproev-1.0.2 → chaproev-1.0.3}/src/ChaProEV.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ChaProEV
-Version: 1.0.2
+Version: 1.0.3
 Summary: ChaProEV: Charging Profiles of Electric Vehicles
 Author-email: Omar Usmani <Omar.Usmani@TNO.nl>
 Project-URL: Homepage, https://github.com/TNO/ChaProEV
@@ -154,7 +154,8 @@ The docmentation can be found [here](https://tno.github.io/ChaProEV/)
 
 ### **Driver**
 The primary driver for the publication and development of ChaProEV in this
-repository is the participation in the Mopo project (funded from 
+repository is the participation in the 
+[Mopo](https://www.tools-for-energy-system-modelling.org/) project (funded from 
 European Climate, 
 Infrastructure and Environment Executive Agency under the European Union’s 
 HORIZON Research and Innovation Actions under grant agreement N°101095998).