siat 3.6.1__py3-none-any.whl → 3.6.7__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 (12) hide show
  1. siat/capm_beta2.py +40 -43
  2. siat/grafix.py +250 -27
  3. siat/risk_adjusted_return2.py +79 -88
  4. siat/security_trend2.py +22 -22
  5. siat/stock.py +42 -49
  6. siat/translate.py +5 -3
  7. siat/valuation.py +14 -15
  8. {siat-3.6.1.dist-info → siat-3.6.7.dist-info}/METADATA +1 -1
  9. {siat-3.6.1.dist-info → siat-3.6.7.dist-info}/RECORD +12 -12
  10. {siat-3.6.1.dist-info → siat-3.6.7.dist-info}/LICENSE +0 -0
  11. {siat-3.6.1.dist-info → siat-3.6.7.dist-info}/WHEEL +0 -0
  12. {siat-3.6.1.dist-info → siat-3.6.7.dist-info}/top_level.txt +0 -0
siat/risk_adjusted_return2.py CHANGED
@@ -809,9 +809,8 @@ if __name__=='__main__':
809
809
 
810
810
  def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alpha'], \
811
811
  ret_type="Annual Adj Ret%",RF=0,regression_period=365, \
812
- attention_value='', \
813
- attention_point='', \
814
-
812
+ attention_value='',attention_value_area='', \
813
+ attention_point='',attention_point_area='', \
815
814
  graph=True,loc1='best', \
816
815
  axhline_value=0,axhline_label='',facecolor='whitesmoke', \
817
816
  printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
@@ -912,9 +911,8 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
912
911
  draw_lines(df1,y_label,x_label=footnotex, \
913
912
  axhline_value=axhline_value,axhline_label=axhline_label, \
914
913
  title_txt=title_txt,data_label=False, \
915
- attention_value=attention_value, \
916
- attention_point=attention_point, \
917
-
914
+ attention_value=attention_value,attention_value_area=attention_value_area, \
915
+ attention_point=attention_point,attention_point_area=attention_point_area, \
918
916
  annotate=annotate,annotate_value=annotate, \
919
917
  mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
920
918
  facecolor=facecolor,loc=loc1)
@@ -974,8 +972,8 @@ if __name__=='__main__':
974
972
 
975
973
  def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
976
974
  ret_type="Annual Adj Ret%",RF=0,regression_period=365, \
977
- attention_value='', \
978
- attention_point='', \
975
+ attention_value='',attention_value_area='', \
976
+ attention_point='',attention_point_area='', \
979
977
  graph=True,loc1='best', \
980
978
  axhline_value=0,axhline_label='', \
981
979
  printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
@@ -1097,9 +1095,8 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
1097
1095
  draw_lines(df1,y_label,x_label=footnotex, \
1098
1096
  axhline_value=axhline_value,axhline_label=axhline_label, \
1099
1097
  title_txt=title_txt,data_label=False, \
1100
- attention_value=attention_value, \
1101
- attention_point=attention_point, \
1102
-
1098
+ attention_value=attention_value,attention_value_area=attention_value_area, \
1099
+ attention_point=attention_point,attention_point_area=attention_point_area, \
1103
1100
  annotate=annotate,annotate_value=annotate, \
1104
1101
  mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
1105
1102
  facecolor=facecolor,loc=loc1)
@@ -1155,8 +1152,8 @@ if __name__=='__main__':
1155
1152
 
1156
1153
  def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treynor'], \
1157
1154
  ret_type="Annual Adj Ret%",RF=0,regression_period=365, \
1158
- attention_value='', \
1159
- attention_point='', \
1155
+ attention_value='',attention_value_area='', \
1156
+ attention_point='',attention_point_area='', \
1160
1157
  graph=True,loc1='best', \
1161
1158
  axhline_value=0,axhline_label='', \
1162
1159
  printout=True,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
@@ -1185,8 +1182,8 @@ def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treyn
1185
1182
  #with HiddenPrints(): #此项将压制所有print输出，造成表头脚注不显示
