Compare commits
3 Commits
cbd60894b9
...
444dc0e751
| Author | SHA1 | Date | |
|---|---|---|---|
| 444dc0e751 | |||
| 07463f68e1 | |||
| 80c7fe0ba8 |
@@ -138,6 +138,11 @@ class FlaskAPIDataSource:
|
||||
# 确保列名标准化
|
||||
df = df[['open', 'high', 'low', 'close', 'volume']]
|
||||
|
||||
# 使用 API 返回的实际数据范围(而非请求参数)
|
||||
actual_start = data.get('date_range', {}).get('start', start_date)
|
||||
actual_end = data.get('date_range', {}).get('end', end_date)
|
||||
actual_count = data.get('count', len(df))
|
||||
|
||||
# 缓存 info 信息(如果有)
|
||||
if 'info' in data:
|
||||
df.attrs['info'] = data['info']
|
||||
@@ -166,7 +171,7 @@ class FlaskAPIDataSource:
|
||||
if 'premium_stats' in data:
|
||||
df.attrs['premium_stats'] = data['premium_stats']
|
||||
|
||||
print(f"✓ {code}: {len(df)} 条数据 ({start_date} ~ {end_date})")
|
||||
print(f"✓ {code}: {actual_count} 条数据 ({actual_start} ~ {actual_end})")
|
||||
return df
|
||||
|
||||
except requests.exceptions.Timeout:
|
||||
|
||||
@@ -228,17 +228,29 @@ class BacktestExecutor(Executor):
|
||||
|
||||
result['策略日收益率'] = result.apply(calc_return, axis=1)
|
||||
else:
|
||||
# 多标的策略(等权组合)
|
||||
# 多标的策略(固定仓位分配)
|
||||
# 核心逻辑:按select_num固定分配仓位,缺失标的用现金替代
|
||||
# 例如:select_num=3,选出2只标的 → 权重=1/3+1/3,现金权重=1/3(收益为0)
|
||||
def calc_multi_return(row):
|
||||
codes = [c for c in row[signal_col].split(',') if c]
|
||||
if not codes:
|
||||
# 空仓:全部现金,收益为0
|
||||
return 0.0
|
||||
returns = []
|
||||
|
||||
# 固定仓位权重:每只标的权重 = 1 / select_num
|
||||
unit_weight = 1.0 / self.select_num
|
||||
|
||||
# 计算实际持仓收益(缺失标的用现金替代,收益为0)
|
||||
total_return = 0.0
|
||||
for c in codes:
|
||||
ret = data.loc[row.name, f'日收益率_{c}'] if f'日收益率_{c}' in data.columns else None
|
||||
if ret is not None and pd.notna(ret):
|
||||
returns.append(ret)
|
||||
return np.mean(returns) if returns else 0.0
|
||||
total_return += ret * unit_weight
|
||||
# 如果数据缺失,视为现金(收益为0,不累加)
|
||||
|
||||
# 缺失标的的仓位自动变成现金(收益为0)
|
||||
# 总收益 = sum(实际持仓收益) + 0 * (缺失仓位)
|
||||
return total_return
|
||||
|
||||
result['策略日收益率'] = result.apply(calc_multi_return, axis=1)
|
||||
|
||||
@@ -256,7 +268,9 @@ class BacktestExecutor(Executor):
|
||||
changed = (signals[signal_col] != prev_signal) & prev_signal.notna()
|
||||
result.loc[changed, '策略日收益率'] -= self.trade_cost
|
||||
else:
|
||||
# 多标的策略:按换手率比例扣除成本
|
||||
# 多标的策略:按固定仓位比例扣除成本
|
||||
# 核心逻辑:每只标的权重固定为1/select_num
|
||||
# 换手率 = (调出数量 + 调入数量) / select_num
|
||||
turnover_list = []
|
||||
for curr, prev in zip(signals[signal_col], prev_signal):
|
||||
if pd.isna(prev) or curr == prev:
|
||||
@@ -264,8 +278,13 @@ class BacktestExecutor(Executor):
|
||||
else:
|
||||
old = set(prev.split(','))
|
||||
new = set(curr.split(','))
|
||||
swapped = len(old - new)
|
||||
turnover = swapped / len(old) if old else 0.0
|
||||
# 调出的标的数量(这些仓位需要卖出)
|
||||
exit_count = len(old - new)
|
||||
# 调入的标的数量(这些仓位需要买入)
|
||||
enter_count = len(new - old)
|
||||
# 换手率 = (卖出 + 买入) / select_num
|
||||
# 每次调仓涉及的仓位比例
|
||||
turnover = (exit_count + enter_count) / self.select_num
|
||||
turnover_list.append(turnover)
|
||||
|
||||
result['换手率'] = turnover_list
|
||||
|
||||
@@ -157,6 +157,10 @@ class RotationStrategy(StrategyBase):
|
||||
else:
|
||||
print(f"✓ Flask API 服务正常 (SSH: {health.get('ssh_configured', False)})")
|
||||
|
||||
# 打印回测时间区间说明
|
||||
print(f"\n回测配置区间: {self.start_date} ~ {self.end_date}")
|
||||
print("注: 各标的实际数据范围可能因上市时间/数据源限制而不同")
|
||||
|
||||
# 获取指数代码列表
|
||||
index_codes = list(code_list_config.keys())
|
||||
|
||||
@@ -413,7 +417,7 @@ class RotationStrategy(StrategyBase):
|
||||
for idx_code in valid_codes:
|
||||
etf_code = etf_code_map.get(idx_code, idx_code)
|
||||
if etf_code in etf_data.columns:
|
||||
returns_data[f'日收益率_{idx_code}'] = etf_data[etf_code].pct_change()
|
||||
returns_data[f'日收益率_{idx_code}'] = etf_data[etf_code].pct_change(fill_method=None)
|
||||
returns_df = pd.DataFrame(returns_data)
|
||||
else:
|
||||
# 回退到指数收盘价数据
|
||||
|
||||
Reference in New Issue
Block a user