Update app.py

app.py

@@ -149,24 +149,60 @@ def optimize_energy_system(city_code, solar_cost, onshore_wind_cost, offshore_wi
     SOC_normalized = [(soc / max_SOC) * 100 for soc in SOC_values] if max_SOC > 0 else [0] * len(SOC_values)
 
     # Create a subplot with 3 rows for energy dispatch, state of charge (SOC), and electricity price.
-    fig = make_subplots(rows=3, cols=1, shared_xaxes=True, vertical_spacing=0.1,
-                        subplot_titles=("Power supply and demand", "State of charge (Battery)", "Electricity Price Over Time"))
-
-    # Plot energy dispatch in the first row.
-    fig.add_trace(go.Scatter(x=data['Time'], y=supply_solar, mode='lines', stackgroup='one', name='Solar', line=dict(color='#FFD700', width=0)), row=1, col=1)  # Solar: Gold
-    fig.add_trace(go.Scatter(x=data['Time'], y=supply_onshore_wind, mode='lines', stackgroup='one', name='Onshore Wind', line=dict(color='#1F78B4', width=0)), row=1, col=1)  # Onshore Wind: Blue
-    fig.add_trace(go.Scatter(x=data['Time'], y=supply_offshore_wind, mode='lines', stackgroup='one', name='Offshore Wind', line=dict(color='#66C2A5', width=0)), row=1, col=1)  # Offshore Wind: Light Green
-    fig.add_trace(go.Scatter(x=data['Time'], y=supply_river, mode='lines', stackgroup='one', name='Run of River', line=dict(color='#FF7F00', width=0)), row=1, col=1)  # Run of River: Orange
-    fig.add_trace(go.Scatter(x=data['Time'], y=battery_discharge_values, mode='lines', stackgroup='one', name='Battery Discharge', fill='tonexty', line=dict(color='#6A3D9A', width=0)), row=1, col=1)  # Battery Discharge: Brown
-    fig.add_trace(go.Scatter(x=data['Time'], y=battery_charge_values, mode='lines', stackgroup='two', name='Battery Charge', fill='tonexty', line=dict(color='#6A3D9A', width=0)), row=1, col=1)  # Battery Charge: Purple
-    fig.add_trace(go.Scatter(x=data['Time'], y=-demand, mode='lines', stackgroup='two', name='Demand', line=dict(color='black', width=0)), row=1, col=1)  # Demand: Black
-    fig.add_trace(go.Scatter(x=data['Time'], y=curtailment_values, mode='lines', stackgroup='two', name='Curtailment', line=dict(color='#aaaaaa', width=0)), row=1, col=1)  # Curtailment: Grey
+    ", "Electricity Price Over Time"))
+
+    # Create separate figure for power supply and demand
+    fig_supply_demand = go.Figure()
+    fig_supply_demand.add_trace(go.Scatter(x=data['Time'], y=supply_solar, mode='lines', stackgroup='one', name='Solar', line=dict(color='#FFD700', width=0)))  # Solar: Gold
+    fig_supply_demand.add_trace(go.Scatter(x=data['Time'], y=supply_onshore_wind, mode='lines', stackgroup='one', name='Onshore Wind', line=dict(color='#1F78B4', width=0)))  # Onshore Wind: Blue
+    fig_supply_demand.add_trace(go.Scatter(x=data['Time'], y=supply_offshore_wind, mode='lines', stackgroup='one', name='Offshore Wind', line=dict(color='#66C2A5', width=0)))  # Offshore Wind: Light Green
+    fig_supply_demand.add_trace(go.Scatter(x=data['Time'], y=supply_river, mode='lines', stackgroup='one', name='Run of River', line=dict(color='#FF7F00', width=0)))  # Run of River: Orange
+    fig_supply_demand.add_trace(go.Scatter(x=data['Time'], y=battery_discharge_values, mode='lines', stackgroup='one', name='Battery Discharge', fill='tonexty', line=dict(color='#6A3D9A', width=0)))  # Battery Discharge: Brown
+    fig_supply_demand.add_trace(go.Scatter(x=data['Time'], y=battery_charge_values, mode='lines', stackgroup='two', name='Battery Charge', fill='tonexty', line=dict(color='#6A3D9A', width=0)))  # Battery Charge: Purple
+    fig_supply_demand.add_trace(go.Scatter(x=data['Time'], y=-demand, mode='lines', stackgroup='two', name='Demand', line=dict(color='black', width=0)))  # Demand: Black
+    fig_supply_demand.add_trace(go.Scatter(x=data['Time'], y=curtailment_values, mode='lines', stackgroup='two', name='Curtailment', line=dict(color='#aaaaaa', width=0)))  # Curtailment: Grey
+    
+    fig_supply_demand.update_layout(
+        title_text='Power Supply and Demand',
+        yaxis_title='Power dispatch (MW)',
+        legend_title='Source',
+        font=dict(size=12),
+        margin=dict(l=40, r=40, t=40, b=40),
+        hovermode='x unified',
+        plot_bgcolor='white',
+        xaxis=dict(showgrid=True, gridwidth=0.5, gridcolor='lightgray'),
+        yaxis=dict(showgrid=True, gridwidth=0.5, gridcolor='lightgray')
+    )  # Curtailment: Grey
 
-    # Plot state of charge (SOC) in the second row, normalized to 100%.
-    fig.add_trace(go.Scatter(x=data['Time'], y=SOC_normalized, mode='lines', name='State of Charge (SOC) - Normalized', line=dict(color='black')), row=2, col=1)
+    # Create separate figure for state of charge (SOC)
+    fig_soc = go.Figure()
+    fig_soc.add_trace(go.Scatter(x=data['Time'], y=SOC_normalized, mode='lines', name='State of Charge (SOC) - Normalized', line=dict(color='black')))
+    
+    fig_soc.update_layout(
+        title_text='State of Charge (Battery)',
+        yaxis_title='State of Charge (%)',
+        font=dict(size=12),
+        margin=dict(l=40, r=40, t=40, b=40),
+        hovermode='x unified',
+        plot_bgcolor='white',
+        xaxis=dict(showgrid=True, gridwidth=0.5, gridcolor='lightgray'),
+        yaxis=dict(showgrid=True, gridwidth=0.5, gridcolor='lightgray')
+    )
 
-    # Plot electricity price in the third row.
-    fig.add_trace(go.Scatter(x=data['Time'], y=price_per_hour, mode='lines', name='Electricity Price', line=dict(color='#FF4500')), row=3, col=1)  # Price: Red-Orange
+    # Create separate figure for electricity price over time
+    fig_price = go.Figure()
+    fig_price.add_trace(go.Scatter(x=data['Time'], y=price_per_hour, mode='lines', name='Electricity Price', line=dict(color='#FF4500')))
+    
+    fig_price.update_layout(
+        title_text='Electricity Price Over Time',
+        yaxis_title='Electricity Price (¥/MWh)',
+        font=dict(size=12),
+        margin=dict(l=40, r=40, t=40, b=40),
+        hovermode='x unified',
+        plot_bgcolor='white',
+        xaxis=dict(showgrid=True, gridwidth=0.5, gridcolor='lightgray'),
+        yaxis=dict(showgrid=True, gridwidth=0.5, gridcolor='lightgray')
+    )  # Price: Red-Orange
 
     # Layout settings for the figure.
     fig.update_layout(
@@ -216,7 +252,9 @@ with st.sidebar:
 if st.button('Calculate Optimal Energy Mix'):
     fig, curtailment_values, price_per_hour = optimize_energy_system(city_code, solar_cost, onshore_wind_cost, offshore_wind_cost, river_cost, battery_cost, yearly_demand)
     if fig:
-        st.plotly_chart(fig, use_container_width=True, height=800)
+        st.plotly_chart(fig_supply_demand, use_container_width=True, height=800)
+    st.plotly_chart(fig_soc, use_container_width=True, height=800)
+    st.plotly_chart(fig_price, use_container_width=True, height=800)
 
         # Additional analysis and visualizations
         st.markdown("### Additional Analysis")