1186
1183
  _,df_tmp=compare_mticker_1rar(ticker=ticker,start=start,end=end,rar=r, \
1187
1184
  ret_type=ret_type,RF=RF,regression_period=regression_period, \
1188
- attention_value=attention_value, \
1189
- attention_point=attention_point, \
1185
+ attention_value=attention_value,attention_value_area=attention_value_area, \
1186
+ attention_point=attention_point,attention_point_area=attention_point_area, \
1190
1187
  graph=graph,facecolor=facecolor, \
1191
1188
  axhline_value=axhline_value,axhline_label=axhline_label, \
1192
1189
  printout=printout,sortby=sortby, \
@@ -1362,8 +1359,8 @@ if __name__=='__main__':
1362
1359
  def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
1363
1360
  ret_type=["Annual Adj Ret%","Monthly Adj Ret%"], \
1364
1361
  RF=0,regression_period=365, \
1365
- attention_value='', \
1366
- attention_point='', \
1362
+ attention_value='',attention_value_area='', \
1363
+ attention_point='',attention_point_area='', \
1367
1364
  graph=True,loc1='best', \
1368
1365
  axhline_value=0,axhline_label='',facecolor='whitesmoke', \
1369
1366
  printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
@@ -1457,8 +1454,8 @@ def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
1457
1454
  draw_lines(df1,y_label,x_label=footnotex, \
1458
1455
  axhline_value=axhline_value,axhline_label=axhline_label, \
1459
1456
  title_txt=title_txt,data_label=False, \
1460
- attention_value=attention_value, \
1461
- attention_point=attention_point, \
1457
+ attention_value=attention_value,attention_value_area=attention_value_area, \
1458
+ attention_point=attention_point,attention_point_area=attention_point_area, \
1462
1459
  annotate=annotate,annotate_value=annotate, \
1463
1460
  mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
1464
1461
  facecolor=facecolor,loc=loc1)
@@ -1515,8 +1512,8 @@ if __name__=='__main__':
1515
1512
 
1516
1513
  def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
1517
1514
  ret_type="Annual Adj Ret%",RF=[0,0.02,0.05],regression_period=365, \
1518
- attention_value='', \
1519
- attention_point='', \
1515
+ attention_value='',attention_value_area='', \
1516
+ attention_point='',attention_point_area='', \
1520
1517
  graph=True,loc1='best', \
1521
1518
  axhline_value=0,axhline_label='',facecolor='whitesmoke', \
1522
1519
  printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
@@ -1605,8 +1602,8 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
1605
1602
  draw_lines(df1,y_label,x_label=footnotex, \
1606
1603
  axhline_value=axhline_value,axhline_label=axhline_label, \
1607
1604
  title_txt=title_txt,data_label=False, \
1608
- attention_value=attention_value, \
1609
- attention_point=attention_point, \
1605
+ attention_value=attention_value,attention_value_area=attention_value_area, \
1606
+ attention_point=attention_point,attention_point_area=attention_point_area, \
1610
1607
  annotate=annotate,annotate_value=annotate, \
1611
1608
  mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
1612
1609
  facecolor=facecolor,loc=loc1)
@@ -1680,8 +1677,8 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
1680
1677
  ret_type="Annual Adj Ret%", \
1681
1678
  RF=0, \
1682
1679
  regression_period=365, \
1683
- attention_value='', \
1684
- attention_point='', \
1680
+ attention_value='',attention_value_area='', \
1681
+ attention_point='',attention_point_area='', \
1685
1682
  graph=True,loc1='best', \
1686
1683
  axhline_value=0,axhline_label='',facecolor='whitesmoke', \
1687
1684
  printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.05, \
@@ -1712,35 +1709,33 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
1712
1709
 
1713
1710
  if rar_num ==1: #一个RAR
1714
1711
  df=compare_mticker_1rar(ticker=ticker,start=start,end=end,rar=rar, \
1715
- ret_type=ret_type,RF=RF,regression_period=regression_period, \
1716
- attention_value=attention_value, \
1717
- attention_point=attention_point, \
1718
-
1719
- graph=graph,loc1=loc1, \
1720
- axhline_value=axhline_value,axhline_label=axhline_label, \
1721
- printout=printout, \
1722
- sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
1723
- annotate=annotate,annotate_value=annotate, \
1724
- mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
1725
- mktidx=mktidx,source=source, \
1726
- ticker_type=ticker_type,facecolor=facecolor)
1712
+ ret_type=ret_type,RF=RF,regression_period=regression_period, \
1713
+ attention_value=attention_value,attention_value_area=attention_value_area, \
1714
+ attention_point=attention_point,attention_point_area=attention_point_area, \
1715
+ graph=graph,loc1=loc1, \
1716
+ axhline_value=axhline_value,axhline_label=axhline_label, \
1717
+ printout=printout, \
1718
+ sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
1719
+ annotate=annotate,annotate_value=annotate, \
1720
+ mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
1721
+ mktidx=mktidx,source=source, \
1722
+ ticker_type=ticker_type,facecolor=facecolor)
1727
1723
  return df
