ChaProEV 1.0.0__tar.gz → 1.0.2__tar.gz

{chaproev-1.0.0 → chaproev-1.0.2}/ChaProEV.toml

@@ -1,6 +1,7 @@
 
-
+[variants]
 use_variants = false
+csv_version = true
 
 
 # Parameters for plots (colors, sizes, etc.)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ChaProEV
-Version: 1.0.0
+Version: 1.0.2
 Summary: ChaProEV: Charging Profiles of Electric Vehicles
 Author-email: Omar Usmani <Omar.Usmani@TNO.nl>
 Project-URL: Homepage, https://github.com/TNO/ChaProEV
@@ -10,12 +10,12 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENCE
-Requires-Dist: attrs==24.2.0
+Requires-Dist: attrs==23.2.0
 Requires-Dist: beautifulsoup4==4.12.3
 Requires-Dist: black==24.10.0
-Requires-Dist: build==1.2.2.post1
-Requires-Dist: cads-api-client==1.4.5
-Requires-Dist: cdsapi==0.7.3
+Requires-Dist: build==1.2.1
+Requires-Dist: cads-api-client==1.1.0
+Requires-Dist: cdsapi==0.7.0
 Requires-Dist: certifi==2024.6.2
 Requires-Dist: charset-normalizer==3.3.2
 Requires-Dist: click==8.1.7
@@ -25,6 +25,7 @@ Requires-Dist: cycler==0.12.1
 Requires-Dist: docutils==0.21.2
 Requires-Dist: docx==0.2.4
 Requires-Dist: et-xmlfile==1.1.0
+Requires-Dist: ETS_CookBook==1.0.31
 Requires-Dist: fonttools==4.53.0
 Requires-Dist: geopandas==1.0.1
 Requires-Dist: ghp-import==2.1.0
@@ -59,7 +60,7 @@ Requires-Dist: pandas-stubs==2.2.2.240603
 Requires-Dist: pathspec==0.12.1
 Requires-Dist: pillow==10.4.0
 Requires-Dist: pip-review==1.3.0
-Requires-Dist: pkginfo==1.11.1
+Requires-Dist: pkginfo==1.10.0
 Requires-Dist: platformdirs==4.2.2
 Requires-Dist: plotly==5.22.0
 Requires-Dist: pluggy==1.5.0
@@ -80,16 +81,15 @@ Requires-Dist: requests==2.32.3
 Requires-Dist: requests-toolbelt==1.0.0
 Requires-Dist: rfc3986==2.0.0
 Requires-Dist: rich==13.7.1
-Requires-Dist: setuptools==75.1.0
+Requires-Dist: setuptools==70.2.0
 Requires-Dist: shapely==2.0.4
 Requires-Dist: six==1.16.0
-Requires-Dist: soupsieve==2.6
+Requires-Dist: soupsieve==2.5
 Requires-Dist: tenacity==8.4.2
 Requires-Dist: toml==0.10.2
-Requires-Dist: tqdm==4.66.5
-Requires-Dist: twine==5.1.1
-Requires-Dist: types-beautifulsoup4==4.12.0.20240907
-Requires-Dist: types-html5lib==1.1.11.20240806
+Requires-Dist: tqdm==4.66.4
+Requires-Dist: types-beautifulsoup4==4.12.0.20240511
+Requires-Dist: types-html5lib==1.1.11.20240228
 Requires-Dist: types-openpyxl==3.1.5.20240630
 Requires-Dist: types-pytz==2024.1.0.20240417
 Requires-Dist: types-requests==2.32.0.20240622

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

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

{chaproev-1.0.0 → chaproev-1.0.2}/requirements.txt

@@ -1,9 +1,9 @@
-attrs==24.2.0
+attrs==23.2.0
 beautifulsoup4==4.12.3
 black==24.10.0
-build==1.2.2.post1
-cads-api-client==1.4.5
-cdsapi==0.7.3
+build==1.2.1
+cads-api-client==1.1.0
+cdsapi==0.7.0
 certifi==2024.6.2
 charset-normalizer==3.3.2
 click==8.1.7
