ChaProEV 1.3.4__tar.gz → 2.0.0__tar.gz

{chaproev-1.3.4/src/ChaProEV.egg-info → chaproev-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ChaProEV
-Version: 1.3.4
+Version: 2.0.0
 Summary: ChaProEV: Charging Profiles of Electric Vehicles
 Author-email: Omar Usmani <Omar.Usmani@TNO.nl>
 Project-URL: Homepage, https://github.com/TNO/ChaProEV
@@ -12,11 +12,14 @@ Description-Content-Type: text/markdown
 License-File: LICENCE
 Requires-Dist: build>=1.6.1
 Requires-Dist: ets-cookbook>=1.2.8
+Requires-Dist: eurostat>=1.1.1
 Requires-Dist: polars>=1.43.2
 Requires-Dist: python-box>=7.4.1
 Requires-Dist: streamlit>=1.62.0
 Requires-Dist: tomli-w>=1.2.0
 Requires-Dist: tqdm>=4.70.0
+Requires-Dist: twine>=7.0.0
+Requires-Dist: typing>=3.10.0.0
 Dynamic: license-file
 
 # **ChaProEV**
@@ -69,12 +72,14 @@ In that case, the only piece of code you need is as follows (you just need
 to put the name of the folder where you put your case scenarios instead of the
 'Mopo'  example).
 ```python
-from ChaProEV import ChaProEV_run
+from ChaProEV.classic import ChaProEV_run
 
 if __name__ == '__main__':
     case_name: str = 'Mopo'
     ChaProEV_run.run_ChaProEV(case_name)
 ```
+
+(In general, replace classic by the mode you want to use)
 If you installed ChaProEV with pip, then the requirements
 should be installed as well (see requirements.txt file if you have issues
 or use the contact below).
@@ -86,13 +91,14 @@ You can use the examples provided in this repository. You can also
 unzip [this file](https://github.com/TNO/ChaProEV/blob/main/ChaProEV_test_case_configuration_files.zip)
 into your working folder and use 'test_case'  as your case name:
 ```python
-from ChaProEV import ChaProEV_run
+from ChaProEV.classic import ChaProEV_run
 
 if __name__ == '__main__':
     case_name: str = 'test_case'
     ChaProEV_run.run_ChaProEV(case_name)
 ```
 
+(In general, replace classic by the mode you want to use)
 
 
 For examples of running ChaProEV and more configuration files,

{chaproev-1.3.4 → chaproev-2.0.0}/README.md

@@ -48,12 +48,14 @@ In that case, the only piece of code you need is as follows (you just need
 to put the name of the folder where you put your case scenarios instead of the
 'Mopo'  example).
 ```python
-from ChaProEV import ChaProEV_run
+from ChaProEV.classic import ChaProEV_run
 
 if __name__ == '__main__':
     case_name: str = 'Mopo'
     ChaProEV_run.run_ChaProEV(case_name)
 ```
+
+(In general, replace classic by the mode you want to use)
 If you installed ChaProEV with pip, then the requirements
 should be installed as well (see requirements.txt file if you have issues
 or use the contact below).
@@ -65,13 +67,14 @@ You can use the examples provided in this repository. You can also
 unzip [this file](https://github.com/TNO/ChaProEV/blob/main/ChaProEV_test_case_configuration_files.zip)
 into your working folder and use 'test_case'  as your case name:
 ```python
-from ChaProEV import ChaProEV_run
+from ChaProEV.classic import ChaProEV_run
 
 if __name__ == '__main__':
     case_name: str = 'test_case'
     ChaProEV_run.run_ChaProEV(case_name)
 ```
 
+(In general, replace classic by the mode you want to use)
 
 
 For examples of running ChaProEV and more configuration files,

{chaproev-1.3.4 → chaproev-2.0.0}/cha.csv

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
-name: chaproev-1.3.4/cha.csv
+name: chaproev-2.0.0/cha.csv
 size: 35085865 bytes
 sha256: c023f8cf501f624ab453eb91bf23c5b735b0be2faa0c5352317fafde5feeec5e

{chaproev-1.3.4 → chaproev-2.0.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'ChaProEV'
-version = '1.3.4'
+version = '2.0.0'
 authors = [
   { name='Omar Usmani', email='Omar.Usmani@TNO.nl' },
 ]
@@ -19,11 +19,14 @@ classifiers = [
 dependencies = [
     "build>=1.6.1",
     "ets-cookbook>=1.2.8",
+    "eurostat>=1.1.1",
     "polars>=1.43.2",
     "python-box>=7.4.1",
     "streamlit>=1.62.0",
     "tomli-w>=1.2.0",
     "tqdm>=4.70.0",
+    "twine>=7.0.0",
+    "typing>=3.10.0.0",
 ]
 # dynamic = ['dependencies']
 # [tool.setuptools.dynamic]
@@ -38,6 +41,12 @@ where = ['src']
 [tool.pytest.ini_options]
 pythonpath = ['src/ChaProEV']
 
+
+[project.scripts]
+classic = 'ChaProEV.classic.ChaProEV_run:test_run'
+stochastic = 'ChaProEV.stochastic.ChaProEV_run:test_run'
+dashboard = 'ChaProEV.stochastic.dashboard:run_dashboard'
+
 [project.urls]
 'Homepage' = 'https://github.com/TNO/ChaProEV'
 

{chaproev-1.3.4/src/ChaProEV → chaproev-2.0.0/src/ChaProEV/classic}/ChaProEV_run.py

@@ -11,7 +11,7 @@ from box import Box
 from ETS_CookBook import ETS_CookBook as cook
 from tqdm.rich import tqdm
 
-from ChaProEV import make_variants, profiles, scenarios_module, writing
+from ChaProEV.classic import make_variants, profiles, scenarios_module, writing
 
 
 @cook.function_timer
@@ -69,6 +69,11 @@ def run_ChaProEV(case_name: str) -> None:
     writing.extra_end_outputs(case_name, general_parameters)
 
 
+def test_run() -> None:
+    case_name: str = 'Mopo'
+    run_ChaProEV(case_name)
+
+
 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.

{chaproev-1.3.4/src/ChaProEV → chaproev-2.0.0/src/ChaProEV/classic}/charging.py

@@ -7,7 +7,7 @@ from box import Box
 from ETS_CookBook import ETS_CookBook as cook
 from rich import print
 
-from ChaProEV import mobility, run_time
+from ChaProEV.classic import mobility, run_time
 
 
 def get_time_modulation(

{chaproev-1.3.4/src/ChaProEV → chaproev-2.0.0/src/ChaProEV/classic}/consumption.py

@@ -7,7 +7,7 @@ import pandas as pd
 from box import Box
 from ETS_CookBook import ETS_CookBook as cook
 
-from ChaProEV import run_time
+from ChaProEV.classic import run_time
 
 
 def create_consumption_tables(

{chaproev-1.3.4/src/ChaProEV → chaproev-2.0.0/src/ChaProEV/classic}/define.py

@@ -19,6 +19,7 @@ to run that function for all class types.
 
 import datetime
 import math
+from typing import TypeVar
 
 import numpy as np
 import pandas as pd
@@ -26,7 +27,7 @@ from box import Box
 from ETS_CookBook import ETS_CookBook as cook
 from rich import print
 
-from ChaProEV import run_time
+from ChaProEV.classic import run_time
 
 
 def get_trip_charging_sessions(
@@ -1578,9 +1579,15 @@ class TripChargingSession:
         )
 
 
+ScenarioObject = TypeVar(
+    'ScenarioObject',
+    bound=Leg | Location | Trip,
+)
+
+
 def declare_class_instances(
-    ChosenClass: type, scenario: Box, general_parameters: Box
-) -> list[type]:
+    ChosenClass: type[ScenarioObject], scenario: Box, general_parameters: Box
+) -> list[ScenarioObject]:
     '''
     This function creates the instances of a class (ChosenClass),
     based on a scenario file name where the instances and their properties
@@ -1591,7 +1598,7 @@ def declare_class_instances(
 
     class_instances: list[str] = scenario[class_name]
 
-    instances: list[type] = []
+    instances: list[ScenarioObject] = []
 
     for class_instance in class_instances:
         append_instance: bool = True
@@ -1619,7 +1626,7 @@ def declare_class_instances(
 # @cook.function_timer
 def declare_all_instances(
     scenario: Box, case_name: str, general_parameters: Box
-) -> tuple[pd.DataFrame, list[type], list[type], list[type]]:
+) -> tuple[pd.DataFrame, list[Leg], list[Location], list[Trip]]:
     '''
     This declares all instances of the various objects
     (legs, locations,  trips).
@@ -1627,11 +1634,11 @@ def declare_all_instances(
     scenario_name: str = scenario.name
     file_parameters: Box = general_parameters.files
     output_folder: str = f'{file_parameters.output_root}/{case_name}'
-    locations: list[type] = declare_class_instances(
+    locations: list[Location] = declare_class_instances(
         Location, scenario, general_parameters
     )
 
-    legs: list[type] = declare_class_instances(
+    legs: list[Leg] = declare_class_instances(
         Leg, scenario, general_parameters
     )
 
@@ -1673,7 +1680,7 @@ def declare_all_instances(
             f'{output_folder}/{scenario_name}_location_connections.pkl'
         )
 
-    trips: list[type] = declare_class_instances(
+    trips: list[Trip] = declare_class_instances(
         Trip, scenario, general_parameters
     )
 

{chaproev-1.3.4/src/ChaProEV → chaproev-2.0.0/src/ChaProEV/classic}/mobility.py

@@ -22,7 +22,7 @@ from box import Box
 from ETS_CookBook import ETS_CookBook as cook
 from rich import print
 
-from ChaProEV import define, run_time
+from ChaProEV.classic import run_time, define
 
 
 class ChargingSession:
@@ -1950,9 +1950,9 @@ def get_kilometers_for_next_leg(
 # @cook.function_timer
 def make_mobility_data(
     location_connections: pd.DataFrame,
-    legs: define.Leg,
-    locations: define.Location,
-    trips: define.Trip,
+    legs: list[define.Leg],
+    locations: list[define.Location],
+    trips: list[define.Trip],
     scenario: Box,
     case_name: str,
     general_parameters: Box,

{chaproev-1.3.4/src/ChaProEV → chaproev-2.0.0/src/ChaProEV/classic}/profiles.py

@@ -7,7 +7,8 @@ import numpy as np
 import pandas as pd
 from box import Box
 
-from ChaProEV import run_time
+from ChaProEV.classic import run_time
+
 
 # @cook.function_timer
 def car_home_parking(case_name: str, general_parameters: Box) -> None:
@@ -160,9 +161,9 @@ def car_home_parking(case_name: str, general_parameters: Box) -> None:
                 + (1 - own_driveway_percentage)
                 * on_street_values_from_network_from_sessions[quantity]
             )
-        sessions_values_columns: list[
-            str
-        ] = home_type_parameters.sessions_values_columns
+        sessions_values_columns: list[str] = (
+            home_type_parameters.sessions_values_columns
+        )
         for quantity in sessions_values_columns:
             charging_sessions_own_driveway_values[
                 quantity
@@ -224,13 +225,13 @@ def fleet_profiles(
     distance_header: str = consumption_parameters.distance_header
     fleet_distance_header: str = consumption_parameters.fleet_distance_header
 
-    energy_carriers_consumption_names: list[
-        str
-    ] = consumption_parameters.energy_carriers_consumption_names
+    energy_carriers_consumption_names: list[str] = (
+        consumption_parameters.energy_carriers_consumption_names
+    )
 
-    fleet_energy_carriers_consumption_names: list[
-        str
-    ] = consumption_parameters.fleet_energy_carriers_consumption_names
+    fleet_energy_carriers_consumption_names: list[str] = (
+        consumption_parameters.fleet_energy_carriers_consumption_names
+    )
     energy_carriers: list[str] = consumption_parameters.energy_carriers
     output_root: str = general_parameters.files.output_root
     output_folder: str = f'{output_root}/{case_name}'
@@ -330,9 +331,9 @@ def fleet_profiles(
                 sessions_dataframe_params: Box = (
                     general_parameters.sessions_dataframe
                 )
-                fleet_display_dataframe_headers: list[
-                    str
-                ] = sessions_dataframe_params.fleet_display_dataframe_headers
+                fleet_display_dataframe_headers: list[str] = (
+                    sessions_dataframe_params.fleet_display_dataframe_headers
+                )
                 fleet_sessions: pd.DataFrame = pd.DataFrame(
                     columns=fleet_display_dataframe_headers,
                     index=reference_sessions.index,
@@ -432,9 +433,9 @@ def make_profile_display_dataframe(
     output_root: str = general_parameters.files.output_root
     output_folder: str = f'{output_root}/{case_name}'
 
-    profile_dataframe_headers: list[
-        str
-    ] = general_parameters.profile_dataframe.headers
+    profile_dataframe_headers: list[str] = (
+        general_parameters.profile_dataframe.headers
+    )
     profile_dataframe: pd.DataFrame = run_time.get_time_stamped_dataframe(
         scenario, general_parameters, locations_as_columns=False
     )
@@ -481,12 +482,12 @@ def make_sessions_display_dataframes(
             .between(display_range[0], display_range[-1])
         ]
     )
-    display_session_headers: list[
-        str
-    ] = general_parameters.sessions_dataframe.display_dataframe_headers
-    display_session_index: list[
-        str
-    ] = general_parameters.sessions_dataframe.display_dataframe_index
+    display_session_headers: list[str] = (
+        general_parameters.sessions_dataframe.display_dataframe_headers
+    )
+    display_session_index: list[str] = (
+        general_parameters.sessions_dataframe.display_dataframe_index
+    )
 
     display_charging_sessions: pd.DataFrame = (
         charging_sessions_with_charged_amounts[
@@ -502,15 +503,15 @@ 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 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['Effective charging efficiency'] = (
+        display_charging_sessions['Effective charging efficiency'].fillna(
+            general_parameters.discharge.no_charge_efficiency_output
+        )
     )
 
     display_charging_sessions.to_pickle(
@@ -544,12 +545,12 @@ def make_display_totals(
     ].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['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}'

{chaproev-1.3.4/src/ChaProEV → chaproev-2.0.0/src/ChaProEV/classic}/scenarios_module.py

@@ -4,13 +4,14 @@ This is where you run the model
 '''
 
 import os
+from pathlib import Path
 
 import pandas as pd
 from box import Box
 from ETS_CookBook import ETS_CookBook as cook
 from rich import print
 
-from ChaProEV import charging, consumption, define, mobility, profiles
+from ChaProEV.classic import charging, consumption, define, mobility, profiles
 
 
 @cook.function_timer
@@ -155,21 +156,21 @@ def run_scenario(
 # @cook.function_timer
 def load_scenarios(case_name: str) -> list[Box]:
     scenario_folder_files: list[str] = os.listdir(f'scenarios/{case_name}')
-    scenario_files: list[str] = [
+    scenario_file_names: list[str] = [
         scenario_folder_file
         for scenario_folder_file in scenario_folder_files
         if scenario_folder_file.split('.')[1] == 'toml'
     ]
-    scenario_file_paths: list[str] = [
-        f'scenarios/{case_name}/{scenario_file}'
-        for scenario_file in scenario_files
+    scenario_file_paths: list[Path] = [
+        Path(f'scenarios/{case_name}/{scenario_file_name}')
+        for scenario_file_name in scenario_file_names
     ]
     scenarios: list[Box] = [
         cook.parameters_from_TOML(scenario_file_path)
         for scenario_file_path in scenario_file_paths
     ]
-    for scenario, scenario_file in zip(scenarios, scenario_files):
-        scenario.name = scenario_file.split('.')[0]
+    for scenario, scenario_file_name in zip(scenarios, scenario_file_names):
+        scenario.name = scenario_file_name.split('.')[0]
     return scenarios
 
 

chaproev-1.3.4/src/ChaProEV/ChaProEV_plus.py → chaproev-2.0.0/src/ChaProEV/stochastic/ChaProEV_run.py

@@ -8,7 +8,13 @@ from box import Box
 from ETS_CookBook import ETS_CookBook as cook
 from rich import print
 
-from ChaProEV import auxiliary, charging_plus, define_plus, mobility_plus
+from ChaProEV.stochastic import (
+    auxiliary,
+    charging,
+    define,
+    mobility,
+    scenarios_module,
+)
 
 
 @dataclass
@@ -84,18 +90,18 @@ def get_charging_quantities(
         run_trips,
         base_trips,
         locations,
-    ) = define_plus.define_user(
+    ) = define.define_user(
         scenario=scenario, random_generator=random_generators.define
     )
 
-    mobility_matrix: pl.DataFrame = mobility_plus.compute_mobility_matrix(
+    mobility_matrix: pl.DataFrame = mobility.compute_mobility_matrix(
         time_ranges=time_ranges,
         run_trips=run_trips,
         base_trips=base_trips,
         scenario=scenario,
     )
 
-    charging_dataframe = charging_plus.compute_charging(
+    charging_dataframe = charging.compute_charging(
         mobility_matrix=mobility_matrix,
         locations=locations,
         scenario=scenario,
@@ -145,7 +151,7 @@ def get_iterated_charging_dataframe(
 
 
 @cook.function_timer
-def run_ChaProEV(scenario: Box) -> tuple[pl.DataFrame, pl.DataFrame]:
+def run_ChaProEV_scenario(scenario: Box) -> tuple[pl.DataFrame, pl.DataFrame]:
     random_generators: auxiliary.RandomGenerators = (
         auxiliary.RandomGenerators.create_generators(scenario=scenario)
     )
@@ -157,22 +163,30 @@ def run_ChaProEV(scenario: Box) -> tuple[pl.DataFrame, pl.DataFrame]:
         iterations=iterations,
         random_generators=random_generators,
     )
-    hourly_values: pl.DataFrame = charging_plus.get_hourly_values(
+    hourly_values: pl.DataFrame = charging.get_hourly_values(
         charging_dataframe
     )
 
     return charging_dataframe, hourly_values
 
 
-if __name__ == '__main__':
+def run_ChaProEV(case_name: str) -> None:
+
+    scenarios: list[Box] = scenarios_module.load_scenarios(case_name=case_name)
+    for scenario in scenarios:
+        run_ChaProEV_scenario(scenario=scenario)
+
+
+def test_run() -> None:
 
     scenario_path: Path = Path('scenarios/plus/test.toml')
     scenario: Box = cook.parameters_from_TOML(scenario_path)
-
     plt.style.use('fivethirtyeight')
     network_power_figure, network_power_plot = plt.subplots(1, 1)
 
-    charging_dataframe, hourly_values = run_ChaProEV(scenario=scenario)
+    charging_dataframe, hourly_values = run_ChaProEV_scenario(
+        scenario=scenario
+    )
     network_power_plot.bar(
         x=hourly_values['Hour number'],
         height=hourly_values['Average power drawn from network (kW)'],
@@ -180,12 +194,21 @@ if __name__ == '__main__':
     network_power_figure.savefig('noot.png')
 
     scenario.charging.adaptive = True
-    charging_dataframe, hourly_values = run_ChaProEV(scenario=scenario)
+    charging_dataframe, hourly_values = run_ChaProEV_scenario(
+        scenario=scenario
+    )
     network_power_plot.bar(
         x=hourly_values['Hour number'],
         height=hourly_values['Average power drawn from network (kW)'],
     )
     network_power_figure.savefig('moot.png')
+
+
+if __name__ == '__main__':
+
+    case_name: str = 'plus'
+    run_ChaProEV(case_name=case_name)
+
     # plot1, plot2 = st.columns(2)
     # with plot1:
     #     st.pyplot(network_power_figure)

chaproev-2.0.0/src/ChaProEV/stochastic/auxiliary.py

@@ -0,0 +1,31 @@
+from dataclasses import dataclass
+
+import numpy as np
+from box import Box
+
+
+@dataclass
+class RandomGenerators:
+    define: np.random.Generator
+    mobility: np.random.Generator
+    charging: np.random.Generator
+
+    @staticmethod
+    def create_generators(scenario: Box) -> RandomGenerators:
+        run_parameters: Box = scenario.run
+        if run_parameters.use_seed:
+            run_seed: int | None = run_parameters.seed
+        else:
+            run_seed = None
+
+        seed_sequence: np.random.SeedSequence = np.random.SeedSequence(
+            run_seed
+        )
+
+        define_seed, mobility_seed, charging_seed = seed_sequence.spawn(3)
+
+        return RandomGenerators(
+            define=np.random.default_rng(seed=define_seed),
+            mobility=np.random.default_rng(seed=mobility_seed),
+            charging=np.random.default_rng(seed=charging_seed),
+        )

chaproev-1.3.4/src/ChaProEV/charging_plus.py → chaproev-2.0.0/src/ChaProEV/stochastic/charging.py

@@ -6,14 +6,14 @@ from box import Box
 from ETS_CookBook import ETS_CookBook as cook
 from rich import print
 
-from ChaProEV import auxiliary, define_plus, mobility_plus
+from ChaProEV.stochastic import auxiliary, define, mobility
 
 
 @cook.function_timer
 def compute_charging(
     *,
     mobility_matrix: pl.DataFrame,
-    locations: dict[str, define_plus.Location],
+    locations: dict[str, define.Location],
     scenario: Box,
     random_generator: np.random.Generator,
 ) -> pl.DataFrame:
@@ -72,7 +72,7 @@ def compute_charging(
                 previous_location_name = location_name
 
             else:
-                location: define_plus.Location = locations[location_name]
+                location: define.Location = locations[location_name]
                 if (previous_location_name == driving_location_name) and (
                     location_name != driving_location_name
                 ):
@@ -84,13 +84,12 @@ def compute_charging(
                     can_charge = (
                         random_generator.random() < location.connectivity
                     )
-
                     does_charge = wants_to_charge and can_charge
+
+                if does_charge:
                     battery_space_at_session_start_kWh: float = (
                         battery_capacity_kWh - current_battery_level_kWh
                     )
-
-                if does_charge:
                     available_power_kW: float = location.charging_power_kW
                     hour_in_day: int = time_stamp.hour
                     modulation_factor: float = (
@@ -218,11 +217,11 @@ if __name__ == '__main__':
         run_trips,
         base_trips,
         locations,
-    ) = define_plus.define_user(
+    ) = define.define_user(
         scenario=scenario, random_generator=random_generators.define
     )
 
-    mobility_matrix: pl.DataFrame = mobility_plus.compute_mobility_matrix(
+    mobility_matrix: pl.DataFrame = mobility.compute_mobility_matrix(
         time_ranges=time_ranges,
         run_trips=run_trips,
         base_trips=base_trips,

chaproev-1.3.4/src/ChaProEV/ChaProEV_dashboard.py → chaproev-2.0.0/src/ChaProEV/stochastic/dashboard.py

@@ -1,3 +1,5 @@
+import subprocess
+import sys
 from pathlib import Path
 
 import matplotlib.pyplot as plt
@@ -6,7 +8,7 @@ import streamlit as st
 from box import Box
 from ETS_CookBook import ETS_CookBook as cook
 
-from ChaProEV import ChaProEV_plus
+from ChaProEV.stochastic import ChaProEV_run
 
 
 def make_dashboard() -> None:
@@ -152,10 +154,10 @@ def make_dashboard() -> None:
         * scenario_A.trips.weekend_trip.start_time_hours_standard_deviation
     )
 
-    charging_dataframe_A, hourly_values_A = ChaProEV_plus.run_ChaProEV(
+    charging_dataframe_A, hourly_values_A = ChaProEV_run.run_ChaProEV_scenario(
         scenario=scenario_A
     )
-    charging_dataframe_B, hourly_values_B = ChaProEV_plus.run_ChaProEV(
+    charging_dataframe_B, hourly_values_B = ChaProEV_run.run_ChaProEV_scenario(
         scenario=scenario_B
     )
 
@@ -187,6 +189,13 @@ def make_dashboard() -> None:
         plt.close(network_power_figure)
 
 
+def run_dashboard() -> None:
+    app_path: Path = Path(__file__).resolve()
+    subprocess.run(
+        [sys.executable, '-m', 'streamlit', 'run', str(app_path)], check=True
+    )
+
+
 if __name__ == '__main__':
 
     make_dashboard()