1728
1724
 
1729
1725
  if rar_num >1: #多个RAR
1730
1726
  printout=True #否则无法运行descriptive_statistics2函数
1731
1727
  df=compare_mticker_mrar(ticker=ticker,start=start,end=end,rar=rar, \
1732
- ret_type=ret_type,RF=RF,regression_period=regression_period, \
1733
- attention_value=attention_value, \
1734
- attention_point=attention_point, \
1735
-
1736
- graph=graph,loc1=loc1, \
1737
- axhline_value=axhline_value,axhline_label=axhline_label, \
1738
- printout=printout, \
1739
- sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
1740
- annotate=annotate,annotate_value=annotate, \
1741
- mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
1742
- mktidx=mktidx,source=source, \
1743
- ticker_type=ticker_type,facecolor=facecolor)
1728
+ ret_type=ret_type,RF=RF,regression_period=regression_period, \
1729
+ attention_value=attention_value,attention_value_area=attention_value_area, \
1730
+ attention_point=attention_point,attention_point_area=attention_point_area, \
1731
+ graph=graph,loc1=loc1, \
1732
+ axhline_value=axhline_value,axhline_label=axhline_label, \
1733
+ printout=printout, \
1734
+ sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
1735
+ annotate=annotate,annotate_value=annotate, \
1736
+ mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
1737
+ mktidx=mktidx,source=source, \
1738
+ ticker_type=ticker_type,facecolor=facecolor)
1744
1739
  return df
1745
1740
  else:
1746
1741
  #实际上是单个证券
@@ -1755,18 +1750,17 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
1755
1750
  RF=RF[0]
1756
1751
 
1757
1752
  df=compare_1ticker_mrar(ticker=ticker,start=start,end=end,rar=rar, \
1758
- ret_type=ret_type,RF=RF,regression_period=regression_period, \
1759
- attention_value=attention_value, \
1760
- attention_point=attention_point, \
1761
-
1762
- graph=graph,loc1=loc1, \
1763
- axhline_value=axhline_value,axhline_label=axhline_label, \
1764
- printout=printout,facecolor=facecolor, \
1765
- sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
1766
- annotate=annotate,annotate_value=annotate, \
1767
- mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
1768
- mktidx=mktidx,source=source, \
1769
- ticker_type=ticker_type)
1753
+ ret_type=ret_type,RF=RF,regression_period=regression_period, \
1754
+ attention_value=attention_value,attention_value_area=attention_value_area, \
1755
+ attention_point=attention_point,attention_point_area=attention_point_area, \
1756
+ graph=graph,loc1=loc1, \
1757
+ axhline_value=axhline_value,axhline_label=axhline_label, \
1758
+ printout=printout,facecolor=facecolor, \
1759
+ sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
1760
+ annotate=annotate,annotate_value=annotate, \
1761
+ mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
1762
+ mktidx=mktidx,source=source, \
1763
+ ticker_type=ticker_type)
1770
1764
  return df
1771
1765
  else:
1772
1766
  #实际上是单个RAR
@@ -1779,18 +1773,17 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
1779
1773
  RF=RF[0]
1780
1774
 
1781
1775
  df=compare_1ticker_1rar_mret(ticker=ticker,start=start,end=end,rar=rar, \
1782
- ret_type=ret_type,RF=RF,regression_period=regression_period, \
1783
- attention_value=attention_value, \
1784
- attention_point=attention_point, \
1785
-
1786
- graph=graph,loc1=loc1, \
1787
- axhline_value=axhline_value,axhline_label=axhline_label, \
1788
- printout=printout, \
1789
- sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
1790
- annotate=annotate,annotate_value=annotate, \
1791
- mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
1792
- mktidx=mktidx,source=source, \
1793
- ticker_type=ticker_type,facecolor=facecolor)
1776
+ ret_type=ret_type,RF=RF,regression_period=regression_period, \
1777
+ attention_value=attention_value,attention_value_area=attention_value_area, \
1778
+ attention_point=attention_point,attention_point_area=attention_point_area, \
1779
+ graph=graph,loc1=loc1, \
1780
+ axhline_value=axhline_value,axhline_label=axhline_label, \
1781
+ printout=printout, \
1782
+ sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
1783
+ annotate=annotate,annotate_value=annotate, \
1784
+ mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
1785
+ mktidx=mktidx,source=source, \
1786
+ ticker_type=ticker_type,facecolor=facecolor)
1794
1787
  return df