@@ -13,6 +13,7 @@ cycler==0.12.1
 docutils==0.21.2
 docx==0.2.4
 et-xmlfile==1.1.0
+ETS_CookBook==1.0.31
 fonttools==4.53.0
 geopandas==1.0.1
 ghp-import==2.1.0
@@ -47,7 +48,7 @@ pandas-stubs==2.2.2.240603
 pathspec==0.12.1
 pillow==10.4.0
 pip-review==1.3.0
-pkginfo==1.11.1
+pkginfo==1.10.0
 platformdirs==4.2.2
 plotly==5.22.0
 pluggy==1.5.0
@@ -68,16 +69,15 @@ requests==2.32.3
 requests-toolbelt==1.0.0
 rfc3986==2.0.0
 rich==13.7.1
-setuptools==75.1.0
+setuptools==70.2.0
 shapely==2.0.4
 six==1.16.0
-soupsieve==2.6
+soupsieve==2.5
 tenacity==8.4.2
 toml==0.10.2
-tqdm==4.66.5
-twine==5.1.1
-types-beautifulsoup4==4.12.0.20240907
-types-html5lib==1.1.11.20240806
+tqdm==4.66.4
+types-beautifulsoup4==4.12.0.20240511
+types-html5lib==1.1.11.20240228
 types-openpyxl==3.1.5.20240630
 types-pytz==2024.1.0.20240417
 types-requests==2.32.0.20240622

{chaproev-1.0.0 → chaproev-1.0.2}/src/ChaProEV/ChaProEV.py

@@ -95,9 +95,10 @@ def run_ChaProEV(case_name: str) -> None:
         general_parameters_file_name
     )
     cook.check_if_folder_exists(f'output/{case_name}')
-    use_variants = general_parameters['use_variants']
+    use_variants = general_parameters['variants']['use_variants']
     if use_variants:
-        make_variants.make_variants(case_name)
+        csv_version = general_parameters['variants']['csv_version']
+        make_variants.make_variants(case_name, csv_version)
     for scenario_file in os.listdir(f'scenarios/{case_name}'):
         # To avoid issues if some files are not configuration files
         if scenario_file.split('.')[1] == 'toml':

chaproev-1.0.2/src/ChaProEV/make_variants.py

