openfund-core 1.0.10__py3-none-any.whl → 1.0.11__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. core/smc/SMCStruct.py +6 -4
  2. {openfund_core-1.0.10.dist-info → openfund_core-1.0.11.dist-info}/METADATA +1 -1
  3. {openfund_core-1.0.10.dist-info → openfund_core-1.0.11.dist-info}/RECORD +5 -5
  4. {openfund_core-1.0.10.dist-info → openfund_core-1.0.11.dist-info}/WHEEL +0 -0
  5. {openfund_core-1.0.10.dist-info → openfund_core-1.0.11.dist-info}/entry_points.txt +0 -0
core/smc/SMCStruct.py CHANGED
@@ -136,8 +136,8 @@ class SMCStruct(SMCBase):
136
136
  获取结构最高点或最低点
137
137
  :param df: DataFrame数据
138
138
  :param bar_index: 当前K线索引
139
- :param lookback: 回溯周期
140
- :param mode: self.HIGH_COL寻找最高点,self.LOW_COL寻找最低点
139
+ :param struct_index: 结构开始索引
140
+ :param mode: high 寻找最高点,low 寻找最低点
141
141
  :return: 结构极值点的索引
142
142
  """
143
143
  df = df.copy()
@@ -148,11 +148,13 @@ class SMCStruct(SMCBase):
148
148
 
149
149
  # 获取窗口内的极值点索引
150
150
  if mode == self.HIGH_COL:
151
- extremeBar = window[self.HIGH_COL].argmax()
151
+ # extremeBar = window[self.HIGH_COL].argmax()
152
+ extremeBar = window[self.HIGH_COL].idxmax()
152
153
  price_col = self.HIGH_COL
153
154
  comp_func = lambda x, y: x > y
154
155
  else:
155
- extremeBar = window[self.LOW_COL].argmin()
156
+ # extremeBar = window[self.LOW_COL].argmin()
157
+ extremeBar = window[self.LOW_COL].idxmin()
156
158
  price_col = self.LOW_COL
157
159
  comp_func = lambda x, y: x < y
158
160
 
{openfund_core-1.0.10.dist-info → openfund_core-1.0.11.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: openfund-core
3
- Version: 1.0.10
3
+ Version: 1.0.11
4
4
  Summary: Openfund-core.
5
5
  Requires-Python: >=3.9,<4.0
6
6
  Classifier: Programming Language :: Python :: 3
{openfund_core-1.0.10.dist-info → openfund_core-1.0.11.dist-info}/RECORD RENAMED
@@ -6,10 +6,10 @@ core/smc/SMCFVG.py,sha256=KDyqR8dQiKYpJ25HpXeVPdxVgAxbtwc9LJ-OVrGIlZk,3009
6
6
  core/smc/SMCLiquidity.py,sha256=-OvMZQCcy7qRSomU58sUmhRJt-gUGt1oPJAiW01_i7I,8009
7
7
  core/smc/SMCOrderBlock.py,sha256=lh868FUjb6RHQ0DwUeBfYymf9j-Lcv6YWJvYlJF3iUo,9918
8
8
  core/smc/SMCPDArray.py,sha256=IjBdpQuAQd3t_nTovEzeiml-EQ-KeLNCmitFxadYxMM,5030
9
- core/smc/SMCStruct.py,sha256=dW3iLKNV78pDbcpyL7SjLVUyAsc1DrO8gSCJkGbrKO4,12339
9
+ core/smc/SMCStruct.py,sha256=j8lODxhEPN3xMYjbDBAIQ9xeEoJ6fQG9S-cumOXSriU,12450
10
10
  core/smc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
11
11
  core/utils/OPTools.py,sha256=tJ1Jq_Caab6OWaX12xn4_g9ryf98Rm5I1zsJEEU8NIQ,1002
12
- openfund_core-1.0.10.dist-info/METADATA,sha256=zCl4CuqeksPfr7usyT0LvLaI8ZMVs4Zlib0Q1oyokYw,1954
13
- openfund_core-1.0.10.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
14
- openfund_core-1.0.10.dist-info/entry_points.txt,sha256=g8GUw3cyKFtcG5VWs8geU5VBLqiWr59GElqERuH8zD0,48
15
- openfund_core-1.0.10.dist-info/RECORD,,
12
+ openfund_core-1.0.11.dist-info/METADATA,sha256=4J-n2EOuCCir1sFCIzKqjEGWG-BbvwmTyIJ_Us-BX18,1954
13
+ openfund_core-1.0.11.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
14
+ openfund_core-1.0.11.dist-info/entry_points.txt,sha256=g8GUw3cyKFtcG5VWs8geU5VBLqiWr59GElqERuH8zD0,48
15
+ openfund_core-1.0.11.dist-info/RECORD,,