ChaProEV 1.3.1__tar.gz → 1.3.2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (148) hide show
  1. {chaproev-1.3.1/src/ChaProEV.egg-info → chaproev-1.3.2}/PKG-INFO +1 -1
  2. {chaproev-1.3.1 → chaproev-1.3.2}/pyproject.toml +1 -1
  3. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV/non_road.py +6 -6
  4. {chaproev-1.3.1 → chaproev-1.3.2/src/ChaProEV.egg-info}/PKG-INFO +1 -1
  5. {chaproev-1.3.1 → chaproev-1.3.2}/.flake8 +0 -0
  6. {chaproev-1.3.1 → chaproev-1.3.2}/.gitignore +0 -0
  7. {chaproev-1.3.1 → chaproev-1.3.2}/.vscode/ltex.dictionary.en-US.txt +0 -0
  8. {chaproev-1.3.1 → chaproev-1.3.2}/.vscode/settings.json +0 -0
  9. {chaproev-1.3.1 → chaproev-1.3.2}/ChaProEV.pptx +0 -0
  10. {chaproev-1.3.1 → chaproev-1.3.2}/ChaProEV.toml +0 -0
  11. {chaproev-1.3.1 → chaproev-1.3.2}/ChaProEV_test_case_configuration_files.zip +0 -0
  12. {chaproev-1.3.1 → chaproev-1.3.2}/Gemfile +0 -0
  13. {chaproev-1.3.1 → chaproev-1.3.2}/LICENCE +0 -0
  14. {chaproev-1.3.1 → chaproev-1.3.2}/MOPO_logo_chaproev on wht.svg +0 -0
  15. {chaproev-1.3.1 → chaproev-1.3.2}/MOPO_logo_chaproev.png +0 -0
  16. {chaproev-1.3.1 → chaproev-1.3.2}/MOPO_logo_chaproev.svg +0 -0
  17. {chaproev-1.3.1 → chaproev-1.3.2}/MOPO_logo_main.svg +0 -0
  18. {chaproev-1.3.1 → chaproev-1.3.2}/MOPO_logo_main_onwhite.svg +0 -0
  19. {chaproev-1.3.1 → chaproev-1.3.2}/README-PC-28624.md +0 -0
  20. {chaproev-1.3.1 → chaproev-1.3.2}/README.md +0 -0
  21. {chaproev-1.3.1 → chaproev-1.3.2}/chaproev-1.3.0/.flake8 +0 -0
  22. {chaproev-1.3.1 → chaproev-1.3.2}/chaproev-1.3.0/.gitignore +0 -0
  23. {chaproev-1.3.1 → chaproev-1.3.2}/comparisons/comparison_template.toml +0 -0
  24. {chaproev-1.3.1 → chaproev-1.3.2}/docs/ChaProEV_workflow.png +0 -0
  25. {chaproev-1.3.1 → chaproev-1.3.2}/docs/Legs.png +0 -0
  26. {chaproev-1.3.1 → chaproev-1.3.2}/docs/Locations.png +0 -0
  27. {chaproev-1.3.1 → chaproev-1.3.2}/docs/Makefile +0 -0
  28. {chaproev-1.3.1 → chaproev-1.3.2}/docs/Trips.png +0 -0
  29. {chaproev-1.3.1 → chaproev-1.3.2}/docs/Vehicle_Temperature_correction_factor.svg +0 -0
  30. {chaproev-1.3.1 → chaproev-1.3.2}/docs/_config.yml +0 -0
  31. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/doctrees/environment.pickle +0 -0
  32. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/doctrees/index.doctree +0 -0
  33. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/.buildinfo +0 -0
  34. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/_sources/index.rst.txt +0 -0
  35. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/_static/alabaster.css +0 -0
  36. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/_static/basic.css +0 -0
  37. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/_static/custom.css +0 -0
  38. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/_static/doctools.js +0 -0
  39. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/_static/documentation_options.js +0 -0
  40. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/_static/file.png +0 -0
  41. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/_static/language_data.js +0 -0
  42. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/_static/minus.png +0 -0
  43. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/_static/plus.png +0 -0
  44. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/_static/pygments.css +0 -0
  45. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/_static/searchtools.js +0 -0
  46. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/_static/sphinx_highlight.js +0 -0
  47. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/genindex.html +0 -0
  48. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/index.html +0 -0
  49. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/objects.inv +0 -0
  50. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/search.html +0 -0
  51. {chaproev-1.3.1 → chaproev-1.3.2}/docs/build/html/searchindex.js +0 -0
  52. {chaproev-1.3.1 → chaproev-1.3.2}/docs/charging.md +0 -0
  53. {chaproev-1.3.1 → chaproev-1.3.2}/docs/consumption-PC-28624.md +0 -0
  54. {chaproev-1.3.1 → chaproev-1.3.2}/docs/consumption.md +0 -0
  55. {chaproev-1.3.1 → chaproev-1.3.2}/docs/define-PC-28624.md +0 -0
  56. {chaproev-1.3.1 → chaproev-1.3.2}/docs/define.md +0 -0
  57. {chaproev-1.3.1 → chaproev-1.3.2}/docs/general_parameters-PC-28624.md +0 -0
  58. {chaproev-1.3.1 → chaproev-1.3.2}/docs/general_parameters.md +0 -0
  59. {chaproev-1.3.1 → chaproev-1.3.2}/docs/index-PC-28624.md +0 -0
  60. {chaproev-1.3.1 → chaproev-1.3.2}/docs/index.md +0 -0
  61. {chaproev-1.3.1 → chaproev-1.3.2}/docs/input.md +0 -0
  62. {chaproev-1.3.1 → chaproev-1.3.2}/docs/make.bat +0 -0
  63. {chaproev-1.3.1 → chaproev-1.3.2}/docs/make_variants.md +0 -0
  64. {chaproev-1.3.1 → chaproev-1.3.2}/docs/mobility-PC-28624.md +0 -0
  65. {chaproev-1.3.1 → chaproev-1.3.2}/docs/mobility.md +0 -0
  66. {chaproev-1.3.1 → chaproev-1.3.2}/docs/multiprocessing.md +0 -0
  67. {chaproev-1.3.1 → chaproev-1.3.2}/docs/non_road.md +0 -0
  68. {chaproev-1.3.1 → chaproev-1.3.2}/docs/outputs.md +0 -0
  69. {chaproev-1.3.1 → chaproev-1.3.2}/docs/parallel_processing.md +0 -0
  70. {chaproev-1.3.1 → chaproev-1.3.2}/docs/profiles.md +0 -0
  71. {chaproev-1.3.1 → chaproev-1.3.2}/docs/run_time.md +0 -0
  72. {chaproev-1.3.1 → chaproev-1.3.2}/docs/running_model.md +0 -0
  73. {chaproev-1.3.1 → chaproev-1.3.2}/docs/scenario-PC-28624.md +0 -0
  74. {chaproev-1.3.1 → chaproev-1.3.2}/docs/scenario.md +0 -0
  75. {chaproev-1.3.1 → chaproev-1.3.2}/docs/scenarios_module.md +0 -0
  76. {chaproev-1.3.1 → chaproev-1.3.2}/docs/source/index.rst +0 -0
  77. {chaproev-1.3.1 → chaproev-1.3.2}/docs/using-PC-28624.md +0 -0
  78. {chaproev-1.3.1 → chaproev-1.3.2}/docs/using.md +0 -0
  79. {chaproev-1.3.1 → chaproev-1.3.2}/docs/variants-PC-28624.md +0 -0
  80. {chaproev-1.3.1 → chaproev-1.3.2}/docs/variants.md +0 -0
  81. {chaproev-1.3.1 → chaproev-1.3.2}/docs/weather-PC-28624.md +0 -0
  82. {chaproev-1.3.1 → chaproev-1.3.2}/docs/weather.md +0 -0
  83. {chaproev-1.3.1 → chaproev-1.3.2}/docs/writing.md +0 -0
  84. {chaproev-1.3.1 → chaproev-1.3.2}/eu-emblem-low-res.jpg +0 -0
  85. {chaproev-1.3.1 → chaproev-1.3.2}/input/Mopo/car_own_driveway_percentage.csv +0 -0
  86. {chaproev-1.3.1 → chaproev-1.3.2}/input/Mopo/fleets.csv +0 -0
  87. {chaproev-1.3.1 → chaproev-1.3.2}/mkdocs-PC-28624.yml +0 -0
  88. {chaproev-1.3.1 → chaproev-1.3.2}/mkdocs.yml +0 -0
  89. {chaproev-1.3.1 → chaproev-1.3.2}/non-road/Mopo/NL_domestic-aviation_2040_Aviation gasoline.toml +0 -0
  90. {chaproev-1.3.1 → chaproev-1.3.2}/non-road/Mopo/NL_domestic-aviation_2050_Aviation gasoline.toml +0 -0
  91. {chaproev-1.3.1 → chaproev-1.3.2}/non-road/Mopo/growth_factors.csv +0 -0
  92. {chaproev-1.3.1 → chaproev-1.3.2}/non-road/Mopo/scenario_demands.csv +0 -0
  93. {chaproev-1.3.1 → chaproev-1.3.2}/non-road/Mopo/scenarios.toml +0 -0
  94. {chaproev-1.3.1 → chaproev-1.3.2}/non-road.toml +0 -0
  95. {chaproev-1.3.1 → chaproev-1.3.2}/ref_val.csv +0 -0
  96. {chaproev-1.3.1 → chaproev-1.3.2}/requirements.txt +0 -0
  97. {chaproev-1.3.1 → chaproev-1.3.2}/requirements_obsolete.txt +0 -0
  98. {chaproev-1.3.1 → chaproev-1.3.2}/scenarios/Mopo/Latvia_car_own_driveway_2050.toml +0 -0
  99. {chaproev-1.3.1 → chaproev-1.3.2}/scenarios/Mopo/Netherlands_urban_car.toml +0 -0
  100. {chaproev-1.3.1 → chaproev-1.3.2}/scenarios/Mopo/Switzerland_car_own_driveway_2050.toml +0 -0
  101. {chaproev-1.3.1 → chaproev-1.3.2}/scenarios/Mopo/XX_bus.toml +0 -0
  102. {chaproev-1.3.1 → chaproev-1.3.2}/scenarios/Mopo/XX_car.toml +0 -0
  103. {chaproev-1.3.1 → chaproev-1.3.2}/scenarios/Mopo/XX_car_test.toml +0 -0
  104. {chaproev-1.3.1 → chaproev-1.3.2}/scenarios/Mopo/XX_truck.toml +0 -0
  105. {chaproev-1.3.1 → chaproev-1.3.2}/scenarios/Mopo/XX_van.toml +0 -0
  106. {chaproev-1.3.1 → chaproev-1.3.2}/scenarios/bus_test/XX_bus.toml +0 -0
  107. {chaproev-1.3.1 → chaproev-1.3.2}/scenarios/cumulative_test/Spain_bus_2050.toml +0 -0
  108. {chaproev-1.3.1 → chaproev-1.3.2}/scenarios/cumulative_test/Spain_van_2050.toml +0 -0
  109. {chaproev-1.3.1 → chaproev-1.3.2}/scenarios/cumulative_test/XX_car.toml +0 -0
  110. {chaproev-1.3.1 → chaproev-1.3.2}/scenarios/cumulative_test/XX_truck.toml +0 -0
  111. {chaproev-1.3.1 → chaproev-1.3.2}/scenarios/cumulative_test/XX_van.toml +0 -0
  112. {chaproev-1.3.1 → chaproev-1.3.2}/scenarios/local_impact_BEVs/baseline.toml +0 -0
  113. {chaproev-1.3.1 → chaproev-1.3.2}/setup.cfg +0 -0
  114. {chaproev-1.3.1 → chaproev-1.3.2}/siec.csv +0 -0
  115. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV/ChaProEV.py +0 -0
  116. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV/__init__.py +0 -0
  117. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV/charging.py +0 -0
  118. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV/consumption.py +0 -0
  119. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV/define.py +0 -0
  120. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV/make_variants.py +0 -0
  121. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV/mobility.py +0 -0
  122. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV/profiles.py +0 -0
  123. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV/py.typed +0 -0
  124. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV/run_time.py +0 -0
  125. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV/scenarios_module.py +0 -0
  126. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV/weather.py +0 -0
  127. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV/writing.py +0 -0
  128. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV.egg-info/PKG-INFO-PC-28624 +0 -0
  129. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV.egg-info/PKG-INFO-PC-28624-2 +0 -0
  130. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV.egg-info/SOURCES-PC-28624-2.txt +0 -0
  131. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV.egg-info/SOURCES-PC-28624.txt +0 -0
  132. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV.egg-info/SOURCES.txt +0 -0
  133. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV.egg-info/dependency_links.txt +0 -0
  134. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV.egg-info/requires-PC-28624-2.txt +0 -0
  135. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV.egg-info/requires-PC-28624.txt +0 -0
  136. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV.egg-info/requires.txt +0 -0
  137. {chaproev-1.3.1 → chaproev-1.3.2}/src/ChaProEV.egg-info/top_level.txt +0 -0
  138. {chaproev-1.3.1 → chaproev-1.3.2}/test_bus_moility_matrices/bus_weekday_in_holiday_week.csv +0 -0
  139. {chaproev-1.3.1 → chaproev-1.3.2}/test_bus_moility_matrices/bus_weekday_in_workweek.csv +0 -0
  140. {chaproev-1.3.1 → chaproev-1.3.2}/test_bus_moility_matrices/bus_weekend_in_holiday_week.csv +0 -0
  141. {chaproev-1.3.1 → chaproev-1.3.2}/test_bus_moility_matrices/bus_weekend_in_workweek.csv +0 -0
  142. {chaproev-1.3.1 → chaproev-1.3.2}/tests/test_battery_space.py +0 -0
  143. {chaproev-1.3.1 → chaproev-1.3.2}/tests/test_charge_and_consumption.py +0 -0
  144. {chaproev-1.3.1 → chaproev-1.3.2}/tests/test_empty_values.py +0 -0
  145. {chaproev-1.3.1 → chaproev-1.3.2}/tests/test_same_output.py +0 -0
  146. {chaproev-1.3.1 → chaproev-1.3.2}/todo.txt +0 -0
  147. {chaproev-1.3.1 → chaproev-1.3.2}/variants/Mopo/XX_car.csv +0 -0
  148. {chaproev-1.3.1 → chaproev-1.3.2}/variants/Mopo.toml +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: ChaProEV