@@ -0,0 +1,139 @@
+import os
+import typing as ty
+
+import pandas as pd
+import toml
+from ETS_CookBook import ETS_CookBook as cook
+
+
+def make_variants(case_name: str, csv_version: bool = True) -> None:
+
+    if csv_version:
+        make_csv_variants(case_name)
+    else:
+        make_toml_variants(case_name)
+
+
+def make_csv_variants(case_name: str) -> None:
+    '''
+    This uses a csv, with commas as separators.
+    If you want to put a list as a value, do it as such:
+    "[1, 2.5, 5]" 
+    (with the quotes: note that this is not necessary in Excel, where you can
+    just put the list with brackets without the quotes)
+    '''
+
+    variant_files_folder: str = f'variants/{case_name}/'
+    variant_files: ty.List[str] = os.listdir(variant_files_folder)
+    for variant_file in variant_files:
+
+        reference_scenario_name: str = variant_file.split('.')[0]
+
+        reference_scenario: ty.Dict = cook.parameters_from_TOML(
+            f'scenarios/{case_name}/{reference_scenario_name}.toml'
+        )
+
+        variant_data: pd.DataFrame = pd.read_csv(
+            f'{variant_files_folder}/{variant_file}'
+        ).set_index('Variant name')
+
+        variant_names: ty.List[str] = list(variant_data.index)
+
+        for variant_name in variant_names:
+
+            variant_scenario: ty.Dict = reference_scenario.copy()
+
+            for quantity_string in variant_data.columns:
+
+                variant_name_list = quantity_string.split('.')
+                variant_value = variant_data.loc[variant_name][quantity_string]
+
+                if isinstance(variant_value, float):
+                    variant_value = float(variant_value)
+                elif variant_value.startswith('['):
+                    variant_value = variant_value.replace('[', '')
+                    variant_value = variant_value.replace(']', '')
+                    variant_value = variant_value.split(',')
+                    variant_value = [
+                        float(value_item) for value_item in variant_value
+                    ]
+
+                cook.set_nested_value(
+                    variant_scenario, variant_name_list, variant_value
+                )
+
+            with open(
+                f'scenarios/{case_name}/{variant_name}.toml',
+                'w',
+                encoding='utf-8',
+            ) as file_to_write:
+                toml.dump(variant_scenario, file_to_write)
+
+
+def make_toml_variants(case_name: str) -> None:
+    variant_configuration: ty.Dict = cook.parameters_from_TOML(
+        f'variants/{case_name}.toml'
+    )
+
+    for reference_scenario_name in variant_configuration[
+        'reference_scenarios'
+    ]:
+        reference_scenario: ty.Dict = cook.parameters_from_TOML(
+            f'scenarios/{case_name}/{reference_scenario_name}.toml'
+        )
+
+        variant_names: ty.List[str] = variant_configuration[
+            'reference_scenarios'
+        ][reference_scenario_name]['variants']
+
+        variant_scenarios: ty.Dict[str, ty.Dict] = {}
+        for variant_name in variant_names:
+            variant_scenarios[variant_name] = reference_scenario.copy()
+
+        modified_parameters: ty.Dict = variant_configuration[
+            'reference_scenarios'
+        ][reference_scenario_name]['modified_parameters']
+
+        modified_parameters_names: ty.List[ty.List[str]] = []
+
+        for modified_parameter in modified_parameters:
+            this_modification_names: ty.List[str] = [modified_parameter]
+            next_step_in_modification = modified_parameters[modified_parameter]
+            next_level: str = list(next_step_in_modification.keys())[0]
+            while next_level not in variant_names:
+
+                this_modification_names.append(next_level)
+                next_step_in_modification = next_step_in_modification[
+                    next_level
+                ]
+                next_level = list(next_step_in_modification.keys())[0]
+
+            modified_parameters_names.append(this_modification_names)
+
+        for modified_parameter_names in modified_parameters_names:
+            for variant_name in variant_names:
+                variant_scenario = variant_scenarios[variant_name]
+
+                variant_nested_keys: ty.List[str] = (
+                    modified_parameter_names + [variant_name]
+                )
+                modified_value = cook.get_nested_value(
+                    modified_parameters, variant_nested_keys
+                )
+                cook.set_nested_value(
+                    variant_scenario, modified_parameter_names, modified_value
+                )
+
+        for variant_name in variant_names:
+            with open(
+                f'scenarios/{case_name}/{variant_name}.toml',
+                'w',
+                encoding='utf-8',
+            ) as file_to_write:
+                toml.dump(variant_scenarios[variant_name], file_to_write)
+
+
+if __name__ == '__main__':
+    case_name = 'Mopo'
+    csv_version = True
+    make_variants(case_name, csv_version)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ChaProEV
-Version: 1.0.0
+Version: 1.0.2
 Summary: ChaProEV: Charging Profiles of Electric Vehicles
 Author-email: Omar Usmani <Omar.Usmani@TNO.nl>
 Project-URL: Homepage, https://github.com/TNO/ChaProEV
@@ -10,12 +10,12 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENCE
-Requires-Dist: attrs==24.2.0
+Requires-Dist: attrs==23.2.0
 Requires-Dist: beautifulsoup4==4.12.3
 Requires-Dist: black==24.10.0
-Requires-Dist: build==1.2.2.post1
-Requires-Dist: cads-api-client==1.4.5
-Requires-Dist: cdsapi==0.7.3
+Requires-Dist: build==1.2.1
+Requires-Dist: cads-api-client==1.1.0
+Requires-Dist: cdsapi==0.7.0
 Requires-Dist: certifi==2024.6.2
 Requires-Dist: charset-normalizer==3.3.2
 Requires-Dist: click==8.1.7