1795
1788
  else:
1796
1789
  #实际上是单个收益率类型
@@ -1801,18 +1794,17 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
1801
1794
  if len(RF) > 1:
1802
1795
 
1803
1796
  df=compare_1ticker_1rar_1ret_mRF(ticker=ticker,start=start,end=end,rar=rar, \
1804
- ret_type=ret_type,RF=RF,regression_period=regression_period, \
1805
- attention_value=attention_value, \
1806
- attention_point=attention_point, \
1807
-
1808
- graph=graph,loc1=loc1, \
1809
- axhline_value=axhline_value,axhline_label=axhline_label, \
1810
- printout=printout,facecolor=facecolor, \
1811
- sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
1812
- annotate=annotate,annotate_value=annotate, \
1813
- mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
1814
- mktidx=mktidx,source=source, \
1815
- ticker_type=ticker_type)
1797
+ ret_type=ret_type,RF=RF,regression_period=regression_period, \
1798
+ attention_value=attention_value,attention_value_area=attention_value_area, \
1799
+ attention_point=attention_point,attention_point_area=attention_point_area, \
1800
+ graph=graph,loc1=loc1, \
1801
+ axhline_value=axhline_value,axhline_label=axhline_label, \
1802
+ printout=printout,facecolor=facecolor, \
1803
+ sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
1804
+ annotate=annotate,annotate_value=annotate, \
1805
+ mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
1806
+ mktidx=mktidx,source=source, \
1807
+ ticker_type=ticker_type)
1816
1808
  return df
1817
1809
  else:
1818
1810
  #实际上是单个RF
@@ -1821,9 +1813,8 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
1821
1813
  #情形5：1只证券，1个RAR，1个收益率类型，1个RF