3
- Version: 1.3.1
3
+ Version: 1.3.2
4
4
  Summary: ChaProEV: Charging Profiles of Electric Vehicles
5
5
  Author-email: Omar Usmani <Omar.Usmani@TNO.nl>
6
6
  Project-URL: Homepage, https://github.com/TNO/ChaProEV
@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
4
4
 
5
5
  [project]
6
6
  name = 'ChaProEV'
7
- version = '1.3.1'
7
+ version = '1.3.2'
8
8
  authors = [
9
9
  { name='Omar Usmani', email='Omar.Usmani@TNO.nl' },
10
10
  ]
@@ -463,7 +463,6 @@ def get_non_road_data(case_name: str, non_road_parameters: box.Box) -> None:
463
463
  future_yearly_demand_values, case_name, non_road_parameters
464
464
  )
465
465
 
466
-
467
466
  country_codes: list[str] = []
468
467
  modes: list[str] = []
469
468
  years: list[int] = []
@@ -493,7 +492,7 @@ def get_non_road_data(case_name: str, non_road_parameters: box.Box) -> None:
493
492
  carriers = sorted(list(set(carriers)))
494
493
  non_thermal_carriers: list[str] = ['Electricity']
495
494
  non_energetic_carriers: list[str] = ['Lubricants']
