diff --git a/ChanBI.py b/ChanBI.py index 3d3fde7..99c0fc7 100644 --- a/ChanBI.py +++ b/ChanBI.py @@ -66,7 +66,7 @@ class ChanBI(): self.end_klc = klc self.set_is_sure(True, sure_klc.end_time) self.end_time = klc.end_time - print(self.start_time, klc.fx, "This bi is ended", len(self.klc_list), klc.index - self.start_klc.index) + #print(self.start_time, klc.fx, "This bi is ended", len(self.klc_list), klc.index - self.start_klc.index) def set_is_sure(self, is_sure, time): self.is_sure = is_sure self.sure_time = time diff --git a/ChanBIZS.py b/ChanBIZS.py index c90c1e2..32245e9 100644 --- a/ChanBIZS.py +++ b/ChanBIZS.py @@ -25,6 +25,7 @@ class ChanBIZS(): self.set_end_time(end_bi.end_klc.end_time) self.is_sure = True self.sure_time = sure_bi.sure_time + print(self.start_time, self.is_sure, len(self.bi_list), self.dir) def set_end_time(self, end_time): self.end_time = end_time def set_zg(self, zg): diff --git a/TF_DF.py b/TF_DF.py index fe4b12e..2746706 100644 --- a/TF_DF.py +++ b/TF_DF.py @@ -1170,6 +1170,10 @@ class TF_DF(): if len(zs_list) > 0: bi_zs_list.append(zs_list) return bi_zs_list + def find_third_bsp(self, bi_list, bi_zs_list): + if len(bi_list) > 3 and len(bi_zs_list) > 0: + last_bi_zs = bi_zs_list[-1] + last_bi = bi_list[-1] def get_zs_list(self, bi_list, seg_list): zs_list = [] diff --git a/web/cn_stock_data.py b/web/cn_stock_data.py index b76ad3e..276be9b 100644 --- a/web/cn_stock_data.py +++ b/web/cn_stock_data.py @@ -194,7 +194,7 @@ class ChinaStockData: } return mapping.get(timeframe, 'daily') - def get_kl_data(self, symbol, timeframe='1d', start_date=None, end_date=None, limit=1000): + def get_kl_data(self, symbol, timeframe='1d', start_date=None, end_date=None, limit=10000): """ 获取A股K线数据 - 支持分批次获取突破单次限制 :param symbol: 股票代码,如 '000001'