Update app.py

app.py

@@ -8,7 +8,7 @@ from indicators.sma import calculate_21_50_sma
 from indicators.bollinger_bands import calculate_bollinger_bands
 from signals.strategy import generate_signals
 from utils.plotting import plot_stock_data_with_signals
-from utils.calculator import simulate_trading  # Import the trading simulation function
+from utils.calculator2 import simulate_all_in_trading  # Adjusted import for calculator2.py
 
 # Streamlit app title
 st.title('StockSwingApp: Stock Trading Signal Generator')
@@ -37,12 +37,10 @@ if st.sidebar.button('Generate Signals'):
             fig = plot_stock_data_with_signals(signals_data)
             st.pyplot(fig)
 
-            # Simulate trading based on generated signals and display results
-            final_stock_value, remaining_cash = simulate_trading(signals_data)
-            st.write(f"Final Value of Stock Holdings: ${final_stock_value:.2f}")
-            st.write(f"Remaining Cash: ${remaining_cash:.2f}")
-            total_portfolio_value = final_stock_value + remaining_cash
-            st.write(f"Total Portfolio Value: ${total_portfolio_value:.2f}")
+            # Simulate trading based on generated signals using calculator2 and display results
+            final_cash, trades = simulate_all_in_trading(signals_data)
+            st.write(f"Final Cash: ${final_cash:.2f}")
+            st.write(f"Trades Executed: {trades}")
 
             # Option to display raw data
             if st.checkbox('Show Raw Data'):