zen-garden 2.8.1__py3-none-any.whl → 2.8.3__py3-none-any.whl

zen_garden/__init__.py

@@ -7,8 +7,9 @@ from .optimization_setup import OptimizationSetup
 from .runner import run
 from .postprocess.results.results import Results
 from .utils import download_example_dataset
+from .postprocess.comparisons import compare_model_values, compare_configs, compare_dicts
 
-__all__ = ["run", "Results", "download_example_dataset"]
+__all__ = ["run", "Results", "download_example_dataset", "compare_model_value", "compare_configs", "compare_dicts"]
 
 
 # set the element classes of the EnergySystem class

zen_garden/__main__.py

@@ -3,7 +3,7 @@ Runs the main function of ZEN-Garden.
 Compilation  of the optimization problem.
 """
 from .runner import run
-from .cli.zen_garden import cli_zen_garden
+from .cli.zen_garden_cli import create_zen_garden_cli
 import warnings
 
 def run_module(config = "./config.py", dataset = None, 
@@ -68,4 +68,4 @@ def run_module(config = "./config.py", dataset = None,
 
 if __name__ == "__main__":
 
-    cli_zen_garden()
+    create_zen_garden_cli()

zen_garden/cli/{zen_example.py → zen_example_cli.py}

@@ -2,7 +2,7 @@ import argparse
 import sys
 from zen_garden.utils import download_example_dataset
 
-def cli_zen_example():
+def create_zen_example_cli():
     """ 
     Entry point for the `zen-example` command-line interface.
 

zen_garden/cli/{zen_garden.py → zen_garden_cli.py}

@@ -39,8 +39,8 @@ def build_parser() -> argparse.ArgumentParser:
     Returns:
         argparse.ArgumentParser: An argument parser configured for the
         ZEN-Garden command-line interface.
