Geek7 commited on
Commit
5474561
·
verified ·
1 Parent(s): 41efbfc

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +4 -5
app.py CHANGED
@@ -20,10 +20,9 @@ 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 MACD
24
- data['26EMA'] = data['Close'].ewm(span=26).mean()
25
- data['12EMA'] = data['Close'].ewm(span=12).mean()
26
- data['MACD'] = data['12EMA'] - data['26EMA']
27
 
28
  return data
29
 
@@ -52,7 +51,7 @@ def main():
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
 
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
  return data
28
 
 
51
  my_market_predictor = Pandas_Market_Predictor(df)
52
 
53
  # Predict Trend
54
+ indicators = ["Doji", "Inside", "MA5", "MA20"]
55
  trend = my_market_predictor.Trend_Detection(indicators, 10)
56
 
57
  # Display results