zen-garden 2.7.15__tar.gz → 2.7.17__tar.gz

{zen_garden-2.7.15 → zen_garden-2.7.17}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: zen_garden
-Version: 2.7.15
+Version: 2.7.17
 Summary: ZEN-garden is an optimization model of energy systems and value chains.
-Author: Alissa Ganter, Johannes Burger, Francesco De Marco, Lukas Kunz, Lukas Schmidt-Engelbertz, Paolo Gabrielli, Giovanni Sansavini
+Author: Alissa Ganter, Johannes Burger, Francesco De Marco, Lukas Kunz, Lukas Schmidt-Engelbertz, Christoph Funke, Paolo Gabrielli, Giovanni Sansavini
 Author-email: Jacob Mannhardt <zen-garden@ethz.ch>
 Requires-Python: >=3.11,<3.14
 Description-Content-Type: text/markdown

{zen_garden-2.7.15 → zen_garden-2.7.17}/pyproject.toml

@@ -11,11 +11,12 @@ authors = [
   {name = "Francesco De Marco"},
   {name = "Lukas Kunz"},
   {name = "Lukas Schmidt-Engelbertz"},
+  {name = "Christoph Funke"},
   {name = "Paolo Gabrielli"},
   {name = "Giovanni Sansavini"},
   ]
 # do not change version manually! Done by bump2version
-version = "2.7.15"
+version = "2.7.17"
 requires-python= ">=3.11,<3.14"
 description="ZEN-garden is an optimization model of energy systems and value chains."
 readme = "README.md"
@@ -78,4 +79,4 @@ addopts = "-n auto"
 
 [project.scripts]
 zen-garden = "zen_garden.__main__:run_module"
-zen-viz = "zen_garden.visualization:parse_arguments_and_run"
+zen-visualization = "zen_garden.visualization:parse_arguments_and_run"

{zen_garden-2.7.15 → zen_garden-2.7.17}/zen_garden/__main__.py

@@ -28,7 +28,7 @@ def run_module(args=None, config = "./config.py", dataset = None,
                   "current working directory. You can specify a config file with the --config argument. However, " \
                   "note that the output directory will always be the current working directory, independent of the " \
                   "dataset specified in the config file."
-    parser = argparse.ArgumentParser(description=description, add_help=True, usage="usage: python -m zen_garden [-h] [--config CONFIG] [--dataset DATASET] [--job_index JOB_INDEX] [--job_index_var JOB_INDEX_VAR] [-- download_example EXAMPLE_NAME]")
+    parser = argparse.ArgumentParser(description=description, add_help=True, usage="usage: zen-garden [-h] [--config CONFIG] [--dataset DATASET] [--job_index JOB_INDEX] [--job_index_var JOB_INDEX_VAR] [-- download_example EXAMPLE_NAME]")
     # TODO make json config default
     parser.add_argument("--config", required=False, type=str, default=config, help="Path to the config file used to run the pipeline (e.g., `./config.json`). Alternatively, if the config file is located in the current working directory, then the file name is alone is also acceptable (e.g. `config.json`).")
     parser.add_argument("--dataset", required=False, type=str, default=dataset, help="Path to the dataset (e.g. `./<dataset_name>`). Alternatively, if the dataset is located in the current working directory, then the folder name alone is also acceptable (e.g. `<dataset_name>`). IMPORTANT: This will overwrite the config.analysis.dataset attribute of the config file!")

{zen_garden-2.7.15 → zen_garden-2.7.17}/zen_garden/postprocess/results/solution_loader.py

@@ -668,7 +668,12 @@ class SolutionLoader():
         version = get_solution_version(scenario)
         if check_if_v1_leq_v2(version,"v1"):
             sequence = self.get_sequence_time_steps(scenario,TimestepType.storage)
-            dict_startend = {sequence.iloc[0]:sequence.iloc[-1]}
+            time_steps_per_year = scenario.system.unaggregated_time_steps_per_year
+            dict_startend = {}
+            for i in np.arange(scenario.system.optimized_years):
+                start_idx = i * time_steps_per_year
+                end_idx = (i + 1) * time_steps_per_year - 1
+                dict_startend[sequence.iloc[start_idx]] = sequence.iloc[end_idx]
         else:
             time_steps_file_name = _get_time_steps_file(scenario)
             time_steps_file_name = time_steps_file_name + ".json"