zen-garden 2.7.14__tar.gz → 2.7.16__tar.gz

{zen_garden-2.7.14 → zen_garden-2.7.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zen_garden
-Version: 2.7.14
+Version: 2.7.16
 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-email: Jacob Mannhardt <zen-garden@ethz.ch>

{zen_garden-2.7.14 → zen_garden-2.7.16}/pyproject.toml

@@ -15,7 +15,7 @@ authors = [
   {name = "Giovanni Sansavini"},
   ]
 # do not change version manually! Done by bump2version
-version = "2.7.14"
+version = "2.7.16"
 requires-python= ">=3.11,<3.14"
 description="ZEN-garden is an optimization model of energy systems and value chains."
 readme = "README.md"

{zen_garden-2.7.14 → zen_garden-2.7.16}/zen_garden/postprocess/results/results.py

@@ -673,6 +673,27 @@ class Results:
             return ""
         return component.doc
 
+    def get_index_names(self, component_name: str, scenario_name: Optional[str] = None) -> list[str]:
+        """
+        Docstring for get_index_names
+        
+        :param self: Description
+        :param component_name: Description
+        :type component_name: str
+        :param scenario_name: Description
+        :type scenario_name: Optional[str]
+        :return: Description
+        :rtype: list[str]
+        """
+        if scenario_name is None:
+            scenario_name = next(iter(self.solution_loader.scenarios.keys()))
+        scenario = self.solution_loader.scenarios[scenario_name]
+        if component_name not in scenario.components:
+            logging.warning(f"Component {component_name} not found and the index names cannot be returned.")
+            return []
+        component = scenario.components[component_name]
+        return component.index_names
+
     def get_years(self, scenario_name: Optional[str] = None) -> list[int]:
         """
         Extracts the years of a given Scenario. If no scenario is given, a random one is taken.

{zen_garden-2.7.14 → zen_garden-2.7.16}/zen_garden/postprocess/results/solution_loader.py

@@ -10,10 +10,13 @@ import h5py  # type: ignore
 import pint
 import pandas as pd
 import numpy as np
+import logging
+
 from typing import Optional, Any,Literal
 from enum import Enum
 from functools import cache
 from zen_garden.default_config import Analysis, System, Solver
+from zen_garden.utils import slice_df_by_index
 
 class ComponentType(Enum):
     parameter: str = "parameter"
@@ -665,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"
@@ -788,6 +796,8 @@ def get_df_from_path(path: str, component_name: str, version: str, data_type: Li
 
     if check_if_v1_leq_v2(version,"v0"):
         pd_read = pd.read_hdf(path, component_name + f"/{data_type}")
+        if len(index) > 0:
+            pd_read = slice_df_by_index(pd_read,index)
     else:
         if data_type == "dataframe":
             try:

{zen_garden-2.7.14 → zen_garden-2.7.16}/zen_garden/utils.py

@@ -262,6 +262,33 @@ def reformat_slicing_index(index, component) -> tuple[str]:
 
     return ref_index
 
+def slice_df_by_index(df,index_tuple) -> dict:
+    """ recreates the slicing index from a tuple of strings and slices the dataframe accordingly
+    :param df: dataframe to be sliced
+    :param index_tuple: tuple of strings representing the slicing index
+    :return: sliced dataframe
+    """
+    index = {}
+    for index_str in index_tuple:
+        if " in " in index_str:
+            key, value_str = index_str.split(" in ")
+            key = key.strip("'")
+            value = eval(value_str)
+        elif " == " in index_str:
+            key, value_str = index_str.split(" == ")
+            key = key.strip("'")
+            value = eval(value_str)
+        else:
+            continue
+        index[key] = value
+    for key in index:
+        if key in df.index.names:
+            if isinstance(index[key], list):
+                df = df.loc[df.index.get_level_values(key).isin(index[key])]
+            else:
+                df = df.xs(index[key], level=key, drop_level=False)
+    return df
+
 def get_label_position(obj,label:int):
     """ Get dict of index and coordinate for variable or constraint labels."""
     name_element = obj.get_name_by_label(int(label))