JayLacoma commited on
Commit
e2af2ba
·
verified ·
1 Parent(s): c2a917f

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +6 -6
app.py CHANGED
@@ -85,7 +85,7 @@ def generate_trading_signals(df):
85
 
86
 
87
  # Modified RSI Signals (tighter thresholds)
88
- df['RSI_Signal'] = np.where(df['RSI'] < 15, 1, 0) # Changed from 20 to 15
89
  df['RSI_Signal'] = np.where(df['RSI'] > 95, -1, df['RSI_Signal']) # Changed from 90 to 95
90
 
91
 
@@ -109,15 +109,15 @@ def generate_trading_signals(df):
109
 
110
 
111
  # Modified Stochastic (tighter thresholds)
112
- df['Stochastic_Signal'] = np.where((df['SlowK'] < 5) & (df['SlowD'] < 7), 1, 0)
113
- df['Stochastic_Signal'] = np.where((df['SlowK'] > 95) & (df['SlowD'] > 90), -1, df['Stochastic_Signal'])
114
 
115
  # Modified CMF Signals
116
- df['CMF_Signal'] = np.where(df['CMF'] > 0.4, -1, np.where(df['CMF'] < -0.3, 1, 0)) # Changed from 0.3 to 0.4
117
 
118
  # Modified CCI Signals
119
- df['CCI_Signal'] = np.where(df['CCI'] < -190, 1, 0) # Changed from -180
120
- df['CCI_Signal'] = np.where(df['CCI'] > 190, -1, df['CCI_Signal']) # Changed from 150
121
 
122
  # Include SMA and MACD in combined signals
123
  df['Combined_Signal'] = df[['RSI_Signal', 'BB_Signal',
 
85
 
86
 
87
  # Modified RSI Signals (tighter thresholds)
88
+ df['RSI_Signal'] = np.where(df['RSI'] < 12, 1, 0) # Changed from 20 to 15
89
  df['RSI_Signal'] = np.where(df['RSI'] > 95, -1, df['RSI_Signal']) # Changed from 90 to 95
90
 
91
 
 
109
 
110
 
111
  # Modified Stochastic (tighter thresholds)
112
+ df['Stochastic_Signal'] = np.where((df['SlowK'] < 5) & (df['SlowD'] < 5), 1, 0)
113
+ df['Stochastic_Signal'] = np.where((df['SlowK'] > 95) & (df['SlowD'] > 95), -1, df['Stochastic_Signal'])
114
 
115
  # Modified CMF Signals
116
+ df['CMF_Signal'] = np.where(df['CMF'] > 0.4, -1, np.where(df['CMF'] < -0.4, 1, 0)) # Changed from 0.3 to 0.4
117
 
118
  # Modified CCI Signals
119
+ df['CCI_Signal'] = np.where(df['CCI'] < -195, 1, 0) # Changed from -180
120
+ df['CCI_Signal'] = np.where(df['CCI'] > 195, -1, df['CCI_Signal']) # Changed from 150
121
 
122
  # Include SMA and MACD in combined signals
123
  df['Combined_Signal'] = df[['RSI_Signal', 'BB_Signal',