0c19e45300
chore(config): 恢复 weight 为 rank 模式
2026-06-08 23:07:37 +08:00
8b7bcf206a
feat(weight): 实现 Kelly 仓位权重模式
...
- config_loader.py: WeightType 枚举新增 KELLY
- simple_rotation.py: compute_position_weights 新增 kelly 分支
- 公式: w_i = max(score_i, 0) / sum(max(score_j, 0))
- 负分自动排除 (Kelly: 不下注负期望)
- 全负分时 fallback 到等权
- _generate_signals 传递 scores 给 kelly 模式
- config_simple.yaml: weight 改为 kelly
- 新增策略总结文档: kelly_weight.md
回测对比 (2020-2026):
- equal: 年化 19.88%, 夏普 1.13, 回撤 -14.65%
- rank: 年化 22.90%, 夏普 1.12, 回撤 -16.27%
- kelly: 年化 30.13%, 夏普 1.15, 回撤 -20.44%
2026-06-08 23:05:26 +08:00
4973a9a2a5
feat(rotation): componentize position weighting + fix bond threshold consistency
...
- Extract compute_position_weights() as pluggable pure function
- Add WeightType enum (equal/rank) and RotationConfig.weight field
- Fix bond threshold dimension mismatch: use configured factor function
for all assets instead of hardcoded weighted_momentum_score
- Default weight: equal in config, active: rank in config_simple.yaml
2026-06-06 22:28:08 +08:00
b564a47a1b
feat: 新增slope_r2因子并切换为默认因子（年化19.84%, 夏普1.14）
...
- simple_rotation.py: 新增3种score函数（vol_adjusted_momentum, slope_r2, momentum）
- config_loader.py: FactorType枚举新增VOL_ADJUSTED_MOMENTUM
- config_simple.yaml: factor.type 切换为 slope_r2
- experiments/factor_comparison.py: 4种因子对比实验脚本
- experiments/output: 实验结果（slope_r2全面胜出）
2026-06-06 15:49:22 +08:00
524fa5f513
refactor(rotation): 移除数据缓存 + 修复空值和pct_change警告
...
- 移除CSV本地缓存（cache_dir、_cache_path、_premium_cache_path、_save_premium_cache）
- 每次运行直接从API获取数据，简化DataCache类
- 修复_get_etf_prices中open/close为None时的空值处理（中证指数API不提供OHLC）
- 修复pct_change的FutureWarning（显式传fill_method=None）
- 更新trade_cost注释
2026-06-03 00:54:48 +08:00
451ffa33d2
clean(rotation): add simple rotation strategy and remove unused files
...
New:
- rotation/simple_rotation.py: daily-iteration rotation strategy (584 lines)
- rotation/config_loader.py: standalone config loader
- rotation/config_simple.yaml: 11 assets, 7 groups
- rotation/README_SIMPLE.md: usage guide
- scripts/get_trading_calendar.py: trading calendar fetcher
Removed:
- rotation/example_usage.py, run_strategy.py (replaced by simple_rotation.py)
- rotation/results/ output files (gitignored)
- scripts/verify_*.py, calculate_returns_from_detail.py (one-off scripts)
- scripts/README_TRADING_CALENDAR.md
Backtest result (2020-01-10 ~ 2026-06-01):
- Total return: 1237.6%, Annual: 52.66%
- Max drawdown: -11.71%, Sharpe: 2.50
2026-06-01 22:28:26 +08:00
