增加了新的笔中枢，但是还是线段的好些

web/app.py

@@ -33,7 +33,7 @@ class TRADE_POINT_TYPE:
 	SELL3 = -3  # 三类卖点
 
 app = Flask(__name__)
-
+macd_factor = 2
 # 初始化交易所
 exchange = ccxt.binance({
 	'enableRateLimit': True,
@@ -421,8 +421,8 @@ def get_a_stock_kl_data(symbol, timeframe, limit=100000, start_time=None, end_ti
 		return None
 
 def add_indicators(df):
-	fast = 12*1
-	slow = 26*1
+	fast = 12*macd_factor
+	slow = 26*macd_factor
 	period = 9*1
 	macd = ta.MACD(df, fastperiod=fast, slowperiod=slow, signalperiod=period)
 
@@ -509,8 +509,8 @@ def add_indicators(df):
 
 def calculate_macd(df):
 	"""计算MACD指标"""
-	exp1 = df['close'].ewm(span=26, adjust=False).mean()
-	exp2 = df['close'].ewm(span=52, adjust=False).mean()
+	exp1 = df['close'].ewm(span=12*macd_factor, adjust=False).mean()
+	exp2 = df['close'].ewm(span=26*macd_factor, adjust=False).mean()
 	macd = exp1 - exp2
 	signal = macd.ewm(span=9, adjust=False).mean()
 	histogram = macd - signal
@@ -534,13 +534,11 @@ def analyze_chan(df, symbol=None, timeframe=None):
 	#for index in range(0, 10):
 		#print(bi_list[index].start_time, bi_list[index].start_klc.end_time, bi_list[index].dir)
 	seg_list = chan.get_seg_list(bi_list)
-	zs_list = chan.calculate_zs(bi_list, seg_list)
+	zs_list = chan.calculate_zs(seg_list)
 	# 计算笔中枢（BI中枢）并拍平成列表
-	try:
-		bi_zs_nested = chan.cal_bi_zs(seg_list)
-		bi_zs_list = [zs for group in bi_zs_nested for zs in (group or [])] if bi_zs_nested else []
-	except Exception:
-		bi_zs_list = []
+
+	#bi_zs_list = chan.cal_bi_zs_list(bi_list)
+	bi_zs_list = chan.cal_bi_zs(seg_list)
 	bsp_list = []
 	if len(bi_zs_list) > 0:
 		bsp_list = chan.find_all_bsp(bi_list, bi_zs_list)