facelift

app.py

@@ -288,6 +288,15 @@ def visualize_simulation(results, date_range):
     return fig
 
 
+MARGIN = dict(
+    l=0,
+    r=0,
+    b=0,
+    t=0,
+    pad=0
+)
+
+
 def plotly_visualize_simulation(results, date_range):
     start_date, end_date = date_range
     results = results.loc[start_date: end_date]
@@ -319,12 +328,49 @@ def plotly_visualize_simulation(results, date_range):
         name='BESS',
         stackgroup='one'
     ))
+    # could not kill the huge padding this introduces:
+    # fig.update_layout(title=f"Simulation for {start_date} - {end_date}")
+    fig.update_layout(height=400, yaxis_title="Consumption in [kW]")
+
+    return fig
+
+
+def plotly_visualize_monthly(consumption):
+    # months = monthly_results.index
+    months = list(range(1, 13))
+    fig = go.Figure()
+    fig.add_trace(go.Scatter(
+        x=months, y=consumption[:, 0], # monthly_results['consumption_from_network'],
+        hoverinfo='x+y',
+        mode='lines',
+        line=dict(width=0.5, color='blue'),
+        name='Network',
+        stackgroup='one' # define stack group
+    ))
+    fig.add_trace(go.Scatter(
+        x=months, y=consumption[:, 1], # y=monthly_results['consumption_from_solar'],
+        hoverinfo='x+y',
+        mode='lines',
+        line=dict(width=0.5, color='orange'),
+        name='Solar',
+        stackgroup='one'
+    ))
+    fig.add_trace(go.Scatter(
+        x=months, y=consumption[:, 2], # y=monthly_results['consumption_from_bess'],
+        hoverinfo='x+y',
+        mode='lines',
+        line=dict(width=0.5, color='green'),
+        name='BESS',
+        stackgroup='one'
+    ))
     fig.update_layout(
+        yaxis_title="Monthly consumption in [MWh]",
         height=400
     )
     return fig
 
 
+# TODO build a dataframe instead
 def monthly_analysis(results):
     consumptions = []
     for month in range(1, 13):
@@ -435,22 +481,25 @@ def ui_refresh(solar_cell_num, bess_nominal_capacity, fixed_consumption):
     # (12, 3), the 3 indexed with (network, solar, bess):
     consumptions_in_mwh = monthly_analysis(results)
 
+    fig_monthly = plotly_visualize_monthly(consumptions_in_mwh)
+
     network, solar, bess = consumptions_in_mwh.sum(axis=0)
-    html = ""
+    html = "<table>\n"
     for column, column_name in zip((network, solar, bess), ("network", "solar", "BESS")):
-        html += f"Yearly consumption satisfied by {column_name}: {column:0.2f} MWh<br>"
+        html += f"<tr><td>Yearly consumption satisfied by {column_name}:&nbsp;&nbsp;&nbsp;</td><td>{column:0.2f} MWh</td></tr>\n"
+    html += "</table>"
 
-    return (fig1, fig2, html)
+    return (html, fig_monthly, fig1, fig2)
 
 
 ui = gr.Interface(
     ui_refresh,
     inputs = [
         gr.Slider(0, 2000, 114, label="Solar cell number"),
-        gr.Slider(0, 1000, 330, label="BESS nominal capacity"),
-        gr.Checkbox(value=False, label="Fixed consumption")],
-    outputs = ["plot", "plot", "html"],
+        gr.Slider(0, 2000, 330, label="BESS nominal capacity in [Ah]"),
+        gr.Checkbox(value=False, label="Use fixed consumption (10 kW)")],
+    outputs = ["html", "plot", "plot", "plot"],
     live=True,
 )
 
-ui.launch()
+ui.launch(show_api=False)