添加新的策略

ChanKLC.py

@@ -64,6 +64,8 @@ class ChanKLC():
 		self.bb2633upper = klu.bb2633upper
 		self.bb2633lower = klu.bb2633lower
 		self.bb2633middle = klu.bb2633middle
+		self.ema5 = klu.ema5
+		self.ma5 = klu.ma5
 	# ==================== EMA 通用计算方法 ====================
 
 	@staticmethod
@@ -337,6 +339,14 @@ class ChanKLC():
 		self.klc_dir = Chan_KLINE_DIR.UP if self.close > self.open else Chan_KLINE_DIR.DOWN
 		self.cal_indicators()
 		self.cal_all_ema_status()
+		if self.open > self.high:
+			self.open = self.high
+		if self.close > self.high:
+			self.close = self.high
+		if self.close < self.low:
+			self.close = self.low
+		if self.close > self.high:
+			self.close = self.high
 	def cal_fx(self):
 		if  self.klc_fx_type == Chan_KLC_FX.TOP1 or self.klc_fx_type == Chan_KLC_FX.TOP2:
 			#print(self.end_time, self.fx, self.macd, self.macdhist, len(self.klu_list))
@@ -385,6 +395,8 @@ class ChanKLC():
 			self.bb2633upper += self.klu_list[index].bb2633upper
 			self.bb2633lower += self.klu_list[index].bb2633lower
 			self.bb2633middle += self.klu_list[index].bb2633middle
+			self.ma5 += self.klu_list[index].ma5
+			self.ema5 += self.klu_list[index].ema5
 			if self.ema_dir != self.klu_list[index].ema_dir:
 				self.ema_dir = 0
 		n = len(self.klu_list)
@@ -397,6 +409,8 @@ class ChanKLC():
 		self.ema104 = self.ema104 / n
 		self.ema156 = self.ema156 / n
 		self.ema208 = self.ema208 / n
+		self.ma5 = self.ma5 / n
+		self.ema5 = self.ema5 / n
 		self.bb2633upper = self.bb2633upper / n
 		self.bb2633lower = self.bb2633lower / n
 		self.bb2633middle = self.bb2633middle / n