diff --git a/HTS_etf_short.py b/HTS_etf_short.py index 06fb685..10e6d32 100644 --- a/HTS_etf_short.py +++ b/HTS_etf_short.py @@ -169,35 +169,35 @@ class HTS_etf (HTS): if short: if slow_k < 10: type_stock['day'] = 10 - if 10 < slow_k < 20: type_stock['day'] = 7.5 - if 20 < slow_k < 30: type_stock['day'] = 5 - if 30 < slow_k < 40: type_stock['day'] = 2.5 + if 10 < slow_k < 15: type_stock['day'] = 7.5 + if 15 < slow_k < 20: type_stock['day'] = 5 + if 20 < slow_k < 25: type_stock['day'] = 2.5 if slow_k_week < 10: type_stock['week'] = 100 - if 10 < slow_k_week < 20: type_stock['week'] = 75 - if 20 < slow_k_week < 30: type_stock['week'] = 50 - if 30 < slow_k_week < 40: type_stock['week'] = 25 + if 10 < slow_k_week < 15: type_stock['week'] = 75 + if 15 < slow_k_week < 20: type_stock['week'] = 50 + if 20 < slow_k_week < 25: type_stock['week'] = 25 if slow_k_month < 10: type_stock['month'] = 1000 - if 10 < slow_k_month < 20: type_stock['month'] = 750 - if 20 < slow_k_month < 30: type_stock['month'] = 500 - if 30 < slow_k_month < 40: type_stock['month'] = 250 + if 10 < slow_k_month < 15: type_stock['month'] = 750 + if 15 < slow_k_month < 20: type_stock['month'] = 500 + if 20 < slow_k_month < 25: type_stock['month'] = 250 else: if slow_k > 90: type_stock['day'] = 10 - if 80 < slow_k < 90: type_stock['day'] = 7.5 - if 70 < slow_k < 80: type_stock['day'] = 5 - if 60 < slow_k < 70: type_stock['day'] = 2.5 + if 85 < slow_k < 90: type_stock['day'] = 7.5 + if 80 < slow_k < 85: type_stock['day'] = 5 + if 75 < slow_k < 80: type_stock['day'] = 2.5 if slow_k_week > 90: type_stock['week'] = 100 - if 80 < slow_k_week < 90: type_stock['week'] = 75 - if 70 < slow_k_week < 80: type_stock['week'] = 50 - if 60 < slow_k_week < 70: type_stock['week'] = 25 + if 85 < slow_k_week < 90: type_stock['week'] = 75 + if 80 < slow_k_week < 85: type_stock['week'] = 50 + if 75 < slow_k_week < 80: type_stock['week'] = 25 if slow_k_month > 90: type_stock['month'] = 1000 - if 80 < slow_k_month < 90: type_stock['month'] = 750 - if 70 < slow_k_month < 80: type_stock['month'] = 500 - if 60 < slow_k_month < 70: type_stock['month'] = 250 + if 85 < slow_k_month < 90: type_stock['month'] = 750 + if 80 < slow_k_month < 85: type_stock['month'] = 500 + if 75 < slow_k_month < 80: type_stock['month'] = 250 return type_stock