diff --git a/hts/BuySellChecker.py b/hts/BuySellChecker.py index be1bd48..024a548 100644 --- a/hts/BuySellChecker.py +++ b/hts/BuySellChecker.py @@ -1131,6 +1131,7 @@ class BuySellChecker: bsLine['buy_weight'][i] = 5.0 """ + if (data['disparity'][i] < 5 and 99.0 < data['disparity_avg60'][i] < 99.1 and -0.009 < data['gradients_avg60'][i] < -0.008 and 0.015 < data['gradients_avg20'][i] < 0.016 and -0.006 < data['gradients_avg5'][i] < -0.005 and -0.009 < data['gradients_low'][i] < -0.008): @@ -1144,7 +1145,7 @@ class BuySellChecker: check = False break if check: - if data['slow_k'][i] < 30: + if data['slow_k'][i] < 10: buy = data['low'][i] data['buy'][i] = buy bsLine['buy'][i] = buy @@ -1197,17 +1198,17 @@ class BuySellChecker: bsLine['buy_weight'][i] = 10.0 - if data['slow_k'][i] > 90: + if data['slow_k'][i] > 75: if (data['slow_d'][i-1] < data['slow_k'][i-1] and data['slow_k'][i] < data['slow_d'][i]): - sell = data['low'][i] + sell = data['close'][i] weight = 100 data['sell'][i] = sell bsLine['sell'][i] = sell bsLine['sell_weight'][i] = weight - if data['slow_k'][i] > 95: + if data['slow_k'][i] > 85: if data['slow_k'][i] < data['slow_d'][i]: - sell = data['low'][i] + sell = data['close'][i] weight = 100 data['sell'][i] = sell bsLine['sell'][i] = sell