Update app.py

app.py

@@ -174,7 +174,7 @@ with st.sidebar:
     wind_range = st.slider("Onshore Wind Capacity Range (MW)", 0, 10000, (0, 10000))
     offshore_wind_range = st.slider("Offshore Wind Capacity Range (MW)", 0, 10000, (0, 10000))
     river_range = st.slider("River Capacity Range (MW)", 0, 10000, (0, 10000))
-    thresholds = st.multiselect("Select MGA Cost Deviation Thresholds (%)", [0.5, 1, 2, 3, 5, 7.5, 10], default=[0.5, 1, 5])
+    thresholds = st.multiselect("Select MGA Cost Deviation Thresholds (%)", list(range(0, 101, 10)), default=[0, 50, 100])
 
     # 技術の選択オプション
     selected_technologies = st.multiselect("Select Technologies to Optimize", ['solar', 'onshore_wind', 'offshore_wind', 'river'], default=['solar', 'onshore_wind', 'offshore_wind', 'river'])
@@ -202,9 +202,16 @@ if st.button("Run MGA Optimization"):
         # Streamlitでコスト積み上げグラフを表示
         st.plotly_chart(fig_cost, use_container_width=True)
 
-        # 各しきい値ごとの技術ごとの容量の範囲を表示
+        # 各技術ごとに異なる色を指定
+        colors = {
+            'solar': 'gold',
+            'onshore_wind': 'skyblue',
+            'offshore_wind': 'lightgreen',
+            'river': 'salmon'
+        }
+
+        # 各技術の容量範囲を個別のグラフで表示
         epsilon_values = sorted(list(set(sol['threshold'] * 100 for sol in alternative_solutions)))
-        fig, ax = plt.subplots()
         
         for tech in selected_technologies:
             storage_min = []
@@ -213,18 +220,19 @@ if st.button("Run MGA Optimization"):
                 capacities = [sol['solution'][tech] for sol in alternative_solutions if sol['technology'] == tech and sol['threshold'] * 100 == epsilon]
                 storage_min.append(min(capacities))
                 storage_max.append(max(capacities))
-            
-            # 塗りつぶし範囲とラインプロット
-            ax.fill_between(epsilon_values, storage_min, storage_max, alpha=0.3, label=f"{tech} range")
-            ax.plot(epsilon_values, storage_min, marker='o', linestyle='-', label=f"{tech} Min")
-            ax.plot(epsilon_values, storage_max, marker='o', linestyle='-', label=f"{tech} Max")
-        
-        # ラベルとタイトル
-        ax.set_xlabel(r'$\epsilon$ [%]')
-        ax.set_ylabel('Capacity [GW]')
-        ax.set_title('Capacity Ranges for Each Technology')
-        ax.legend()
-        ax.grid(True, linestyle='--', alpha=0.7)
-        
-        # Streamlitにプロットを表示
-        st.pyplot(fig)
+
+            # 各技術ごとにグラフ作成
+            fig, ax = plt.subplots()
+            ax.fill_between(epsilon_values, storage_min, storage_max, color=colors[tech], alpha=0.3, label=f"{tech} range")
+            ax.plot(epsilon_values, storage_min, marker='o', color=colors[tech], linestyle='-', linewidth=1.5, label=f"{tech} Min")
+            ax.plot(epsilon_values, storage_max, marker='o', color=colors[tech], linestyle='-', linewidth=1.5, label=f"{tech} Max")
+
+            # ラベルとタイトル
+            ax.set_xlabel(r'$\epsilon$ [%]')
+            ax.set_ylabel(f'{tech.capitalize()} Capacity [GW]')
+            ax.set_title(f'Capacity Range for {tech.capitalize()}')
+            ax.legend()
+            ax.grid(True, linestyle='--', alpha=0.7)
+
+            # Streamlitに各技術のプロットを表示
+            st.pyplot(fig)