Update app.py
Browse files
app.py
CHANGED
@@ -347,7 +347,7 @@ def generate_trading_signals(df):
|
|
347 |
df['BB_Signal'] = np.where(df['Close'] > df['UpperBB'], -1, df['BB_Signal'])
|
348 |
|
349 |
df['Stochastic_Signal'] = np.where((df['SlowK'] < 15) & (df['SlowD'] < 15), 1, 0)
|
350 |
-
df['Stochastic_Signal'] = np.where((df['SlowK'] >
|
351 |
|
352 |
df['CMF_Signal'] = np.where(df['CMF'] > 0.4, -1, np.where(df['CMF'] < -0.4, 1, 0))
|
353 |
|
@@ -378,7 +378,7 @@ def plot_combined_signals(df, ticker):
|
|
378 |
fig.add_trace(go.Scatter(
|
379 |
x=buy_signals.index, y=buy_signals['Close'],
|
380 |
mode='markers',
|
381 |
-
marker=dict(symbol='triangle-up', size=12, color='
|
382 |
name='Buy Signal'
|
383 |
))
|
384 |
|
@@ -451,11 +451,11 @@ def plot_individual_signals(df, ticker):
|
|
451 |
|
452 |
|
453 |
signal_colors = {
|
454 |
-
'RSI_Signal': {'buy': '
|
455 |
-
'BB_Signal': {'buy': '
|
456 |
-
'Stochastic_Signal': {'buy': '
|
457 |
-
'CMF_Signal': {'buy': '
|
458 |
-
'CCI_Signal': {'buy': '
|
459 |
}
|
460 |
|
461 |
|
|
|
347 |
df['BB_Signal'] = np.where(df['Close'] > df['UpperBB'], -1, df['BB_Signal'])
|
348 |
|
349 |
df['Stochastic_Signal'] = np.where((df['SlowK'] < 15) & (df['SlowD'] < 15), 1, 0)
|
350 |
+
df['Stochastic_Signal'] = np.where((df['SlowK'] > 95) & (df['SlowD'] > 95), -1, df['Stochastic_Signal'])
|
351 |
|
352 |
df['CMF_Signal'] = np.where(df['CMF'] > 0.4, -1, np.where(df['CMF'] < -0.4, 1, 0))
|
353 |
|
|
|
378 |
fig.add_trace(go.Scatter(
|
379 |
x=buy_signals.index, y=buy_signals['Close'],
|
380 |
mode='markers',
|
381 |
+
marker=dict(symbol='triangle-up', size=12, color='lightgreen'),
|
382 |
name='Buy Signal'
|
383 |
))
|
384 |
|
|
|
451 |
|
452 |
|
453 |
signal_colors = {
|
454 |
+
'RSI_Signal': {'buy': 'blueviolet', 'sell': 'violet'}, # Light purple / Pale butter
|
455 |
+
'BB_Signal': {'buy': 'blueviolet', 'sell': 'violet'}, # Purple / Chiffon yellow
|
456 |
+
'Stochastic_Signal': {'buy': 'blueviolet', 'sell': 'violet'}, # Purple / Corn silk
|
457 |
+
'CMF_Signal': {'buy': 'blueviolet', 'sell': 'violet'}, # Deep purple / Lemon chiffon
|
458 |
+
'CCI_Signal': {'buy': 'blueviolet', 'sell': 'violet'} # Dark purple / Soft maize
|
459 |
}
|
460 |
|
461 |
|