添加新的判断依据

TF_DF.py

@@ -492,42 +492,8 @@ class TF_DF():
 		bi_list = self.cal_bi_list(self.get_klc_list(dataframe))
 		return bi_list
 	def get_kl_data(self, dataframe:DataFrame):
-		fields = "time,open,high,low,close,volume"
-		klu_list = []
-		last_klu = None
-		for i in range(0, len(dataframe)):
-			item = dataframe.iloc[i]
-			date = item['date']
-			o = item['open']
-			h = item['high']
-			l = item['low']
-			c = item['close']
-			v = item['volume']
-			#time_obj = date.fromtimestamp(date)
-			#date = date + timedelta(hours=8)
-			time_str = date.strftime('%Y-%m-%d %H:%M:%S')
-			item_data = [
-				time_str,
-				o,
-				h,
-				l,
-				c,
-				v
-			]
-			#klu =  KLU(self.create_item_dict(item_data, GetColumnNameFromFieldList(fields)))
-			klu = ChanKLU(time_str, o, h, l, c, v)
-			#print(klu.time, klu.open, klu.high, klu.low, klu.close, klu.volume)	
-			klu.set_idx(i)
-			klu_list.append(klu)
-			if last_klu:
-				last_klu.set_next(klu)
-				klu.set_pre(last_klu)
-			last_klu = klu
-			if 'macd' in item:
-				klu.set_indicators(item)
-		return klu_list
-	def get_klc_list(self, dataframe):
-		klu_list = self.get_klu_list(dataframe)
+		return self.cal_kl_data(dataframe)
+	def get_klc_list(self, klu_list):
 		klc_list = []
 		last_klu = None
 		macd = ChanMACD(klu_list)
@@ -1664,6 +1630,6 @@ class TF_DF():
 			if is_near_support or volume_confirmation:
 				third_klu.set_pattern(Chan_KLU_PATTERN.TWEEZER_BOTTOM)
 				return
-
+	
 	def get_decimal(self, value):
 		return Decimal("{:.2f}".format(value))