Update app.py

app.py

@@ -87,23 +87,26 @@ def get_amortization(value):
     return array_amortization
 
 
-def get_array_PV():
+def get_array_CF_PV():
     I_0 = Buying_an_autopilot * Number_machines + Purchase_of_peripheral_equipment + Introduction_of_autopilot
     
     array_discounting = get_array_discounting()
     array_amortization = get_amortization(I_0)
     
     array_PV = [-I_0]
+    array_CF = [-I_0]
     
     for idx in range(1, Number_of_months + 1, 1):
         
         profit = get_profit(array_amortization[idx], idx)
         
+        array_CF.append(profit)
+        
         cur_PV = get_PV(profit, array_discounting[idx])
         
         array_PV.append(cur_PV)
         
-    return array_PV
+    return array_CF, array_PV
 
 
 def get_array_NPV():
@@ -115,13 +118,16 @@ def get_array_NPV():
 
 if st.button('Сюда кликнуть чтобы посчитать'):
     Number_pallets, Number_machines, Number_employees = get_number_pallets_and_machines_employees()
-    array_PV = get_array_PV()
+    array_CF, array_PV = get_array_PV()
     array_NPV =  get_array_NPV()
-    st.write('Тут всё показываем')
-     
-        
+    
+    IRR = np.irr(array_CF)
+    
+    st.write(f'NPV за {Number_of_months} месяцев:', array_NPV[-1])
+    st.write(f'IRR на {Number_of_months} месяцев:', IRR)
+    
     chart_data = pd.DataFrame(columns=['PV', 'NPV'])
     chart_data['PV'] = array_PV
     chart_data['NPV'] = array_NPV
 
-    st.line_chart(chart_data)
+    st.area_chart(chart_data)