Update app.py
Browse files
app.py
CHANGED
@@ -71,7 +71,6 @@ def generate_trading_signals(df):
|
|
71 |
df['RSI'] = calculate_rsi(df)
|
72 |
df['MiddleBB'], df['UpperBB'], df['LowerBB'] = calculate_bollinger_bands(df)
|
73 |
df['SlowK'], df['SlowD'] = calculate_stochastic_oscillator(df)
|
74 |
-
df['ATR'] = calculate_atr(df)
|
75 |
df['CMF'] = calculate_cmf(df)
|
76 |
df['CCI'] = calculate_cci(df)
|
77 |
|
@@ -95,7 +94,6 @@ def generate_trading_signals(df):
|
|
95 |
df['Stochastic_Signal'] = np.where((df['SlowK'] < 10) & (df['SlowD'] < 15), 1, 0)
|
96 |
df['Stochastic_Signal'] = np.where((df['SlowK'] > 90) & (df['SlowD'] > 85), -1, df['Stochastic_Signal'])
|
97 |
|
98 |
-
df['ATR_Signal'] = calculate_atr_signal(df)
|
99 |
|
100 |
df['CMF_Signal'] = np.where(df['CMF'] > 0.3, -1, np.where(df['CMF'] < -0.3, 1, 0))
|
101 |
|
@@ -234,7 +232,7 @@ def plot_individual_signals(df, ticker):
|
|
234 |
def display_signals(df):
|
235 |
# Create a signals DataFrame
|
236 |
signals_df = df[['Close', 'SMA_Signal', 'MACD_Signal', 'RSI_Signal',
|
237 |
-
'BB_Signal', 'Stochastic_Signal',
|
238 |
'CMF_Signal', 'CCI_Signal']].copy()
|
239 |
|
240 |
# The Date is the index, so we don't need to add it as a column
|
|
|
71 |
df['RSI'] = calculate_rsi(df)
|
72 |
df['MiddleBB'], df['UpperBB'], df['LowerBB'] = calculate_bollinger_bands(df)
|
73 |
df['SlowK'], df['SlowD'] = calculate_stochastic_oscillator(df)
|
|
|
74 |
df['CMF'] = calculate_cmf(df)
|
75 |
df['CCI'] = calculate_cci(df)
|
76 |
|
|
|
94 |
df['Stochastic_Signal'] = np.where((df['SlowK'] < 10) & (df['SlowD'] < 15), 1, 0)
|
95 |
df['Stochastic_Signal'] = np.where((df['SlowK'] > 90) & (df['SlowD'] > 85), -1, df['Stochastic_Signal'])
|
96 |
|
|
|
97 |
|
98 |
df['CMF_Signal'] = np.where(df['CMF'] > 0.3, -1, np.where(df['CMF'] < -0.3, 1, 0))
|
99 |
|
|
|
232 |
def display_signals(df):
|
233 |
# Create a signals DataFrame
|
234 |
signals_df = df[['Close', 'SMA_Signal', 'MACD_Signal', 'RSI_Signal',
|
235 |
+
'BB_Signal', 'Stochastic_Signal',
|
236 |
'CMF_Signal', 'CCI_Signal']].copy()
|
237 |
|
238 |
# The Date is the index, so we don't need to add it as a column
|