#update

yutiansut · Dec 29, 2019 · 02aa7c6 · 02aa7c6
1 parent d2b29fb
commit 02aa7c6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/QUANTAXIS/QAUtil/QACode.py b/QUANTAXIS/QAUtil/QACode.py
@@ -80,3 +80,33 @@ def QA_util_code_tolist(code, auto_fill=True):
  return [QA_util_code_tostr(item) for item in code]
  else:
  return [item for item in code]
+
+
+
+def QA_util_code_adjust_ctp(code, source):
+ """
+ 此函数用于在ctp和通达信之间来回转换
+
+ QA_util_code_adjust_ctp('AP001', source='ctp')
+ 'AP2001'
+ 
+ QA_util_code_adjust_ctp('AP2001', source = 'tdx')
+ 'AP001'
+
+ QA_util_code_adjust_ctp('RB2001', source = 'tdx')
+ 'rb2001'
+
+ QA_util_code_adjust_ctp('rb2001', source = 'ctp')
+ 'RB2001'
+ 
+ """
+ if source == 'ctp':
+ if len(re.search(r'[0-9]+', code)[0]) <4:
+ return re.search(r'[a-zA-z]+', code)[0] + '2' + re.search(r'[0-9]+', code)[0]
+ else:
+ return code.upper()
+ else:
+ if re.search(r'[a-zA-z]+', code)[0].upper() in ['RM', 'CJ', 'OI', 'CY', 'AP', 'SF', 'SA', 'UR', 'FG', 'LR', 'CF', 'WH', 'IPS', 'ZC', 'SPD', 'MA', 'TA', 'JR', 'SM', 'PM', 'RS', 'SR', 'RI']:
+ return re.search(r'[a-zA-z]+', code)[0] + re.search(r'[0-9]+', code)[0][1:]
+ else:
+ return re.search(r'[a-zA-z]+', code)[0].lower() + re.search(r'[0-9]+', code)[0]
diff --git a/QUANTAXIS/QAUtil/__init__.py b/QUANTAXIS/QAUtil/__init__.py
@@ -34,7 +34,7 @@
 # config
 from QUANTAXIS.QAUtil.QACfg import QA_util_cfg_initial, QA_util_get_cfg
 # code function
-from QUANTAXIS.QAUtil.QACode import QA_util_code_tolist, QA_util_code_tostr
+from QUANTAXIS.QAUtil.QACode import QA_util_code_tolist, QA_util_code_tostr, QA_util_code_adjust_ctp
 # csv
 from QUANTAXIS.QAUtil.QACsv import QA_util_save_csv
 # date

diff --git a/QUANTAXIS/__init__.py b/QUANTAXIS/__init__.py
@@ -31,7 +31,7 @@
 2017/4/8
 """
 
-__version__ = '1.7.0'
+__version__ = '1.7.1'
 __author__ = 'yutiansut'
 
 import argparse
@@ -242,6 +242,7 @@
  OUTPUT_FORMAT, RUNNING_ENVIRONMENT, RUNNING_STATUS, TRADE_STATUS,
  QA_Setting, QA_util_calc_time, QA_util_cfg_initial, QA_util_code_tolist,
  QA_util_code_tostr, QA_util_date_gap, QA_util_date_int2str,
+ QA_util_code_adjust_ctp,
  QA_util_date_stamp, QA_util_date_str2int, QA_util_date_today,
  QA_util_date_valid, QA_util_dict_remove_key, QA_util_diff_list,
  QA_util_file_md5, QA_util_format_date2str, QA_util_get_cfg,