Update app.py

app.py

@@ -76,7 +76,29 @@ def plotdata(t, s, i,r,R0, e=None):
     plt.tight_layout()
     
     return fig
- 
+    
+def compare_plt(country,i,pop):
+    fig = plt.figure(figsize=(12,6))
+    ax = [fig.add_subplot(121, axisbelow=True),fig.add_subplot(122)]
+    ax[0].set_title('Monkeypox confirmed cases')
+    ax[0].plot(all_location[country]['total_cases'],lw=3,label='Infective')
+    ax[0].set_xlabel('Days')
+    ax[0].set_ylabel('Number of cases')
+    ax[0].legend()
+    
+    scaler = all_location[country]['total_cases'].apply(lambda x : x/pop)
+    ax[1].set_title('Monkeypox confirmed cases compare with model')
+    ax[1].plot(scaler,lw=3,label='Real Infective')
+    ax[1].plot(i,lw=3,label='SIR model Infective')
+    ax[1].set_ylim(0,0.00005)
+    ax[1].set_xlim(0,200)
+    ax[1].set_xlabel('Days')
+    ax[1].set_ylabel('Fraction Number of cases')
+    ax[1].legend()
+    plt.tight_layout()
+    
+    return fig
+    
 #final model
 def SIR(country,R0,t_infective,pop):
   #R0 = 0.57 - 1.25
@@ -104,30 +126,8 @@ def SIR(country,R0,t_infective,pop):
   rmpe = mean_absolute_percentage_error(scaler,i[0:rangee])
 
 
-  return R0,t_infective,beta,gamma,rmpe,plotdata(t, s, i,r,R0)
+  return R0,t_infective,beta,gamma,rmpe,plotdata(t, s, i,r,R0),compare_plt(country,i,pop)
   
-def compare_plt(country,pop):
-    fig = plt.figure(figsize=(12,6))
-    ax = [fig.add_subplot(121, axisbelow=True),fig.add_subplot(122)]
-    ax[0].set_title('Monkeypox confirmed cases')
-    ax[0].plot(all_location[country]['total_cases'],lw=3,label='Infective')
-    ax[0].set_xlabel('Days')
-    ax[0].set_ylabel('Number of cases')
-    ax[0].legend()
-    
-    scaler = all_location[country]['total_cases'].apply(lambda x : x/pop)
-    ax[1].set_title('Monkeypox confirmed cases compare with model')
-    ax[1].plot(scaler,lw=3,label='Real Infective')
-    ax[1].plot(i,lw=3,label='SIR model Infective')
-    ax[1].set_ylim(0,0.00005)
-    ax[1].set_xlim(0,200)
-    ax[1].set_xlabel('Days')
-    ax[1].set_ylabel('Fraction Number of cases')
-    ax[1].legend()
-    plt.tight_layout()
-    
-    return fig
-
 def main():
     st.title("SIR Model for Monkeypox")
 
@@ -137,26 +137,7 @@ def main():
         R0 = st.slider("Basic Reproduction Number (R0)", 0.57, 3.00, 0.57)# user's input
         country_code = code[country][0]
         pop = pop_dict[country_code]
-        
-        fig = plt.figure(figsize=(12,6))
-        ax = [fig.add_subplot(121, axisbelow=True),fig.add_subplot(122)]
-        ax[0].set_title('Monkeypox confirmed cases')
-        ax[0].plot(all_location[country_code]['total_cases'],lw=3,label='Infective')
-        ax[0].set_xlabel('Days')
-        ax[0].set_ylabel('Number of cases')
-        ax[0].legend()
-        
-        scaler = all_location[country_code]['total_cases'].apply(lambda x : x/pop)
-        ax[1].set_title('Monkeypox confirmed cases compare with model')
-        ax[1].plot(scaler,lw=3,label='Real Infective')
-        ax[1].plot(i,lw=3,label='SIR model Infective')
-        ax[1].set_ylim(0,0.00005)
-        ax[1].set_xlim(0,200)
-        ax[1].set_xlabel('Days')
-        ax[1].set_ylabel('Fraction Number of cases')
-        ax[1].legend()
-        plt.tight_layout()
- 
+       
         # clicked==True only when the button is clicked
         clicked = st.form_submit_button("Show Graph")
         if clicked:
@@ -164,8 +145,8 @@ def main():
             # Show SIR
             SIR_param = SIR(country_code,R0,recovery,pop)
             
+            st.pyplot(SIR_param[-2])
             st.pyplot(SIR_param[-1])
-            st.pyplot(fig)
             st.success("SIR model parameters for "+str(country)+" is")
             st.success("R0 = "+str(SIR_param[0]))
             st.success("Beta = "+str(SIR_param[2]))