zen-garden 2.8.11__tar.gz → 2.8.13__tar.gz

{zen_garden-2.8.11 → zen_garden-2.8.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zen_garden
-Version: 2.8.11
+Version: 2.8.13
 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>
@@ -29,6 +29,9 @@ Requires-Dist: pytest ; extra == "dev"
 Requires-Dist: coverage ; extra == "dev"
 Requires-Dist: pytest-xdist ; extra == "dev"
 Requires-Dist: pytest-cov ; extra == "dev"
+Requires-Dist: black==25.12.0 ; extra == "dev"
+Requires-Dist: ruff==0.14.13 ; extra == "dev"
+Requires-Dist: mypy==1.19.1 ; extra == "dev"
 Requires-Dist: sphinx==7.3.7 ; extra == "docs"
 Requires-Dist: myst-parser==3.0.1 ; extra == "docs"
 Requires-Dist: sphinx-book-theme==1.1.3 ; extra == "docs"
@@ -72,13 +75,13 @@ ZEN-garden is developed by the [Reliability and Risk Engineering Laboratory](htt
 <hr style="height: 5px; background-color: black;">
 
 ## Quick Start
-To get started with ZEN-garden, you can follow the instructions in the [installation guide](https://zen-garden.readthedocs.io/en/latest/files/user_guide/installation.html).
+To get started with ZEN-garden, you can follow the instructions in the [installation guide](https://zen-garden.readthedocs.io/en/latest/files/quick_start/installation.html).
 
 If you want to use ZEN-garden without working on the codebase, run the following command:
 ```bash
 pip install zen-garden
 ```
-If you want to work on the codebase, fork and clone the repository and install the package in editable mode. More information on how to install the package in editable mode can be found in the [installation guide](https://zen-garden.readthedocs.io/en/latest/files/user_guide/installation.html).
+If you want to work on the codebase, fork and clone the repository and install the package in editable mode. More information on how to install the package in editable mode can be found in the [installation guide](https://zen-garden.readthedocs.io/en/latest/files/quick_start/installation.html).
 
 ## Documentation
 Please refer to the documentation of the ZEN-garden framework [on Read-the-Docs](https://zen-garden.readthedocs.io/en/latest/). 

{zen_garden-2.8.11 → zen_garden-2.8.13}/README.md

@@ -22,13 +22,13 @@ ZEN-garden is developed by the [Reliability and Risk Engineering Laboratory](htt
 <hr style="height: 5px; background-color: black;">
 
 ## Quick Start
-To get started with ZEN-garden, you can follow the instructions in the [installation guide](https://zen-garden.readthedocs.io/en/latest/files/user_guide/installation.html).
+To get started with ZEN-garden, you can follow the instructions in the [installation guide](https://zen-garden.readthedocs.io/en/latest/files/quick_start/installation.html).
 
 If you want to use ZEN-garden without working on the codebase, run the following command:
 ```bash
 pip install zen-garden
 ```
-If you want to work on the codebase, fork and clone the repository and install the package in editable mode. More information on how to install the package in editable mode can be found in the [installation guide](https://zen-garden.readthedocs.io/en/latest/files/user_guide/installation.html).
+If you want to work on the codebase, fork and clone the repository and install the package in editable mode. More information on how to install the package in editable mode can be found in the [installation guide](https://zen-garden.readthedocs.io/en/latest/files/quick_start/installation.html).
 
 ## Documentation
 Please refer to the documentation of the ZEN-garden framework [on Read-the-Docs](https://zen-garden.readthedocs.io/en/latest/). 

{zen_garden-2.8.11 → zen_garden-2.8.13}/pyproject.toml

@@ -16,7 +16,7 @@ authors = [
   {name = "Giovanni Sansavini"},
   ]
 # do not change version manually! Done by bump2version
-version = "2.8.11"
+version = "2.8.13"
 requires-python= ">=3.11,<3.14"
 description="ZEN-garden is an optimization model of energy systems and value chains."
 readme = "README.md"
@@ -60,7 +60,10 @@ dev = [
     "pytest",
     "coverage",
     "pytest-xdist",
-    "pytest-cov"
+    "pytest-cov",
+    "black==25.12.0",
+    "ruff==0.14.13",
+    "mypy==1.19.1"
 ]
 
 vis = [
@@ -74,10 +77,31 @@ Homepage = "https://github.com/ZEN-universe/ZEN-garden"
 Documentation = "https://zen-garden.readthedocs.io/en/latest/"
 Zenodo = "https://zenodo.org/api/records/13385110"
 
-[tool.pytest.ini_options]
-addopts = "-n auto"
-
 [project.scripts]
 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-example = "zen_garden.cli.zen_example_cli:create_zen_example_cli"
+zen-example = "zen_garden.cli.zen_example_cli:create_zen_example_cli"
+
+[tool.pytest.ini_options]
+addopts = "-n auto"
+
+[tool.black]
+line-length = 79
+target-version = ["py311", "py312", "py313"]
+
+[tool.ruff]
+line-length = 79
+fix = false
+
+[tool.ruff.lint]
+select = ["E", "F", "I", "B"]
+ignore = []
+
+[tool.ruff.lint.isort]
+known-first-party = ["your_package_name"]
+
+[tool.mypy]
+warn_unused_configs = true
+ignore_missing_imports = true
+check_untyped_defs = false
+disallow_untyped_defs = false

{zen_garden-2.8.11 → zen_garden-2.8.13}/zen_garden/postprocess/results/solution_loader.py

@@ -379,6 +379,9 @@ class SolutionLoader():
                 series_to_concat.append(current_mf)
                 break
 
+        if len(series_to_concat) == 0:
+            return pd.Series(dtype=float)
+
         return pd.concat(series_to_concat)
 
     def _concatenate_raw_dataseries(

{zen_garden-2.8.11 → zen_garden-2.8.13}/zen_garden/preprocess/time_series_aggregation.py

@@ -305,7 +305,7 @@ class TimeSeriesAggregation(object):
         else:
             for element in self.optimization_setup.get_all_elements(Element):
                 # check to multiply the time series with the yearly variation
-                self.yearly_variation_nonaggregated_ts(element)
+                self.overwrite_ts_without_expanded_timeindex(element)
 
     def overwrite_ts_with_expanded_timeindex(self, element, old_sequence_time_steps):
         """ this method expands the aggregated time series to match the extended operational time steps because of matching the investment and operational time sequences.
@@ -323,46 +323,24 @@ class TimeSeriesAggregation(object):
                 new_ts = new_ts.stack()
                 # multiply with yearly variation
                 new_ts = self.multiply_yearly_variation(element, ts, new_ts)
-                #insert year specific TSA output
-                if self.conducted_tsa:
-                    for year in self.year_specific_tsa.keys():
-                        if (element.name,ts) in self.year_specific_tsa[year].keys():
-                            base_time_steps = self.energy_system.time_steps.decode_time_step(year, "yearly")
-                            element_time_steps = self.energy_system.time_steps.encode_time_step(base_time_steps,time_step_type="operation")
-                            year_ts = self.year_specific_tsa[year][element.name,ts]
-                            #ToDO better assignment of values?
-                            for column in year_ts.columns:
-                                if isinstance(column, tuple):
-                                    new_ts.loc[*column, element_time_steps] = year_ts[column].values
-                                else:
-                                    new_ts.loc[column,element_time_steps] = year_ts[column].values
-                #insert year specific TS if not aggregated
-                else:
-                    for year in self.optimization_setup.year_specific_ts.keys():
-                        if (element.name,ts) in self.optimization_setup.year_specific_ts[year].keys():
-                            base_time_steps = self.energy_system.time_steps.decode_time_step(year, "yearly")
-                            element_time_steps = self.energy_system.time_steps.encode_time_step(base_time_steps,time_step_type="operation")
-                            year_ts = self.optimization_setup.year_specific_ts[year][(element.name,ts)].unstack(header_set_time_steps).T
-                            #ToDO better assignment of values?
-                            for column in year_ts.columns:
-                                if isinstance(column, tuple):
-                                    new_ts.loc[*column, element_time_steps] = year_ts[column].values
-                                else:
-                                    new_ts.loc[column, element_time_steps] = year_ts[column].values
+                # insert year specific TSA output
+                new_ts = self.add_year_specific_ts(element, ts,new_ts,header_set_time_steps)
                 #overwrite time series
                 setattr(element, ts, new_ts)
 
-    def yearly_variation_nonaggregated_ts(self, element):
+    def overwrite_ts_without_expanded_timeindex(self, element):
         """ multiply the time series with the yearly variation if the element's time series are not aggregated
 
         :param element: element of the optimization """
+        header_set_time_steps = self.analysis.header_data_inputs.set_time_steps
         for ts in element.raw_time_series:
-            if element.raw_time_series[ts] is None:
-                continue
-            # multiply with yearly variation
-            new_ts = self.multiply_yearly_variation(element, ts, getattr(element, ts))
-            # overwrite time series
-            setattr(element, ts, new_ts)
+            if element.raw_time_series[ts] is not None:
+                # multiply with yearly variation
+                new_ts = self.multiply_yearly_variation(element, ts, getattr(element, ts))
+                # insert year specific TSA output
+                new_ts = self.add_year_specific_ts(element, ts,new_ts,header_set_time_steps)
+                # overwrite time series
+                setattr(element, ts, new_ts)
 
     def multiply_yearly_variation(self, element, ts_name, ts, year_specific = None):
         """ this method multiplies time series with the yearly variation of the time series
@@ -398,7 +376,41 @@ class TimeSeriesAggregation(object):
             rounding_value = 10 ** (-self.optimization_setup.solver.rounding_decimal_points_tsa)
             ts[ts.abs() < rounding_value] = 0
         return ts
+    
+    def add_year_specific_ts(self, element, ts,new_ts,header_set_time_steps):
+        """ this method adds a year specific time series for an element
 
+        :param element: element of the time series
+        :param ts: time series to add 
+        :param new_ts: new time series to add year specific values to 
+        :param header_set_time_steps: name of set_time_steps """
+        if self.conducted_tsa:
+            for year in self.year_specific_tsa.keys():
+                if (element.name,ts) in self.year_specific_tsa[year].keys():
+                    base_time_steps = self.energy_system.time_steps.decode_time_step(year, "yearly")
+                    element_time_steps = self.energy_system.time_steps.encode_time_step(base_time_steps,time_step_type="operation")
+                    year_ts = self.year_specific_tsa[year][element.name,ts]
+                    #ToDO better assignment of values?
+                    for column in year_ts.columns:
+                        if isinstance(column, tuple):
+                            new_ts.loc[*column, element_time_steps] = year_ts[column].values
+                        else:
+                            new_ts.loc[column,element_time_steps] = year_ts[column].values
+        #insert year specific TS if not aggregated
+        else:
+            for year in self.optimization_setup.year_specific_ts.keys():
+                if (element.name,ts) in self.optimization_setup.year_specific_ts[year].keys():
+                    base_time_steps = self.energy_system.time_steps.decode_time_step(year, "yearly")
+                    element_time_steps = self.energy_system.time_steps.encode_time_step(base_time_steps,time_step_type="operation")
+                    year_ts = self.optimization_setup.year_specific_ts[year][(element.name,ts)].unstack(header_set_time_steps).T
+                    #ToDO better assignment of values?
+                    for column in year_ts.columns:
+                        if isinstance(column, tuple):
+                            new_ts.loc[*column, element_time_steps] = year_ts[column].values
+                        else:
+                            new_ts.loc[column, element_time_steps] = year_ts[column].values
+        return new_ts
+    
     def repeat_sequence_time_steps_for_all_years(self):
         """ this method repeats the operational time series for all years."""
         logging.info("Repeat the time series sequences for all years")