-    """
 
+    """
     description = (
         "Run ZEN-Garden with a given config file. By default, the config file "
         "is read from the current working directory. You may specify a config "
@@ -103,8 +103,8 @@ def resolve_job_index(job_index:str, job_index_var:str) -> list[int]:
     Returns:
         list[int] | None: List of job indices to run in the current instance of
             ZEN-garden, or ``None`` if no job index is specified.
-    """
 
+    """
     if job_index:
         return [int(i) for i in job_index.split(",")]
     elif ((env_value := os.environ.get(job_index_var)) is not None):
@@ -112,7 +112,7 @@ def resolve_job_index(job_index:str, job_index_var:str) -> list[int]:
     else:
         return None
 
-def cli_zen_garden():
+def create_zen_garden_cli():
     """
     Entry point for the `zen-garden` command-line interface.
     

zen_garden/cli/{zen_visualization.py → zen_visualization_cli.py}

@@ -1,6 +1,6 @@
 from zen_temple.main import parse_arguments_and_run
 
-def cli_zen_visualization():
+def create_zen_visualization_cli():
     """
     Entry point for the `zen-visualization` command-line interface.
 

zen_garden/utils.py

@@ -351,6 +351,8 @@ def slice_df_by_index(df,index_tuple) -> dict:
             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
                 df = df.xs(index[key], level=key, drop_level=False)
     return df
 

{zen_garden-2.8.1.dist-info → zen_garden-2.8.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zen_garden
-Version: 2.8.1
+Version: 2.8.3
 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>

{zen_garden-2.8.1.dist-info → zen_garden-2.8.3.dist-info}/RECORD

@@ -1,13 +1,13 @@
-zen_garden/__init__.py,sha256=sRHfb04eQ2pW861LIfPBaPncaz6sEFtpdY3C6dD3sD4,551
-zen_garden/__main__.py,sha256=Z2sXjLANNazouQ4tB1lneDLmLQSisSgRwiLTAzUtXSI,2490
+zen_garden/__init__.py,sha256=WBclzn3dV9EIAu5idZiGHaEj8SQGr_q2IaUz9qPrQSw,700
+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=Ahng10Z7F42-M3YEU2yicgbQ3wL6x_m2KDafYlZOeoo,60344
+zen_garden/utils.py,sha256=IA52GLccjTbx8pQekc9pAdQD-CO90kfGzkhLBqDcJNs,60519
 zen_garden/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zen_garden/cli/zen_example.py,sha256=N1ScEoPdOX4z0kUuXxXI5Jqps0h6dYgvIsoK-XPiDU8,1404
-zen_garden/cli/zen_garden.py,sha256=DEMcaVJLvV_MLsqsaB_feWg-VATbN09naV9wwaaZ8CI,6498
-zen_garden/cli/zen_visualization.py,sha256=lBbnNHEwo151IlLQIggAUrnuBOe-qokb7ncSjA5mTRU,753
+zen_garden/cli/zen_example_cli.py,sha256=hCYlAxM5BdphMzXA5LyHmTN3UiYIhMlG7G9sxYi0G_s,1411
+zen_garden/cli/zen_garden_cli.py,sha256=ikiJZoIP4_D-eoNuo4m2f2Z4ydU0sHLDUpCEWn93nnU,6505
+zen_garden/cli/zen_visualization_cli.py,sha256=vSK2jbe6rNguXwLDMpU3-boreRtjjuDncCkZDCy7CSA,760
 zen_garden/model/__init__.py,sha256=7QIygxkUlNsOBbJPr5VdAxcJQCz6t_FSlD1uytUhuDE,48
 zen_garden/model/component.py,sha256=NeMV47l6Ec_ij_jburCx4cz6lI5k1-b6t0_DfuWFhhY,40488
 zen_garden/model/element.py,sha256=VoKM3qwnuysNx78vx-vuAIQl9lgQEr2f5bcXfVCShMs,21574
@@ -33,8 +33,8 @@ zen_garden/preprocess/extract_input_data.py,sha256=PWKdel7s488SELseyAaoFkwXpzJU4
 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.1.dist-info/entry_points.txt,sha256=RaFYYEElysx-aP6t2m5Ye1Uofy-23f0PYFPHFSbSDho,199
-zen_garden-2.8.1.dist-info/licenses/LICENSE.txt,sha256=_kEtxPe9gWOwMzdiy8nLzgABiPdMvUS0kaSCOIrEA_E,1101
-zen_garden-2.8.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-zen_garden-2.8.1.dist-info/METADATA,sha256=eUt18EJ7kcUMM8ZwpGrDspMOq5UYrUBHjUOgddB7-FE,5648
-zen_garden-2.8.1.dist-info/RECORD,,
+zen_garden-2.8.3.dist-info/entry_points.txt,sha256=FkXXB0MgvdZG_p_zPifgXc0G2GSPJi0NncG3hZ8TXkU,232
+zen_garden-2.8.3.dist-info/licenses/LICENSE.txt,sha256=_kEtxPe9gWOwMzdiy8nLzgABiPdMvUS0kaSCOIrEA_E,1101
+zen_garden-2.8.3.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+zen_garden-2.8.3.dist-info/METADATA,sha256=TcnGCmbml2108unb-EwfsGX0ToywSNt7VVbXMwO1GZ0,5648
+zen_garden-2.8.3.dist-info/RECORD,,

zen_garden-2.8.3.dist-info/entry_points.txt

@@ -0,0 +1,5 @@
+[console_scripts]
+zen-example=zen_garden.cli.zen_example_cli:create_zen_example_cli
+zen-garden=zen_garden.cli.zen_garden_cli:create_zen_garden_cli
+zen-visualization=zen_garden.cli.zen_visualization_cli:create_zen_visualization_cli
+

zen_garden-2.8.1.dist-info/entry_points.txt

@@ -1,5 +0,0 @@
-[console_scripts]
-zen-example=zen_garden.cli.zen_example:cli_zen_example
-zen-garden=zen_garden.cli.zen_garden:cli_zen_garden
-zen-visualization=zen_garden.cli.zen_visualization:cli_zen_visualization
-