zen-garden 2.7.14__py3-none-any.whl → 2.7.16__py3-none-any.whl

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/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/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))

{zen_garden-2.7.14.dist-info → zen_garden-2.7.16.dist-info}/METADATA

@@ -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.dist-info → zen_garden-2.7.16.dist-info}/RECORD

@@ -3,7 +3,7 @@ zen_garden/__main__.py,sha256=r3pop1FpaTfe9YUGxYP48T1uqdq5uZW8gBzZKbZOFno,4624
 zen_garden/_internal.py,sha256=K648bT1O8gD9uIrfmqPXP5lDdlkJd3-Ai111_IyIc1w,5347
 zen_garden/default_config.py,sha256=ozz2LBSGSaMH8alEAzh-6ziM9IE9zXM9PfRD3nulAIs,8663
 zen_garden/optimization_setup.py,sha256=Rv_IciR_Y9GF-OaPDDAvTQ2huTuAt94jrWpcDJCQgWQ,42176
-zen_garden/utils.py,sha256=-G4uaLix4U9Fzg7FWayK9QzHEbJ0uMdvLfgJDxVewpw,57461
+zen_garden/utils.py,sha256=skTvbc0zRps1Q0EZFdJGPnG8RUeo_Xv2IraOR4SXdQU,58453
 zen_garden/visualization.py,sha256=zZApEFtwdA1NpDKTvrZS9lyeiT__s6lR7QVaj6mUCmg,110
 zen_garden/model/__init__.py,sha256=7QIygxkUlNsOBbJPr5VdAxcJQCz6t_FSlD1uytUhuDE,48
 zen_garden/model/component.py,sha256=NeMV47l6Ec_ij_jburCx4cz6lI5k1-b6t0_DfuWFhhY,40488
@@ -23,15 +23,15 @@ zen_garden/postprocess/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 zen_garden/postprocess/comparisons.py,sha256=uyEtV0Q8_YPzJi4b12DWiqYU-kKJz6I3Li-I7_6RURY,13239
 zen_garden/postprocess/postprocess.py,sha256=0_1iy028iZmvf2egXUFO2ZS13HmkacMt7A5eTI0iCE4,29644
 zen_garden/postprocess/results/__init__.py,sha256=363lzC0uRJ5F42cOEhD9jxMPCioTt8WRt0qwZG0IizY,49
-zen_garden/postprocess/results/results.py,sha256=GQOHxYM9dJhmYwkG0M0LdA9LpxDv-jPASlv0yKGxWZU,39706
-zen_garden/postprocess/results/solution_loader.py,sha256=QO1AqW8uFOO1TqiaXCuoZ3mo7wZx2y49DC9sBd-z6sY,30800
+zen_garden/postprocess/results/results.py,sha256=jdJprpSbfs62TZKcHbkfCvSkpG-8fTRXTWoXew9M9AQ,40585
+zen_garden/postprocess/results/solution_loader.py,sha256=ChEV4kUi4m5h3Q6B8oxf9wPdEmrH_CNTs5BRNR8UZQs,31252
 zen_garden/preprocess/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zen_garden/preprocess/extract_input_data.py,sha256=PWKdel7s488SELseyAaoFkwXpzJU4MZg0pW0wO2ZHoI,51523
 zen_garden/preprocess/parameter_change_log.py,sha256=WNhLYTyuaFkUl_e4QH36W1chpqg00m7zg__PawPogAY,387
 zen_garden/preprocess/time_series_aggregation.py,sha256=v8xRRk4I9WZ2yi7V3I_Ersj2RV1T2WIKslx8ohkMfWI,32112
 zen_garden/preprocess/unit_handling.py,sha256=OGIHFyDdUmGU-GEGHkJGJ9RmKfDBy5-HmuBQmtYAK5Q,63043
-zen_garden-2.7.14.dist-info/entry_points.txt,sha256=Jfa7k0xmvGql3hGJid62hGV1rzDt81uTs3PgZre0VJk,118
-zen_garden-2.7.14.dist-info/licenses/LICENSE.txt,sha256=_kEtxPe9gWOwMzdiy8nLzgABiPdMvUS0kaSCOIrEA_E,1101
-zen_garden-2.7.14.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-zen_garden-2.7.14.dist-info/METADATA,sha256=VhHX_jXfbpv4FPslZxwhKmVQw1u4ua3NufVFUlm6R0M,5632
-zen_garden-2.7.14.dist-info/RECORD,,
+zen_garden-2.7.16.dist-info/entry_points.txt,sha256=Jfa7k0xmvGql3hGJid62hGV1rzDt81uTs3PgZre0VJk,118
+zen_garden-2.7.16.dist-info/licenses/LICENSE.txt,sha256=_kEtxPe9gWOwMzdiy8nLzgABiPdMvUS0kaSCOIrEA_E,1101
+zen_garden-2.7.16.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+zen_garden-2.7.16.dist-info/METADATA,sha256=rh8SzLVXjHwV9foyWEcIxOwR3xvyzQFASIXyT2YesZ0,5632
+zen_garden-2.7.16.dist-info/RECORD,,