@@ -25,6 +25,7 @@ Requires-Dist: cycler==0.12.1
 Requires-Dist: docutils==0.21.2
 Requires-Dist: docx==0.2.4
 Requires-Dist: et-xmlfile==1.1.0
+Requires-Dist: ETS_CookBook==1.0.31
 Requires-Dist: fonttools==4.53.0
 Requires-Dist: geopandas==1.0.1
 Requires-Dist: ghp-import==2.1.0
@@ -59,7 +60,7 @@ Requires-Dist: pandas-stubs==2.2.2.240603
 Requires-Dist: pathspec==0.12.1
 Requires-Dist: pillow==10.4.0
 Requires-Dist: pip-review==1.3.0
-Requires-Dist: pkginfo==1.11.1
+Requires-Dist: pkginfo==1.10.0
 Requires-Dist: platformdirs==4.2.2
 Requires-Dist: plotly==5.22.0
 Requires-Dist: pluggy==1.5.0
@@ -80,16 +81,15 @@ Requires-Dist: requests==2.32.3
 Requires-Dist: requests-toolbelt==1.0.0
 Requires-Dist: rfc3986==2.0.0
 Requires-Dist: rich==13.7.1
-Requires-Dist: setuptools==75.1.0
+Requires-Dist: setuptools==70.2.0
 Requires-Dist: shapely==2.0.4
 Requires-Dist: six==1.16.0
-Requires-Dist: soupsieve==2.6
+Requires-Dist: soupsieve==2.5
 Requires-Dist: tenacity==8.4.2
 Requires-Dist: toml==0.10.2
-Requires-Dist: tqdm==4.66.5
-Requires-Dist: twine==5.1.1
-Requires-Dist: types-beautifulsoup4==4.12.0.20240907
-Requires-Dist: types-html5lib==1.1.11.20240806
+Requires-Dist: tqdm==4.66.4
+Requires-Dist: types-beautifulsoup4==4.12.0.20240511
+Requires-Dist: types-html5lib==1.1.11.20240228
 Requires-Dist: types-openpyxl==3.1.5.20240630
 Requires-Dist: types-pytz==2024.1.0.20240417
 Requires-Dist: types-requests==2.32.0.20240622

{chaproev-1.0.0 → chaproev-1.0.2}/src/ChaProEV.egg-info/SOURCES.txt

@@ -2,7 +2,6 @@
 .gitignore
 ChaProEV.pptx
 ChaProEV.toml
-ETS_CookBook-1.0.30-py3-none-any.whl
 Gemfile
 LICENCE
 MOPO_logo_chaproev on wht.svg
@@ -83,4 +82,5 @@ src/ChaProEV.egg-info/requires.txt
 src/ChaProEV.egg-info/top_level.txt
 tests/test_battery_space.py
 tests/test_same_output.py
-variants/Mopo.toml
+variants/Mopo.toml
+variants/Mopo/XX_car.csv

{chaproev-1.0.0 → chaproev-1.0.2}/src/ChaProEV.egg-info/requires.txt

@@ -1,9 +1,9 @@
-attrs==24.2.0
+attrs==23.2.0
 beautifulsoup4==4.12.3
 black==24.10.0
-build==1.2.2.post1
-cads-api-client==1.4.5
-cdsapi==0.7.3
+build==1.2.1
+cads-api-client==1.1.0
+cdsapi==0.7.0
 certifi==2024.6.2
 charset-normalizer==3.3.2
 click==8.1.7
@@ -13,6 +13,7 @@ cycler==0.12.1
 docutils==0.21.2
 docx==0.2.4
 et-xmlfile==1.1.0
+ETS_CookBook==1.0.31
 fonttools==4.53.0
 geopandas==1.0.1
 ghp-import==2.1.0
@@ -47,7 +48,7 @@ pandas-stubs==2.2.2.240603
 pathspec==0.12.1
 pillow==10.4.0
 pip-review==1.3.0
