flixopt 2.1.1__py3-none-any.whl → 2.2.0b0__py3-none-any.whl

flixopt/linear_converters.py

@@ -165,7 +165,7 @@ class CoolingTower(LinearConverter):
             label,
             inputs=[P_el, Q_th],
             outputs=[],
-            conversion_factors=[{P_el.label: 1, Q_th.label: -specific_electricity_demand}],
+            conversion_factors=[{P_el.label: -1, Q_th.label: specific_electricity_demand}],
             on_off_parameters=on_off_parameters,
             meta_data=meta_data,
         )
@@ -177,12 +177,12 @@ class CoolingTower(LinearConverter):
 
     @property
     def specific_electricity_demand(self):
-        return -self.conversion_factors[0][self.Q_th.label]
+        return self.conversion_factors[0][self.Q_th.label]
 
     @specific_electricity_demand.setter
     def specific_electricity_demand(self, value):
         check_bounds(value, 'specific_electricity_demand', self.label_full, 0, 1)
-        self.conversion_factors[0][self.Q_th.label] = -value
+        self.conversion_factors[0][self.Q_th.label] = value
 
 
 @register_class_for_io

flixopt/plotting.py

@@ -209,7 +209,7 @@ class ColorProcessor:
 
 def with_plotly(
     data: pd.DataFrame,
-    mode: Literal['bar', 'line', 'area'] = 'area',
+    style: Literal['stacked_bar', 'line', 'area', 'grouped_bar'] = 'stacked_bar',
     colors: ColorType = 'viridis',
     title: str = '',
     ylabel: str = '',
@@ -222,7 +222,7 @@ def with_plotly(
     Args:
         data: A DataFrame containing the data to plot, where the index represents time (e.g., hours),
               and each column represents a separate data series.
-        mode: The plotting mode. Use 'bar' for stacked bar charts, 'line' for stepped lines,
+        style: The plotting style. Use 'stacked_bar' for stacked bar charts, 'line' for stepped lines,
               or 'area' for stacked area charts.
         colors: Color specification, can be:
             - A string with a colorscale name (e.g., 'viridis', 'plasma')
@@ -235,7 +235,8 @@ def with_plotly(
     Returns:
         A Plotly figure object containing the generated plot.
     """
-    assert mode in ['bar', 'line', 'area'], f"'mode' must be one of {['bar', 'line', 'area']}"
+    if style not in ['stacked_bar', 'line', 'area', 'grouped_bar']:
+        raise ValueError(f"'style' must be one of {['stacked_bar', 'line', 'area', 'grouped_bar']}")
     if data.empty:
         return go.Figure()
 
@@ -243,23 +244,40 @@ def with_plotly(
 
     fig = fig if fig is not None else go.Figure()
 
-    if mode == 'bar':
+    if style == 'stacked_bar':
         for i, column in enumerate(data.columns):
             fig.add_trace(
                 go.Bar(
                     x=data.index,
                     y=data[column],
                     name=column,
-                    marker=dict(color=processed_colors[i]),
+                    marker=dict(color=processed_colors[i],
+                                line=dict(width=0, color='rgba(0,0,0,0)')),  #Transparent line with 0 width
                 )
             )
 
         fig.update_layout(
-            barmode='relative' if mode == 'bar' else None,
+            barmode='relative',
             bargap=0,  # No space between bars
-            bargroupgap=0,  # No space between groups of bars
+            bargroupgap=0,  # No space between grouped bars
         )
-    elif mode == 'line':
+    if style == 'grouped_bar':
+        for i, column in enumerate(data.columns):
+            fig.add_trace(
+                go.Bar(
+                    x=data.index,
+                    y=data[column],
+                    name=column,
+                    marker=dict(color=processed_colors[i])
+                )
+            )
+
+        fig.update_layout(
+            barmode='group',
+            bargap=0.2,  # No space between bars
+            bargroupgap=0,  # space between grouped bars
+        )
+    elif style == 'line':
         for i, column in enumerate(data.columns):
             fig.add_trace(
                 go.Scatter(
@@ -270,7 +288,7 @@ def with_plotly(
                     line=dict(shape='hv', color=processed_colors[i]),
                 )
             )
-    elif mode == 'area':
+    elif style == 'area':
         data = data.copy()
         data[(data > -1e-5) & (data < 1e-5)] = 0  # Preventing issues with plotting
         # Split columns into positive, negative, and mixed categories
@@ -345,7 +363,7 @@ def with_plotly(
 
 def with_matplotlib(
     data: pd.DataFrame,
-    mode: Literal['bar', 'line'] = 'bar',
+    style: Literal['stacked_bar', 'line'] = 'stacked_bar',
     colors: ColorType = 'viridis',
     title: str = '',
     ylabel: str = '',
@@ -360,7 +378,7 @@ def with_matplotlib(
     Args:
         data: A DataFrame containing the data to plot. The index should represent time (e.g., hours),
               and each column represents a separate data series.
-        mode: Plotting mode. Use 'bar' for stacked bar charts or 'line' for stepped lines.
+        style: Plotting style. Use 'stacked_bar' for stacked bar charts or 'line' for stepped lines.
         colors: Color specification, can be:
             - A string with a colormap name (e.g., 'viridis', 'plasma')
             - A list of color strings (e.g., ['#ff0000', '#00ff00'])
@@ -376,19 +394,19 @@ def with_matplotlib(
         A tuple containing the Matplotlib figure and axes objects used for the plot.
 
     Notes:
-        - If `mode` is 'bar', bars are stacked for both positive and negative values.
+        - If `style` is 'stacked_bar', bars are stacked for both positive and negative values.
           Negative values are stacked separately without extra labels in the legend.
-        - If `mode` is 'line', stepped lines are drawn for each data series.
+        - If `style` is 'line', stepped lines are drawn for each data series.
         - The legend is placed below the plot to accommodate multiple data series.
     """
-    assert mode in ['bar', 'line'], f"'mode' must be one of {['bar', 'line']} for matplotlib"
+    assert style in ['stacked_bar', 'line'], f"'style' must be one of {['stacked_bar', 'line']} for matplotlib"
 
     if fig is None or ax is None:
         fig, ax = plt.subplots(figsize=figsize)
 
     processed_colors = ColorProcessor(engine='matplotlib').process_colors(colors, list(data.columns))
 
-    if mode == 'bar':
+    if style == 'stacked_bar':
         cumulative_positive = np.zeros(len(data))
         cumulative_negative = np.zeros(len(data))
         width = data.index.to_series().diff().dropna().min()  # Minimum time difference
@@ -419,7 +437,7 @@ def with_matplotlib(
             )
             cumulative_negative += negative_values.values
 
-    elif mode == 'line':
+    elif style == 'line':
         for i, column in enumerate(data.columns):
             ax.step(data.index, data[column], where='post', color=processed_colors[i], label=column)