添加裸K形态，前端添加KLC显示

2025-10-29 01:16:50 +08:00
parent abe663e1a6
commit fe4193b153
8 changed files with 589 additions and 114 deletions
@@ -1,6 +1,6 @@
 from datetime import timedelta
 from pandas import DataFrame
-from ChanEnum import Chan_FX_TYPE, Chan_KLINE_DIR, Chan_BI_DIR, Chan_SEG_DIR, Chan_ZS_DIR, Chan_BSP_DIR, Chan_BSP_TYPE, Chan_KLC_FX, Chan_MACD_STATE, Chan_PRICE_TREND
+from ChanEnum import Chan_FX_TYPE, Chan_KLINE_DIR, Chan_BI_DIR, Chan_SEG_DIR, Chan_ZS_DIR, Chan_BSP_DIR, Chan_BSP_TYPE, Chan_KLC_FX, Chan_MACD_STATE, Chan_PRICE_TREND, Chan_KLU_PATTERN
 from ChanKLU import ChanKLU
 from ChanKLC import ChanKLC
 from ChanBI import ChanBI
@@ -576,7 +576,7 @@ class ChanLun():
 						if near_resistance_touch:
 							# 若动量不强，则更偏空
 							score -= 1 if (hist is None or pre_hist is None or hist <= pre_hist) else 0
-				# 3.4) 多次对 EMA52 的“拒绝”配合 MACD 逆向：易形成压/支并反向
+				# 3.4) 多次对 EMA52 的"拒绝"配合 MACD 逆向：易形成压/支并反向
 				# 统计近窗口内的上/下拒绝次数：
 				# - 上拒绝：价格位于 EMA52 下方，最高触及/越过 EMA52 但收盘仍在下方
 				# - 下拒绝：价格位于 EMA52 上方，最低触及/跌破 EMA52 但收盘仍在上方
@@ -701,7 +701,7 @@ class ChanLun():
 						for i in range(1, len(hist_seq)):
 							if abs(hist_seq[i]) < abs(hist_seq[i-1]):
 								weaken_steps += 1
-						# 近窗口对 EMA52 的“未能站上/跌破”统计（放宽窗口与条件）
+						# 近窗口对 EMA52 的"未能站上/跌破"统计（放宽窗口与条件）
 						window_ema = prev_klcs[-4:] if len(prev_klcs) > 0 else []
 						no_up_break = False
 						no_down_break = False
@@ -1343,8 +1343,70 @@ class ChanLun():
 		return klc_list
 	
 	def get_klu_list(self, dataframe):
-		return self.get_kl_data(dataframe)
-
-	def get_decimal(self, value):
-		return Decimal("{:.2f}".format(value))
+		klu_list = self.get_kl_data(dataframe)
+		return self.cal_klu_pattern(klu_list)
+	def cal_klu_pattern(self, klu_list):
+		"""
+		计算裸K的pattern - 只识别反转形态
+		"""
+		if not klu_list or len(klu_list) < 3:
+			return klu_list
+			
+		for i, klu in enumerate(klu_list):
+			# 单根K线反转模式识别
+			self._detect_single_reversal_pattern(klu)
+			
+			
+			# 验证形态是否成立
+			if klu.pattern != Chan_KLU_PATTERN.UNKNOWN:
+				print(klu.time, klu.pattern)
+		return klu_list
+	
+	def _detect_single_reversal_pattern(self, klu):
+		"""检测单根K线反转模式"""
+		body = abs(klu.close - klu.open)
+		upper_shadow = klu.high - max(klu.close, klu.open)
+		lower_shadow = min(klu.close, klu.open) - klu.low
+		total_range = klu.high - klu.low
+		
+		# 避免除零
+		if total_range == 0:
+			return
+		
+		body_ratio = body / total_range
+		upper_ratio = upper_shadow / total_range
+		lower_ratio = lower_shadow / total_range
+		
+		# 锤子线/上吊线 - 反转信号
+		if lower_ratio / body_ratio >= 2:
+			# 锤子线：底部反转，需要前一根是下跌趋势
+			if klu.close > klu.open and klu.pre and klu.pre.close < klu.pre.open:
+				klu.set_pattern(Chan_KLU_PATTERN.HAMMER)  # 底部反转
+			# 上吊线：顶部反转，需要前一根是上涨趋势
+			elif klu.close < klu.open and klu.pre and klu.pre.close > klu.pre.open:
+				klu.set_pattern(Chan_KLU_PATTERN.HANGING_MAN)  # 顶部反转
+		
+		# 倒锤子线/射击之星 - 反转信号
+		elif upper_ratio / body_ratio >= 2:
+			# 倒锤子线：底部反转，需要前一根是下跌趋势
+			if klu.close > klu.open and klu.pre and klu.pre.close < klu.pre.open:
+				klu.set_pattern(Chan_KLU_PATTERN.INVERTED_HAMMER)  # 底部反转
+			# 射击之星：顶部反转，需要前一根是上涨趋势
+			elif klu.close < klu.open and klu.pre and klu.pre.close > klu.pre.open:
+				klu.set_pattern(Chan_KLU_PATTERN.SHOOTING_STAR)  # 顶部反转
+		
+		# 十字星 - 反转信号
+		elif body_ratio <= 0.1:
+			if upper_ratio > 0.4 and lower_ratio > 0.4:
+				klu.set_pattern(Chan_KLU_PATTERN.LONG_LEGGED_DOJI)  # 强烈反转信号
+			elif upper_ratio > 0.4 and lower_ratio <= 0.1:
+				# 墓碑十字星：顶部反转，需要前一根是上涨趋势
+				if klu.pre and klu.pre.close > klu.pre.open:
+					klu.set_pattern(Chan_KLU_PATTERN.GRAVESTONE_DOJI)  # 顶部反转
+			elif lower_ratio > 0.4 and upper_ratio <= 0.1:
+				# 蜻蜓十字星：底部反转，需要前一根是下跌趋势
+				if klu.pre and klu.pre.close < klu.pre.open:
+					klu.set_pattern(Chan_KLU_PATTERN.DRAGONFLY_DOJI)  # 底部反转
+			else:
+				klu.set_pattern(Chan_KLU_PATTERN.DOJI)  # 一般反转信号