exerpy 0.0.2__py3-none-any.whl → 0.0.4__py3-none-any.whl

exerpy/analyses.py

@@ -2,14 +2,16 @@ import json
 import logging
 import os
 
+import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
 from tabulate import tabulate
 
 from .components.component import component_registry
 from .components.helpers.cycle_closer import CycleCloser
-from .functions import add_chemical_exergy
-from .functions import add_total_exergy_flow
+from .components.helpers.power_bus import PowerBus
+from .components.nodes.splitter import Splitter
+from .functions import add_chemical_exergy, add_total_exergy_flow
 
 
 class ExergyAnalysis:
@@ -70,6 +72,10 @@ class ExergyAnalysis:
         Creates an instance from a JSON file containing system data.
     exergy_results(print_results=True)
         Displays and returns tables of exergy analysis results.
+    plot_exergy_waterfall(title=None, figsize=(12, 10), exclude_components=None, show_plot=True)
+        Creates an exergy destruction waterfall diagram visualizing exergy flow through the system.
+    print_exergy_summary()
+        Prints a concise text summary of the exergy analysis results.
     export_to_json(output_path)
         Exports the model and analysis results to a JSON file.
     _serialize()
@@ -106,7 +112,7 @@ class ExergyAnalysis:
         self.components = _construct_components(component_data, connection_data, Tamb)
         self.connections = connection_data
 
-    def analyse(self, E_F, E_P, E_L={}) -> None:
+    def analyse(self, E_F, E_P, E_L=None) -> None:
         """
         Run the exergy analysis for the entire system and calculate overall exergy efficiency.
 
@@ -120,6 +126,8 @@ class ExergyAnalysis:
             Dictionary containing input and output connections for loss exergy (default is {}).
         """
         # Initialize class attributes for the exergy value of the total system
+        if E_L is None:
+            E_L = {}
         self.E_F = 0.0
         self.E_P = 0.0
         self.E_L = 0.0
@@ -131,53 +139,38 @@ class ExergyAnalysis:
             for connections in ex_flow.values():
                 for connection in connections:
                     if connection not in self.connections:
-                        msg = (
-                            f"The connection {connection} is not part of the "
-                            "plant's connections."
-                        )
+                        msg = f"The connection {connection} is not part of the " "plant's connections."
                         raise ValueError(msg)
 
         # Calculate total fuel exergy (E_F) by summing up all specified input connections
         if "inputs" in E_F:
             self.E_F += sum(
-                self.connections[conn]['E']
-                for conn in E_F["inputs"]
-                if self.connections[conn]['E'] is not None
+                self.connections[conn]["E"] for conn in E_F["inputs"] if self.connections[conn]["E"] is not None
             )
 
         if "outputs" in E_F:
             self.E_F -= sum(
-                self.connections[conn]['E']
-                for conn in E_F["outputs"]
-                if self.connections[conn]['E'] is not None
+                self.connections[conn]["E"] for conn in E_F["outputs"] if self.connections[conn]["E"] is not None
             )
 
         # Calculate total product exergy (E_P) by summing up all specified input and output connections
         if "inputs" in E_P:
             self.E_P += sum(
-                self.connections[conn]['E']
-                for conn in E_P["inputs"]
-                if self.connections[conn]['E'] is not None
+                self.connections[conn]["E"] for conn in E_P["inputs"] if self.connections[conn]["E"] is not None
             )
         if "outputs" in E_P:
             self.E_P -= sum(
-                self.connections[conn]['E']
-                for conn in E_P["outputs"]
-                if self.connections[conn]['E'] is not None
+                self.connections[conn]["E"] for conn in E_P["outputs"] if self.connections[conn]["E"] is not None
             )
 
         # Calculate total loss exergy (E_L) by summing up all specified input and output connections
         if "inputs" in E_L:
             self.E_L += sum(
-                self.connections[conn]['E']
-                for conn in E_L["inputs"]
-                if self.connections[conn]['E'] is not None
+                self.connections[conn]["E"] for conn in E_L["inputs"] if self.connections[conn]["E"] is not None
             )
         if "outputs" in E_L:
             self.E_L -= sum(
-                self.connections[conn]['E']
-                for conn in E_L["outputs"]
-                if self.connections[conn]['E'] is not None
+                self.connections[conn]["E"] for conn in E_L["outputs"] if self.connections[conn]["E"] is not None
             )
 
         # Calculate overall exergy efficiency epsilon = E_P / E_F
@@ -187,41 +180,50 @@ class ExergyAnalysis:
         # The rest is counted as total exergy destruction with all components of the system
         self.E_D = self.E_F - self.E_P - self.E_L
 
-        if self.epsilon is not None:
-            eff_str = f"{self.epsilon:.2%}"
-        else:
-            eff_str = "N/A"
+        # Check for unaccounted connections in the system
+        self._check_unaccounted_system_conns()
+
+        eff_str = f"{self.epsilon:.2%}" if self.epsilon is not None else "N/A"
         logging.info(
             f"Overall exergy analysis completed: E_F = {self.E_F:.2f} kW, "
             f"E_P = {self.E_P:.2f} kW, E_L = {self.E_L:.2f} kW, "
             f"Efficiency = {eff_str}"
-            )
+        )
 
         # Perform exergy balance for each individual component in the system
         total_component_E_D = 0.0
-        for component_name, component in self.components.items():
+        for _component_name, component in self.components.items():
             if component.__class__.__name__ == "CycleCloser":
                 continue
             else:
                 # Calculate E_F, E_D, E_P
                 component.calc_exergy_balance(self.Tamb, self.pamb, self.split_physical_exergy)
+
+                # Update is_dissipative flag based on actual E_P value for Valve components
+                # This is needed because when split_physical_exergy=False, valves may become
+                # dissipative (E_P = nan) even if not initially marked as such based on temperatures
+                if component.__class__.__name__ == "Valve" and np.isnan(component.E_P):
+                    component.is_dissipative = True
+
                 # Safely calculate y and y* avoiding division by zero
                 if self.E_F != 0:
                     component.y = component.E_D / self.E_F
-                    component.y_star = component.E_D / self.E_D if component.E_D is not None else None
+                    component.y_star = component.E_D / self.E_D if component.E_D is not None else np.nan
                 else:
-                    component.y = None
-                    component.y_star = None
+                    component.y = np.nan
+                    component.y_star = np.nan
                 # Sum component destruction if available
-                if component.E_D is not None:
+                if component.E_D is not np.nan:
                     total_component_E_D += component.E_D
 
         # Check if the sum of all component exergy destructions matches the overall system exergy destruction
         if not np.isclose(total_component_E_D, self.E_D, rtol=1e-5):
-            logging.warning(f"Sum of component exergy destructions ({total_component_E_D:.2f} W) "
-                            f"does not match overall system exergy destruction ({self.E_D:.2f} W).")
+            logging.warning(
+                f"Sum of component exergy destructions ({total_component_E_D:.2f} W) "
+                f"does not match overall system exergy destruction ({self.E_D:.2f} W)."
+            )
         else:
-            logging.info(f"Exergy destruction check passed: Sum of component E_D matches overall E_D.")
+            logging.info("Exergy destruction check passed: Sum of component E_D matches overall E_D.")
 
     @classmethod
     def from_tespy(cls, model: str, Tamb=None, pamb=None, chemExLib=None, split_physical_exergy=True):
@@ -247,22 +249,19 @@ class ExergyAnalysis:
         """
         from tespy.networks import Network
 
-        from .parser.from_tespy.tespy_config import EXERPY_TESPY_MAPPINGS
+        from .parser.from_tespy.tespy_parser import to_exerpy
 
         if isinstance(model, str):
             model = Network.from_json(model)
         elif isinstance(model, Network):
             pass
         else:
-            msg = (
-                "Model parameter must be a path to a valid tespy network "
-                "export or a tespy network"
-            )
+            msg = "Model parameter must be a path to a valid tespy network " "export or a tespy network"
             raise TypeError(msg)
 
-        data = model.to_exerpy(Tamb, pamb, EXERPY_TESPY_MAPPINGS)
+        data = to_exerpy(model, Tamb, pamb)
         data, Tamb, pamb = _process_json(data, Tamb, pamb, chemExLib, split_physical_exergy)
-        return cls(data['components'], data['connections'], Tamb, pamb, chemExLib, split_physical_exergy)
+        return cls(data["components"], data["connections"], Tamb, pamb, chemExLib, split_physical_exergy)
 
     @classmethod
     def from_aspen(cls, path, Tamb=None, pamb=None, chemExLib=None, split_physical_exergy=True):
@@ -272,7 +271,7 @@ class ExergyAnalysis:
         Parameters
         ----------
         path : str
-            Path to the Ebsilon file (.bkp format).
+            Path to the Aspen file (.bkp format).
         Tamb : float, optional
             Ambient temperature for analysis, default is None.
         pamb : float, optional
@@ -285,7 +284,7 @@ class ExergyAnalysis:
         Returns
         -------
         ExergyAnalysis
-            An instance of the ExergyAnalysis class with parsed Ebsilon data.
+            An instance of the ExergyAnalysis class with parsed Aspen data.
         """
 
         from .parser.from_aspen import aspen_parser as aspen_parser
@@ -293,21 +292,22 @@ class ExergyAnalysis:
         # Check if the file is an Aspen file
         _, file_extension = os.path.splitext(path)
 
-        if file_extension == '.bkp':
-            logging.info("Running Ebsilon simulation and generating JSON data.")
+        if file_extension == ".bkp":
+            logging.info("Running Aspen parsing and generating JSON data.")
             data = aspen_parser.run_aspen(path, split_physical_exergy=split_physical_exergy)
-            logging.info("Simulation completed successfully.")
+            logging.info("Parsing completed successfully.")
 
         else:
             # If the file format is not supported
-            raise ValueError(
-                f"Unsupported file format: {file_extension}. Please provide "
-                "an Ebsilon (.bkp) file."
-            )
+            raise ValueError(f"Unsupported file format: {file_extension}. Please provide " "an Aspen (.bkp) file.")
 
         data, Tamb, pamb = _process_json(
-            data, Tamb=Tamb, pamb=pamb, chemExLib=chemExLib, split_physical_exergy=split_physical_exergy,
-            required_component_fields=["name", "type"]
+            data,
+            Tamb=Tamb,
+            pamb=pamb,
+            chemExLib=chemExLib,
+            split_physical_exergy=split_physical_exergy,
+            required_component_fields=["name", "type"],
         )
         return cls(data["components"], data["connections"], Tamb, pamb, chemExLib, split_physical_exergy)
 
@@ -340,21 +340,22 @@ class ExergyAnalysis:
         # Check if the file is an Ebsilon file
         _, file_extension = os.path.splitext(path)
 
-        if file_extension == '.ebs':
+        if file_extension == ".ebs":
             logging.info("Running Ebsilon simulation and generating JSON data.")
             data = ebs_parser.run_ebsilon(path, split_physical_exergy=split_physical_exergy)
             logging.info("Simulation completed successfully.")
 
         else:
             # If the file format is not supported
-            raise ValueError(
-                f"Unsupported file format: {file_extension}. Please provide "
-                "an Ebsilon (.ebs) file."
-            )
+            raise ValueError(f"Unsupported file format: {file_extension}. Please provide " "an Ebsilon (.ebs) file.")
 
         data, Tamb, pamb = _process_json(
-            data, Tamb=Tamb, pamb=pamb, chemExLib=chemExLib, split_physical_exergy=split_physical_exergy,
-            required_component_fields=["name", "type", "type_index"]
+            data,
+            Tamb=Tamb,
+            pamb=pamb,
+            chemExLib=chemExLib,
+            split_physical_exergy=split_physical_exergy,
+            required_component_fields=["name", "type", "type_index"],
         )
         return cls(data["components"], data["connections"], Tamb, pamb, chemExLib, split_physical_exergy)
 
@@ -392,7 +393,7 @@ class ExergyAnalysis:
         data, Tamb, pamb = _process_json(
             data, Tamb=Tamb, pamb=pamb, chemExLib=chemExLib, split_physical_exergy=split_physical_exergy
         )
-        return cls(data['components'], data['connections'], Tamb, pamb, chemExLib, split_physical_exergy)
+        return cls(data["components"], data["connections"], Tamb, pamb, chemExLib, split_physical_exergy)
 
     def exergy_results(self, print_results=True):
         """
@@ -412,8 +413,10 @@ class ExergyAnalysis:
             (df_component_results, df_material_connection_results, df_non_material_connection_results)
             with the exergy analysis results.
         """
+
         # Define the lambda function for safe multiplication
-        convert = lambda x, factor: x * factor if x is not None else None
+        def convert(x, factor):
+            return x * factor if x is not None else None
 
         # COMPONENTS
         component_results = {
@@ -424,14 +427,14 @@ class ExergyAnalysis:
             "E_L [kW]": [],
             "ε [%]": [],
             "y [%]": [],
-            "y* [%]": []
+            "y* [%]": [],
         }
 
         # Populate the dictionary with exergy analysis data from each component,
         # excluding CycleCloser components.
         for component_name, component in self.components.items():
             # Exclude components whose class name is "CycleCloser"
-            if component.__class__.__name__ == "CycleCloser":
+            if component.__class__.__name__ == "CycleCloser" or component.__class__.__name__ == "PowerBus":
                 continue
 
             component_results["Component"].append(component_name)
@@ -439,7 +442,9 @@ class ExergyAnalysis:
             E_F_kW = convert(component.E_F, 1e-3)
             E_P_kW = convert(component.E_P, 1e-3)
             E_D_kW = convert(component.E_D, 1e-3)
-            E_L_kW = convert(getattr(component, 'E_L', None), 1e-3) if getattr(component, 'E_L', None) is not None else 0
+            E_L_kW = (
+                convert(getattr(component, "E_L", None), 1e-3) if getattr(component, "E_L", None) is not None else 0
+            )
             epsilon_percent = convert(component.epsilon, 1e2)
 
             component_results["E_F [kW]"].append(E_F_kW)
@@ -458,7 +463,7 @@ class ExergyAnalysis:
 
         # Add the overall results to the components as dummy component "TOT"
         df_component_results.loc["TOT", "E_F [kW]"] = convert(self.E_F, 1e-3)
-        df_component_results.loc["TOT", "Component"] = 'TOT'
+        df_component_results.loc["TOT", "Component"] = "TOT"
         df_component_results.loc["TOT", "E_L [kW]"] = convert(self.E_L, 1e-3)
         df_component_results.loc["TOT", "E_P [kW]"] = convert(self.E_P, 1e-3)
         df_component_results.loc["TOT", "E_D [kW]"] = convert(self.E_D, 1e-3)
@@ -479,42 +484,57 @@ class ExergyAnalysis:
             "e^PH [kJ/kg]": [],
             "e^T [kJ/kg]": [],
             "e^M [kJ/kg]": [],
-            "e^CH [kJ/kg]": []
+            "e^CH [kJ/kg]": [],
         }
 
         # NON-MATERIAL CONNECTIONS
-        non_material_connection_results = {
-            "Connection": [],
-            "Kind": [],
-            "Energy Flow [kW]": [],
-            "Exergy Flow [kW]": []
-        }
+        non_material_connection_results = {"Connection": [], "Kind": [], "Energy Flow [kW]": [], "Exergy Flow [kW]": []}
+
+        # Create set of valid component names
+        valid_components = {comp.name for comp in self.components.values()}
 
         # Populate the dictionaries with exergy analysis data for each connection
         for conn_name, conn_data in self.connections.items():
+
+            # Filter: only include connections that have source OR target in self.components
+            is_part_of_the_system = (
+                conn_data.get("source_component") in valid_components
+                or conn_data.get("target_component") in valid_components
+            )
+            if not is_part_of_the_system:
+                continue
+
             # Separate material and non-material connections based on fluid type
             kind = conn_data.get("kind", None)
 
             # Check if the connection is a non-material energy flow type
-            if kind in {'power', 'heat'}:
+            if kind in {"power", "heat"}:
                 # Non-material connections: only record energy flow, converted to kW using lambda
                 non_material_connection_results["Connection"].append(conn_name)
                 non_material_connection_results["Kind"].append(kind)
                 non_material_connection_results["Energy Flow [kW]"].append(convert(conn_data.get("energy_flow"), 1e-3))
                 non_material_connection_results["Exergy Flow [kW]"].append(convert(conn_data.get("E"), 1e-3))
-            elif kind == 'material':
+            elif kind == "material":
                 # Material connections: record full data with conversions using lambda
                 material_connection_results["Connection"].append(conn_name)
-                material_connection_results["m [kg/s]"].append(conn_data.get('m', None))
-                material_connection_results["T [°C]"].append(conn_data.get('T') - 273.15)  # Convert to °C
-                material_connection_results["p [bar]"].append(convert(conn_data.get('p'), 1e-5))  # Convert Pa to bar
-                material_connection_results["h [kJ/kg]"].append(convert(conn_data.get('h'), 1e-3))  # Convert to kJ/kg
-                material_connection_results["s [J/kgK]"].append(conn_data.get('s', None))
-                material_connection_results["e^PH [kJ/kg]"].append(convert(conn_data.get('e_PH'), 1e-3))  # Convert to kJ/kg
-                material_connection_results["e^T [kJ/kg]"].append(convert(conn_data.get('e_T'), 1e-3))    # Convert to kJ/kg
-                material_connection_results["e^M [kJ/kg]"].append(convert(conn_data.get('e_M'), 1e-3))    # Convert to kJ/kg
-                material_connection_results["e^CH [kJ/kg]"].append(convert(conn_data.get('e_CH'), 1e-3))  # Convert to kJ/kg
-                material_connection_results["E [kW]"].append(convert(conn_data.get("E"), 1e-3))          # Convert to kW
+                material_connection_results["m [kg/s]"].append(conn_data.get("m", None))
+                material_connection_results["T [°C]"].append(conn_data.get("T") - 273.15)  # Convert to °C
+                material_connection_results["p [bar]"].append(convert(conn_data.get("p"), 1e-5))  # Convert Pa to bar
+                material_connection_results["h [kJ/kg]"].append(convert(conn_data.get("h"), 1e-3))  # Convert to kJ/kg
+                material_connection_results["s [J/kgK]"].append(conn_data.get("s", None))
+                material_connection_results["e^PH [kJ/kg]"].append(
+                    convert(conn_data.get("e_PH"), 1e-3)
+                )  # Convert to kJ/kg
+                material_connection_results["e^T [kJ/kg]"].append(
+                    convert(conn_data.get("e_T"), 1e-3)
+                )  # Convert to kJ/kg
+                material_connection_results["e^M [kJ/kg]"].append(
+                    convert(conn_data.get("e_M"), 1e-3)
+                )  # Convert to kJ/kg
+                material_connection_results["e^CH [kJ/kg]"].append(
+                    convert(conn_data.get("e_CH"), 1e-3)
+                )  # Convert to kJ/kg
+                material_connection_results["E [kW]"].append(convert(conn_data.get("E"), 1e-3))  # Convert to kW
 
         # Convert the material and non-material connection dictionaries into DataFrames
         df_material_connection_results = pd.DataFrame(material_connection_results)
@@ -527,39 +547,264 @@ class ExergyAnalysis:
         if print_results:
             # Print the material connection results DataFrame in the console in a table format
             print("\nMaterial Connection Exergy Analysis Results:")
-            print(tabulate(df_material_connection_results.reset_index(drop=True), headers='keys', tablefmt='psql', floatfmt='.3f'))
+            print(
+                tabulate(
+                    df_material_connection_results.reset_index(drop=True),
+                    headers="keys",
+                    tablefmt="psql",
+                    floatfmt=".3f",
+                )
+            )
 
             # Print the non-material connection results DataFrame in the console in a table format
             print("\nNon-Material Connection Exergy Analysis Results:")
-            print(tabulate(df_non_material_connection_results.reset_index(drop=True), headers='keys', tablefmt='psql', floatfmt='.3f'))
+            print(
+                tabulate(
+                    df_non_material_connection_results.reset_index(drop=True),
+                    headers="keys",
+                    tablefmt="psql",
+                    floatfmt=".3f",
+                )
+            )
 
             # Print the component results DataFrame in the console in a table format
             print("\nComponent Exergy Analysis Results:")
-            print(tabulate(df_component_results.reset_index(drop=True), headers='keys', tablefmt='psql', floatfmt='.3f'))
+            print(
+                tabulate(df_component_results.reset_index(drop=True), headers="keys", tablefmt="psql", floatfmt=".3f")
+            )
 
         return df_component_results, df_material_connection_results, df_non_material_connection_results
 
+    def plot_exergy_waterfall(self, title=None, figsize=(12, 10), exclude_components=None, show_plot=True):
+        """
+        Create an exergy destruction waterfall diagram.
+
+        This method visualizes the exergy flow through the system as a waterfall chart,
+        showing how exergy is destroyed in each component from the exergetic fuel (100%)
+        down to the exergetic product and losses.
+
+        Parameters
+        ----------
+        title : str, optional
+            Title for the plot. If None, no title is displayed.
+        figsize : tuple, optional
+            Figure size as (width, height) in inches. Default is (12, 10).
+        exclude_components : list, optional
+            List of component names to exclude from the diagram.
+            By default, all components with NaN E_F (Exergetic Fuel) are excluded,
+            as well as CycleCloser and PowerBus components.
+        show_plot : bool, optional
+            Whether to display the plot immediately. Default is True.
+
+        Returns
+        -------
+        fig : matplotlib.figure.Figure
+            The figure object containing the waterfall diagram.
+        ax : matplotlib.axes.Axes
+            The axes object of the waterfall diagram.
+
+        Raises
+        ------
+        RuntimeError
+            If the exergy analysis has not been performed yet (analyse() not called).
+
+        Notes
+        -----
+        - The waterfall diagram displays exergy values as percentages of the total fuel exergy.
+        - Components are sorted by their exergy destruction rate (y [%]) in descending order.
+        - Each bar represents the remaining exergy after destruction in that component.
+        - Red bars indicate exergy destruction in components.
+        - Blue bar represents the initial exergetic fuel (100%).
+        - Green bar represents the final exergetic product.
+
+        Examples
+        --------
+        >>> analysis = ExergyAnalysis.from_tespy(network, Tamb=288.15, pamb=101325)  # doctest: +SKIP
+        >>> analysis.analyse(E_F={'inputs': ['fuel']}, E_P={'outputs': ['power']})  # doctest: +SKIP
+        >>> fig, ax = analysis.plot_exergy_waterfall(title='Power Plant Exergy Waterfall')  # doctest: +SKIP
+        >>> fig.savefig('exergy_waterfall.pdf')  # doctest: +SKIP
+
+        See Also
+        --------
+        exergy_results : Display tabular exergy analysis results.
+        print_exergy_summary : Print a text summary of exergy analysis.
+        """
+        # Check if analysis has been performed
+        if not hasattr(self, "epsilon") or self.epsilon is None:
+            raise RuntimeError("Exergy analysis has not been performed yet. Please call analyse() first.")
+
+        # Get component results without printing
+        df_component_results, _, _ = self.exergy_results(print_results=False)
+
+        # Default exclusions: empty list, but filter for valid E_F
+        if exclude_components is None:
+            exclude_components = []
+
+        # Get total values from df_component_results
+        total_row = df_component_results[df_component_results["Component"] == "TOT"].iloc[0]
+        epsilon_total = total_row["ε [%]"]
+        E_L_total = total_row["E_L [kW]"]
+        E_F_total = total_row["E_F [kW]"]
+        exergetic_loss_percent = (E_L_total / E_F_total) * 100 if E_F_total != 0 else 0
+
+        # Filter components (exclude TOT, components with NaN E_F, and specified components)
+        component_data = df_component_results[
+            (df_component_results["Component"] != "TOT")
+            & (df_component_results["E_F [kW]"].notna())
+            & (~df_component_results["Component"].isin(exclude_components))
+            & (df_component_results["y [%]"].notna())
+        ].copy()
+
+        # Sort by y [%] in descending order
+        component_data = component_data.sort_values("y [%]", ascending=False)
+
+        # Create bar values: Start at 100%, decrease by each component's y [%]
+        bar_values = [100.0]
+        current_value = 100.0
+        for y in component_data["y [%]"]:
+            current_value -= y
+            bar_values.append(current_value)
+        bar_values.append(epsilon_total)  # Final bar is the exergetic product
+
+        # Create labels for spaces between bars
+        space_labels = ["Exergetic fuel"] + list(component_data["Component"]) + ["Exergetic loss", "Exergetic product"]
+
+        # Create the figure
+        fig, ax = plt.subplots(figsize=figsize)
+
+        # Number of bars and spaces
+        n_bars = len(bar_values)
+
+        # Create horizontal bars at positions 0, 1, 2, ..., n_bars-1
+        bar_positions = np.arange(n_bars)
+        bar_colors = ["#1565C0"] + ["#D32F2F"] * (n_bars - 2) + ["#2E7D32"]
+        # Blue for fuel, red for destruction, green for product
+
+        for i, (pos, value, color) in enumerate(zip(bar_positions, bar_values, bar_colors, strict=False)):
+            ax.barh(pos, value, color=color, alpha=0.8, height=0.6)
+            # Add value label inside the bar on the right
+            ax.text(
+                value - 2, pos, f"{value:.2f}%", va="center", ha="right", fontsize=9, fontweight="bold", color="white"
+            )
+
+        # Add space labels between bars
+        # Space positions: between bars, so at 0.5, 1.5, 2.5, ..., and above/below
+        space_positions = [-0.5] + [i + 0.5 for i in range(n_bars - 1)] + [n_bars - 0.5]
+
+        for i, (space_pos, label) in enumerate(zip(space_positions, space_labels, strict=False)):
+            if i == 0:  # Exergetic fuel - above first bar
+                ax.text(2, space_pos, label, va="center", ha="left", fontsize=10, fontweight="bold", style="italic")
+            elif i == len(space_labels) - 2:  # Exergetic loss
+                loss_label = f"{label} (-{exergetic_loss_percent:.2f}%)"
+                ax.text(
+                    2, space_pos, loss_label, va="center", ha="left", fontsize=10, fontweight="bold", style="italic"
+                )
+            elif i == len(space_labels) - 1:  # Exergetic product - below last bar
+                ax.text(2, space_pos, label, va="center", ha="left", fontsize=10, fontweight="bold", style="italic")
+            else:  # Component labels
+                component_idx = i - 1
+                destruction_rate = component_data.iloc[component_idx]["y [%]"]
+                label_with_rate = f"{label} (-{destruction_rate:.2f}%)"
+                ax.text(2, space_pos, label_with_rate, va="center", ha="left", fontsize=10, fontweight="bold")
+
+        # Customize plot
+        ax.set_yticks(bar_positions)
+        ax.set_yticklabels([""] * n_bars)  # Empty labels since we have custom labels
+        ax.set_xlabel("Exergy [%]", fontsize=12, fontweight="bold")
+
+        if title is not None:
+            ax.set_title(title, fontsize=14, fontweight="bold", pad=20)
+
+        ax.set_xlim(0, 100)
+        ax.set_ylim(-1, n_bars)
+        ax.grid(axis="x", alpha=0.3, linestyle="--")
+        ax.axvline(x=0, color="black", linewidth=0.8)
+        ax.invert_yaxis()  # Invert so highest bar is at top
+
+        plt.tight_layout()
+
+        if show_plot:
+            plt.show()
+
+        return fig, ax
+
+    def print_exergy_summary(self):
+        """
+        Print a text summary of the exergy analysis results.
+
+        This method provides a concise summary of the overall system exergy performance,
+        including fuel exergy, total destruction, losses, and efficiency.
+
+        Raises
+        ------
+        RuntimeError
+            If the exergy analysis has not been performed yet (analyse() not called).
+
+        Notes
+        -----
+        The summary includes:
+        - Exergetic Fuel: Normalized to 100%
+        - Total Exergy Destruction: Sum of all component exergy destructions as % of fuel
+        - Exergetic Loss: Exergy losses to the environment as % of fuel
+        - Exergetic Product (ε): Overall system exergy efficiency as %
+
+        Examples
+        --------
+        >>> analysis = ExergyAnalysis.from_tespy(network, Tamb=288.15, pamb=101325)  # doctest: +SKIP
+        >>> analysis.analyse(E_F={'inputs': ['fuel']}, E_P={'outputs': ['power']})  # doctest: +SKIP
+        >>> analysis.print_exergy_summary()  # doctest: +SKIP
+        Exergy Analysis Summary:
+        Exergetic Fuel: 100.00%
+        Total Exergy Destruction: 35.42%
+        Exergetic Loss: 5.12%
+        Exergetic Product (ε): 59.46%
+
+        See Also
+        --------
+        exergy_results : Display detailed tabular results.
+        plot_exergy_waterfall : Create a visual waterfall diagram.
+        """
+        # Check if analysis has been performed
+        if not hasattr(self, "epsilon") or self.epsilon is None:
+            raise RuntimeError("Exergy analysis has not been performed yet. Please call analyse() first.")
+
+        # Get component results without printing
+        df_component_results, _, _ = self.exergy_results(print_results=False)
+
+        total_row = df_component_results[df_component_results["Component"] == "TOT"].iloc[0]
+        epsilon_total = total_row["ε [%]"]
+        E_L_total = total_row["E_L [kW]"]
+        E_F_total = total_row["E_F [kW]"]
+        exergetic_loss_percent = (E_L_total / E_F_total) * 100 if E_F_total != 0 else 0
+
+        print("\nExergy Analysis Summary:")
+        print("Exergetic Fuel: 100.00%")
+        print(f"Total Exergy Destruction: {100 - epsilon_total - exergetic_loss_percent:.2f}%")
+        print(f"Exergetic Loss: {exergetic_loss_percent:.2f}%")
+        print(f"Exergetic Product (epsilon): {epsilon_total:.2f}%")
+
     def export_to_json(self, output_path):
         """
         Export the model to a JSON file.
-        
+
         Parameters
         ----------
         output_path : str
             Path where the JSON file will be saved.
-        
+
         Returns
         -------
         None
             The model is saved to the specified path.
-        
+
         Notes
         -----
         This method serializes the model using the internal _serialize method
         and writes the resulting data to a JSON file with indentation.
+        NaN values are converted to null for valid JSON output.
         """
         data = self._serialize()
-        with open(output_path, 'w') as json_file:
+        with open(output_path, "w") as json_file:
             json.dump(data, json_file, indent=4)
             logging.info(f"Model exported to JSON file: {output_path}.")
 
@@ -578,19 +823,69 @@ class ExergyAnalysis:
         export = {}
         export["components"] = self._component_data
         export["connections"] = self._connection_data