496
- profiles_grouped_by_carrier: dict[str, pd.DataFrame] = {}
495
+ profiles_grouped_by_carrier: dict[str, pd.Series] = {}
497
496
  country_year_profiles: dict[str, pd.DataFrame] = {}
498
497
  print(f'{country_codes=}')
499
498
  print(f'{modes=}')
@@ -540,7 +539,7 @@ def get_non_road_data(case_name: str, non_road_parameters: box.Box) -> None:
540
539
  group_name: str = (
541
540
  f'{country_code}_{mode}_non_thermal_PJ_{year}'
542
541
  )
543
- profiles_grouped_by_carrier[group_name] = pd.DataFrame(
542
+ profiles_grouped_by_carrier[group_name] = pd.Series(
544
543
  sum(profiles_to_group_non_thermal)
545
544
  )
546
545
  this_country_year_profiles[f'{mode}_non_thermal_PJ'] = (
@@ -549,7 +548,7 @@ def get_non_road_data(case_name: str, non_road_parameters: box.Box) -> None:
549
548
 
550
549
  if len(profiles_to_group_thermal) > 0:
551
550
  group_name = f'{country_code}_{mode}_thermal_PJ_{year}'
552
- profiles_grouped_by_carrier[group_name] = pd.DataFrame(
551
+ profiles_grouped_by_carrier[group_name] = pd.Series(
553
552
  sum(profiles_to_group_thermal)
554
553
  )
555
554
  this_country_year_profiles[f'{mode}_thermal_PJ'] = (
@@ -613,5 +612,6 @@ if __name__ == '__main__':
613
612
  print('and/or year (or even carrier)')
614
613
  print('Parallelize saving?')
615
614
 
616
- ENTSO-e for future
617
- WLO?
615
+ # ENTSO-e for future
616
+ # WLO?
617
+ # Add proportionality cutoff for partial weeks (also for road????)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: ChaProEV
3
- Version: 1.3.1
3
+ Version: 1.3.2
4
4
  Summary: ChaProEV: Charging Profiles of Electric Vehicles
5
5
  Author-email: Omar Usmani <Omar.Usmani@TNO.nl>
6
6
  Project-URL: Homepage, https://github.com/TNO/ChaProEV
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes