zen-garden 2.8.5__py3-none-any.whl → 2.8.10__py3-none-any.whl

zen_garden/postprocess/results/solution_loader.py

@@ -353,6 +353,8 @@ class SolutionLoader():
                 next_year = year + 1
             decision_horizon = tuple(range(year, next_year))
             current_mf = pd_dict[year]
+            if current_mf.empty:
+                return pd.Series(dtype=float)
             if component.timestep_type is TimestepType.yearly:
                 year_series = current_mf[
                     current_mf.index.get_level_values("year").isin(decision_horizon)

zen_garden/utils.py

@@ -21,6 +21,7 @@ import requests
 from importlib.metadata import metadata
 import zipfile
 import io
+import pandas as pd
 
 def setup_logger(level=logging.INFO):
     """ set up logger
@@ -350,10 +351,10 @@ def slice_df_by_index(df,index_tuple) -> dict:
         if key in df.index.names:
             if isinstance(index[key], list):
                 df = df.loc[df.index.get_level_values(key).isin(index[key])]
-            else:
-                if index[key] not in df.index.get_level_values(key):
-                    df = pd.DataFrame(columns=df.columns)  # return empty dataframe if value not in index
+            elif index[key] in df.index.get_level_values(key):
                 df = df.xs(index[key], level=key, drop_level=False)
+            else:
+                df = pd.DataFrame(columns=df.columns)  # return empty dataframe if value not in index
     return df
 
 def get_label_position(obj,label:int):

{zen_garden-2.8.5.dist-info → zen_garden-2.8.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zen_garden
-Version: 2.8.5
+Version: 2.8.10
 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, Christoph Funke, Paolo Gabrielli, Giovanni Sansavini
 Author-email: Jacob Mannhardt <zen-garden@ethz.ch>
@@ -62,6 +62,8 @@ Provides-Extra: vis
 
 <img src="https://github.com/ZEN-universe/ZEN-garden/assets/114185605/d6a9aca9-74b0-4a82-8295-43e6a78b8450" alt="drawing" width="200"/>
 
+
+
 Welcome to the ZEN-garden! ZEN-garden is an optimization framework for energy transition pathways. 
 It is currently used to model the electricity system, hydrogen value chains, and carbon capture, storage and utilization (CCUS) value chains. 
 However, it is designed to be modular and flexible, and can be extended to model other types of energy systems, value chains or other network-based systems. 

{zen_garden-2.8.5.dist-info → zen_garden-2.8.10.dist-info}/RECORD

@@ -3,7 +3,7 @@ zen_garden/__main__.py,sha256=Zrz6zr81gXN3_NLPwWz3a-8HiiRgqGx_OzQHarBcxtQ,2508
 zen_garden/default_config.py,sha256=ozz2LBSGSaMH8alEAzh-6ziM9IE9zXM9PfRD3nulAIs,8663
 zen_garden/optimization_setup.py,sha256=Rv_IciR_Y9GF-OaPDDAvTQ2huTuAt94jrWpcDJCQgWQ,42176
 zen_garden/runner.py,sha256=gLjHh3DZbgUAiz5lsnDiSwAZT5RFw52-Pnr1K_nPaMM,7207
-zen_garden/utils.py,sha256=IA52GLccjTbx8pQekc9pAdQD-CO90kfGzkhLBqDcJNs,60519
+zen_garden/utils.py,sha256=GFR-LBIkMA7pDQ46J07mr0ujqyIfNPlI0UVnvBDfHRw,60529
 zen_garden/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zen_garden/cli/zen_example_cli.py,sha256=hCYlAxM5BdphMzXA5LyHmTN3UiYIhMlG7G9sxYi0G_s,1411
 zen_garden/cli/zen_garden_cli.py,sha256=ikiJZoIP4_D-eoNuo4m2f2Z4ydU0sHLDUpCEWn93nnU,6505
@@ -28,14 +28,14 @@ zen_garden/postprocess/postprocess.py,sha256=0_1iy028iZmvf2egXUFO2ZS13HmkacMt7A5
 zen_garden/postprocess/results/__init__.py,sha256=363lzC0uRJ5F42cOEhD9jxMPCioTt8WRt0qwZG0IizY,49
 zen_garden/postprocess/results/cache.py,sha256=t-1P7k9EVkSxR1oB1NIodux3JbfhBhxxwgRytcQ8vjQ,1592
 zen_garden/postprocess/results/results.py,sha256=S21h0Unf4l3a8WD0UFvn8IeMgDxKitZRaiX7iLvJnL0,41012
-zen_garden/postprocess/results/solution_loader.py,sha256=n3n_n-6hmTjgW6LGSQo8gyI45xp8kn5n1r0Tx5IxCNw,31427
+zen_garden/postprocess/results/solution_loader.py,sha256=YmGqu4lbbxUv-qTO3Uxq1yxpiHHYCEi5lFfcnuHfI3w,31506
 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=y78oxoPVqcA3y9aEiyr0MU5zITf2BPNGVKOfyMhhCvY,63040
-zen_garden-2.8.5.dist-info/entry_points.txt,sha256=FkXXB0MgvdZG_p_zPifgXc0G2GSPJi0NncG3hZ8TXkU,232
-zen_garden-2.8.5.dist-info/licenses/LICENSE.txt,sha256=_kEtxPe9gWOwMzdiy8nLzgABiPdMvUS0kaSCOIrEA_E,1101
-zen_garden-2.8.5.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-zen_garden-2.8.5.dist-info/METADATA,sha256=qnXLdxyLXnbQPSdDndtaTTlUYJU2ZqFRQgxf7BlfT4Y,5648
-zen_garden-2.8.5.dist-info/RECORD,,
+zen_garden-2.8.10.dist-info/entry_points.txt,sha256=FkXXB0MgvdZG_p_zPifgXc0G2GSPJi0NncG3hZ8TXkU,232
+zen_garden-2.8.10.dist-info/licenses/LICENSE.txt,sha256=_kEtxPe9gWOwMzdiy8nLzgABiPdMvUS0kaSCOIrEA_E,1101
+zen_garden-2.8.10.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+zen_garden-2.8.10.dist-info/METADATA,sha256=nhPpZDYsSDS6f0qeNS4nFo2hQZRcJBJInIUcAPDvcls,5651
+zen_garden-2.8.10.dist-info/RECORD,,