-        export["ambient_conditions"] = {
-            "Tamb": self.Tamb,
-            "Tamb_unit": "K",
-            "pamb": self.pamb,
-            "pamb_unit": "Pa"
-        }
-        export["settings"] = {
-            "split_physical_exergy": self.split_physical_exergy,
-            "chemExLib": self.chemExLib
+        export["ambient_conditions"] = {"Tamb": self.Tamb, "Tamb_unit": "K", "pamb": self.pamb, "pamb_unit": "Pa"}
+        export["settings"] = {"split_physical_exergy": self.split_physical_exergy, "chemExLib": self.chemExLib}
+
+        # add per-component exergy results
+        for _comp_type, comps in export["components"].items():
+            for comp_name, comp_data in comps.items():
+                comp = self.components[comp_name]
+                comp_data["exergy_results"] = {
+                    "E_F": _nan_to_none(getattr(comp, "E_F", None)),
+                    "E_P": _nan_to_none(getattr(comp, "E_P", None)),
+                    "E_D": _nan_to_none(getattr(comp, "E_D", None)),
+                    "epsilon": _nan_to_none(getattr(comp, "epsilon", None)),
+                    "y": _nan_to_none(getattr(comp, "y", None)),
+                    "y_star": _nan_to_none(getattr(comp, "y_star", None)),
+                }
+
+        # add overall system exergy results
+        export["system_results"] = {
+            "E_F": _nan_to_none(getattr(self, "E_F", None)),
+            "E_P": _nan_to_none(getattr(self, "E_P", None)),
+            "E_D": _nan_to_none(getattr(self, "E_D", None)),
+            "E_L": _nan_to_none(getattr(self, "E_L", None)),
+            "epsilon": _nan_to_none(getattr(self, "epsilon", None)),
         }
 
         return export
 
+    def _check_unaccounted_system_conns(self):
+        """
+        Check if system boundary connections are not included in E_F, E_P, or E_L dictionaries.
+        """
+        # Collect all accounted streams
+        accounted_streams = set()
+        for dictionary in [self.E_F_dict, self.E_P_dict, self.E_L_dict]:
+            accounted_streams.update(dictionary.get("inputs", []))
+            accounted_streams.update(dictionary.get("outputs", []))
+
+        # Identify actual system boundary connections
+        # A connection is at the boundary if source OR target is None/missing
+        system_boundary_conns = []
+        for conn_name, conn_data in self.connections.items():
+            source = conn_data.get("source_component", None)
+            target = conn_data.get("target_component", None)
+            if conn_data.get("source_component_type", None) == 1:
+                source = None
+
+            # Connection is at system boundary if one side is not connected
+            if source is None or target is None:
+                kind = conn_data.get("kind", "")
+                exergy = conn_data.get("E", 0)
+                # Only consider material/heat/power streams with significant exergy
+                if kind in ["material", "heat", "power"] and abs(exergy) > 1e-3:
+                    system_boundary_conns.append(conn_name)
+
+        # Find unaccounted boundary connections
+        unaccounted = [conn for conn in system_boundary_conns if conn not in accounted_streams]
+
+        if unaccounted:
+            conn_list = ", ".join(f"'{conn}'" for conn in sorted(unaccounted))
+            logging.warning(
+                f"The following system boundary connections are not included in E_F, E_P, or E_L: {conn_list}"
+            )
+
 
 def _construct_components(component_data, connection_data, Tamb):
     """
@@ -620,9 +915,9 @@ def _construct_components(component_data, connection_data, Tamb):
     for component_type, component_instances in component_data.items():
         for component_name, component_information in component_instances.items():
             # Skip components of type 'Splitter'
-            if component_type == "Splitter" or component_information.get('type') == "Splitter":
-                logging.info(f"Skipping 'Splitter' component during the exergy analysis: {component_name}")
-                continue  # Skip this component
+            """if component_type == "Splitter" or component_information.get('type') == "Splitter":
+            logging.info(f"Skipping 'Splitter' component during the exergy analysis: {component_name}")
+            continue  # Skip this component"""
 
             # Fetch the corresponding class from the registry using the component type
             component_class = component_registry.items.get(component_type)
@@ -639,15 +934,15 @@ def _construct_components(component_data, connection_data, Tamb):
             component.outl = {}
 
             # Assign streams to the components based on connection data
-            for conn_id, conn_info in connection_data.items():
+            for _conn_id, conn_info in connection_data.items():
                 # Assign inlet streams
-                if conn_info['target_component'] == component_name:
-                    target_connector_idx = conn_info['target_connector']  # Use 0-based indexing
+                if conn_info["target_component"] == component_name:
+                    target_connector_idx = conn_info["target_connector"]  # Use 0-based indexing
                     component.inl[target_connector_idx] = conn_info  # Assign inlet stream
 
                 # Assign outlet streams
-                if conn_info['source_component'] == component_name:
-                    source_connector_idx = conn_info['source_connector']  # Use 0-based indexing
+                if conn_info["source_component"] == component_name:
+                    source_connector_idx = conn_info["source_connector"]  # Use 0-based indexing
                     component.outl[source_connector_idx] = conn_info  # Assign outlet stream
 
             # --- NEW: Automatically mark Valve components as dissipative ---
@@ -663,7 +958,7 @@ def _construct_components(component_data, connection_data, Tamb):
                     else:
                         component.is_dissipative = False
                 except Exception as e:
-                    logging.warning(f"Could not evaluate dissipativity for Valve '{component_name}': {e}")
+                    logging.warning(f"Could not evaluate if Valve '{component_name}' is dissipative or not: {e}")
                     component.is_dissipative = False
             else:
                 component.is_dissipative = False
@@ -674,6 +969,13 @@ def _construct_components(component_data, connection_data, Tamb):
     return components  # Return the dictionary of created components
 
 
+def _nan_to_none(value):
+    """Convert NaN/Inf floats to None for valid JSON serialization."""
+    if isinstance(value, float) and not np.isfinite(value):
+        return None
+    return value
+
+
 def _load_json(json_path):
     """
     Load and validate a JSON file.
@@ -698,15 +1000,17 @@ def _load_json(json_path):
     if not os.path.exists(json_path):
         raise FileNotFoundError(f"File not found: {json_path}")
 
-    if not json_path.endswith('.json'):
+    if not json_path.endswith(".json"):
         raise ValueError("File must have .json extension")
 
     # Load and validate JSON
-    with open(json_path, 'r') as file:
+    with open(json_path) as file:
         return json.load(file)
 
 
-def _process_json(data, Tamb=None, pamb=None, chemExLib=None, split_physical_exergy=True, required_component_fields=['name']):
+def _process_json(
+    data, Tamb=None, pamb=None, chemExLib=None, split_physical_exergy=True, required_component_fields=None
+):
     """Process JSON data to prepare it for exergy analysis.
     This function validates the data structure, ensures all required fields are present,
     and enriches the data with chemical exergy and total exergy flow calculations.
@@ -734,29 +1038,31 @@ def _process_json(data, Tamb=None, pamb=None, chemExLib=None, split_physical_exe
         If required sections or fields are missing, or if data structure is invalid
     """
     # Validate required sections
-    required_sections = ['components', 'connections', 'ambient_conditions']
+    if required_component_fields is None:
+        required_component_fields = ["name"]
+    required_sections = ["components", "connections", "ambient_conditions"]
     missing_sections = [s for s in required_sections if s not in data]
     if missing_sections:
         raise ValueError(f"Missing required sections: {missing_sections}")
 
     # Check for mass_composition in material streams if chemical exergy is requested
     if chemExLib:
-        for conn_name, conn_data in data['connections'].items():
-            if conn_data.get('kind') == 'material' and 'mass_composition' not in conn_data:
+        for conn_name, conn_data in data["connections"].items():
+            if conn_data.get("kind") == "material" and "mass_composition" not in conn_data:
                 raise ValueError(f"Material stream '{conn_name}' missing mass_composition")
 
     # Extract or use provided ambient conditions
-    Tamb = Tamb or data['ambient_conditions'].get('Tamb')
-    pamb = pamb or data['ambient_conditions'].get('pamb')
+    Tamb = Tamb or data["ambient_conditions"].get("Tamb")
+    pamb = pamb or data["ambient_conditions"].get("pamb")
 
     if Tamb is None or pamb is None:
         raise ValueError("Ambient conditions (Tamb, pamb) must be provided either in JSON or as parameters")
 
     # Validate component data structure
-    if not isinstance(data['components'], dict):
+    if not isinstance(data["components"], dict):
         raise ValueError("Components section must be a dictionary")
 
-    for comp_type, components in data['components'].items():
+    for comp_type, components in data["components"].items():
         if not isinstance(components, dict):
             raise ValueError(f"Component type '{comp_type}' must contain dictionary of components")
 
@@ -766,8 +1072,8 @@ def _process_json(data, Tamb=None, pamb=None, chemExLib=None, split_physical_exe
                 raise ValueError(f"Component '{comp_name}' missing required fields: {missing_fields}")
 
     # Validate connection data structure
-    for conn_name, conn_data in data['connections'].items():
-        required_conn_fields = ['kind', 'source_component', 'target_component']
+    for conn_name, conn_data in data["connections"].items():
+        required_conn_fields = ["kind", "source_component", "target_component"]
         missing_fields = [f for f in required_conn_fields if f not in conn_data]
         if missing_fields:
             raise ValueError(f"Connection '{conn_name}' missing required fields: {missing_fields}")
@@ -787,7 +1093,7 @@ def _process_json(data, Tamb=None, pamb=None, chemExLib=None, split_physical_exe
 
 
 class ExergoeconomicAnalysis:
-    """"
+    """ "
     This class performs exergoeconomic analysis on a previously completed exergy analysis.
     It takes the results from an ExergyAnalysis instance and builds upon them
     to conduct a complete exergoeconomic analysis. It constructs and solves a system
@@ -872,12 +1178,12 @@ class ExergoeconomicAnalysis:
 
         This method assigns unique indices to each cost variable in the matrix system
         and populates a dictionary mapping these indices to variable names.
-        
+
         For material streams, separate indices are assigned for thermal, mechanical,
         and chemical exergy components when chemical exergy is enabled (otherwise only
         thermal and mechanical). For non-material streams (heat, power), a single index
         is assigned for the total exergy cost.
-        
+
         Notes
         -----
         The assigned indices are used for constructing the cost balance equations
@@ -889,8 +1195,9 @@ class ExergoeconomicAnalysis:
         # Process each connection (stream) which is part of the system (has a valid source or target)
         for name, conn in self.connections.items():
             conn["name"] = name  # Add the connection name to the dictionary
-            is_part_of_the_system = (conn.get("source_component") in valid_components) or \
-                                    (conn.get("target_component") in valid_components)
+            is_part_of_the_system = (conn.get("source_component") in valid_components) or (
+                conn.get("target_component") in valid_components
+            )
             if not is_part_of_the_system:
                 continue
             else:
@@ -898,21 +1205,14 @@ class ExergoeconomicAnalysis:
                 # For material streams, assign indices based on the flag.
                 if kind == "material":
                     if self.exergy_analysis.chemical_exergy_enabled:
-                        conn["CostVar_index"] = {
-                            "T": col_number,
-                            "M": col_number + 1,
-                            "CH": col_number + 2
-                        }
-                        self.variables[str(col_number)]     = f"C_{name}_T"
+                        conn["CostVar_index"] = {"T": col_number, "M": col_number + 1, "CH": col_number + 2}
+                        self.variables[str(col_number)] = f"C_{name}_T"
                         self.variables[str(col_number + 1)] = f"C_{name}_M"
                         self.variables[str(col_number + 2)] = f"C_{name}_CH"
                         col_number += 3
                     else:
-                        conn["CostVar_index"] = {
-                            "T": col_number,
-                            "M": col_number + 1
-                        }
-                        self.variables[str(col_number)]     = f"C_{name}_T"
+                        conn["CostVar_index"] = {"T": col_number, "M": col_number + 1}
+                        self.variables[str(col_number)] = f"C_{name}_T"
                         self.variables[str(col_number + 1)] = f"C_{name}_M"
                         col_number += 2
                     # Check if this connection's target is a dissipative component.
@@ -922,7 +1222,7 @@ class ExergoeconomicAnalysis:
                         if comp is not None and getattr(comp, "is_dissipative", False):
                             # Add an extra index for the dissipative cost difference.
                             conn["CostVar_index"]["dissipative"] = col_number
-                            self.variables[str(col_number)] = "dissipative"
+                            self.variables[str(col_number)] = f"dissipative_{comp.name}"
                             col_number += 1
                 # For non-material streams (e.g., heat, power), assign one index.
                 elif kind in ("heat", "power"):
@@ -958,14 +1258,16 @@ class ExergoeconomicAnalysis:
         """
         # --- Component Costs ---
         for comp_name, comp in self.components.items():
-            if isinstance(comp, CycleCloser):
+            if isinstance(comp, CycleCloser | PowerBus):
                 continue
             else:
                 cost_key = f"{comp_name}_Z"
                 if cost_key in Exe_Eco_Costs:
                     comp.Z_costs = Exe_Eco_Costs[cost_key] / 3600  # Convert currency/h to currency/s
                 else:
-                    raise ValueError(f"Cost for component '{comp_name}' is mandatory but not provided in Exe_Eco_Costs.")
+                    raise ValueError(
+                        f"Cost for component '{comp_name}' is mandatory but not provided in Exe_Eco_Costs."
+                    )
 
         # --- Connection Costs ---
         accepted_kinds = {"material", "heat", "power"}
@@ -983,7 +1285,9 @@ class ExergoeconomicAnalysis:
 
             # For input connections (except for power connections) a cost is mandatory.
             if is_input and kind != "power" and cost_key not in Exe_Eco_Costs:
-                raise ValueError(f"Cost for input connection '{conn_name}' is mandatory but not provided in Exe_Eco_Costs.")
+                raise ValueError(
+                    f"Cost for input connection '{conn_name}' is mandatory but not provided in Exe_Eco_Costs."
+                )
 
             # Assign cost if provided.
             if cost_key in Exe_Eco_Costs:
@@ -1012,23 +1316,22 @@ class ExergoeconomicAnalysis:
                     # Assign only the total cost for heat and power streams.
                     conn["C_TOT"] = c_TOT * conn["E"]
 
-
     def construct_matrix(self, Tamb):
         """
         Construct the exergoeconomic cost matrix and vector.
-        
+
         Parameters
         ----------
         Tamb : float
             Ambient temperature in Kelvin.
-            
+
         Returns
         -------
         tuple
             A tuple containing:
             - A: numpy.ndarray - The coefficient matrix for the linear equation system
             - b: numpy.ndarray - The right-hand side vector for the linear equation system
-            
+
         Notes
         -----
         This method constructs a system of linear equations that includes:
@@ -1038,9 +1341,8 @@ class ExergoeconomicAnalysis:
         4. Custom auxiliary equations from each component
         5. Special equations for dissipative components
         """
-        num_vars = self.num_variables
-        A = np.zeros((num_vars, num_vars))
-        b = np.zeros(num_vars)
+        self._A = np.zeros((self.num_variables, self.num_variables))
+        self._b = np.zeros(self.num_variables)
         counter = 0
 
         # Filter out CycleCloser instances, keeping the component objects.
@@ -1050,26 +1352,26 @@ class ExergoeconomicAnalysis:
 
         # 1. Cost balance equations for productive components.
         for comp in valid_components:
-            if not getattr(comp, "is_dissipative", False):
-            # Assign the row index for the cost balance equation to this component.
+            if (
+                not getattr(comp, "is_dissipative", False)
+                and not isinstance(comp, Splitter)
+                and not isinstance(comp, PowerBus)
+            ):
+                # Assign the row index for the cost balance equation to this component.
                 comp.exergy_cost_line = counter
                 for conn in self.connections.values():
                     # Check if the connection is linked to a valid component.
                     # If the connection's target is the component, it is an inlet (add +1).
                     if conn.get("target_component") == comp.name:
-                        for key, col in conn["CostVar_index"].items():
-                            A[counter, col] = 1  # Incoming costs
+                        for _key, col in conn["CostVar_index"].items():
+                            self._A[counter, col] = 1  # Incoming costs
                     # If the connection's source is the component, it is an outlet (subtract -1).
                     elif conn.get("source_component") == comp.name:
-                        for key, col in conn["CostVar_index"].items():
-                            A[counter, col] = -1  # Outgoing costs
-                    self.equations[counter] = f"Z_costs_{comp.name}"  # Store the equation name
+                        for _key, col in conn["CostVar_index"].items():
+                            self._A[counter, col] = -1  # Outgoing costs
+                    self.equations[counter] = {"kind": "cost_balance", "object": [comp.name], "property": "Z_costs"}
 
-            # For productive components: C_in - C_out = -Z_costs.
-            if getattr(comp, "is_dissipative", False):
-                continue
-            else:
-                b[counter] = -getattr(comp, "Z_costs", 1)
+                self._b[counter] = -getattr(comp, "Z_costs", 1)
                 counter += 1
 
         # 2. Inlet stream equations.
@@ -1081,25 +1383,23 @@ class ExergoeconomicAnalysis:
         for name, conn in self.connections.items():
             # A connection is treated as an inlet if its source_component is missing or not part of the system
             # and its target_component is among the valid components.
-            if (conn.get("source_component") is None or conn.get("source_component") not in self.components) \
-                    and (conn.get("target_component") in valid_component_names):
+            if (conn.get("source_component") is None or conn.get("source_component") not in self.components) and (
+                conn.get("target_component") in valid_component_names
+            ):
                 kind = conn.get("kind", "material")
                 if kind == "material":
-                    if self.chemical_exergy_enabled:
-                        exergy_terms = ["T", "M", "CH"]
-                    else:
-                        exergy_terms = ["T", "M"]
+                    exergy_terms = ["T", "M", "CH"] if self.chemical_exergy_enabled else ["T", "M"]
                     for label in exergy_terms:
                         idx = conn["CostVar_index"][label]
-                        A[counter, idx] = 1  # Fix the cost variable.
-                        b[counter] = conn.get(f"C_{label}", conn.get("C_TOT", 0))
-                        self.equations[counter] = f"boundary_stream_costs_{name}_{label}"
+                        self._A[counter, idx] = 1  # Fix the cost variable.
+                        self._b[counter] = conn.get(f"C_{label}", conn.get("C_TOT", 0))
+                        self.equations[counter] = {"kind": "boundary", "object": [name], "property": f"c_{label}"}
                         counter += 1
                 elif kind == "heat":
                     idx = conn["CostVar_index"]["exergy"]
-                    A[counter, idx] = 1
-                    b[counter] = conn.get("C_TOT", 0)
-                    self.equations[counter] = f"boundary_stream_costs_{name}_TOT"
+                    self._A[counter, idx] = 1
+                    self._b[counter] = conn.get("C_TOT", 0)
+                    self.equations[counter] = {"kind": "boundary", "object": [name], "property": "c_TOT"}
                     counter += 1
                 elif kind == "power":
                     if not has_power_outlet:
@@ -1107,19 +1407,36 @@ class ExergoeconomicAnalysis:
                         if not conn.get("C_TOT"):
                             continue
                         idx = conn["CostVar_index"]["exergy"]
-                        A[counter, idx] = 1
-                        b[counter] = conn.get("C_TOT", 0)
-                        self.equations[counter] = f"boundary_stream_costs_{name}_TOT"
+                        self._A[counter, idx] = 1
+                        self._b[counter] = conn.get("C_TOT", 0)
+                        self.equations[counter] = {"kind": "boundary", "object": [name], "property": "c_TOT"}
                         counter += 1
                     else:
-                        continue
+                        # When there are power outlets, we still need at least one boundary condition
+                        # for power inlets to fix the absolute cost value. The aux_power_eq only
+                        # equalizes specific costs but doesn't set the actual value.
+                        if conn.get("C_TOT"):
+                            idx = conn["CostVar_index"]["exergy"]
+                            self._A[counter, idx] = 1
+                            self._b[counter] = conn.get("C_TOT", 0)
+                            self.equations[counter] = {"kind": "boundary", "object": [name], "property": "c_TOT"}
+                            counter += 1
 
         # 3. Auxiliary equations for the equality of the specific costs
         # of all power flows at the input or output of the system.
-        power_conns = [conn for conn in self.connections.values()
-                    if conn.get("kind") == "power" and
-                    (conn.get("source_component") not in valid_component_names or conn.get("target_component") not in valid_component_names) and not
-                    (conn.get("source_component") not in valid_component_names and conn.get("target_component") not in valid_component_names)]
+        power_conns = [
+            conn
+            for conn in self.connections.values()
+            if conn.get("kind") == "power"
+            and (
+                conn.get("source_component") not in valid_component_names
+                or conn.get("target_component") not in valid_component_names
+            )
+            and not (
+                conn.get("source_component") not in valid_component_names
+                and conn.get("target_component") not in valid_component_names
+            )
+        ]
 
         # Only add auxiliary equations if there is more than one power connection.
         if len(power_conns) > 1:
@@ -1128,10 +1445,14 @@ class ExergoeconomicAnalysis:
             ref_idx = ref["CostVar_index"]["exergy"]
             for conn in power_conns[1:]:
                 cur_idx = conn["CostVar_index"]["exergy"]
-                A[counter, ref_idx] = 1 / ref["E"] if ref["E"] != 0 else 1
-                A[counter, cur_idx] = -1 / conn["E"] if conn["E"] != 0 else -1
-                b[counter] = 0
-                self.equations[counter] = f"aux_power_eq_{ref['name']}_{conn['name']}"
+                self._A[counter, ref_idx] = 1 / ref["E"] if ref["E"] != 0 else 1
+                self._A[counter, cur_idx] = -1 / conn["E"] if conn["E"] != 0 else -1
+                self._b[counter] = 0
+                self.equations[counter] = {
+                    "kind": "aux_power_eq",
+                    "objects": [ref["name"], conn["name"]],
+                    "property": "c_TOT",
+                }
                 counter += 1
 
         # 4. Auxiliary equations.
@@ -1144,7 +1465,9 @@ class ExergoeconomicAnalysis:
                 if hasattr(comp, "aux_eqs") and callable(comp.aux_eqs):
                     # The aux_eqs function should accept the current matrix, vector, counter, and Tamb,
                     # and return the updated (A, b, counter).
-                    A, b, counter, self.equations = comp.aux_eqs(A, b, counter, Tamb, self.equations, self.chemical_exergy_enabled)
+                    self._A, self._b, counter, self.equations = comp.aux_eqs(
+                        self._A, self._b, counter, Tamb, self.equations, self.chemical_exergy_enabled
+                    )
                 else:
                     # If no auxiliary equations are provided.
                     logging.warning(f"No auxiliary equations provided for component '{comp.name}'.")
@@ -1154,34 +1477,38 @@ class ExergoeconomicAnalysis:
         # This will build an equation that integrates the dissipative cost difference (C_diff)
         # into the overall cost balance (i.e. it charges the component’s Z_costs accordingly).
         for comp in self.components.values():
-            if getattr(comp, "is_dissipative", False):
-                if hasattr(comp, "dis_eqs") and callable(comp.dis_eqs):
-                    # Let the component provide its own modifications for the cost matrix.
-                    A, b, counter, self.equations = comp.dis_eqs(A, b, counter, Tamb, self.equations, self.chemical_exergy_enabled, list(self.components.values()))
-
-        return A, b
-
+            if getattr(comp, "is_dissipative", False) and hasattr(comp, "dis_eqs") and callable(comp.dis_eqs):
+                # Let the component provide its own modifications for the cost matrix.
+                self._A, self._b, counter, self.equations = comp.dis_eqs(
+                    self._A,
+                    self._b,
+                    counter,
+                    Tamb,
+                    self.equations,
+                    self.chemical_exergy_enabled,
+                    list(self.components.values()),
+                )
 
     def solve_exergoeconomic_analysis(self, Tamb):
         """
         Solve the exergoeconomic cost balance equations and assign the results to connections and components.
-        
+
         Parameters
         ----------
         Tamb : float
             Ambient temperature in Kelvin.
-            
+
         Returns
         -------
         tuple
-            (exergy_cost_matrix, exergy_cost_vector) - The coefficient matrix and right-hand side vector used 
+            (exergy_cost_matrix, exergy_cost_vector) - The coefficient matrix and right-hand side vector used
             in the linear equation system.
-            
+
         Raises
         ------
         ValueError
             If the exergoeconomic system is singular or if the cost balance is not satisfied.
-            
+
         Notes
         -----
         This method performs the following steps:
@@ -1193,61 +1520,72 @@ class ExergoeconomicAnalysis:
         6. Computes system-level cost variables
         """
         # Step 1: Construct the cost matrix
-        exergy_cost_matrix, exergy_cost_vector = self.construct_matrix(Tamb)
+        self.construct_matrix(Tamb)
 
         # Step 2: Solve the system of equations
         try:
-            C_solution = np.linalg.solve(exergy_cost_matrix, exergy_cost_vector)
+            C_solution = np.linalg.solve(self._A, self._b)
+            if np.isnan(C_solution).any():
+                raise ValueError(
+                    "The solution of the cost matrix contains NaN values, indicating an issue with the cost balance equations or specifications."
+                )
         except np.linalg.LinAlgError:
-            raise ValueError(f"Exergoeconomic system is singular and cannot be solved. "
-                             f"Provided equations: {len(self.equations)}, variables in system: {len(self.variables)}")
+            raise ValueError(
+                f"Exergoeconomic system is singular and cannot be solved. "
+                f"Provided equations: {len(self.equations)}, variables in system: {len(self.variables)}"
+            )
+
+        # Step 3: Distribute the cost differences of dissipative components to the serving components
+        self.distribute_all_Z_diff(C_solution)
 
-        # Step 3: Assign solutions to connections
+        # Step 4: Assign solutions to connections
         for conn_name, conn in self.connections.items():
-            is_part_of_the_system = conn.get("source_component") or conn.get("target_component")
+            is_part_of_the_system = (
+                conn.get("source_component") in self.components or conn.get("target_component") in self.components
+            )
             if not is_part_of_the_system:
                 continue
             else:
                 kind = conn.get("kind")
                 if kind == "material":
                     # Retrieve mass flow and specific exergy values
-                    m_val = conn.get("m", 1)         # mass flow [kg/s]
-                    e_T = conn.get("e_T", 0)         # thermal specific exergy [kJ/kg]
-                    e_M = conn.get("e_M", 0)         # mechanical specific exergy [kJ/kg]
-                    E_T = m_val * e_T                # thermal exergy flow [kW]
-                    E_M = m_val * e_M                # mechanical exergy flow [kW]
+                    m_val = conn.get("m", 1)  # mass flow [kg/s]
+                    e_T = conn.get("e_T", 0)  # thermal specific exergy [kJ/kg]
+                    e_M = conn.get("e_M", 0)  # mechanical specific exergy [kJ/kg]
+                    E_T = m_val * e_T  # thermal exergy flow [kW]
+                    E_M = m_val * e_M  # mechanical exergy flow [kW]
 
                     conn["C_T"] = C_solution[conn["CostVar_index"]["T"]]
-                    conn["c_T"] = conn["C_T"] / E_T if E_T != 0 else np.nan
+                    conn["c_T"] = conn["C_T"] / E_T if E_T != 0 else 0.0
 
                     conn["C_M"] = C_solution[conn["CostVar_index"]["M"]]
-                    conn["c_M"] = conn["C_M"] / E_M if E_M != 0 else np.nan
+                    conn["c_M"] = conn["C_M"] / E_M if E_M != 0 else 0.0
 
                     conn["C_PH"] = conn["C_T"] + conn["C_M"]
-                    conn["c_PH"] = conn["C_PH"] / (E_T + E_M) if (E_T + E_M) != 0 else np.nan
+                    conn["c_PH"] = conn["C_PH"] / (E_T + E_M) if (E_T + E_M) != 0 else 0.0
 
                     if self.chemical_exergy_enabled:
-                        e_CH = conn.get("e_CH", 0)   # chemical specific exergy [kJ/kg]
-                        E_CH = m_val * e_CH         # chemical exergy flow [kW]
+                        e_CH = conn.get("e_CH", 0)  # chemical specific exergy [kJ/kg]
+                        E_CH = m_val * e_CH  # chemical exergy flow [kW]
                         conn["C_CH"] = C_solution[conn["CostVar_index"]["CH"]]
-                        conn["c_CH"] = conn["C_CH"] / E_CH if E_CH != 0 else np.nan
+                        conn["c_CH"] = conn["C_CH"] / E_CH if E_CH != 0 else 0.0
                         conn["C_TOT"] = conn["C_T"] + conn["C_M"] + conn["C_CH"]
                         total_E = E_T + E_M + E_CH
-                        conn["c_TOT"] = conn["C_TOT"] / total_E if total_E != 0 else np.nan
+                        conn["c_TOT"] = conn["C_TOT"] / total_E if total_E != 0 else 0.0
                     else:
                         conn["C_TOT"] = conn["C_T"] + conn["C_M"]
                         total_E = E_T + E_M
-                        conn["c_TOT"] = conn["C_TOT"] / total_E if total_E != 0 else np.nan
+                        conn["c_TOT"] = conn["C_TOT"] / total_E if total_E != 0 else 0.0
                 elif kind in {"heat", "power"}:
                     conn["C_TOT"] = C_solution[conn["CostVar_index"]["exergy"]]
                     conn["c_TOT"] = conn["C_TOT"] / conn.get("E", 1)
 
-        # Step 4: Assign C_P, C_F, C_D, and f values to components
+        # Step 5: Assign C_P, C_F, C_D, and f values to components
         for comp in self.exergy_analysis.components.values():
             if hasattr(comp, "exergoeconomic_balance") and callable(comp.exergoeconomic_balance):
-                comp.exergoeconomic_balance(self.exergy_analysis.Tamb)
+                comp.exergoeconomic_balance(self.exergy_analysis.Tamb, self.chemical_exergy_enabled)
 
-        # Step 5: Distribute the cost of loss streams to the product streams.
+        # Step 6: Distribute the cost of loss streams to the product streams.
         # For each loss stream (provided in E_L_dict), its C_TOT is distributed among the product streams (in E_P_dict)
         # in proportion to their exergy (E). After the distribution the loss stream's C_TOT is set to zero.
         loss_streams = self.E_L_dict.get("inputs", [])
@@ -1282,7 +1620,7 @@ class ExergoeconomicAnalysis:
             # The cost of the loss streams are not set to zero to show
             # them in the table, but they are attributed to the product streams.
 
-        # Step 6: Compute system-level cost variables using the E_F and E_P dictionaries.
+        # Step 7: Compute system-level cost variables using the E_F and E_P dictionaries.
         # Compute total fuel cost (C_F_total) from fuel streams.
         C_F_total = 0.0
         for conn_name in self.E_F_dict.get("inputs", []):
@@ -1316,25 +1654,99 @@ class ExergoeconomicAnalysis:
         Z_total *= 3600
 
         # Store the system-level costs in the exergy analysis instance.
-        self.system_costs = {
-            "C_F": float(C_F_total),
-            "C_P": float(C_P_total),
-            "Z": float(Z_total)
-        }
+        self.system_costs = {"C_F": float(C_F_total), "C_P": float(C_P_total), "Z": float(Z_total)}
 
         # Check cost balance and raise error if violated
         if abs(self.system_costs["C_P"] - self.system_costs["C_F"] - self.system_costs["Z"]) > 1e-4:
             raise ValueError(
-                f"Exergoeconomic cost balance not satisfied: C_P ({self.system_costs['C_P']:.6f}) ≠ "
-                f"C_F ({self.system_costs['C_F']:.6f}) + Z ({self.system_costs['Z']:.6f})"
+                f"Exergoeconomic cost balance of the entire system is not satisfied: \n"
+                f"C_P = {self.system_costs['C_P']:.3f} and is not equal to \n"
+                f"C_F ({self.system_costs['C_F']:.3f}) + ∑Z ({self.system_costs['Z']:.3f}) = {self.system_costs['C_F'] + self.system_costs['Z']:.3f}. \n"
+                f"The problem may be caused by incorrect specifications of E_F, E_P, and E_L."
             )
 
-        return exergy_cost_matrix, exergy_cost_vector
+    def distribute_all_Z_diff(self, C_solution):
+        """
+        Distribute every dissipative cost-difference (the C_diff variables) among
+        all components according to their `serving_weight`.
+
+        Parameters
+        ----------
+        C_solution : array_like
+            Solution vector of cost variables from the solved linear system.
+        """
+        # find all indices of variables named "dissipative_*"
+        diss_indices = [int(idx) for idx, name in self.variables.items() if name.startswith("dissipative_")]
+        total_C_diff = sum(C_solution[i] for i in diss_indices)
+        # assign to each component that got a serving_weight
+        for comp in self.exergy_analysis.components.values():
+            if hasattr(comp, "serving_weight"):
+                comp.Z_diss = comp.serving_weight * total_C_diff
+
+    def check_cost_balance(self, tol=1e-6):
+        """
+        Check the exergoeconomic cost balance for each component.
+
+        For each component, verify that
+        sum of inlet C_TOT minus sum of outlet C_TOT plus component Z_costs
+        equals zero within the given tolerance.
+
+        Parameters
+        ----------
+        tol : float, optional
+            Numerical tolerance for balance check (default is 1e-6).
+
+        Returns
+        -------
+        dict
+            Mapping from component name to tuple (balance, is_balanced),
+            where balance is the residual and is_balanced is True if
+            abs(balance) <= tol.
+        """
+        from .components.helpers.cycle_closer import CycleCloser
+
+        balances = {}
+        for name, comp in self.exergy_analysis.components.items():
+            if isinstance(comp, CycleCloser):
+                continue
+            inlet_sum = 0.0
+            outlet_sum = 0.0
+            for conn in self.connections.values():
+                # Use sum of cost components instead of C_TOT, because C_TOT may have been
+                # modified by loss attribution (Step 6) which is not part of the matrix equation.
+                kind = conn.get("kind", "material")
+                if kind == "material":
+                    cost = (conn.get("C_T", 0) or 0) + (conn.get("C_M", 0) or 0)
+                    if self.chemical_exergy_enabled:
+                        cost += conn.get("C_CH", 0) or 0
+                else:
+                    # For heat/power streams, use C_TOT directly (no loss attribution applies)
+                    cost = conn.get("C_TOT", 0) or 0
+                if conn.get("target_component") == name:
+                    inlet_sum += cost
+                if conn.get("source_component") == name:
+                    outlet_sum += cost
+            comp.C_in = inlet_sum
+            comp.C_out = outlet_sum
+            z_cost = getattr(comp, "Z_costs", 0)
+            z_diss = getattr(comp, "Z_diss", 0)
+            balance = inlet_sum - outlet_sum + z_cost + z_diss
+            balances[name] = (balance, abs(balance) <= tol)
+
+        all_ok = all(flag for _, flag in balances.values())
+        if all_ok:
+            logging.info("All component cost balances are fulfilled.")
+        else:
+            for name, (bal, ok) in balances.items():
+                if not ok:
+                    logging.warning(f"Balance for component {name} not fulfilled: residual = {bal:.6f}")
+
+        return balances
 
     def run(self, Exe_Eco_Costs, Tamb):
         """
         Execute the full exergoeconomic analysis.
-        
+
         Parameters
         ----------
         Exe_Eco_Costs : dict
@@ -1343,7 +1755,7 @@ class ExergoeconomicAnalysis:
             Format for connections: "<connection_name>_c": cost_value [currency/GJ]
         Tamb : float
             Ambient temperature in Kelvin.
-            
+
         Notes
         -----
         This method performs the complete exergoeconomic analysis by:
@@ -1354,8 +1766,108 @@ class ExergoeconomicAnalysis:
         self.initialize_cost_variables()
         self.assign_user_costs(Exe_Eco_Costs)
         self.solve_exergoeconomic_analysis(Tamb)
-        logging.info(f"Exergoeconomic analysis completed successfully.")
+        logging.info("Exergoeconomic analysis completed successfully.")
+        self.check_cost_balance()
+
+    def print_equations(self):
+        """
+        Get mapping of equation indices to equation descriptions.
+
+        Returns
+        -------
+        dict
+            Keys are equation indices (int), values are equation descriptions (str).
+        """
+        return {i: self.equations[i] for i in sorted(self.equations)}
+
+    def print_variables(self):
+        """
+        Get mapping of variable indices to variable names.
+
+        Returns
+        -------
+        dict
+            Keys are variable indices (int), values are variable names (str).
+        """
+        return {int(k): v for k, v in self.variables.items()}
+
+    def detect_linear_dependencies(self, tol_strict: float = 1e-12, tol_near: float = 1e-8):
+        """
+        Scan A for zero-rows, zero-cols, exactly colinear equation pairs
+        (error ≤ tol_strict), and near-colinear pairs (≤ tol_near but > tol_strict).
+        """
+        A = self._A
+
+        # 1) empty rows/cols
+        zero_rows = np.where((np.abs(A) < tol_strict).all(axis=1))[0].tolist()
+        zero_cols = np.where((np.abs(A) < tol_strict).all(axis=0))[0].tolist()
+
+        # 2) norms once
+        norms = np.linalg.norm(A, axis=1)
+
+        strict = []
+        near = []
+        n = A.shape[0]
+        for i in range(n):
+            for j in range(i + 1, n):
+                ni, nj = norms[i], norms[j]
+                if ni > tol_strict and nj > tol_strict:
+                    dot = float(np.dot(A[i], A[j]))
+                    diff = abs(dot - ni * nj)
+                    if diff <= tol_strict:
+                        strict.append((i, j))
+                    elif diff <= tol_near:
+                        near.append((i, j))
+
+        # drop any strict pairs from the near list
+        near_only = [pair for pair in near if pair not in strict]
+
+        return {
+            "zero_rows": zero_rows,
+            "zero_columns": zero_cols,
+            "colinear_equations_strict": strict,
+            "colinear_equations_near_only": near_only,
+        }
+
+    def print_dependency_report(self, tol_strict: float = 1e-12, tol_near: float = 1e-8):
+        """
+        Nicely print which equations or variables are under- or over-determined,
+        distinguishing exact vs. near colinearities.
+        """
+        deps = self.detect_linear_dependencies(tol_strict, tol_near)
 
+        # empty equations
+        if deps["zero_rows"]:
+            print("⚠ Equations with no variables:")
+            for eq in deps["zero_rows"]:
+                print(f"  • Eq[{eq}]: {self.equations.get(eq)}")
+        else:
+            print("✓ No empty equations.")
+
+        # unused variables
+        if deps["zero_columns"]:
+            print("\n⚠ Variables never used in any equation:")
+            for var in deps["zero_columns"]:
+                name = self.variables.get(str(var))
+                print(f"  • Var[{var}]: {name}")
+        else:
+            print("✓ All variables appear in at least one equation.")
+
+        # exactly colinear
+        if deps["colinear_equations_strict"]:
+            print("\n⚠ Exactly colinear (redundant) equation pairs:")
+            for i, j in deps["colinear_equations_strict"]:
+                print(f"  • Eq[{i}] {self.equations[i]!r}  ≈  Eq[{j}] {self.equations[j]!r}")
+        else:
+            print("✓ No exactly colinear equation pairs detected.")
+
+        # near-colinear
+        if deps["colinear_equations_near_only"]:
+            print("\n⚠ Nearly colinear equation pairs (|dot−‖i‖‖j‖| ≤ tol_near):")
+            for i, j in deps["colinear_equations_near_only"]:
+                print(f"  • Eq[{i}] {self.equations[i]!r}  ≈? Eq[{j}] {self.equations[j]!r}")
+        else:
+            print("✓ No near-colinear equation pairs detected.")
 
     def exergoeconomic_results(self, print_results=True):
         """
@@ -1388,7 +1900,7 @@ class ExergoeconomicAnalysis:
         f_list = []
 
         # Iterate over the component DataFrame rows. The "Component" column contains the key.
-        for idx, row in df_comp.iterrows():
+        for _idx, row in df_comp.iterrows():
             comp_name = row["Component"]
             if comp_name != "TOT":
                 comp = self.components.get(comp_name, None)
@@ -1421,26 +1933,33 @@ class ExergoeconomicAnalysis:
         df_comp[f"C_D [{self.currency}/h]"] = C_D_list
         df_comp[f"Z [{self.currency}/h]"] = Z_cost_list
         df_comp[f"C_D+Z [{self.currency}/h]"] = df_comp[f"C_D [{self.currency}/h]"] + df_comp[f"Z [{self.currency}/h]"]
-        df_comp[f"f [%]"] = f_list
-        df_comp[f"r [%]"] = r_list
+        df_comp["f [%]"] = f_list
+        df_comp["r [%]"] = r_list
 
         # Update the TOT row with system-level values using .loc.
         df_comp.loc["TOT", f"C_F [{self.currency}/h]"] = self.system_costs.get("C_F", np.nan)
         df_comp.loc["TOT", f"C_P [{self.currency}/h]"] = self.system_costs.get("C_P", np.nan)
-        df_comp.loc["TOT", f"Z [{self.currency}/h]"]   = self.system_costs.get("Z", np.nan)
+        df_comp.loc["TOT", f"Z [{self.currency}/h]"] = self.system_costs.get("Z", np.nan)
         df_comp.loc["TOT", f"C_D+Z [{self.currency}/h]"] = (
-            df_comp.loc["TOT", f"C_D [{self.currency}/h]"] +
-            df_comp.loc["TOT", f"Z [{self.currency}/h]"]
+            df_comp.loc["TOT", f"C_D [{self.currency}/h]"] + df_comp.loc["TOT", f"Z [{self.currency}/h]"]
         )
 
         df_comp[f"c_F [{self.currency}/GJ]"] = df_comp[f"C_F [{self.currency}/h]"] / df_comp["E_F [kW]"] * 1e6 / 3600
         df_comp[f"c_P [{self.currency}/GJ]"] = df_comp[f"C_P [{self.currency}/h]"] / df_comp["E_P [kW]"] * 1e6 / 3600
 
-        df_comp.loc["TOT", f"C_D [{self.currency}/h]"] = df_comp.loc["TOT", f"c_F [{self.currency}/GJ]"] * df_comp.loc["TOT", f"E_D [kW]"] / 1e6 * 3600
-        df_comp.loc["TOT", f"C_D+Z [{self.currency}/h]"] = df_comp.loc["TOT", f"C_D [{self.currency}/h]"] + df_comp.loc["TOT", f"Z [{self.currency}/h]"]
-        df_comp.loc["TOT", f"f [%]"] = df_comp.loc["TOT", f"Z [{self.currency}/h]"] / df_comp.loc["TOT", f"C_D+Z [{self.currency}/h]"] * 100
-        df_comp.loc["TOT", f"r [%]"] = ((df_comp.loc["TOT", f"c_P [{self.currency}/GJ]"] - df_comp.loc["TOT", f"c_F [{self.currency}/GJ]"]) /
-                                         df_comp.loc["TOT", f"c_F [{self.currency}/GJ]"]) * 100
+        df_comp.loc["TOT", f"C_D [{self.currency}/h]"] = (
+            df_comp.loc["TOT", f"c_F [{self.currency}/GJ]"] * df_comp.loc["TOT", "E_D [kW]"] / 1e6 * 3600
+        )
+        df_comp.loc["TOT", f"C_D+Z [{self.currency}/h]"] = (
+            df_comp.loc["TOT", f"C_D [{self.currency}/h]"] + df_comp.loc["TOT", f"Z [{self.currency}/h]"]
+        )
+        df_comp.loc["TOT", "f [%]"] = (
+            df_comp.loc["TOT", f"Z [{self.currency}/h]"] / df_comp.loc["TOT", f"C_D+Z [{self.currency}/h]"] * 100
+        )
+        df_comp.loc["TOT", "r [%]"] = (
+            (df_comp.loc["TOT", f"c_P [{self.currency}/GJ]"] - df_comp.loc["TOT", f"c_F [{self.currency}/GJ]"])
+            / df_comp.loc["TOT", f"c_F [{self.currency}/GJ]"]
+        ) * 100
 
         # -------------------------
         # Add cost columns to material connections.
@@ -1450,15 +1969,31 @@ class ExergoeconomicAnalysis:
         C_M_list = []
         C_CH_list = []
         C_TOT_list = []
-        # Lowercase cost columns (in GJ/{currency})
+        # Lowercase cost columns (in {currency}/GJ_ex)
         c_T_list = []
         c_M_list = []
         c_CH_list = []
         c_TOT_list = []
 
-        for idx, row in df_mat.iterrows():
-            conn_name = row['Connection']
+        # Create set of valid component names
+        valid_components = {comp.name for comp in self.components.values()}
+
+        for _idx, row in df_mat.iterrows():
+            conn_name = row["Connection"]
             conn_data = self.connections.get(conn_name, {})
+
+            # Verify connection is part of the system
+            is_part_of_the_system = (
+                conn_data.get("source_component") in valid_components
+                or conn_data.get("target_component") in valid_components
+            )
+            if not is_part_of_the_system:
+                # Skip this connection
+                C_T_list.append(np.nan)
+                C_M_list.append(np.nan)
+                # ... append nan for all other lists
+                continue
+
             kind = conn_data.get("kind", None)
             if kind == "material":
                 C_T = conn_data.get("C_T", None)
@@ -1503,17 +2038,17 @@ class ExergoeconomicAnalysis:
         df_mat[f"C^M [{self.currency}/h]"] = C_M_list
         df_mat[f"C^CH [{self.currency}/h]"] = C_CH_list
         df_mat[f"C^TOT [{self.currency}/h]"] = C_TOT_list
-        df_mat[f"c^T [GJ/{self.currency}]"] = c_T_list
-        df_mat[f"c^M [GJ/{self.currency}]"] = c_M_list
-        df_mat[f"c^CH [GJ/{self.currency}]"] = c_CH_list
-        df_mat[f"c^TOT [GJ/{self.currency}]"] = c_TOT_list
+        df_mat[f"c^T [{self.currency}/GJ_ex]"] = c_T_list
+        df_mat[f"c^M [{self.currency}/GJ_ex]"] = c_M_list
+        df_mat[f"c^CH [{self.currency}/GJ_ex]"] = c_CH_list
+        df_mat[f"c^TOT [{self.currency}/GJ_ex]"] = c_TOT_list
 
         # -------------------------
         # Add cost columns to non-material connections.
         # -------------------------
         C_TOT_non_mat = []
         c_TOT_non_mat = []
-        for idx, row in df_non_mat.iterrows():
+        for _idx, row in df_non_mat.iterrows():
             conn_name = row["Connection"]
             conn_data = self.connections.get(conn_name, {})
             C_TOT = conn_data.get("C_TOT", None)
@@ -1521,48 +2056,52 @@ class ExergoeconomicAnalysis:
             c_TOT = conn_data.get("c_TOT", None)
             c_TOT_non_mat.append(c_TOT * 1e9 if c_TOT is not None else None)
         df_non_mat[f"C^TOT [{self.currency}/h]"] = C_TOT_non_mat
-        df_non_mat[f"c^TOT [GJ/{self.currency}]"] = c_TOT_non_mat
+        df_non_mat[f"c^TOT [{self.currency}/GJ_ex]"] = c_TOT_non_mat
 
         # -------------------------
         # Split the material connections into two tables according to your specifications.
         # -------------------------
         # df_mat1: Columns from mass flow until e^CH.
-        df_mat1 = df_mat[[
-            "Connection",
-            "m [kg/s]",
-            "T [°C]",
-            "p [bar]",
-            "h [kJ/kg]",
-            "s [J/kgK]",
-            "E [kW]",
-            "e^PH [kJ/kg]",
-            "e^T [kJ/kg]",
-            "e^M [kJ/kg]",
-            "e^CH [kJ/kg]"
-        ]].copy()
+        df_mat1 = df_mat[
+            [
+                "Connection",
+                "m [kg/s]",
+                "T [°C]",
+                "p [bar]",
+                "h [kJ/kg]",
+                "s [J/kgK]",
+                "E [kW]",
+                "e^PH [kJ/kg]",
+                "e^T [kJ/kg]",
+                "e^M [kJ/kg]",
+                "e^CH [kJ/kg]",
+            ]
+        ].copy()
 
         # df_mat2: Columns from E onward, plus the uppercase and lowercase cost columns.
-        df_mat2 = df_mat[[
-            "Connection",
-            "E [kW]",
-            "e^PH [kJ/kg]",
-            "e^T [kJ/kg]",
-            "e^M [kJ/kg]",
-            "e^CH [kJ/kg]",
-            f"C^T [{self.currency}/h]",
-            f"C^M [{self.currency}/h]",
-            f"C^CH [{self.currency}/h]",
-            f"C^TOT [{self.currency}/h]",
-            f"c^T [GJ/{self.currency}]",
-            f"c^M [GJ/{self.currency}]",
-            f"c^CH [GJ/{self.currency}]",
-            f"c^TOT [GJ/{self.currency}]"
-        ]].copy()
+        df_mat2 = df_mat[
+            [
+                "Connection",
+                "E [kW]",
+                "e^PH [kJ/kg]",
+                "e^T [kJ/kg]",
+                "e^M [kJ/kg]",
+                "e^CH [kJ/kg]",
+                f"C^T [{self.currency}/h]",
+                f"C^M [{self.currency}/h]",
+                f"C^CH [{self.currency}/h]",
+                f"C^TOT [{self.currency}/h]",
+                f"c^T [{self.currency}/GJ_ex]",
+                f"c^M [{self.currency}/GJ_ex]",
+                f"c^CH [{self.currency}/GJ_ex]",
+                f"c^TOT [{self.currency}/GJ_ex]",
+            ]
+        ].copy()
 
         # Remove any columns that contain only NaN values from df_mat1, df_mat2, and df_non_mat.
-        df_mat1.dropna(axis=1, how='all', inplace=True)
-        df_mat2.dropna(axis=1, how='all', inplace=True)
-        df_non_mat.dropna(axis=1, how='all', inplace=True)
+        df_mat1.dropna(axis=1, how="all", inplace=True)
+        df_mat2.dropna(axis=1, how="all", inplace=True)
+        df_non_mat.dropna(axis=1, how="all", inplace=True)
 
         # -------------------------
         # Print the four tables if requested.
@@ -1608,7 +2147,7 @@ class EconomicAnalysis:
     def __init__(self, pars):
         """
         Initialize the EconomicAnalysis with plant parameters provided in a dictionary.
-        
+
         Parameters
         ----------
         pars : dict
@@ -1618,15 +2157,15 @@ class EconomicAnalysis:
             - n: Lifetime of the plant (years)
             - r_n: Nominal escalation rate (yearly based)
         """
-        self.tau = pars['tau']
-        self.i_eff = pars['i_eff']
-        self.n = pars['n']
-        self.r_n = pars['r_n']
+        self.tau = pars["tau"]
+        self.i_eff = pars["i_eff"]
+        self.n = pars["n"]
+        self.r_n = pars["r_n"]
 
     def compute_crf(self):
         """
         Compute the Capital Recovery Factor (CRF) using the effective rate of return.
-        
+
         Returns
         -------
         float
@@ -1636,12 +2175,12 @@ class EconomicAnalysis:
         -----
         CRF = i_eff * (1 + i_eff)**n / ((1 + i_eff)**n - 1)
         """
-        return self.i_eff * (1 + self.i_eff)**self.n / ((1 + self.i_eff)**self.n - 1)
+        return self.i_eff * (1 + self.i_eff) ** self.n / ((1 + self.i_eff) ** self.n - 1)
 
     def compute_celf(self):
         """
         Compute the Cost Escalation Levelization Factor (CELF) for repeating expenditures.
-        
+
         Returns
         -------
         float
@@ -1658,12 +2197,12 @@ class EconomicAnalysis:
     def compute_levelized_investment_cost(self, total_PEC):
         """
         Compute the levelized investment cost (annualized investment cost).
-        
+
         Parameters
         ----------
         total_PEC : float
             Total purchasing equipment cost (PEC) across all components.
-            
+
         Returns
         -------
         float
@@ -1674,14 +2213,14 @@ class EconomicAnalysis:
     def compute_component_costs(self, PEC_list, OMC_relative):
         """
         Compute the cost rates for each component.
-        
+
         Parameters
         ----------
         PEC_list : list of float
             The purchasing equipment cost (PEC) of each component (in currency).
         OMC_relative : list of float
             For each component, the first-year OM cost as a fraction of its PEC.
-            
+
         Returns
         -------
         tuple
@@ -1693,10 +2232,13 @@ class EconomicAnalysis:
         total_PEC = sum(PEC_list)
         # Levelize total investment cost and allocate proportionally.
         levelized_investment_cost = self.compute_levelized_investment_cost(total_PEC)
-        Z_CC = [(levelized_investment_cost * pec / total_PEC) / self.tau for pec in PEC_list]
+        if total_PEC == 0:
+            Z_CC = [0 for _ in PEC_list]
+        else:
+            Z_CC = [(levelized_investment_cost * pec / total_PEC) / self.tau for pec in PEC_list]
 
         # Compute first-year OMC for each component as a fraction of PEC.
-        first_year_OMC = [frac * pec for frac, pec in zip(OMC_relative, PEC_list)]
+        first_year_OMC = [frac * pec for frac, pec in zip(OMC_relative, PEC_list, strict=False)]
         total_first_year_OMC = sum(first_year_OMC)
 
         # Levelize the total operating and maintenance cost.
@@ -1704,8 +2246,11 @@ class EconomicAnalysis:
         levelized_om_cost = total_first_year_OMC * celf_value
 
         # Allocate the levelized OM cost to each component in proportion to its PEC.
-        Z_OM = [(levelized_om_cost * pec / total_PEC) / self.tau for pec in PEC_list]
+        if total_PEC == 0:
+            Z_OM = [0 for _ in PEC_list]
+        else:
+            Z_OM = [(levelized_om_cost * pec / total_PEC) / self.tau for pec in PEC_list]
 
         # Total cost rate per component.
-        Z_total = [zcc + zom for zcc, zom in zip(Z_CC, Z_OM)]
-        return Z_CC, Z_OM, Z_total
+        Z_total = [zcc + zom for zcc, zom in zip(Z_CC, Z_OM, strict=False)]
+        return Z_CC, Z_OM, Z_total