Update app.py
Browse files
app.py
CHANGED
@@ -20,10 +20,6 @@ def calculate_indicators(data):
|
|
20 |
data['Doji'] = abs(data['Close'] - data['open']) <= 0.01 * (data['high'] - data['low'])
|
21 |
data['Inside'] = (data['high'] < data['high'].shift(1)) & (data['low'] > data['low'].shift(1))
|
22 |
|
23 |
-
# Calculate Moving Averages
|
24 |
-
data['MA5'] = data['Close'].rolling(window=5).mean()
|
25 |
-
data['MA20'] = data['Close'].rolling(window=20).mean()
|
26 |
-
|
27 |
# Calculate MACD
|
28 |
data['26EMA'] = data['Close'].ewm(span=26).mean()
|
29 |
data['12EMA'] = data['Close'].ewm(span=12).mean()
|
@@ -56,7 +52,7 @@ def main():
|
|
56 |
my_market_predictor = Pandas_Market_Predictor(df)
|
57 |
|
58 |
# Predict Trend
|
59 |
-
indicators = ["Doji", "Inside", "
|
60 |
trend = my_market_predictor.Trend_Detection(indicators, 10)
|
61 |
|
62 |
# Display results
|
|
|
20 |
data['Doji'] = abs(data['Close'] - data['open']) <= 0.01 * (data['high'] - data['low'])
|
21 |
data['Inside'] = (data['high'] < data['high'].shift(1)) & (data['low'] > data['low'].shift(1))
|
22 |
|
|
|
|
|
|
|
|
|
23 |
# Calculate MACD
|
24 |
data['26EMA'] = data['Close'].ewm(span=26).mean()
|
25 |
data['12EMA'] = data['Close'].ewm(span=12).mean()
|
|
|
52 |
my_market_predictor = Pandas_Market_Predictor(df)
|
53 |
|
54 |
# Predict Trend
|
55 |
+
indicators = ["Doji", "Inside", "MACD"]
|
56 |
trend = my_market_predictor.Trend_Detection(indicators, 10)
|
57 |
|
58 |
# Display results
|