remove unused config && update test pkl

ricequant · Feb 23, 2017 · 3e828c5 · 3e828c5
1 parent 237cb92
commit 3e828c5
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 18 deletions.
diff --git a/rqalpha/__main__.py b/rqalpha/__main__.py
@@ -63,7 +63,6 @@ def update_bundle(data_bundle_path):
 @click.option('-rt', '--run-type', 'base__run_type', type=click.Choice(['b', 'p']), default="b")
 @click.option('--resume', 'base__resume_mode', is_flag=True)
 @click.option('--handle-split/--not-handle-split', 'base__handle_split', default=None, help="handle split")
-@click.option('--risk-grid/--no-risk-grid', 'base__cal_risk_grid', default=True)
 @click.option('--disable-user-system-log', 'extra__user_system_log_disabled', is_flag=True, help='disable user system log')
 @click.option('-l', '--log-level', 'extra__log_level', type=click.Choice(['verbose', 'debug', 'info', 'error', 'none']))
 @click.option('-p', '--plot/--no-plot', 'mod__analyser__plot', default=None, help="plot result")

diff --git a/rqalpha/config.yml b/rqalpha/config.yml
@@ -40,21 +40,14 @@ base:
   persist_mode: real_time
   # 选择是否开启自动处理, 默认不开启
   handle_split: false
-  # 选择是否开启Alpha/Beta 等风险指标的实时计算，默认开启
-  cal_risk_grid: true
 
 extra:
-  # 指定回测结束时将回测数据输出到指定文件中
-  output_file: ~
   # 选择日期的输出等级，有 `verbose` | `info` | `warning` | `error` 等选项，您可以通过设置 `verbose` 来查看最详细的日志，
   # 或者设置 `error` 只查看错误级别的日志输出
   log_level: info
   user_system_log_disabled: false
   # 在回测结束后，选择是否查看图形化的收益曲线
-  plot: false
   context_vars: ~
-  plot_save_file: ~
-  report_save_path:  ~
   # force_run_init_when_pt_resume: 在PT的resume模式时，是否强制执行用户init。主要用于用户改代码。
   force_run_init_when_pt_resume: false
   # enable_profiler: 是否启动性能分析

diff --git a/tests/outs/test_f_buy_and_hold.pkl b/tests/outs/test_f_buy_and_hold.pkl
diff --git a/tests/outs/test_f_macd.pkl b/tests/outs/test_f_macd.pkl
diff --git a/tests/outs/test_f_mean_reverting.pkl b/tests/outs/test_f_mean_reverting.pkl
diff --git a/tests/outs/test_s_dma.pkl b/tests/outs/test_s_dma.pkl
diff --git a/tests/outs/test_s_dual_thrust.pkl b/tests/outs/test_s_dual_thrust.pkl
diff --git a/tests/outs/test_s_golden_cross.pkl b/tests/outs/test_s_golden_cross.pkl
diff --git a/tests/outs/test_s_turtle.pkl b/tests/outs/test_s_turtle.pkl
diff --git a/tests/outs/time.csv b/tests/outs/time.csv
@@ -1,10 +1,2 @@
-date_time,time_spend
-2017-02-22 11:19:09.672697,25.548931
-2017-02-22 11:21:49.141829,24.767031
-2017-02-22 11:27:18.907992,26.539639
-2017-02-22 11:37:34.984080,25.417706
-2017-02-22 12:04:45.139427,27.134841
-2017-02-22 12:39:40.127696,27.465236
-2017-02-22 12:41:32.618867,27.305641
-2017-02-23 10:50:17.666061,27.731157
-2017-02-23 10:50:53.688850,26.854954
+date_time,time_spend
+2017-02-23 14:00:19.115075,26.238209