mgbam commited on
Commit
cefc4af
·
verified ·
1 Parent(s): 032a6d6

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +11 -7
app.py CHANGED
@@ -43,14 +43,18 @@ data_load_state.text("Loading SPY data...done!")
43
 
44
  # Calculate technical indicators: MACD and RSI
45
  macd_indicator = MACD(close=data['Close'])
 
 
46
 
47
- # Convert outputs to 1-dimensional lists
48
- macd_values = np.array(macd_indicator.macd()).flatten().tolist()
49
- macd_signal_values = np.array(macd_indicator.macd_signal()).flatten().tolist()
 
 
50
 
51
- # Create the Series using the lists
52
- data['MACD'] = pd.Series(macd_values, index=data.index)
53
- data['MACD_signal'] = pd.Series(macd_signal_values, index=data.index)
54
 
55
  rsi_indicator = RSIIndicator(close=data['Close'], window=14)
56
  data['RSI'] = rsi_indicator.rsi()
@@ -200,4 +204,4 @@ st.write(f"**Return:** {return_pct:.2f}%")
200
 
201
  st.markdown("""
202
  *This extended demo is for educational purposes only and does not constitute financial advice. Always test your strategies extensively before trading with real money.*
203
- """)
 
43
 
44
  # Calculate technical indicators: MACD and RSI
45
  macd_indicator = MACD(close=data['Close'])
46
+ macd_val = macd_indicator.macd()
47
+ macd_signal_val = macd_indicator.macd_signal()
48
 
49
+ # If the returned MACD is a DataFrame, extract the first column.
50
+ if isinstance(macd_val, pd.DataFrame):
51
+ macd_val = macd_val.iloc[:, 0]
52
+ if isinstance(macd_signal_val, pd.DataFrame):
53
+ macd_signal_val = macd_signal_val.iloc[:, 0]
54
 
55
+ # Assign the MACD values to the DataFrame.
56
+ data['MACD'] = macd_val
57
+ data['MACD_signal'] = macd_signal_val
58
 
59
  rsi_indicator = RSIIndicator(close=data['Close'], window=14)
60
  data['RSI'] = rsi_indicator.rsi()
 
204
 
205
  st.markdown("""
206
  *This extended demo is for educational purposes only and does not constitute financial advice. Always test your strategies extensively before trading with real money.*
207
+ """)