1822
1814
  df=compare_1ticker_mrar(ticker=ticker,start=start,end=end,rar=rar, \
1823
1815
  ret_type=ret_type,RF=RF,regression_period=regression_period, \
1824
- attention_value=attention_value, \
1825
- attention_point=attention_point, \
1826
-
1816
+ attention_value=attention_value,attention_value_area=attention_value_area, \
1817
+ attention_point=attention_point,attention_point_area=attention_point_area, \
1827
1818
  graph=graph,loc1=loc1, \
1828
1819
  axhline_value=axhline_value,axhline_label=axhline_label, \
1829
1820
  printout=printout,sortby=sortby, \
siat/security_trend2.py CHANGED
@@ -124,9 +124,11 @@ if __name__=='__main__':
124
124
  def security_trend(ticker,indicator='Close',adjust='', \
125
125
  start='default',end='default', \
126
126
  #纵轴水平线
127
- attention_value='',average_value=False, \
127
+ attention_value='',attention_value_area='', \
128
+
129
+ average_value=False, \
128
130
  #横轴垂直线
129
- attention_point='', \
131
+ attention_point='',attention_point_area='', \
130
132
 
131
133
  kline=False,kline_demo=False,mav=[5,20], \
132
134
 
@@ -136,7 +138,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
136
138
  ret_type='Annual Adj Ret%',RF=0,regression_period=365,market_index="auto", \
137
139
  sortby='tpw_mean',trailing=7,trend_threshhold=0.05, \
138
140
 
139
- #绘制河流图的上下边界
141
+ #绘制河流图的上下边界，由变量指定
140
142
  band_area='', \
141
143
 
142
144
 
@@ -412,11 +414,11 @@ def security_trend(ticker,indicator='Close',adjust='', \
412
414
  df=security_indicator(ticker=tickers[0],indicator=measures[0],adjust=adjust, \
413
415
  fromdate=fromdate,todate=todate, \
414
416
  zeroline=zeroline, \
415
- attention_value=attention_value, \
416
417
  average_value=average_value, \
417
- attention_point=attention_point, \
418
+ attention_value=attention_value,attention_value_area=attention_value_area, \
419
+ attention_point=attention_point,attention_point_area=attention_point_area, \
418
420
  datatag=datatag,power=power,graph=graph, \
419
- source=source, \
421
+ source=source,loc=loc1, \
420
422
  mark_top=mark_top,mark_bottom=mark_bottom, \
421
423
  mark_end=mark_end,ticker_type=ticker_type, \
422
424
  facecolor=facecolor)
@@ -432,8 +434,8 @@ def security_trend(ticker,indicator='Close',adjust='', \
432
434
  df=compare_security(tickers=tickers[0],measures=measures[:2], \
433
435
  adjust=adjust, \
434
436
  fromdate=fromdate,todate=todate,twinx=twinx, \
435
- attention_value=attention_value, \
436
- attention_point=attention_point, \
437
+ attention_value=attention_value,attention_value_area=attention_value_area, \
438
+ attention_point=attention_point,attention_point_area=attention_point_area, \
437
439
  loc1=loc1,loc2=loc2,graph=graph,source=source, \
438
440
  ticker_type=ticker_type,facecolor=facecolor)
439
441
  return df
@@ -448,8 +450,8 @@ def security_trend(ticker,indicator='Close',adjust='', \
448
450
  df=security_mindicators(ticker=tickers[0],measures=measures, \
449
451
  adjust=adjust, \
450
452
  fromdate=fromdate,todate=todate, \
451
- attention_value=attention_value, \
452
- attention_point=attention_point, \
453
+ attention_value=attention_value,attention_value_area=attention_value_area, \
454
+ attention_point=attention_point,attention_point_area=attention_point_area, \
453
455
  graph=graph,smooth=smooth,band_area=band_area,loc=loc1, \
454
456
  date_range=date_range,date_freq=date_freq, \
455
457
  annotate=annotate,annotate_value=annotate_value, \
@@ -468,8 +470,8 @@ def security_trend(ticker,indicator='Close',adjust='', \
468
470
  df=compare_security(tickers=tickers,measures=measures[0], \
469
471
  adjust=adjust, \
470
472
  fromdate=fromdate,todate=todate,twinx=twinx, \
471
- attention_value=attention_value, \
472
- attention_point=attention_point, \
473
+ attention_value=attention_value,attention_value_area=attention_value_area, \
474
+ attention_point=attention_point,attention_point_area=attention_point_area, \
473
475
  loc1=loc1,loc2=loc2,graph=graph,source=source, \
474
476
  ticker_type=ticker_type,facecolor=facecolor)
475
477
  return df
@@ -499,8 +501,8 @@ def security_trend(ticker,indicator='Close',adjust='', \
499
501
 
500
502
  df=compare_msecurity(tickers=tickers,measure=measures[0], \
501
503
  start=fromdate,end=todate, \
502
- attention_value=attention_value, \
503
- attention_point=attention_point, \
504
+ attention_value=attention_value,attention_value_area=attention_value_area, \
505
+ attention_point=attention_point,attention_point_area=attention_point_area, \
504
506
  adjust=adjust, \
505
507
  axhline_value=axhline_value,axhline_label=axhline_label, \
506
508
  preprocess=preprocess,linewidth=linewidth, \
@@ -524,8 +526,8 @@ def security_trend(ticker,indicator='Close',adjust='', \
524
526
 
525
527
  df=compare_rar_security(ticker=tickers,start=fromdate,end=todate,rar=measures, \
526
528
  ret_type=ret_type,RF=RF,regression_period=regression_period, \
527
- attention_value=attention_value, \
528
- attention_point=attention_point, \
529
+ attention_value=attention_value,attention_value_area=attention_value_area, \
530
+ attention_point=attention_point,attention_point_area=attention_point_area, \
529
531
  graph=graph,axhline_value=0,axhline_label='', \
530
532
  loc1=loc1, \
531
533
  printout=printout, \
@@ -541,9 +543,8 @@ def security_trend(ticker,indicator='Close',adjust='', \
541
543
  df=compare_beta_security(ticker=tickers,start=fromdate,end=todate, \
542
544
  adjust=adjust, \
543
545
  RF=RF,regression_period=regression_period, \
544
- attention_value=attention_value, \
545
- attention_point=attention_point, \
546
-
546
+ attention_value=attention_value,attention_value_area=attention_value_area, \
547
+ attention_point=attention_point,attention_point_area=attention_point_area, \
547
548
  graph=graph,facecolor=facecolor,loc=loc1, \
548
549
  annotate=annotate,annotate_value=annotate_value, \
549
550
  mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
@@ -559,9 +560,8 @@ def security_trend(ticker,indicator='Close',adjust='', \
559
560
  preprocess=preprocess,scaling_option=scaling_option, \
560
561
  twinx=twinx,loc1=loc1,loc2=loc2, \
561
562
  graph=graph,facecolor=facecolor, \
562
- attention_value=attention_value, \
563
- attention_point=attention_point, \
564
-
563
+ attention_value=attention_value,attention_value_area=attention_value_area, \
564
+ attention_point=attention_point,attention_point_area=attention_point_area, \
565
565
  annotate=annotate,annotate_value=annotate_value, \
566
566
  mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)
567
567
  return df
siat/stock.py CHANGED
@@ -630,12 +630,12 @@ if __name__ =="__main__":
630
630
  def security_indicator(ticker,indicator, \
631
631
  fromdate,todate,adjust='', \
632
632
  zeroline=False, \
633
- attention_value='', \
633
+ attention_value='',attention_value_area='', \
634
+ attention_point='',attention_point_area='', \
634
635
  average_value=False, \
635
- attention_point='', \
636
636
  datatag=False,power=0,graph=True,source='auto', \
637
637
  mark_top=True,mark_bottom=True,mark_end=True, \
638
- ticker_type='auto',facecolor='whitesmoke'):
638
+ ticker_type='auto',facecolor='whitesmoke',loc='best'):
639
639
  """
640
640
  功能：单只证券的全部指标
641
641
  """
@@ -742,11 +742,11 @@ def security_indicator(ticker,indicator, \
742
742
 
743
743
  plot_line(erdf3,indicator,collabel,ylabeltxt,titletxt,footnote,datatag=datatag, \
744
744
  power=power,zeroline=zeroline, \
745
- attention_value=attention_value, \
746
745
  average_value=average_value, \
747
- attention_point=attention_point, \
746
+ attention_value=attention_value,attention_value_area=attention_value_area, \
747
+ attention_point=attention_point,attention_point_area=attention_point_area, \
748
748
  mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
749
- facecolor=facecolor)
749
+ facecolor=facecolor,loc=loc)
750
750
 
751
751
  return erdf3
752
752
 
@@ -865,8 +865,8 @@ if __name__ =="__main__":
865
865
 
866
866
  def security_mindicators(ticker,measures,
867
867
  fromdate,todate, \
868
- attention_value='', \
869
- attention_point='', \
868
+ attention_value='',attention_value_area='', \
869
+ attention_point='',attention_point_area='', \
870
870
  adjust='', \
871
871
  band_area='', \
872
872
  graph=True,smooth=True,loc='best',facecolor='whitesmoke', \
@@ -976,8 +976,8 @@ def security_mindicators(ticker,measures,
976
976
  draw_lines2(df,y_label,x_label,axhline_value,axhline_label,titletxt, \
977
977
  data_label=False,resample_freq='6H',smooth=smooth, \
978
978
  date_range=date_range,date_freq=date_freq,date_fmt='%Y-%m-%d', \
979
- attention_value=attention_value, \
980
- attention_point=attention_point, \
979
+ attention_value=attention_value,attention_value_area=attention_value_area, \
980
+ attention_point=attention_point,attention_point_area=attention_point_area, \
981
981
  annotate=annotate,annotate_value=annotate_value, \
982
982
  mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end,facecolor=facecolor, \
983
983
  band_area=band_area,loc=loc)
@@ -1346,11 +1346,11 @@ if __name__ =="__main__":
1346
1346
  pv=price_lpsd2(df,"000002.SZ","2019-1-1","2020-3-16","Annual Exp Price Volatility")
1347
1347
  #==============================================================================
1348
1348
  def comp_1security_2measures(df,measure1,measure2,twinx=False, \
1349
- attention_value='', \
1350
- attention_point='', \
1349
+ attention_value='',attention_value_area='', \
1350
+ attention_point='',attention_point_area='', \
1351
1351
  loc1='upper left',loc2='lower left', \
1352
1352
  graph=True,facecolor='whitesmoke', \
1353
- ticker_type='auto'):
1353
+ ticker_type='auto'):
1354
1354
  """
1355
1355
  功能：对比绘制一只证券两个指标的折线图。
1356
1356
  输入：证券指标数据集df；行情类别measure1/2。
@@ -1401,10 +1401,10 @@ def comp_1security_2measures(df,measure1,measure2,twinx=False, \
1401
1401
  print("attention_point=",attention_point)
1402
1402
 
1403
1403
  plot_line2(df,ticker,measure1,label1,df,ticker,measure2,label2, \
1404
- ylabeltxt,titletxt,footnote,zeroline=zeroline,twinx=twinx, \
1405
- yline=attention_value, \
1406
- xline=attention_point, \
1407
- loc1=loc1,loc2=loc2,facecolor=facecolor)
1404
+ ylabeltxt,titletxt,footnote,zeroline=zeroline,twinx=twinx, \
1405
+ yline=attention_value,attention_value_area=attention_value_area, \
1406
+ xline=attention_point,attention_point_area=attention_point_area, \
1407
+ loc1=loc1,loc2=loc2,facecolor=facecolor)
1408
1408
 
1409
1409
  return
1410
1410
 
@@ -1418,8 +1418,8 @@ if __name__ =="__main__":
1418
1418
  comp_1security_2measures(df,measure1,measure2)
1419
1419
  #==============================================================================
1420
1420
  def comp_2securities_1measure(df1,df2,measure,twinx=False, \
1421
- attention_value='', \
1422
- attention_point='', \
1421
+ attention_value='',attention_value_area='', \
1422
+ attention_point='',attention_point_area='', \
1423
1423
  loc1='best',loc2='best',graph=True, \
1424
1424
  ticker_type=['auto','auto'],facecolor='whitesmoke'):
1425
1425
  """
@@ -1480,10 +1480,10 @@ def comp_2securities_1measure(df1,df2,measure,twinx=False, \
1480
1480
  footnote=footnote1+str(todaydt)+text_lang("统计","")
1481
1481
 
1482
1482
  plot_line2(df1,ticker1,measure,label,df2,ticker2,measure,label, \
1483
- ylabeltxt,titletxt,footnote,zeroline=zeroline,twinx=twinx, \
1484
- yline=attention_value, \
1485
- xline=attention_point, \
1486
- loc1=loc1,loc2=loc2,facecolor=facecolor)
1483
+ ylabeltxt,titletxt,footnote,zeroline=zeroline,twinx=twinx, \
1484
+ yline=attention_value,attention_value_area=attention_value_area, \
1485
+ xline=attention_point,attention_point_area=attention_point_area, \
1486
+ loc1=loc1,loc2=loc2,facecolor=facecolor)
1487
1487
 
1488
1488
  return
1489
1489
 
@@ -1522,8 +1522,8 @@ if __name__ =="__main__":
1522
1522
  def compare_security(tickers,measures,fromdate,todate, \
1523
1523
  adjust='', \
1524
1524
  twinx=False, \
1525
- attention_value='', \
1526
- attention_point='', \
1525
+ attention_value='',attention_value_area='', \
1526
+ attention_point='',attention_point_area='', \
1527
1527
  loc1='best',loc2='lower left',graph=True,source='auto', \
1528
1528
  ticker_type='auto',facecolor='whitesmoke'):
1529
1529
  """
@@ -1615,12 +1615,11 @@ def compare_security(tickers,measures,fromdate,todate, \
1615
1615
  with HiddenPrints():
1616
1616
  #security_indicator未能做到同时获得Close和Adj Close
1617
1617
  df1tmp=security_indicator(ticker=ticker1,indicator=measure1,adjust=adjust1, \
1618
- fromdate=fromdate,todate=todate, \
1619
- attention_value=attention_value, \
1620
- attention_point=attention_point, \
1621
- source=source, \
1622
- ticker_type=ticker_type, \
1623
- graph=False)
1618
+ fromdate=fromdate,todate=todate, \
1619
+ source=source, \
1620
+ ticker_type=ticker_type, \
1621
+ graph=False)
1622
+
1624
1623
  if df_have_data(df1tmp)=="Found":
1625
1624
  pltdf1= df1tmp[[measure1]]
1626
1625
  else:
@@ -1636,12 +1635,10 @@ def compare_security(tickers,measures,fromdate,todate, \
1636
1635
  with HiddenPrints():
1637
1636
  #security_indicator未能做到同时获得Close和Adj Close
1638
1637
  df2tmp=security_indicator(ticker=ticker1,indicator=measure2,adjust=adjust2, \
1639
- fromdate=fromdate,todate=todate, \
1640
- attention_value=attention_value, \
1641
- attention_point=attention_point, \
1642
- source=source, \
1643
- ticker_type=ticker_type, \
1644
- graph=False)
1638
+ fromdate=fromdate,todate=todate, \
1639
+ source=source, \
1640
+ ticker_type=ticker_type, \
1641
+ graph=False)
1645
1642
 
1646
1643
  if df_have_data(df2tmp)=="Found":
1647
1644
  pltdf2= df2tmp[[measure2]]
@@ -1661,8 +1658,8 @@ def compare_security(tickers,measures,fromdate,todate, \
1661
1658
  print("attention_point=",attention_point)
1662
1659
 
1663
1660
  comp_1security_2measures(pltdf,measure1,measure2,twinx=twinx, \
1664
- attention_value=attention_value, \
1665
- attention_point=attention_point, \
1661
+ attention_value=attention_value,attention_value_area=attention_value_area, \
1662
+ attention_point=attention_point,attention_point_area=attention_point_area, \
1666
1663
  loc1=loc1,loc2=loc2,graph=graph, \
1667
1664
  ticker_type=ticker_type[0],facecolor=facecolor)
1668
1665
 
@@ -1683,8 +1680,6 @@ def compare_security(tickers,measures,fromdate,todate, \
1683
1680
 
1684
1681
  df1tmp=security_indicator(ticker=ticker1,indicator=measure1,adjust=adjust, \
1685
1682
  fromdate=fromdate,todate=todate, \
1686
- attention_value=attention_value, \
1687
- attention_point=attention_point, \
1688
1683
  source=source, \
1689
1684
  ticker_type=ticker_type, \
1690
1685
  graph=False)
@@ -1696,8 +1691,6 @@ def compare_security(tickers,measures,fromdate,todate, \
1696
1691
 
1697
1692
  df2tmp=security_indicator(ticker=ticker2,indicator=measure1,adjust=adjust, \
1698
1693
  fromdate=fromdate,todate=todate, \
1699
- attention_value=attention_value, \
1700
- attention_point=attention_point, \
1701
1694
  source=source, \
1702
1695
  ticker_type=ticker_type, \
1703
1696
  graph=False)
@@ -1716,8 +1709,8 @@ def compare_security(tickers,measures,fromdate,todate, \
1716
1709
  print("attention_point=",attention_point)
1717
1710
 
1718
1711
  comp_2securities_1measure(pltdf1,pltdf2,measure1,twinx=twinx, \
1719
- attention_value=attention_value, \
1720
- attention_point=attention_point, \
1712
+ attention_value=attention_value,attention_value_area=attention_value_area, \
1713
+ attention_point=attention_point,attention_point_area=attention_point_area, \
1721
1714
  loc1=loc1,loc2=loc2,graph=graph, \
1722
1715
  ticker_type=ticker_type_list,facecolor=facecolor)
1723
1716
 
@@ -1950,8 +1943,8 @@ if __name__ =="__main__":
1950
1943
 
1951
1944
 
1952
1945
  def compare_msecurity(tickers,measure,start,end, \
1953
- attention_value='', \
1954
- attention_point='', \
1946
+ attention_value='',attention_value_area='', \
1947
+ attention_point='',attention_point_area='', \
1955
1948
  adjust='', \
1956
1949
  axhline_value=0,axhline_label='', \
1957
1950
  preprocess='none',linewidth=1.5, \
@@ -2131,8 +2124,8 @@ def compare_msecurity(tickers,measure,start,end, \
2131
2124
 
2132
2125
  draw_lines(dfs2,y_label,x_label,axhline_value,axhline_label,title_txt, \
2133
2126
  data_label=False,resample_freq='H',smooth=smooth,linewidth=linewidth,loc=loc, \
2134
- attention_value=attention_value, \
2135
- attention_point=attention_point, \
2127
+ attention_value=attention_value,attention_value_area=attention_value_area, \
2128
+ attention_point=attention_point,attention_point_area=attention_point_area, \
2136
2129
  annotate=annotate,annotate_value=annotate_value,plus_sign=plus_sign, \
2137
2130
  mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end,facecolor=facecolor)
2138
2131