-pkginfo==1.11.1
+pkginfo==1.10.0
 platformdirs==4.2.2
 plotly==5.22.0
 pluggy==1.5.0
@@ -68,16 +69,15 @@ requests==2.32.3
 requests-toolbelt==1.0.0
 rfc3986==2.0.0
 rich==13.7.1
-setuptools==75.1.0
+setuptools==70.2.0
 shapely==2.0.4
 six==1.16.0
-soupsieve==2.6
+soupsieve==2.5
 tenacity==8.4.2
 toml==0.10.2
-tqdm==4.66.5
-twine==5.1.1
-types-beautifulsoup4==4.12.0.20240907
-types-html5lib==1.1.11.20240806
+tqdm==4.66.4
+types-beautifulsoup4==4.12.0.20240511
+types-html5lib==1.1.11.20240228
 types-openpyxl==3.1.5.20240630
 types-pytz==2024.1.0.20240417
 types-requests==2.32.0.20240622

chaproev-1.0.2/variants/Mopo/XX_car.csv

@@ -0,0 +1,4 @@
+Variant name,legs.come_from_work.distance,trips.commute_to_work_and_leisure.time_between_legs
+Netherlands_urban_car,0.201624702,"[1,2,3]"
+Netherlands_semiurban_car,0.269056809,"[1,2,3]"
+Netherlands_rural_car,0.440458824,"[1,2.5,3]"

chaproev-1.0.0/src/ChaProEV/make_variants.py

@@ -1,72 +0,0 @@
-import typing as ty
-
-import toml
-from ETS_CookBook import ETS_CookBook as cook
-
-
-def make_variants(scenario_name: str) -> None:
-    variant_configuration: ty.Dict = cook.parameters_from_TOML(
-        f'variants/{scenario_name}.toml'
-    )
-
-    for reference_scenario_name in variant_configuration[
-        'reference_scenarios'
-    ]:
-        reference_scenario: ty.Dict = cook.parameters_from_TOML(
-            f'scenarios/{scenario_name}/{reference_scenario_name}.toml'
-        )
-
-        variant_names: ty.List[str] = variant_configuration[
-            'reference_scenarios'
-        ][reference_scenario_name]['variants']
-
-        variant_scenarios: ty.Dict[str, ty.Dict] = {}
-        for variant_name in variant_names:
-            variant_scenarios[variant_name] = reference_scenario.copy()
-
-        modified_parameters: ty.Dict = variant_configuration[
-            'reference_scenarios'
-        ][reference_scenario_name]['modified_parameters']
-
-        modified_parameters_names: ty.List[ty.List[str]] = []
-
-        for modified_parameter in modified_parameters:
-            this_modification_names: ty.List[str] = [modified_parameter]
-            next_step_in_modification = modified_parameters[modified_parameter]
-            next_level: str = list(next_step_in_modification.keys())[0]
-            while next_level not in variant_names:
-
-                this_modification_names.append(next_level)
-                next_step_in_modification = next_step_in_modification[
-                    next_level
-                ]
-                next_level = list(next_step_in_modification.keys())[0]
-
-            modified_parameters_names.append(this_modification_names)
-
-        for modified_parameter_names in modified_parameters_names:
-            for variant_name in variant_names:
-                variant_scenario = variant_scenarios[variant_name]
-
-                variant_nested_keys: ty.List[str] = (
-                    modified_parameter_names + [variant_name]
-                )
-                modified_value = cook.get_nested_value(
-                    modified_parameters, variant_nested_keys
-                )
-                cook.set_nested_value(
-                    variant_scenario, modified_parameter_names, modified_value
-                )
-
-        for variant_name in variant_names:
-            with open(
-                f'scenarios/{scenario_name}/{variant_name}.toml',
-                'w',
-                encoding='utf-8',
-            ) as file_to_write:
-                toml.dump(variant_scenarios[variant_name], file_to_write)
-
-
-if __name__ == '__main__':
-    case_name = 'Mopo'
-    make_variants(case_name)