Compare commits

..

20 Commits

Author SHA1 Message Date
boris 9b4462f880 修正策略止盈止损和补仓投影 2026-05-28 18:40:32 +08:00
boris 87b7b2642d 修正策略投影tick依赖 2026-05-28 18:17:33 +08:00
boris 5eee5c7c63 缩小tick查询到实际订单 2026-05-28 17:45:00 +08:00
boris c6dc1d1474 修正回测执行时tick取价 2026-05-28 17:32:40 +08:00
boris 8c86918970 修正微盘买入预算与表达式性能 2026-05-28 10:39:43 +08:00
boris 200d5d1f41 完善平台策略回测撮合和滑点 2026-05-28 08:59:14 +08:00
boris 3499d4aa74 chore: 更新 fidc-backtest-engine - 2026-05-22 2026-05-22 17:22:33 +08:00
boris 7dbd66b467 修复止盈关闭时的延迟卖出误触发 2026-05-20 17:51:29 +08:00
boris db8b0bf142 修复AiQuant回测撮合一致性 2026-05-20 12:09:01 +08:00
boris 6e54471e57 修复回测撮合与AiQuant兼容语义 2026-05-18 23:06:47 +08:00
boris 3f383c1a88 修复平台策略撮合限价与回补语义 2026-05-18 11:14:51 +08:00
boris 4577657c90 对齐 AiQuant RQAlpha 回测语义 2026-05-15 11:48:10 +08:00
boris 94662b6e75 chore: 更新 fidc-backtest-engine - 2026-05-13 2026-05-13 23:48:16 +08:00
boris 616cab0e7e chore: 更新 fidc-backtest-engine - 2026-05-13 2026-05-13 21:57:57 +08:00
boris db72f6f515 修复 AiQuant 微盘回测撮合语义 2026-05-13 18:43:02 +08:00
boris 2165831708 使用前一交易日指数价格计算市值区间,模拟实盘场景
- 修改trading_ratio()返回5个值,包含prev_level
- 使用prev_level计算市值区间,符合实盘决策逻辑
- 调整默认参数对齐AiQuant实际运行版本(xs=0.008, cap_span=10)
- 增强MA过滤调试日志,输出首个决策日所有股票的过滤详情
- 添加市值区间计算调试日志
2026-05-12 18:03:56 +08:00
boris 1a402f2048 实现市值区间padding机制
- 添加padding_ratio、min_padding、max_padding配置参数
- 在市值区间计算中应用padding扩大选股范围
- 更新OmniMicroCapConfig、CnSmallCapRotationConfig和DynamicMarketCapBandSelector
- AiQuant V1.0.4默认padding: ratio=0.5, min=12.5, max=30.0
- 目标:增加候选股票数量,匹配AiQuant行为
2026-05-11 20:38:12 +08:00
boris bbe60537ff 修复MA过滤器逻辑错误和成交量过滤器策略名称匹配
- 修复MA过滤器:第二个比较添加 * rsi_rate (ma10 * rsi_rate > ma30)
- 修复成交量过滤器:使用contains匹配策略名称而非精确匹配
- 添加调试日志用于诊断MA过滤问题
- 同时修复strategy.rs和platform_strategy_spec.rs中的逻辑
2026-05-11 20:13:52 +08:00
boris 3b033fd294 修复 core 执行层默认添加 new_listing 的问题
问题:
- platform expr 选股从 eligible_universe_on 开始
- eligible_universe_on 无条件过滤新股
- 导致即使 strategy_spec.universe.exclude 不含 new_listing,仍会过滤新股

修复:
- StrategyRuntimeSpec 补 universe_exclude 字段
- platform expr 选股从 factor/candidate/market 合并开始
- 按 strategy_spec.universe.exclude 自己决定是否排除 new_listing
- 补回归测试

相关:
- 保持旧策略默认排除不变
- 新策略可以显式不排除新股
2026-05-09 02:08:36 -07:00
boris d9de9715ef chore: 更新 fidc-backtest-engine - 2026-05-08 2026-05-08 19:57:49 -07:00
19 changed files with 8051 additions and 867 deletions
+51
View File
@@ -100,6 +100,57 @@ fn main() -> Result<(), Box<dyn Error>> {
let mut engine = BacktestEngine::new(data, strategy, broker, config); let mut engine = BacktestEngine::new(data, strategy, broker, config);
engine.run()? engine.run()?
} }
"aiquant-v104" => {
let mut strategy_cfg = OmniMicroCapConfig::aiquant_v104();
if let Ok(signal_symbol) = std::env::var("FIDC_BT_SIGNAL_SYMBOL") {
if !signal_symbol.trim().is_empty() {
strategy_cfg.benchmark_signal_symbol = signal_symbol;
}
}
if let Some(date) = debug_date {
let eligible = data.eligible_universe_on(date);
eprintln!(
"DEBUG eligible_universe_on {} count={}",
date,
eligible.len()
);
for row in eligible.iter().take(20) {
eprintln!(" {} {:.6}", row.symbol, row.market_cap_bn);
}
let mut debug_strategy = OmniMicroCapStrategy::new(strategy_cfg.clone());
let debug_subscriptions = BTreeSet::new();
let decision = debug_strategy.on_day(&StrategyContext {
execution_date: date,
decision_date: date,
decision_index: 1,
data: &data,
portfolio: &PortfolioState::new(20_000.0),
futures_account: None,
open_orders: &[],
dynamic_universe: None,
subscriptions: &debug_subscriptions,
process_events: &[],
active_process_event: None,
active_datetime: None,
order_events: &[],
fills: &[],
})?;
eprintln!("DEBUG notes={:?}", decision.notes);
eprintln!("DEBUG diagnostics={:?}", decision.diagnostics);
return Ok(());
}
config.decision_lag_trading_days = decision_lag.unwrap_or(1);
config.execution_price_field = execution_price.unwrap_or(PriceField::Close);
config.initial_cash = initial_cash.unwrap_or(20_000.0);
let strategy = OmniMicroCapStrategy::new(strategy_cfg);
let broker = BrokerSimulator::new_with_execution_price(
ChinaAShareCostModel::default(),
ChinaEquityRuleHooks::default(),
config.execution_price_field,
);
let mut engine = BacktestEngine::new(data, strategy, broker, config);
engine.run()?
}
_ => { _ => {
let mut strategy_cfg = OmniMicroCapConfig::omni_microcap(); let mut strategy_cfg = OmniMicroCapConfig::omni_microcap();
if let Ok(signal_symbol) = std::env::var("FIDC_BT_SIGNAL_SYMBOL") { if let Ok(signal_symbol) = std::env::var("FIDC_BT_SIGNAL_SYMBOL") {
File diff suppressed because it is too large Load Diff
+9 -1
View File
@@ -44,7 +44,7 @@ pub struct ChinaAShareCostModel {
impl Default for ChinaAShareCostModel { impl Default for ChinaAShareCostModel {
fn default() -> Self { fn default() -> Self {
Self { Self {
commission_rate: 0.0003, commission_rate: 0.0008,
stamp_tax_rate_before_change: 0.001, stamp_tax_rate_before_change: 0.001,
stamp_tax_rate_after_change: 0.0005, stamp_tax_rate_after_change: 0.0005,
minimum_commission: 5.0, minimum_commission: 5.0,
@@ -53,6 +53,14 @@ impl Default for ChinaAShareCostModel {
} }
impl ChinaAShareCostModel { impl ChinaAShareCostModel {
pub fn aiquant_rqalpha_default() -> Self {
Self {
stamp_tax_rate_before_change: 0.0005,
stamp_tax_rate_after_change: 0.0005,
..Self::default()
}
}
pub fn commission_for(&self, gross_amount: f64) -> f64 { pub fn commission_for(&self, gross_amount: f64) -> f64 {
if gross_amount <= 0.0 { if gross_amount <= 0.0 {
return 0.0; return 0.0;
+206 -23
View File
@@ -1,4 +1,4 @@
use std::collections::{BTreeMap, HashMap}; use std::collections::{BTreeMap, HashMap, HashSet};
use std::fs; use std::fs;
use std::path::Path; use std::path::Path;
@@ -9,6 +9,7 @@ use thiserror::Error;
use crate::calendar::TradingCalendar; use crate::calendar::TradingCalendar;
use crate::futures::{FuturesCommissionType, FuturesTradingParameter}; use crate::futures::{FuturesCommissionType, FuturesTradingParameter};
use crate::instrument::Instrument; use crate::instrument::Instrument;
use crate::risk_control::ChinaAShareRiskControl;
mod date_format { mod date_format {
use chrono::NaiveDate; use chrono::NaiveDate;
@@ -456,7 +457,9 @@ struct SymbolPriceSeries {
close_prefix: Vec<f64>, close_prefix: Vec<f64>,
prev_close_prefix: Vec<f64>, prev_close_prefix: Vec<f64>,
last_prefix: Vec<f64>, last_prefix: Vec<f64>,
volume_prefix: Vec<f64>, unpaused_volumes: Vec<f64>,
unpaused_volume_prefix: Vec<f64>,
unpaused_count_prefix: Vec<usize>,
} }
impl SymbolPriceSeries { impl SymbolPriceSeries {
@@ -469,15 +472,20 @@ impl SymbolPriceSeries {
let closes = sorted.iter().map(|row| row.close).collect::<Vec<_>>(); let closes = sorted.iter().map(|row| row.close).collect::<Vec<_>>();
let prev_closes = sorted.iter().map(|row| row.prev_close).collect::<Vec<_>>(); let prev_closes = sorted.iter().map(|row| row.prev_close).collect::<Vec<_>>();
let last_prices = sorted.iter().map(|row| row.last_price).collect::<Vec<_>>(); let last_prices = sorted.iter().map(|row| row.last_price).collect::<Vec<_>>();
let volumes = sorted
.iter()
.map(|row| row.volume as f64)
.collect::<Vec<_>>();
let open_prefix = prefix_sums(&opens); let open_prefix = prefix_sums(&opens);
let close_prefix = prefix_sums(&closes); let close_prefix = prefix_sums(&closes);
let prev_close_prefix = prefix_sums(&prev_closes); let prev_close_prefix = prefix_sums(&prev_closes);
let last_prefix = prefix_sums(&last_prices); let last_prefix = prefix_sums(&last_prices);
let volume_prefix = prefix_sums(&volumes); let mut unpaused_volumes = Vec::new();
let mut unpaused_count_prefix = Vec::with_capacity(sorted.len() + 1);
unpaused_count_prefix.push(0);
for row in &sorted {
if !row.paused {
unpaused_volumes.push(row.volume as f64);
}
unpaused_count_prefix.push(unpaused_volumes.len());
}
let unpaused_volume_prefix = prefix_sums(&unpaused_volumes);
Self { Self {
snapshots: sorted, snapshots: sorted,
@@ -490,7 +498,9 @@ impl SymbolPriceSeries {
close_prefix, close_prefix,
prev_close_prefix, prev_close_prefix,
last_prefix, last_prefix,
volume_prefix, unpaused_volumes,
unpaused_volume_prefix,
unpaused_count_prefix,
} }
} }
@@ -587,15 +597,25 @@ impl SymbolPriceSeries {
} }
fn decision_volume_moving_average(&self, date: NaiveDate, lookback: usize) -> Option<f64> { fn decision_volume_moving_average(&self, date: NaiveDate, lookback: usize) -> Option<f64> {
let values = self.decision_volume_values(date, lookback)?;
if values.len() < lookback {
return None;
}
let sum = values.iter().sum::<f64>();
Some(sum / lookback as f64)
}
fn current_volume_moving_average(&self, date: NaiveDate, lookback: usize) -> Option<f64> {
if lookback == 0 { if lookback == 0 {
return None; return None;
} }
let end = self.previous_completed_end_index(date)?; let end = self.end_index(date)?;
if end < lookback { let end_count = *self.unpaused_count_prefix.get(end)?;
if end_count < lookback {
return None; return None;
} }
let start = end - lookback; let start_count = end_count - lookback;
let sum = self.volume_prefix[end] - self.volume_prefix[start]; let sum = self.unpaused_volume_prefix[end_count] - self.unpaused_volume_prefix[start_count];
Some(sum / lookback as f64) Some(sum / lookback as f64)
} }
@@ -604,16 +624,23 @@ impl SymbolPriceSeries {
return None; return None;
} }
let end = self.previous_completed_end_index(date)?; let end = self.previous_completed_end_index(date)?;
if end < lookback { let values = self.trailing_unpaused_volumes(end, lookback)?;
if values.len() < lookback {
return None; return None;
} }
let start = end - lookback; Some(values)
Some( }
self.snapshots[start..end]
.iter() fn trailing_unpaused_volumes(&self, end: usize, lookback: usize) -> Option<Vec<f64>> {
.map(|snapshot| snapshot.volume as f64) if lookback == 0 || end == 0 {
.collect(), return None;
) }
let end_count = *self.unpaused_count_prefix.get(end)?;
if end_count < lookback {
return None;
}
let start_count = end_count - lookback;
Some(self.unpaused_volumes[start_count..end_count].to_vec())
} }
fn end_index(&self, date: NaiveDate) -> Option<usize> { fn end_index(&self, date: NaiveDate) -> Option<usize> {
@@ -641,6 +668,14 @@ impl SymbolPriceSeries {
self.values_for(field).get(end - 1).copied() self.values_for(field).get(end - 1).copied()
} }
fn snapshot_before(&self, date: NaiveDate) -> Option<&DailyMarketSnapshot> {
let end = self.previous_completed_end_index(date)?;
if end == 0 {
return None;
}
self.snapshots.get(end - 1)
}
fn prefix_for(&self, field: PriceField) -> &[f64] { fn prefix_for(&self, field: PriceField) -> &[f64] {
match field { match field {
PriceField::DayOpen => &self.open_prefix, PriceField::DayOpen => &self.open_prefix,
@@ -1050,8 +1085,12 @@ impl DataSet {
let market_series_by_symbol = build_market_series(&market_by_date); let market_series_by_symbol = build_market_series(&market_by_date);
let benchmark_series_cache = let benchmark_series_cache =
BenchmarkPriceSeries::new(&benchmark_by_date.values().cloned().collect::<Vec<_>>()); BenchmarkPriceSeries::new(&benchmark_by_date.values().cloned().collect::<Vec<_>>());
let eligible_universe_by_date = let eligible_universe_by_date = build_eligible_universe(
build_eligible_universe(&factor_by_date, &candidate_index, &market_index); &factor_by_date,
&candidate_index,
&market_index,
&instruments,
);
let futures_params_by_symbol = build_futures_params_index(futures_params); let futures_params_by_symbol = build_futures_params_index(futures_params);
Ok(Self { Ok(Self {
@@ -1144,6 +1183,33 @@ impl DataSet {
.unwrap_or(&[]) .unwrap_or(&[])
} }
pub fn execution_quote_key_set(&self) -> HashSet<(NaiveDate, String)> {
self.execution_quotes_index.keys().cloned().collect()
}
pub fn add_execution_quotes(&mut self, quotes: Vec<IntradayExecutionQuote>) -> usize {
let mut added = 0usize;
let mut touched = HashSet::<(NaiveDate, String)>::new();
for quote in quotes {
let key = (quote.date, quote.symbol.clone());
let rows = self.execution_quotes_index.entry(key.clone()).or_default();
if rows.iter().any(|existing| {
existing.timestamp == quote.timestamp && existing.symbol == quote.symbol
}) {
continue;
}
rows.push(quote);
touched.insert(key);
added += 1;
}
for key in touched {
if let Some(rows) = self.execution_quotes_index.get_mut(&key) {
rows.sort_by_key(|quote| quote.timestamp);
}
}
added
}
pub fn order_book_depth_on( pub fn order_book_depth_on(
&self, &self,
date: NaiveDate, date: NaiveDate,
@@ -1815,6 +1881,12 @@ impl DataSet {
.and_then(|series| series.price_on_or_before(date, field)) .and_then(|series| series.price_on_or_before(date, field))
} }
pub fn market_before(&self, date: NaiveDate, symbol: &str) -> Option<&DailyMarketSnapshot> {
self.market_series_by_symbol
.get(symbol)
.and_then(|series| series.snapshot_before(date))
}
pub fn factor_snapshots_on(&self, date: NaiveDate) -> Vec<&DailyFactorSnapshot> { pub fn factor_snapshots_on(&self, date: NaiveDate) -> Vec<&DailyFactorSnapshot> {
self.factor_by_date self.factor_by_date
.get(&date) .get(&date)
@@ -2065,6 +2137,34 @@ impl DataSet {
} }
} }
pub fn market_current_numeric_moving_average(
&self,
date: NaiveDate,
symbol: &str,
field: &str,
lookback: usize,
) -> Option<f64> {
let field = normalize_field(field);
match field.as_str() {
"close" | "prev_close" | "stock_close" | "price" => {
self.market_moving_average(date, symbol, lookback, PriceField::Close)
}
"volume" | "stock_volume" => self
.market_series_by_symbol
.get(symbol)
.and_then(|series| series.current_volume_moving_average(date, lookback))
.or_else(|| self.factor_moving_average(date, symbol, "daily_volume", lookback)),
"day_open" | "dayopen" => {
self.market_moving_average(date, symbol, lookback, PriceField::DayOpen)
}
"open" => self.market_moving_average(date, symbol, lookback, PriceField::Open),
"last" | "last_price" => {
self.market_moving_average(date, symbol, lookback, PriceField::Last)
}
other => self.factor_moving_average(date, symbol, other, lookback),
}
}
pub fn market_decision_numeric_values( pub fn market_decision_numeric_values(
&self, &self,
date: NaiveDate, date: NaiveDate,
@@ -3221,6 +3321,7 @@ fn build_eligible_universe(
factor_by_date: &BTreeMap<NaiveDate, Vec<DailyFactorSnapshot>>, factor_by_date: &BTreeMap<NaiveDate, Vec<DailyFactorSnapshot>>,
candidate_index: &HashMap<(NaiveDate, String), CandidateEligibility>, candidate_index: &HashMap<(NaiveDate, String), CandidateEligibility>,
market_index: &HashMap<(NaiveDate, String), DailyMarketSnapshot>, market_index: &HashMap<(NaiveDate, String), DailyMarketSnapshot>,
instruments: &HashMap<String, Instrument>,
) -> BTreeMap<NaiveDate, Vec<EligibleUniverseSnapshot>> { ) -> BTreeMap<NaiveDate, Vec<EligibleUniverseSnapshot>> {
let mut per_date = BTreeMap::<NaiveDate, Vec<EligibleUniverseSnapshot>>::new(); let mut per_date = BTreeMap::<NaiveDate, Vec<EligibleUniverseSnapshot>>::new();
@@ -3237,7 +3338,14 @@ fn build_eligible_universe(
let Some(market) = market_index.get(&key) else { let Some(market) = market_index.get(&key) else {
continue; continue;
}; };
if !candidate.eligible_for_selection() || market.paused { if ChinaAShareRiskControl::selection_rejection_reason(
*date,
candidate,
market,
instruments.get(&factor.symbol),
)
.is_some()
{
continue; continue;
} }
rows.push(EligibleUniverseSnapshot { rows.push(EligibleUniverseSnapshot {
@@ -3258,6 +3366,11 @@ fn build_eligible_universe(
per_date per_date
} }
#[cfg(test)]
fn instrument_passes_baseline_selection(instrument: Option<&Instrument>, date: NaiveDate) -> bool {
ChinaAShareRiskControl::instrument_rejection_reason(instrument, date).is_none()
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
@@ -3297,6 +3410,49 @@ mod tests {
} }
} }
#[test]
fn baseline_selection_uses_structured_instrument_dates_and_status_only() {
let date = NaiveDate::parse_from_str("2025-01-02", "%Y-%m-%d").unwrap();
let instrument = |name: &str, status: &str, delisted_at: Option<NaiveDate>| Instrument {
symbol: "000001.SZ".to_string(),
name: name.to_string(),
board: "SZ".to_string(),
round_lot: 100,
listed_at: Some(NaiveDate::parse_from_str("2020-01-01", "%Y-%m-%d").unwrap()),
delisted_at,
status: status.to_string(),
};
assert!(instrument_passes_baseline_selection(
Some(&instrument("Short History Stock", "active", None)),
date
));
assert!(instrument_passes_baseline_selection(
Some(&instrument("*ST测试", "active", None)),
date
));
assert!(instrument_passes_baseline_selection(
Some(&instrument("ST测试", "active", None)),
date
));
assert!(instrument_passes_baseline_selection(
Some(&instrument("退市测试", "active", None)),
date
));
assert!(!instrument_passes_baseline_selection(
Some(&instrument("正常名称", "delisted", None)),
date
));
assert!(!instrument_passes_baseline_selection(
Some(&instrument(
"正常名称",
"active",
Some(NaiveDate::parse_from_str("2025-01-01", "%Y-%m-%d").unwrap()),
)),
date
));
}
#[test] #[test]
fn decision_volume_average_uses_previous_completed_days_only() { fn decision_volume_average_uses_previous_completed_days_only() {
let series = SymbolPriceSeries::new(&[ let series = SymbolPriceSeries::new(&[
@@ -3328,6 +3484,33 @@ mod tests {
); );
} }
#[test]
fn decision_volume_average_skips_paused_days_before_counting_window() {
let mut paused = market_row("2025-01-03", 11.0, 0);
paused.paused = true;
let series = SymbolPriceSeries::new(&[
market_row("2025-01-02", 10.0, 100),
paused,
market_row("2025-01-06", 12.0, 300),
market_row("2025-01-07", 13.0, 10_000),
]);
assert_eq!(
series.decision_volume_moving_average(
NaiveDate::parse_from_str("2025-01-07", "%Y-%m-%d").unwrap(),
2
),
Some(200.0)
);
assert_eq!(
series.decision_volume_moving_average(
NaiveDate::parse_from_str("2025-01-07", "%Y-%m-%d").unwrap(),
3
),
None
);
}
#[test] #[test]
fn reads_mixed_numeric_and_text_extra_factors_from_quoted_csv_json() { fn reads_mixed_numeric_and_text_extra_factors_from_quoted_csv_json() {
let path = temp_csv_path("mixed_factor_maps"); let path = temp_csv_path("mixed_factor_maps");
+219 -16
View File
@@ -6,7 +6,7 @@ use thiserror::Error;
use crate::broker::{BrokerExecutionReport, BrokerSimulator, MatchingType}; use crate::broker::{BrokerExecutionReport, BrokerSimulator, MatchingType};
use crate::cost::CostModel; use crate::cost::CostModel;
use crate::data::{BenchmarkSnapshot, DataSet, DataSetError, PriceField}; use crate::data::{BenchmarkSnapshot, DataSet, DataSetError, IntradayExecutionQuote, PriceField};
use crate::event_bus::{BacktestProcessMod, BacktestProcessModLoader, ProcessEventBus}; use crate::event_bus::{BacktestProcessMod, BacktestProcessModLoader, ProcessEventBus};
use crate::events::{ use crate::events::{
AccountEvent, FillEvent, OrderEvent, OrderSide, OrderStatus, PositionEvent, ProcessEvent, AccountEvent, FillEvent, OrderEvent, OrderSide, OrderStatus, PositionEvent, ProcessEvent,
@@ -20,7 +20,10 @@ use crate::metrics::{BacktestMetrics, compute_backtest_metrics};
use crate::portfolio::{CashReceivable, HoldingSummary, PortfolioState}; use crate::portfolio::{CashReceivable, HoldingSummary, PortfolioState};
use crate::rules::EquityRuleHooks; use crate::rules::EquityRuleHooks;
use crate::scheduler::{ScheduleRule, ScheduleStage, Scheduler, default_stage_time}; use crate::scheduler::{ScheduleRule, ScheduleStage, Scheduler, default_stage_time};
use crate::strategy::{Strategy, StrategyContext}; use crate::strategy::{
OpenOrderView, OrderIntent, Strategy, StrategyContext, StrategyDecision,
TargetPortfolioOrderPricing,
};
#[derive(Debug, Error)] #[derive(Debug, Error)]
pub enum BacktestError { pub enum BacktestError {
@@ -95,6 +98,18 @@ pub struct BacktestResult {
pub metrics: BacktestMetrics, pub metrics: BacktestMetrics,
} }
#[derive(Debug, Clone)]
pub struct ExecutionQuoteRequest {
pub date: NaiveDate,
pub start_time: Option<chrono::NaiveTime>,
pub end_time: Option<chrono::NaiveTime>,
pub symbols: BTreeSet<String>,
}
type ExecutionQuoteLoader = Box<
dyn FnMut(ExecutionQuoteRequest) -> Result<Vec<IntradayExecutionQuote>, BacktestError> + Send,
>;
#[derive(Debug, Clone, Serialize)] #[derive(Debug, Clone, Serialize)]
pub struct AnalyzerTradeRow { pub struct AnalyzerTradeRow {
#[serde(with = "date_format")] #[serde(with = "date_format")]
@@ -313,6 +328,8 @@ pub struct BacktestEngine<S, C, R> {
broker: BrokerSimulator<C, R>, broker: BrokerSimulator<C, R>,
config: BacktestConfig, config: BacktestConfig,
dividend_reinvestment: bool, dividend_reinvestment: bool,
cash_dividends_enabled: bool,
cash_dividend_adjusts_cost_basis: bool,
process_event_bus: ProcessEventBus, process_event_bus: ProcessEventBus,
dynamic_universe: Option<BTreeSet<String>>, dynamic_universe: Option<BTreeSet<String>>,
subscriptions: BTreeSet<String>, subscriptions: BTreeSet<String>,
@@ -323,6 +340,7 @@ pub struct BacktestEngine<S, C, R> {
futures_settlement_price_mode: String, futures_settlement_price_mode: String,
futures_cost_model: FuturesTransactionCostModel, futures_cost_model: FuturesTransactionCostModel,
futures_validation_config: FuturesValidationConfig, futures_validation_config: FuturesValidationConfig,
execution_quote_loader: Option<ExecutionQuoteLoader>,
} }
impl<S, C, R> BacktestEngine<S, C, R> { impl<S, C, R> BacktestEngine<S, C, R> {
@@ -338,6 +356,8 @@ impl<S, C, R> BacktestEngine<S, C, R> {
broker, broker,
config, config,
dividend_reinvestment: false, dividend_reinvestment: false,
cash_dividends_enabled: true,
cash_dividend_adjusts_cost_basis: true,
process_event_bus: ProcessEventBus::new(), process_event_bus: ProcessEventBus::new(),
dynamic_universe: None, dynamic_universe: None,
subscriptions: BTreeSet::new(), subscriptions: BTreeSet::new(),
@@ -348,14 +368,39 @@ impl<S, C, R> BacktestEngine<S, C, R> {
futures_settlement_price_mode: "close".to_string(), futures_settlement_price_mode: "close".to_string(),
futures_cost_model: FuturesTransactionCostModel::default(), futures_cost_model: FuturesTransactionCostModel::default(),
futures_validation_config: FuturesValidationConfig::default(), futures_validation_config: FuturesValidationConfig::default(),
execution_quote_loader: None,
} }
} }
pub fn into_data(self) -> DataSet {
self.data
}
pub fn with_execution_quote_loader<F>(mut self, loader: F) -> Self
where
F: FnMut(ExecutionQuoteRequest) -> Result<Vec<IntradayExecutionQuote>, BacktestError>
+ Send
+ 'static,
{
self.execution_quote_loader = Some(Box::new(loader));
self
}
pub fn with_dividend_reinvestment(mut self, enabled: bool) -> Self { pub fn with_dividend_reinvestment(mut self, enabled: bool) -> Self {
self.dividend_reinvestment = enabled; self.dividend_reinvestment = enabled;
self self
} }
pub fn with_cash_dividends(mut self, enabled: bool) -> Self {
self.cash_dividends_enabled = enabled;
self
}
pub fn with_cash_dividend_cost_basis_adjustment(mut self, enabled: bool) -> Self {
self.cash_dividend_adjusts_cost_basis = enabled;
self
}
pub fn with_futures_account(mut self, account: FuturesAccountState) -> Self { pub fn with_futures_account(mut self, account: FuturesAccountState) -> Self {
self.futures_account = Some(account); self.futures_account = Some(account);
self self
@@ -460,6 +505,48 @@ where
C: CostModel, C: CostModel,
R: EquityRuleHooks, R: EquityRuleHooks,
{ {
fn ensure_execution_quotes_for_decision(
&mut self,
execution_date: NaiveDate,
portfolio: &PortfolioState,
open_orders: &[OpenOrderView],
decision: &StrategyDecision,
start_time: Option<chrono::NaiveTime>,
end_time: Option<chrono::NaiveTime>,
) -> Result<(), BacktestError> {
if self.execution_quote_loader.is_none() {
return Ok(());
}
if self.broker.execution_price_field() != PriceField::Last
&& !decision_has_algo_execution(decision)
{
return Ok(());
}
let start_time = start_time.or_else(|| self.broker.intraday_execution_start_time());
let mut symbols = execution_quote_symbols_for_decision(decision, portfolio, open_orders);
symbols.retain(|symbol| {
!has_execution_quote_in_window(&self.data, execution_date, symbol, start_time, end_time)
});
if symbols.is_empty() {
return Ok(());
}
let request = ExecutionQuoteRequest {
date: execution_date,
start_time,
end_time,
symbols,
};
let quotes = self
.execution_quote_loader
.as_mut()
.expect("checked execution quote loader")
.as_mut()(request)?;
self.data.add_execution_quotes(quotes);
Ok(())
}
fn apply_strategy_directives( fn apply_strategy_directives(
&mut self, &mut self,
execution_date: NaiveDate, execution_date: NaiveDate,
@@ -1721,6 +1808,15 @@ where
&mut auction_decision, &mut auction_decision,
&mut directive_report, &mut directive_report,
)?; )?;
let pre_auction_execution_orders = self.open_order_views();
self.ensure_execution_quotes_for_decision(
execution_date,
&portfolio,
&pre_auction_execution_orders,
&auction_decision,
None,
None,
)?;
let mut report = self.broker.execute( let mut report = self.broker.execute(
execution_date, execution_date,
&mut portfolio, &mut portfolio,
@@ -1925,6 +2021,15 @@ where
&mut directive_report, &mut directive_report,
)?; )?;
let pre_intraday_execution_orders = self.open_order_views();
self.ensure_execution_quotes_for_decision(
execution_date,
&portfolio,
&pre_intraday_execution_orders,
&decision,
None,
None,
)?;
let mut intraday_report = let mut intraday_report =
self.broker self.broker
.execute(execution_date, &mut portfolio, &self.data, &decision)?; .execute(execution_date, &mut portfolio, &self.data, &decision)?;
@@ -2082,6 +2187,15 @@ where
&mut tick_decision, &mut tick_decision,
&mut directive_report, &mut directive_report,
)?; )?;
let pre_tick_execution_orders = self.open_order_views();
self.ensure_execution_quotes_for_decision(
execution_date,
&portfolio,
&pre_tick_execution_orders,
&tick_decision,
Some(tick_time),
Some(tick_time),
)?;
let mut tick_report = self.broker.execute_between( let mut tick_report = self.broker.execute_between(
execution_date, execution_date,
&mut portfolio, &mut portfolio,
@@ -2127,7 +2241,12 @@ where
} }
} }
portfolio.update_prices(execution_date, &self.data, PriceField::Close)?; portfolio.update_prices_with_options(
execution_date,
&self.data,
PriceField::Close,
self.broker.same_day_buy_close_mark_at_fill(),
)?;
let post_trade_open_orders = self.open_order_views(); let post_trade_open_orders = self.open_order_views();
let visible_order_events = result let visible_order_events = result
@@ -2516,13 +2635,17 @@ where
continue; continue;
} }
if action.share_cash.abs() > f64::EPSILON { if self.cash_dividends_enabled && action.share_cash.abs() > f64::EPSILON {
let cash_before = portfolio.cash(); let cash_before = portfolio.cash();
let (cash_delta, quantity_after, average_cost) = { let (cash_delta, quantity_after, average_cost) = {
let position = portfolio let position = portfolio
.position_mut_if_exists(&action.symbol) .position_mut_if_exists(&action.symbol)
.expect("position exists for dividend action"); .expect("position exists for dividend action");
let cash_delta = position.apply_cash_dividend(action.share_cash); let cash_delta = if self.cash_dividend_adjusts_cost_basis {
position.apply_cash_dividend(action.share_cash)
} else {
position.apply_cash_dividend_preserve_cost_basis(action.share_cash)
};
(cash_delta, position.quantity, position.average_cost) (cash_delta, position.quantity, position.average_cost)
}; };
if cash_delta.abs() > f64::EPSILON { if cash_delta.abs() > f64::EPSILON {
@@ -2985,24 +3108,17 @@ where
} }
let quantity = position.quantity; let quantity = position.quantity;
let fallback_reference_price = if position.last_price > 0.0 { let settlement_price = if position.last_price.is_finite() && position.last_price > 0.0 {
position.last_price position.last_price
} else { } else if position.average_cost.is_finite() && position.average_cost > 0.0 {
position.average_cost position.average_cost
} else {
0.0
}; };
let effective_delisted_at = instrument let effective_delisted_at = instrument
.delisted_at .delisted_at
.or_else(|| self.data.calendar().previous_day(date)) .or_else(|| self.data.calendar().previous_day(date))
.unwrap_or(date); .unwrap_or(date);
let settlement_price = self
.data
.price_on_or_before(effective_delisted_at, &symbol, PriceField::Close)
.or_else(|| {
self.data
.price_on_or_before(date, &symbol, PriceField::Close)
})
.filter(|price| price.is_finite() && *price > 0.0)
.unwrap_or(fallback_reference_price);
if !settlement_price.is_finite() || settlement_price <= 0.0 { if !settlement_price.is_finite() || settlement_price <= 0.0 {
return Err(BacktestError::Execution(format!( return Err(BacktestError::Execution(format!(
"missing delisting settlement price for {} on {}", "missing delisting settlement price for {} on {}",
@@ -3072,6 +3188,93 @@ where
} }
} }
fn has_execution_quote_in_window(
data: &DataSet,
date: NaiveDate,
symbol: &str,
start_time: Option<chrono::NaiveTime>,
end_time: Option<chrono::NaiveTime>,
) -> bool {
let start_cursor = start_time.map(|time| date.and_time(time));
let end_cursor = end_time.map(|time| date.and_time(time));
data.execution_quotes_on(date, symbol).iter().any(|quote| {
!start_cursor.is_some_and(|cursor| quote.timestamp < cursor)
&& !end_cursor.is_some_and(|cursor| quote.timestamp > cursor)
})
}
fn decision_has_algo_execution(decision: &StrategyDecision) -> bool {
decision.order_intents.iter().any(|intent| {
matches!(
intent,
OrderIntent::AlgoValue { .. }
| OrderIntent::AlgoPercent { .. }
| OrderIntent::TargetPortfolioSmart {
order_prices: Some(TargetPortfolioOrderPricing::AlgoOrder { .. }),
..
}
)
})
}
fn execution_quote_symbols_for_decision(
decision: &StrategyDecision,
portfolio: &PortfolioState,
open_orders: &[OpenOrderView],
) -> BTreeSet<String> {
let mut symbols = BTreeSet::new();
symbols.extend(open_orders.iter().map(|order| order.symbol.clone()));
if decision.rebalance {
symbols.extend(portfolio.positions().keys().cloned());
symbols.extend(decision.target_weights.keys().cloned());
}
if !decision.exit_symbols.is_empty() {
symbols.extend(decision.exit_symbols.iter().cloned());
}
for intent in &decision.order_intents {
match intent {
OrderIntent::Shares { symbol, .. }
| OrderIntent::LimitShares { symbol, .. }
| OrderIntent::Lots { symbol, .. }
| OrderIntent::LimitLots { symbol, .. }
| OrderIntent::TargetShares { symbol, .. }
| OrderIntent::LimitTargetShares { symbol, .. }
| OrderIntent::TargetValue { symbol, .. }
| OrderIntent::LimitTargetValue { symbol, .. }
| OrderIntent::Value { symbol, .. }
| OrderIntent::LimitValue { symbol, .. }
| OrderIntent::Percent { symbol, .. }
| OrderIntent::LimitPercent { symbol, .. }
| OrderIntent::TargetPercent { symbol, .. }
| OrderIntent::LimitTargetPercent { symbol, .. }
| OrderIntent::AlgoValue { symbol, .. }
| OrderIntent::AlgoPercent { symbol, .. }
| OrderIntent::CancelSymbol { symbol, .. } => {
symbols.insert(symbol.clone());
}
OrderIntent::TargetPortfolioSmart { target_weights, .. } => {
symbols.extend(portfolio.positions().keys().cloned());
symbols.extend(target_weights.keys().cloned());
}
OrderIntent::CancelAll { .. } => {
symbols.extend(open_orders.iter().map(|order| order.symbol.clone()));
}
OrderIntent::UpdateUniverse { .. }
| OrderIntent::Subscribe { .. }
| OrderIntent::Unsubscribe { .. }
| OrderIntent::DepositWithdraw { .. }
| OrderIntent::FinanceRepay { .. }
| OrderIntent::SetManagementFeeRate { .. }
| OrderIntent::CancelOrder { .. }
| OrderIntent::Futures { .. } => {}
}
}
symbols.retain(|symbol| !symbol.trim().is_empty());
symbols
}
fn collect_scheduled_decisions<S: Strategy>( fn collect_scheduled_decisions<S: Strategy>(
strategy: &mut S, strategy: &mut S,
scheduler: &Scheduler<'_>, scheduler: &Scheduler<'_>,
+8 -4
View File
@@ -12,13 +12,16 @@ pub mod platform_expr_strategy;
pub mod platform_runtime_schema; pub mod platform_runtime_schema;
pub mod platform_strategy_spec; pub mod platform_strategy_spec;
pub mod portfolio; pub mod portfolio;
pub mod risk_control;
pub mod rules; pub mod rules;
pub mod scheduler; pub mod scheduler;
pub mod strategy; pub mod strategy;
pub mod strategy_ai; pub mod strategy_ai;
pub mod universe; pub mod universe;
pub use broker::{BrokerExecutionReport, BrokerSimulator, MatchingType, SlippageModel}; pub use broker::{
BrokerExecutionReport, BrokerSimulator, DynamicSlippageConfig, MatchingType, SlippageModel,
};
pub use calendar::TradingCalendar; pub use calendar::TradingCalendar;
pub use cost::{ChinaAShareCostModel, CostModel, TradingCost}; pub use cost::{ChinaAShareCostModel, CostModel, TradingCost};
pub use data::{ pub use data::{
@@ -31,7 +34,7 @@ pub use data::{
pub use engine::{ pub use engine::{
AnalyzerMonthlyReturnRow, AnalyzerPositionRow, AnalyzerReport, AnalyzerRiskSummary, AnalyzerMonthlyReturnRow, AnalyzerPositionRow, AnalyzerReport, AnalyzerRiskSummary,
AnalyzerTradeRow, BacktestConfig, BacktestDayProgress, BacktestEngine, BacktestError, AnalyzerTradeRow, BacktestConfig, BacktestDayProgress, BacktestEngine, BacktestError,
BacktestResult, DailyEquityPoint, FuturesValidationConfig, BacktestResult, DailyEquityPoint, ExecutionQuoteRequest, FuturesValidationConfig,
}; };
pub use event_bus::{BacktestProcessMod, BacktestProcessModLoader, ProcessEventBus}; pub use event_bus::{BacktestProcessMod, BacktestProcessModLoader, ProcessEventBus};
pub use events::{ pub use events::{
@@ -48,8 +51,8 @@ pub use metrics::{BacktestMetrics, compute_backtest_metrics};
pub use platform_expr_strategy::{ pub use platform_expr_strategy::{
PlatformAccountActionKind, PlatformExplicitActionStage, PlatformExplicitCancelKind, PlatformAccountActionKind, PlatformExplicitActionStage, PlatformExplicitCancelKind,
PlatformExplicitOrderKind, PlatformExprStrategy, PlatformExprStrategyConfig, PlatformExplicitOrderKind, PlatformExprStrategy, PlatformExprStrategyConfig,
PlatformRebalanceSchedule, PlatformScheduleFrequency, PlatformTradeAction, PlatformRebalanceSchedule, PlatformScheduleFrequency, PlatformSelectionQuotePlan,
PlatformUniverseActionKind, PlatformTradeAction, PlatformUniverseActionKind,
}; };
pub use platform_runtime_schema::{ pub use platform_runtime_schema::{
PLATFORM_RUNTIME_SCHEMA_VERSION, PlatformRuntimeSchema, reserved_scope_names, PLATFORM_RUNTIME_SCHEMA_VERSION, PlatformRuntimeSchema, reserved_scope_names,
@@ -66,6 +69,7 @@ pub use platform_strategy_spec::{
StrategyRuntimeSpec, platform_expr_config_from_spec, platform_expr_config_from_value, StrategyRuntimeSpec, platform_expr_config_from_spec, platform_expr_config_from_value,
}; };
pub use portfolio::{CashReceivable, HoldingSummary, PendingCashFlow, PortfolioState, Position}; pub use portfolio::{CashReceivable, HoldingSummary, PendingCashFlow, PortfolioState, Position};
pub use risk_control::ChinaAShareRiskControl;
pub use rules::{ChinaEquityRuleHooks, EquityRuleHooks, RuleCheck}; pub use rules::{ChinaEquityRuleHooks, EquityRuleHooks, RuleCheck};
pub use scheduler::{ pub use scheduler::{
ScheduleFrequency, ScheduleRule, ScheduleStage, ScheduleTimeRule, Scheduler, default_stage_time, ScheduleFrequency, ScheduleRule, ScheduleStage, ScheduleTimeRule, Scheduler, default_stage_time,
File diff suppressed because it is too large Load Diff
@@ -223,6 +223,7 @@ const RUNTIME_HELPER_FUNCTIONS: &[&str] = &[
"factor", "factor",
"day_factor", "day_factor",
"rolling_mean", "rolling_mean",
"rolling_mean_current",
"ma", "ma",
"sma", "sma",
"vma", "vma",
+117 -3
View File
@@ -20,6 +20,8 @@ pub struct StrategyRuntimeSpec {
#[serde(default)] #[serde(default)]
pub benchmark: Option<StrategyBenchmarkSpec>, pub benchmark: Option<StrategyBenchmarkSpec>,
#[serde(default)] #[serde(default)]
pub universe: Option<StrategyUniverseSpec>,
#[serde(default)]
pub signal_symbol: Option<String>, pub signal_symbol: Option<String>,
#[serde(default)] #[serde(default)]
pub execution: Option<StrategyExecutionSpec>, pub execution: Option<StrategyExecutionSpec>,
@@ -40,9 +42,18 @@ pub struct StrategyBenchmarkSpec {
pub fallback_instrument_id: Option<String>, pub fallback_instrument_id: Option<String>,
} }
#[derive(Debug, Clone, Default, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct StrategyUniverseSpec {
#[serde(default)]
pub exclude: Vec<String>,
}
#[derive(Debug, Clone, Default, Deserialize, Serialize)] #[derive(Debug, Clone, Default, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct StrategyExecutionSpec { pub struct StrategyExecutionSpec {
#[serde(default)]
pub compatibility_profile: Option<String>,
#[serde(default)] #[serde(default)]
pub matching_type: Option<String>, pub matching_type: Option<String>,
#[serde(default)] #[serde(default)]
@@ -50,6 +61,12 @@ pub struct StrategyExecutionSpec {
#[serde(default)] #[serde(default)]
pub slippage_value: Option<f64>, pub slippage_value: Option<f64>,
#[serde(default)] #[serde(default)]
pub slippage_impact_coefficient: Option<f64>,
#[serde(default)]
pub slippage_volatility_coefficient: Option<f64>,
#[serde(default)]
pub slippage_max_value: Option<f64>,
#[serde(default)]
pub strict_value_budget: Option<bool>, pub strict_value_budget: Option<bool>,
} }
@@ -85,6 +102,12 @@ pub struct StrategyEngineConfig {
#[serde(default)] #[serde(default)]
pub slippage_value: Option<f64>, pub slippage_value: Option<f64>,
#[serde(default)] #[serde(default)]
pub slippage_impact_coefficient: Option<f64>,
#[serde(default)]
pub slippage_volatility_coefficient: Option<f64>,
#[serde(default)]
pub slippage_max_value: Option<f64>,
#[serde(default)]
pub strict_value_budget: Option<bool>, pub strict_value_budget: Option<bool>,
#[serde(default)] #[serde(default)]
pub dividend_reinvestment: Option<bool>, pub dividend_reinvestment: Option<bool>,
@@ -105,6 +128,15 @@ pub struct DynamicRangeConfig {
pub cap_span: Option<f64>, pub cap_span: Option<f64>,
#[serde(default)] #[serde(default)]
pub xs: Option<f64>, pub xs: Option<f64>,
/// Padding ratio to expand the market cap range (e.g., 0.5 means 50% of span)
#[serde(default)]
pub padding_ratio: Option<f64>,
/// Minimum padding in billion yuan
#[serde(default)]
pub min_padding: Option<f64>,
/// Maximum padding in billion yuan
#[serde(default)]
pub max_padding: Option<f64>,
} }
#[derive(Debug, Clone, Default, Deserialize, Serialize)] #[derive(Debug, Clone, Default, Deserialize, Serialize)]
@@ -138,6 +170,8 @@ pub struct IndexThrottleConfig {
#[derive(Debug, Clone, Default, Deserialize, Serialize)] #[derive(Debug, Clone, Default, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct SkipWindowConfig { pub struct SkipWindowConfig {
#[serde(default)]
pub year: Option<u32>,
#[serde(default)] #[serde(default)]
pub month: Option<u32>, pub month: Option<u32>,
#[serde(default)] #[serde(default)]
@@ -350,6 +384,13 @@ pub fn platform_expr_config_from_spec(
{ {
cfg.rebalance_schedule = Some(schedule); cfg.rebalance_schedule = Some(schedule);
} }
if let Some(time) = engine
.rebalance_schedule
.as_ref()
.and_then(parse_schedule_execution_time)
{
cfg.intraday_execution_time = Some(time);
}
if let Some(stock_ma_filter) = engine.stock_ma_filter.as_ref() { if let Some(stock_ma_filter) = engine.stock_ma_filter.as_ref() {
if let Some(days) = stock_ma_filter.short_days.filter(|value| *value > 0) { if let Some(days) = stock_ma_filter.short_days.filter(|value| *value > 0) {
cfg.stock_short_ma_days = days; cfg.stock_short_ma_days = days;
@@ -373,7 +414,14 @@ pub fn platform_expr_config_from_spec(
cfg.skip_month_day_ranges = engine cfg.skip_month_day_ranges = engine
.skip_windows .skip_windows
.iter() .iter()
.filter_map(|window| Some((window.month?, window.start_day?, window.end_day?))) .filter_map(|window| {
Some((
window.year,
window.month?,
window.start_day?,
window.end_day?,
))
})
.collect(); .collect();
} }
if let Some(spec_signal_symbol) = engine if let Some(spec_signal_symbol) = engine
@@ -424,6 +472,14 @@ pub fn platform_expr_config_from_spec(
cfg.signal_symbol = spec_signal_symbol.clone(); cfg.signal_symbol = spec_signal_symbol.clone();
} }
} }
if let Some(universe) = spec.universe.as_ref() {
cfg.universe_exclude = universe
.exclude
.iter()
.map(|item| item.trim().to_ascii_lowercase())
.filter(|item| !item.is_empty())
.collect();
}
let mut prelude_parts = Vec::new(); let mut prelude_parts = Vec::new();
if let Some(runtime_expr) = spec.runtime_expressions.as_ref() if let Some(runtime_expr) = spec.runtime_expressions.as_ref()
@@ -464,6 +520,13 @@ pub fn platform_expr_config_from_spec(
{ {
cfg.rebalance_schedule = Some(schedule); cfg.rebalance_schedule = Some(schedule);
} }
if let Some(time) = runtime_expr
.schedule
.as_ref()
.and_then(parse_schedule_execution_time)
{
cfg.intraday_execution_time = Some(time);
}
if let Some(selection) = runtime_expr.selection.as_ref() { if let Some(selection) = runtime_expr.selection.as_ref() {
if let Some(expr) = selection if let Some(expr) = selection
.limit_expr .limit_expr
@@ -593,6 +656,13 @@ pub fn platform_expr_config_from_spec(
{ {
cfg.explicit_action_schedule = Some(schedule); cfg.explicit_action_schedule = Some(schedule);
} }
if let Some(time) = trading
.schedule
.as_ref()
.and_then(parse_schedule_execution_time)
{
cfg.intraday_execution_time = Some(time);
}
cfg.explicit_actions = trading cfg.explicit_actions = trading
.actions .actions
.iter() .iter()
@@ -619,8 +689,8 @@ pub fn platform_expr_config_from_spec(
if let Some(stock_ma_filter) = engine.stock_ma_filter.as_ref() { if let Some(stock_ma_filter) = engine.stock_ma_filter.as_ref() {
let ratio = stock_ma_filter.rsi_rate.unwrap_or(1.0001); let ratio = stock_ma_filter.rsi_rate.unwrap_or(1.0001);
cfg.stock_filter_expr = format!( cfg.stock_filter_expr = format!(
"stock_ma_short > stock_ma_mid * {} && stock_ma_mid > stock_ma_long", "stock_ma_short > stock_ma_mid * {} && stock_ma_mid * {} > stock_ma_long",
ratio ratio, ratio
); );
} }
if let Some(index_throttle) = engine.index_throttle.as_ref() { if let Some(index_throttle) = engine.index_throttle.as_ref() {
@@ -653,6 +723,15 @@ pub fn platform_expr_config_from_spec(
if !cfg.benchmark_symbol.trim().is_empty() { if !cfg.benchmark_symbol.trim().is_empty() {
cfg.benchmark_symbol = normalize_symbol(&cfg.benchmark_symbol, None); cfg.benchmark_symbol = normalize_symbol(&cfg.benchmark_symbol, None);
} }
if spec
.execution
.as_ref()
.and_then(|execution| execution.compatibility_profile.as_deref())
.map(|value| value.trim().to_ascii_lowercase())
.is_some_and(|value| value == "aiquant_rqalpha" || value == "aiquant")
{
cfg.aiquant_transaction_cost = true;
}
cfg cfg
} }
@@ -709,6 +788,16 @@ fn parse_schedule_time_rule(
} }
} }
fn parse_schedule_execution_time(schedule: &StrategyExpressionScheduleConfig) -> Option<NaiveTime> {
match parse_schedule_time_rule(schedule)? {
ScheduleTimeRule::BeforeTrading => NaiveTime::from_hms_opt(9, 0, 0),
ScheduleTimeRule::MinuteOfDay(minutes) => {
let seconds = minutes.checked_mul(60)?;
NaiveTime::from_num_seconds_from_midnight_opt(seconds, 0)
}
}
}
fn parse_schedule_clock_time(raw: Option<&str>) -> Option<NaiveTime> { fn parse_schedule_clock_time(raw: Option<&str>) -> Option<NaiveTime> {
let value = raw?.trim(); let value = raw?.trim();
if value.is_empty() { if value.is_empty() {
@@ -1024,6 +1113,8 @@ mod tests {
"strategyId": "runtime_spec_test", "strategyId": "runtime_spec_test",
"signalSymbol": "000852.SH", "signalSymbol": "000852.SH",
"benchmark": { "instrumentId": "000852.SH" }, "benchmark": { "instrumentId": "000852.SH" },
"universe": { "exclude": ["paused", "st", "kcb", "one_yuan"] },
"execution": { "compatibilityProfile": "aiquant_rqalpha" },
"runtimeExpressions": { "runtimeExpressions": {
"prelude": "let stocknum = 8;", "prelude": "let stocknum = 8;",
"selection": { "selection": {
@@ -1054,13 +1145,36 @@ mod tests {
assert_eq!(cfg.strategy_name, "runtime_spec_test"); assert_eq!(cfg.strategy_name, "runtime_spec_test");
assert_eq!(cfg.signal_symbol, "000852.SH"); assert_eq!(cfg.signal_symbol, "000852.SH");
assert_eq!(cfg.selection_limit_expr, "stocknum"); assert_eq!(cfg.selection_limit_expr, "stocknum");
assert_eq!(cfg.universe_exclude, ["paused", "st", "kcb", "one_yuan"]);
assert!(!cfg.rotation_enabled); assert!(!cfg.rotation_enabled);
assert!(cfg.daily_top_up_enabled); assert!(cfg.daily_top_up_enabled);
assert!(cfg.retry_empty_rebalance); assert!(cfg.retry_empty_rebalance);
assert!(!cfg.calendar_rebalance_interval);
assert!(cfg.aiquant_transaction_cost);
assert_eq!(cfg.explicit_actions.len(), 1); assert_eq!(cfg.explicit_actions.len(), 1);
assert_eq!( assert_eq!(
cfg.explicit_action_stage, cfg.explicit_action_stage,
PlatformExplicitActionStage::OpenAuction PlatformExplicitActionStage::OpenAuction
); );
} }
#[test]
fn parses_daily_schedule_time_for_aiquant_execution_quotes() {
let spec = serde_json::json!({
"execution": { "compatibilityProfile": "aiquant_rqalpha" },
"runtimeExpressions": {
"schedule": { "frequency": "daily", "time": "09:33" }
}
});
let cfg = platform_expr_config_from_value("", "", &spec).expect("config");
assert_eq!(cfg.rebalance_schedule, None);
assert_eq!(
cfg.intraday_execution_time,
Some(NaiveTime::from_hms_opt(9, 33, 0).unwrap())
);
assert!(!cfg.calendar_rebalance_interval);
assert!(cfg.aiquant_transaction_cost);
}
} }
+249 -4
View File
@@ -1,7 +1,7 @@
use chrono::NaiveDate; use chrono::NaiveDate;
use indexmap::IndexMap; use indexmap::IndexMap;
use serde::Serialize; use serde::Serialize;
use std::collections::BTreeMap; use std::collections::{BTreeMap, BTreeSet};
use crate::data::{DataSet, DataSetError, PriceField}; use crate::data::{DataSet, DataSetError, PriceField};
@@ -9,6 +9,7 @@ use crate::data::{DataSet, DataSetError, PriceField};
pub struct PositionLot { pub struct PositionLot {
pub acquired_date: NaiveDate, pub acquired_date: NaiveDate,
pub quantity: u32, pub quantity: u32,
pub entry_price: f64,
pub price: f64, pub price: f64,
} }
@@ -72,6 +73,7 @@ impl Position {
self.lots.push(PositionLot { self.lots.push(PositionLot {
acquired_date: date, acquired_date: date,
quantity, quantity,
entry_price: price,
price, price,
}); });
self.quantity += quantity; self.quantity += quantity;
@@ -205,6 +207,22 @@ impl Position {
} }
} }
pub fn record_buy_trade_cost(&mut self, quantity: u32, value: f64) {
if quantity == 0 || !value.is_finite() {
return;
}
let cost = value.max(0.0);
if cost <= 0.0 {
return;
}
if let Some(lot) = self.lots.last_mut() {
lot.price += cost / quantity as f64;
self.recalculate_average_cost();
}
self.day_trade_cost += cost;
self.refresh_day_pnl();
}
pub fn set_dividend_receivable(&mut self, value: f64) { pub fn set_dividend_receivable(&mut self, value: f64) {
self.dividend_receivable = if value.is_finite() { self.dividend_receivable = if value.is_finite() {
value.max(0.0) value.max(0.0)
@@ -214,13 +232,28 @@ impl Position {
} }
pub fn holding_return(&self, price: f64) -> Option<f64> { pub fn holding_return(&self, price: f64) -> Option<f64> {
if self.quantity == 0 || self.average_cost <= 0.0 { let Some(avg_price) = self.average_entry_price() else {
return None;
};
if avg_price <= 0.0 {
None None
} else { } else {
Some((price / self.average_cost) - 1.0) Some((price / avg_price) - 1.0)
} }
} }
pub fn average_entry_price(&self) -> Option<f64> {
if self.quantity == 0 {
return None;
}
let total = self
.lots
.iter()
.map(|lot| lot.entry_price * lot.quantity as f64)
.sum::<f64>();
Some(total / self.quantity as f64)
}
fn recalculate_average_cost(&mut self) { fn recalculate_average_cost(&mut self) {
if self.quantity == 0 { if self.quantity == 0 {
self.average_cost = 0.0; self.average_cost = 0.0;
@@ -237,14 +270,31 @@ impl Position {
} }
pub fn apply_cash_dividend(&mut self, dividend_per_share: f64) -> f64 { pub fn apply_cash_dividend(&mut self, dividend_per_share: f64) -> f64 {
self.apply_cash_dividend_internal(dividend_per_share, true)
}
pub fn apply_cash_dividend_preserve_cost_basis(&mut self, dividend_per_share: f64) -> f64 {
self.apply_cash_dividend_internal(dividend_per_share, false)
}
fn apply_cash_dividend_internal(
&mut self,
dividend_per_share: f64,
adjust_cost_basis: bool,
) -> f64 {
if self.quantity == 0 || !dividend_per_share.is_finite() || dividend_per_share == 0.0 { if self.quantity == 0 || !dividend_per_share.is_finite() || dividend_per_share == 0.0 {
return 0.0; return 0.0;
} }
for lot in &mut self.lots { for lot in &mut self.lots {
lot.entry_price -= dividend_per_share;
if adjust_cost_basis {
lot.price -= dividend_per_share; lot.price -= dividend_per_share;
} }
}
if adjust_cost_basis {
self.average_cost -= dividend_per_share; self.average_cost -= dividend_per_share;
}
self.last_price -= dividend_per_share; self.last_price -= dividend_per_share;
let cash_delta = self.quantity as f64 * dividend_per_share; let cash_delta = self.quantity as f64 * dividend_per_share;
self.day_dividend_cash += cash_delta; self.day_dividend_cash += cash_delta;
@@ -264,6 +314,7 @@ impl Position {
.map(|lot| PositionLot { .map(|lot| PositionLot {
acquired_date: lot.acquired_date, acquired_date: lot.acquired_date,
quantity: round_half_up_u32(lot.quantity as f64 * ratio), quantity: round_half_up_u32(lot.quantity as f64 * ratio),
entry_price: lot.entry_price / ratio,
price: lot.price / ratio, price: lot.price / ratio,
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
@@ -316,6 +367,7 @@ pub struct PortfolioState {
positions: IndexMap<String, Position>, positions: IndexMap<String, Position>,
cash_receivables: Vec<CashReceivable>, cash_receivables: Vec<CashReceivable>,
pending_cash_flows: Vec<PendingCashFlow>, pending_cash_flows: Vec<PendingCashFlow>,
day_sold_symbols: BTreeSet<String>,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@@ -348,6 +400,7 @@ impl PortfolioState {
positions: IndexMap::new(), positions: IndexMap::new(),
cash_receivables: Vec::new(), cash_receivables: Vec::new(),
pending_cash_flows: Vec::new(), pending_cash_flows: Vec::new(),
day_sold_symbols: BTreeSet::new(),
} }
} }
@@ -402,7 +455,18 @@ impl PortfolioState {
} }
pub fn prune_flat_positions(&mut self) { pub fn prune_flat_positions(&mut self) {
self.positions.retain(|_, position| !position.is_flat()); let mut sold_symbols = Vec::new();
self.positions.retain(|symbol, position| {
if position.is_flat() {
if position.sold_quantity() > 0 {
sold_symbols.push(symbol.clone());
}
false
} else {
true
}
});
self.day_sold_symbols.extend(sold_symbols);
} }
pub fn add_cash_receivable(&mut self, receivable: CashReceivable) { pub fn add_cash_receivable(&mut self, receivable: CashReceivable) {
@@ -538,6 +602,7 @@ impl PortfolioState {
} }
pub fn begin_trading_day(&mut self) { pub fn begin_trading_day(&mut self) {
self.day_sold_symbols.clear();
for position in self.positions.values_mut() { for position in self.positions.values_mut() {
position.begin_trading_day(); position.begin_trading_day();
} }
@@ -550,7 +615,31 @@ impl PortfolioState {
data: &DataSet, data: &DataSet,
field: PriceField, field: PriceField,
) -> Result<(), DataSetError> { ) -> Result<(), DataSetError> {
self.update_prices_with_options(date, data, field, false)
}
pub fn update_prices_with_options(
&mut self,
date: NaiveDate,
data: &DataSet,
field: PriceField,
same_day_buy_close_mark_at_fill: bool,
) -> Result<(), DataSetError> {
let day_sold_symbols = self.day_sold_symbols.clone();
for position in self.positions.values_mut() { for position in self.positions.values_mut() {
let sold_today =
position.sold_quantity() > 0 || day_sold_symbols.contains(&position.symbol);
if same_day_buy_close_mark_at_fill
&& field == PriceField::Close
&& position.day_buy_quantity > 0
&& !sold_today
&& position.sellable_qty(date) == 0
&& position.last_price.is_finite()
&& position.last_price > 0.0
{
position.refresh_day_pnl();
continue;
}
let price = data let price = data
.price(date, &position.symbol, field) .price(date, &position.symbol, field)
.or_else(|| data.price_on_or_before(date, &position.symbol, field)) .or_else(|| data.price_on_or_before(date, &position.symbol, field))
@@ -705,6 +794,7 @@ impl PortfolioState {
.map(|lot| PositionLot { .map(|lot| PositionLot {
acquired_date: lot.acquired_date, acquired_date: lot.acquired_date,
quantity: round_half_up_u32(lot.quantity as f64 * ratio), quantity: round_half_up_u32(lot.quantity as f64 * ratio),
entry_price: lot.entry_price / ratio,
price: lot.price / ratio, price: lot.price / ratio,
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
@@ -801,6 +891,35 @@ mod tests {
); );
} }
#[test]
fn strategy_entry_price_excludes_buy_commission_cost_basis() {
let date = NaiveDate::from_ymd_opt(2025, 1, 2).unwrap();
let mut position = Position::new("600561.SH");
position.buy(date, 22_200, 5.66);
position.record_buy_trade_cost(22_200, 100.0);
assert!(position.average_cost > 5.66);
assert!((position.average_entry_price().unwrap() - 5.66).abs() < 1e-12);
assert!((position.holding_return(6.06).unwrap() - (6.06 / 5.66 - 1.0)).abs() < 1e-12);
}
#[test]
fn cash_dividend_can_preserve_avg_cost_for_aiquant_compatibility() {
let date = NaiveDate::from_ymd_opt(2025, 1, 2).unwrap();
let mut position = Position::new("603102.SH");
position.buy(date, 1000, 46.45);
position.record_buy_trade_cost(1000, 37.16);
let cost_before = position.average_cost;
let entry_before = position.average_entry_price().unwrap();
let cash = position.apply_cash_dividend_preserve_cost_basis(0.6);
assert!((cash - 600.0).abs() < 1e-12);
assert!((position.average_cost - cost_before).abs() < 1e-12);
assert!((position.average_entry_price().unwrap() - (entry_before - 0.6)).abs() < 1e-12);
assert!((position.last_price - 45.85).abs() < 1e-12);
}
#[test] #[test]
fn portfolio_tracks_dividend_receivable_and_day_pnl() { fn portfolio_tracks_dividend_receivable_and_day_pnl() {
let prev_date = NaiveDate::from_ymd_opt(2025, 1, 2).unwrap(); let prev_date = NaiveDate::from_ymd_opt(2025, 1, 2).unwrap();
@@ -1066,6 +1185,132 @@ mod tests {
assert!(position.position_pnl.abs() < 1e-6); assert!(position.position_pnl.abs() < 1e-6);
} }
#[test]
fn portfolio_marks_same_day_buy_at_fill_until_next_trading_day() {
let buy_date = NaiveDate::from_ymd_opt(2025, 2, 10).unwrap();
let next_date = NaiveDate::from_ymd_opt(2025, 2, 11).unwrap();
let symbol = "002652.SZ";
let mut portfolio = PortfolioState::new(20_000.0);
portfolio.position_mut(symbol).buy(buy_date, 1300, 3.01);
let dataset = DataSet::from_components(
vec![Instrument {
symbol: symbol.to_string(),
name: "Same Day Buy Test".to_string(),
board: "SZ".to_string(),
round_lot: 100,
listed_at: None,
delisted_at: None,
status: "active".to_string(),
}],
vec![
DailyMarketSnapshot {
date: buy_date,
symbol: symbol.to_string(),
timestamp: None,
day_open: 2.99,
open: 2.99,
high: 3.06,
low: 2.98,
close: 3.06,
last_price: 3.06,
bid1: 3.01,
ask1: 3.02,
prev_close: 2.98,
volume: 152_975,
tick_volume: 152_975,
bid1_volume: 338,
ask1_volume: 2476,
trading_phase: None,
paused: false,
upper_limit: 3.28,
lower_limit: 2.68,
price_tick: 0.01,
},
DailyMarketSnapshot {
date: next_date,
symbol: symbol.to_string(),
timestamp: None,
day_open: 3.03,
open: 3.03,
high: 3.08,
low: 3.00,
close: 3.07,
last_price: 3.07,
bid1: 3.06,
ask1: 3.07,
prev_close: 3.06,
volume: 160_000,
tick_volume: 160_000,
bid1_volume: 1000,
ask1_volume: 1000,
trading_phase: None,
paused: false,
upper_limit: 3.37,
lower_limit: 2.75,
price_tick: 0.01,
},
],
Vec::new(),
Vec::new(),
vec![
BenchmarkSnapshot {
date: buy_date,
benchmark: "000852.SH".to_string(),
open: 1000.0,
close: 1000.0,
prev_close: 999.0,
volume: 1000,
},
BenchmarkSnapshot {
date: next_date,
benchmark: "000852.SH".to_string(),
open: 1001.0,
close: 1001.0,
prev_close: 1000.0,
volume: 1000,
},
],
)
.expect("dataset");
portfolio
.update_prices_with_options(buy_date, &dataset, PriceField::Close, true)
.expect("same day close");
let position = portfolio.position(symbol).expect("position");
assert!((position.last_price - 3.01).abs() < 1e-9);
assert!((position.market_value() - 3913.0).abs() < 1e-6);
portfolio.begin_trading_day();
portfolio
.update_prices(next_date, &dataset, PriceField::Close)
.expect("next day close");
let position = portfolio.position(symbol).expect("position");
assert!((position.last_price - 3.07).abs() < 1e-9);
assert!((position.market_value() - 3991.0).abs() < 1e-6);
let prev_date = NaiveDate::from_ymd_opt(2025, 2, 7).unwrap();
let mut roundtrip_portfolio = PortfolioState::new(20_000.0);
roundtrip_portfolio
.position_mut(symbol)
.buy(prev_date, 2000, 2.90);
roundtrip_portfolio.begin_trading_day();
roundtrip_portfolio
.position_mut(symbol)
.sell(2000, 3.01)
.expect("same day sell");
roundtrip_portfolio.prune_flat_positions();
roundtrip_portfolio
.position_mut(symbol)
.buy(buy_date, 1800, 3.01);
roundtrip_portfolio
.update_prices(buy_date, &dataset, PriceField::Close)
.expect("same day roundtrip close");
let position = roundtrip_portfolio.position(symbol).expect("position");
assert!((position.last_price - 3.06).abs() < 1e-9);
assert!((position.market_value() - 5508.0).abs() < 1e-6);
}
#[test] #[test]
fn position_tracks_day_lifecycle_fields() { fn position_tracks_day_lifecycle_fields() {
let prev_date = NaiveDate::from_ymd_opt(2025, 1, 2).unwrap(); let prev_date = NaiveDate::from_ymd_opt(2025, 1, 2).unwrap();
+125
View File
@@ -0,0 +1,125 @@
use chrono::NaiveDate;
use crate::data::{CandidateEligibility, DailyMarketSnapshot, PriceField};
use crate::instrument::Instrument;
use crate::portfolio::Position;
#[derive(Debug, Clone, Copy, Default)]
pub struct ChinaAShareRiskControl;
impl ChinaAShareRiskControl {
pub fn instrument_rejection_reason(
instrument: Option<&Instrument>,
date: NaiveDate,
) -> Option<&'static str> {
let instrument = instrument?;
if instrument
.listed_at
.is_some_and(|listed_at| listed_at > date)
{
return Some("not_listed");
}
if instrument
.delisted_at
.is_some_and(|delisted_at| delisted_at <= date)
{
return Some("inactive_or_delisted");
}
let status = instrument.status.trim().to_ascii_lowercase();
if matches!(
status.as_str(),
"inactive" | "delisted" | "terminated" | "expired"
) || status.contains("delist")
{
return Some("inactive_or_delisted");
}
None
}
pub fn selection_rejection_reason(
date: NaiveDate,
candidate: &CandidateEligibility,
market: &DailyMarketSnapshot,
instrument: Option<&Instrument>,
) -> Option<&'static str> {
if let Some(reason) = Self::instrument_rejection_reason(instrument, date) {
return Some(reason);
}
if market.paused || candidate.is_paused {
return Some("paused");
}
if candidate.is_st {
return Some("st");
}
if candidate.is_new_listing {
return Some("new_listing");
}
if candidate.is_kcb {
return Some("kcb");
}
if candidate.is_one_yuan || market.day_open <= 1.0 {
return Some("one_yuan");
}
if !candidate.allow_buy || !candidate.allow_sell {
return Some("trade_disabled");
}
None
}
pub fn buy_rejection_reason(
date: NaiveDate,
candidate: &CandidateEligibility,
market: &DailyMarketSnapshot,
instrument: Option<&Instrument>,
check_price: f64,
) -> Option<&'static str> {
if let Some(reason) = Self::selection_rejection_reason(date, candidate, market, instrument)
{
return Some(reason);
}
if !candidate.allow_buy {
return Some("buy_disabled");
}
if market.is_at_upper_limit_price(check_price) {
return Some("open at or above upper limit");
}
None
}
pub fn sell_rejection_reason(
date: NaiveDate,
candidate: &CandidateEligibility,
market: &DailyMarketSnapshot,
instrument: Option<&Instrument>,
position: Option<&Position>,
check_price: f64,
) -> Option<&'static str> {
if let Some(reason) = Self::instrument_rejection_reason(instrument, date) {
return Some(reason);
}
if market.paused || candidate.is_paused {
return Some("paused");
}
if !candidate.allow_sell {
return Some("sell_disabled");
}
if market.is_at_lower_limit_price(check_price) {
return Some("open at or below lower limit");
}
if position.is_some_and(|position| position.sellable_qty(date) == 0) {
return Some("t+1 sellable quantity is zero");
}
None
}
pub fn buy_check_price(market: &DailyMarketSnapshot, price_field: PriceField) -> f64 {
market.buy_price(price_field)
}
pub fn sell_check_price(market: &DailyMarketSnapshot, price_field: PriceField) -> f64 {
match price_field {
PriceField::Last => market.price(PriceField::Last),
_ => market.sell_price(price_field),
}
}
}
+18 -33
View File
@@ -2,6 +2,7 @@ use chrono::NaiveDate;
use crate::data::{CandidateEligibility, DailyMarketSnapshot, PriceField}; use crate::data::{CandidateEligibility, DailyMarketSnapshot, PriceField};
use crate::portfolio::Position; use crate::portfolio::Position;
use crate::risk_control::ChinaAShareRiskControl;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct RuleCheck { pub struct RuleCheck {
@@ -47,20 +48,6 @@ pub trait EquityRuleHooks {
#[derive(Debug, Clone, Default)] #[derive(Debug, Clone, Default)]
pub struct ChinaEquityRuleHooks; pub struct ChinaEquityRuleHooks;
impl ChinaEquityRuleHooks {
fn at_upper_limit(snapshot: &DailyMarketSnapshot, price_field: PriceField) -> bool {
snapshot.is_at_upper_limit_price(snapshot.buy_price(price_field))
}
fn at_lower_limit(snapshot: &DailyMarketSnapshot, price_field: PriceField) -> bool {
let check_price = match price_field {
PriceField::Last => snapshot.price(PriceField::Last),
_ => snapshot.sell_price(price_field),
};
snapshot.is_at_lower_limit_price(check_price)
}
}
impl EquityRuleHooks for ChinaEquityRuleHooks { impl EquityRuleHooks for ChinaEquityRuleHooks {
fn can_buy( fn can_buy(
&self, &self,
@@ -69,14 +56,14 @@ impl EquityRuleHooks for ChinaEquityRuleHooks {
candidate: &CandidateEligibility, candidate: &CandidateEligibility,
price_field: PriceField, price_field: PriceField,
) -> RuleCheck { ) -> RuleCheck {
if snapshot.paused || candidate.is_paused { if let Some(reason) = ChinaAShareRiskControl::buy_rejection_reason(
return RuleCheck::reject("paused"); _execution_date,
} candidate,
if !candidate.allow_buy { snapshot,
return RuleCheck::reject("buy disabled by eligibility flags"); None,
} ChinaAShareRiskControl::buy_check_price(snapshot, price_field),
if Self::at_upper_limit(snapshot, price_field) { ) {
return RuleCheck::reject("open at or above upper limit"); return RuleCheck::reject(reason);
} }
RuleCheck::allow() RuleCheck::allow()
@@ -90,17 +77,15 @@ impl EquityRuleHooks for ChinaEquityRuleHooks {
position: &Position, position: &Position,
price_field: PriceField, price_field: PriceField,
) -> RuleCheck { ) -> RuleCheck {
if snapshot.paused || candidate.is_paused { if let Some(reason) = ChinaAShareRiskControl::sell_rejection_reason(
return RuleCheck::reject("paused"); execution_date,
} candidate,
if !candidate.allow_sell { snapshot,
return RuleCheck::reject("sell disabled by eligibility flags"); None,
} Some(position),
if Self::at_lower_limit(snapshot, price_field) { ChinaAShareRiskControl::sell_check_price(snapshot, price_field),
return RuleCheck::reject("open at or below lower limit"); ) {
} return RuleCheck::reject(reason);
if position.sellable_qty(execution_date) == 0 {
return RuleCheck::reject("t+1 sellable quantity is zero");
} }
RuleCheck::allow() RuleCheck::allow()
+195 -61
View File
@@ -17,6 +17,7 @@ use crate::events::{FillEvent, OrderEvent, OrderSide, OrderStatus, ProcessEvent}
use crate::futures::{FuturesAccountState, FuturesOrderIntent}; use crate::futures::{FuturesAccountState, FuturesOrderIntent};
use crate::instrument::Instrument; use crate::instrument::Instrument;
use crate::portfolio::PortfolioState; use crate::portfolio::PortfolioState;
use crate::risk_control::ChinaAShareRiskControl;
use crate::scheduler::ScheduleRule; use crate::scheduler::ScheduleRule;
use crate::universe::{DynamicMarketCapBandSelector, SelectionContext, UniverseSelector}; use crate::universe::{DynamicMarketCapBandSelector, SelectionContext, UniverseSelector};
@@ -1090,6 +1091,9 @@ pub struct CnSmallCapRotationConfig {
pub base_index_level: f64, pub base_index_level: f64,
pub base_cap_floor: f64, pub base_cap_floor: f64,
pub cap_span: f64, pub cap_span: f64,
pub padding_ratio: f64,
pub min_padding: f64,
pub max_padding: f64,
pub short_ma_days: usize, pub short_ma_days: usize,
pub long_ma_days: usize, pub long_ma_days: usize,
pub stock_short_ma_days: usize, pub stock_short_ma_days: usize,
@@ -1101,7 +1105,7 @@ pub struct CnSmallCapRotationConfig {
pub take_profit_pct: f64, pub take_profit_pct: f64,
pub signal_symbol: Option<String>, pub signal_symbol: Option<String>,
pub skip_months: Vec<u32>, pub skip_months: Vec<u32>,
pub skip_month_day_ranges: Vec<(u32, u32, u32)>, pub skip_month_day_ranges: Vec<(Option<u32>, u32, u32, u32)>,
} }
impl CnSmallCapRotationConfig { impl CnSmallCapRotationConfig {
@@ -1114,6 +1118,9 @@ impl CnSmallCapRotationConfig {
base_index_level: 2000.0, base_index_level: 2000.0,
base_cap_floor: 7.0, base_cap_floor: 7.0,
cap_span: 10.0, cap_span: 10.0,
padding_ratio: 0.5,
min_padding: 8.0,
max_padding: 20.0,
short_ma_days: 3, short_ma_days: 3,
long_ma_days: 5, long_ma_days: 5,
stock_short_ma_days: 3, stock_short_ma_days: 3,
@@ -1138,6 +1145,9 @@ impl CnSmallCapRotationConfig {
base_index_level: 2000.0, base_index_level: 2000.0,
base_cap_floor: 7.0, base_cap_floor: 7.0,
cap_span: 10.0, cap_span: 10.0,
padding_ratio: 0.5,
min_padding: 8.0,
max_padding: 20.0,
short_ma_days: 5, short_ma_days: 5,
long_ma_days: 10, long_ma_days: 10,
stock_short_ma_days: 5, stock_short_ma_days: 5,
@@ -1150,23 +1160,29 @@ impl CnSmallCapRotationConfig {
signal_symbol: Some("000852.SH".to_string()), signal_symbol: Some("000852.SH".to_string()),
skip_months: vec![], skip_months: vec![],
skip_month_day_ranges: vec![ skip_month_day_ranges: vec![
(1, 15, 30), (None, 1, 15, 30),
(4, 15, 29), (None, 4, 15, 29),
(8, 15, 31), (None, 8, 15, 31),
(10, 20, 30), (None, 10, 20, 30),
(12, 20, 30), (None, 12, 20, 30),
], ],
} }
} }
fn in_skip_window(&self, date: NaiveDate) -> bool { fn in_skip_window(&self, date: NaiveDate) -> bool {
let year = date.year() as u32;
let month = date.month(); let month = date.month();
let day = date.day(); let day = date.day();
self.skip_months.contains(&month) self.skip_months.contains(&month)
|| self || self
.skip_month_day_ranges .skip_month_day_ranges
.iter() .iter()
.any(|(m, start_day, end_day)| month == *m && day >= *start_day && day <= *end_day) .any(|(window_year, m, start_day, end_day)| {
window_year.map(|value| value == year).unwrap_or(true)
&& month == *m
&& day >= *start_day
&& day <= *end_day
})
} }
} }
@@ -1185,6 +1201,9 @@ impl CnSmallCapRotationStrategy {
config.cap_span, config.cap_span,
config.xs, config.xs,
config.stocknum, config.stocknum,
config.padding_ratio,
config.min_padding,
config.max_padding,
), ),
config, config,
last_gross_exposure: None, last_gross_exposure: None,
@@ -1508,6 +1527,9 @@ pub struct OmniMicroCapConfig {
pub base_index_level: f64, pub base_index_level: f64,
pub base_cap_floor: f64, pub base_cap_floor: f64,
pub cap_span: f64, pub cap_span: f64,
pub padding_ratio: f64,
pub min_padding: f64,
pub max_padding: f64,
pub benchmark_signal_symbol: String, pub benchmark_signal_symbol: String,
pub benchmark_short_ma_days: usize, pub benchmark_short_ma_days: usize,
pub benchmark_long_ma_days: usize, pub benchmark_long_ma_days: usize,
@@ -1518,7 +1540,7 @@ pub struct OmniMicroCapConfig {
pub trade_rate: f64, pub trade_rate: f64,
pub stop_loss_ratio: f64, pub stop_loss_ratio: f64,
pub take_profit_ratio: f64, pub take_profit_ratio: f64,
pub skip_month_day_ranges: Vec<(u32, u32, u32)>, pub skip_month_day_ranges: Vec<(Option<u32>, u32, u32, u32)>,
} }
impl OmniMicroCapConfig { impl OmniMicroCapConfig {
@@ -1531,6 +1553,9 @@ impl OmniMicroCapConfig {
base_index_level: 2000.0, base_index_level: 2000.0,
base_cap_floor: 7.0, base_cap_floor: 7.0,
cap_span: 10.0, cap_span: 10.0,
padding_ratio: 0.5,
min_padding: 8.0,
max_padding: 20.0,
benchmark_signal_symbol: "000001.SH".to_string(), benchmark_signal_symbol: "000001.SH".to_string(),
benchmark_short_ma_days: 5, benchmark_short_ma_days: 5,
benchmark_long_ma_days: 10, benchmark_long_ma_days: 10,
@@ -1547,12 +1572,44 @@ impl OmniMicroCapConfig {
} }
} }
pub fn aiquant_v104() -> Self {
Self {
strategy_name: "aiquant-v1.0.4".to_string(),
refresh_rate: 120,
stocknum: 5,
xs: 4.0 / 500.0,
base_index_level: 2000.0,
base_cap_floor: 7.0,
cap_span: 10.0,
padding_ratio: 1.2,
min_padding: 29.5,
max_padding: 50.0,
benchmark_signal_symbol: "000852.SH".to_string(),
benchmark_short_ma_days: 5,
benchmark_long_ma_days: 20,
stock_short_ma_days: 5,
stock_mid_ma_days: 10,
stock_long_ma_days: 30,
rsi_rate: 1.0001,
trade_rate: 0.5,
stop_loss_ratio: 0.92,
take_profit_ratio: 1.16,
skip_month_day_ranges: Vec::new(),
}
}
fn in_skip_window(&self, date: NaiveDate) -> bool { fn in_skip_window(&self, date: NaiveDate) -> bool {
let year = date.year() as u32;
let month = date.month(); let month = date.month();
let day = date.day(); let day = date.day();
self.skip_month_day_ranges self.skip_month_day_ranges
.iter() .iter()
.any(|(m, start_day, end_day)| month == *m && day >= *start_day && day <= *end_day) .any(|(window_year, m, start_day, end_day)| {
window_year.map(|value| value == year).unwrap_or(true)
&& month == *m
&& day >= *start_day
&& day <= *end_day
})
} }
} }
@@ -1724,11 +1781,23 @@ impl OmniMicroCapStrategy {
if !sizing_price.is_finite() || sizing_price <= 0.0 { if !sizing_price.is_finite() || sizing_price <= 0.0 {
return 0; return 0;
} }
let snapshot_requested_qty = self.round_lot_quantity( let mut snapshot_requested_qty = self.round_lot_quantity(
((projected.cash().min(order_value)) / sizing_price).floor() as u32, ((projected.cash().min(order_value)) / sizing_price).floor() as u32,
minimum_order_quantity, minimum_order_quantity,
order_step_size, order_step_size,
); );
while snapshot_requested_qty > 0 {
let gross_amount = sizing_price * snapshot_requested_qty as f64;
let cash_out = gross_amount + self.buy_commission(gross_amount);
if cash_out <= order_value + 1e-6 && cash_out <= projected.cash() + 1e-6 {
break;
}
snapshot_requested_qty = self.decrement_order_quantity(
snapshot_requested_qty,
minimum_order_quantity,
order_step_size,
);
}
let projected_execution_price = self.projected_execution_price(market, OrderSide::Buy); let projected_execution_price = self.projected_execution_price(market, OrderSide::Buy);
let projected_fill = self.projected_select_execution_fill( let projected_fill = self.projected_select_execution_fill(
ctx, ctx,
@@ -1740,14 +1809,15 @@ impl OmniMicroCapStrategy {
minimum_order_quantity, minimum_order_quantity,
order_step_size, order_step_size,
false, false,
Some(projected.cash()), Some(projected.cash().min(order_value)),
Some(order_value + 400.0), Some(order_value),
execution_state, execution_state,
); );
let mut quantity = snapshot_requested_qty; let mut quantity = snapshot_requested_qty;
while quantity > 0 { while quantity > 0 {
let gross_amount = projected_execution_price * quantity as f64; let gross_amount = projected_execution_price * quantity as f64;
if gross_amount <= order_value + 400.0 && gross_amount <= projected.cash() + 1e-6 { let cash_out = gross_amount + self.buy_commission(gross_amount);
if cash_out <= order_value + 1e-6 && cash_out <= projected.cash() + 1e-6 {
break; break;
} }
quantity = quantity =
@@ -1762,7 +1832,8 @@ impl OmniMicroCapStrategy {
.unwrap_or(projected_execution_price); .unwrap_or(projected_execution_price);
while quantity > 0 { while quantity > 0 {
let gross_amount = execution_price * quantity as f64; let gross_amount = execution_price * quantity as f64;
if gross_amount <= projected.cash() + 1e-6 { let cash_out = gross_amount + self.buy_commission(gross_amount);
if cash_out <= order_value + 1e-6 && cash_out <= projected.cash() + 1e-6 {
break; break;
} }
quantity = quantity =
@@ -1778,7 +1849,7 @@ impl OmniMicroCapStrategy {
}; };
let gross_amount = fill.price * fill.quantity as f64; let gross_amount = fill.price * fill.quantity as f64;
let cash_out = gross_amount + self.buy_commission(gross_amount); let cash_out = gross_amount + self.buy_commission(gross_amount);
if gross_amount > projected.cash() + 1e-6 { if cash_out > projected.cash() + 1e-6 || cash_out > order_value + 1e-6 {
return 0; return 0;
} }
projected.apply_cash_delta(-cash_out); projected.apply_cash_delta(-cash_out);
@@ -2097,7 +2168,8 @@ impl OmniMicroCapStrategy {
&self, &self,
ctx: &StrategyContext<'_>, ctx: &StrategyContext<'_>,
date: NaiveDate, date: NaiveDate,
) -> Result<(f64, f64, f64, f64), BacktestError> { ) -> Result<(f64, f64, f64, f64, f64), BacktestError> {
// 当前交易日的指数价格(用于MA计算和仓位控制)
let current_level = ctx let current_level = ctx
.data .data
.market_decision_close(date, &self.config.benchmark_signal_symbol) .market_decision_close(date, &self.config.benchmark_signal_symbol)
@@ -2106,6 +2178,16 @@ impl OmniMicroCapStrategy {
symbol: self.config.benchmark_signal_symbol.clone(), symbol: self.config.benchmark_signal_symbol.clone(),
field: "decision_close", field: "decision_close",
})?; })?;
// 前一交易日的指数价格(用于市值区间计算,模拟实盘场景)
let prev_level = if let Some(prev_date) = ctx.data.previous_trading_date(date, 1) {
ctx.data
.market_decision_close(prev_date, &self.config.benchmark_signal_symbol)
.unwrap_or(current_level)
} else {
current_level
};
let ma_short = ctx let ma_short = ctx
.data .data
.market_decision_close_moving_average( .market_decision_close_moving_average(
@@ -2137,14 +2219,25 @@ impl OmniMicroCapStrategy {
} else { } else {
1.0 1.0
}; };
Ok((current_level, ma_short, ma_long, trading_ratio)) Ok((current_level, prev_level, ma_short, ma_long, trading_ratio))
} }
fn market_cap_band(&self, index_level: f64) -> (f64, f64) { fn market_cap_band(&self, index_level: f64) -> (f64, f64) {
let y = (index_level - self.config.base_index_level) * self.config.xs let y = (index_level - self.config.base_index_level) * self.config.xs
+ self.config.base_cap_floor; + self.config.base_cap_floor;
let start = y.round(); let start = y.round();
(start, start + self.config.cap_span) let end = start + self.config.cap_span;
// Apply padding to expand the range
let span = end - start;
let padding = (span * self.config.padding_ratio)
.max(self.config.min_padding)
.min(self.config.max_padding);
let lower_bound = (start - padding).max(0.0);
let upper_bound = end + padding;
(lower_bound, upper_bound)
} }
fn stock_passes_ma_filter( fn stock_passes_ma_filter(
@@ -2175,19 +2268,67 @@ impl OmniMicroCapStrategy {
return false; return false;
}; };
ma_short > ma_mid * self.config.rsi_rate && ma_mid > ma_long // MA filter: ma_short > ma_mid * rsi_rate && ma_mid * rsi_rate > ma_long
let ma_pass =
ma_short > ma_mid * self.config.rsi_rate && ma_mid * self.config.rsi_rate > ma_long;
// Debug logging for ALL stocks on first decision date
static DEBUG_DATE: std::sync::Mutex<Option<NaiveDate>> = std::sync::Mutex::new(None);
let mut debug_date = DEBUG_DATE.lock().unwrap();
let should_debug = if let Some(d) = *debug_date {
d == date
} else {
*debug_date = Some(date);
true
};
if should_debug {
eprintln!(
"[MA_FILTER] {} cap={:.2} ma5={:.4} ma10={:.4} ma30={:.4} ma10*rsi={:.4} pass={} ({}>{:.4}? {} && {:.4}>{}? {})",
symbol,
ctx.data.market_decision_close(date, symbol).unwrap_or(0.0),
ma_short,
ma_mid,
ma_long,
ma_mid * self.config.rsi_rate,
ma_pass,
ma_short,
ma_mid * self.config.rsi_rate,
ma_short > ma_mid * self.config.rsi_rate,
ma_mid * self.config.rsi_rate,
ma_long,
ma_mid * self.config.rsi_rate > ma_long
);
} }
fn special_name(&self, ctx: &StrategyContext<'_>, symbol: &str) -> bool { if !ma_pass {
let instrument_name = ctx return false;
}
// Volume filter: V5 < V60 (applied for omni_microcap strategies)
if self.config.strategy_name.contains("aiquant")
|| self.config.strategy_name.contains("AiQuant")
|| self.config.strategy_name.contains("omni")
{
let Some(volume_ma5) = ctx
.data .data
.instruments() .market_decision_volume_moving_average(date, symbol, 5)
.get(symbol) else {
.map(|instrument| instrument.name.as_str()) return false;
.unwrap_or(""); };
instrument_name.contains("ST") let Some(volume_ma60) = ctx
|| instrument_name.contains('*') .data
|| instrument_name.contains('退') .market_decision_volume_moving_average(date, symbol, 60)
else {
return false;
};
if volume_ma5 >= volume_ma60 {
return false;
}
}
true
} }
fn can_sell_position(&self, ctx: &StrategyContext<'_>, date: NaiveDate, symbol: &str) -> bool { fn can_sell_position(&self, ctx: &StrategyContext<'_>, date: NaiveDate, symbol: &str) -> bool {
@@ -2203,11 +2344,15 @@ impl OmniMicroCapStrategy {
let Ok(candidate) = ctx.data.require_candidate(date, symbol) else { let Ok(candidate) = ctx.data.require_candidate(date, symbol) else {
return false; return false;
}; };
let lower_limit_check_price = market.price(PriceField::Last); ChinaAShareRiskControl::sell_rejection_reason(
!(market.paused date,
|| candidate.is_paused candidate,
|| !candidate.allow_sell market,
|| market.is_at_lower_limit_price(lower_limit_check_price)) ctx.data.instrument(symbol),
Some(position),
ChinaAShareRiskControl::sell_check_price(market, PriceField::Last),
)
.is_none()
} }
fn buy_rejection_reason( fn buy_rejection_reason(
@@ -2219,30 +2364,14 @@ impl OmniMicroCapStrategy {
let market = ctx.data.require_market(date, symbol)?; let market = ctx.data.require_market(date, symbol)?;
let candidate = ctx.data.require_candidate(date, symbol)?; let candidate = ctx.data.require_candidate(date, symbol)?;
if market.paused || candidate.is_paused { if let Some(reason) = ChinaAShareRiskControl::buy_rejection_reason(
return Ok(Some("paused".to_string())); date,
} candidate,
if candidate.is_st || self.special_name(ctx, symbol) { market,
return Ok(Some("st_or_special_name".to_string())); ctx.data.instrument(symbol),
} ChinaAShareRiskControl::buy_check_price(market, PriceField::Last),
if candidate.is_kcb { ) {
return Ok(Some("kcb".to_string())); return Ok(Some(reason.to_string()));
}
if !candidate.allow_buy {
return Ok(Some("buy_disabled".to_string()));
}
if market.is_at_upper_limit_price(market.day_open)
|| market.is_at_upper_limit_price(market.buy_price(PriceField::Last))
{
return Ok(Some("upper_limit".to_string()));
}
if market.is_at_lower_limit_price(market.day_open)
|| market.is_at_lower_limit_price(market.sell_price(PriceField::Last))
{
return Ok(Some("lower_limit".to_string()));
}
if market.day_open <= 1.0 {
return Ok(Some("one_yuan".to_string()));
} }
if !self.truth_selection_contains(date, symbol) if !self.truth_selection_contains(date, symbol)
&& !self.stock_passes_ma_filter(ctx, date, symbol) && !self.stock_passes_ma_filter(ctx, date, symbol)
@@ -2546,7 +2675,8 @@ impl Strategy for OmniMicroCapStrategy {
}); });
} }
let (index_level, ma_short, ma_long, trading_ratio) = match self.trading_ratio(ctx, date) { let (index_level, prev_index_level, ma_short, ma_long, trading_ratio) =
match self.trading_ratio(ctx, date) {
Ok(value) => value, Ok(value) => value,
Err(BacktestError::Execution(message)) Err(BacktestError::Execution(message))
if message.contains("insufficient benchmark") => if message.contains("insufficient benchmark") =>
@@ -2564,7 +2694,12 @@ impl Strategy for OmniMicroCapStrategy {
} }
Err(err) => return Err(err), Err(err) => return Err(err),
}; };
let (band_low, band_high) = self.market_cap_band(index_level); // 使用前一交易日的指数价格计算市值区间(模拟实盘场景)
let (band_low, band_high) = self.market_cap_band(prev_index_level);
eprintln!(
"[DEBUG] date={} current_index={:.2} prev_index={:.2} band=[{:.0}, {:.0}]",
date, index_level, prev_index_level, band_low, band_high
);
let (stock_list, selection_notes) = self.select_symbols(ctx, date, band_low, band_high)?; let (stock_list, selection_notes) = self.select_symbols(ctx, date, band_low, band_high)?;
let periodic_rebalance = ctx.decision_index % self.config.refresh_rate == 0; let periodic_rebalance = ctx.decision_index % self.config.refresh_rate == 0;
let mut projected = ctx.portfolio.clone(); let mut projected = ctx.portfolio.clone();
@@ -2586,8 +2721,7 @@ impl Strategy for OmniMicroCapStrategy {
let stop_hit = current_price let stop_hit = current_price
<= position.average_cost * self.config.stop_loss_ratio <= position.average_cost * self.config.stop_loss_ratio
+ self.stop_loss_tolerance(market); + self.stop_loss_tolerance(market);
let profit_hit = !market.is_at_upper_limit_price(current_price) let profit_hit = current_price / position.average_cost > self.config.take_profit_ratio;
&& current_price / position.average_cost > self.config.take_profit_ratio;
let can_sell = self.can_sell_position(ctx, date, &position.symbol); let can_sell = self.can_sell_position(ctx, date, &position.symbol);
if stop_hit || profit_hit { if stop_hit || profit_hit {
let sell_reason = if stop_hit { let sell_reason = if stop_hit {
+2 -2
View File
@@ -546,8 +546,8 @@ pub fn build_optimization_prompt(
prompt.push_str("你是 OmniQuant 平台策略脚本优化器。必须输出完整、可运行的平台策略脚本,不要输出解释文本。\n"); prompt.push_str("你是 OmniQuant 平台策略脚本优化器。必须输出完整、可运行的平台策略脚本,不要输出解释文本。\n");
prompt.push_str("输出格式硬约束:回复第一行必须是 strategy(\"...\")、let、fn、const 或 //;回复中不得包含 Markdown、解释、思考过程、手册复述、JSON 包装或自然语言总结。\n"); prompt.push_str("输出格式硬约束:回复第一行必须是 strategy(\"...\")、let、fn、const 或 //;回复中不得包含 Markdown、解释、思考过程、手册复述、JSON 包装或自然语言总结。\n");
prompt.push_str("长度硬约束:策略代码目标 80 行以内,只保留必要 let/fn/strategy 块;不要复制下面的手册片段、历史策略全文或字段清单。\n"); prompt.push_str("长度硬约束:策略代码目标 80 行以内,只保留必要 let/fn/strategy 块;不要复制下面的手册片段、历史策略全文或字段清单。\n");
prompt.push_str("只修改与优化目标相关的少量参数或过滤条件,保留原策略的市场、基准、信号指数和核心风控;不引入手册未列出的字段或外部平台 API 名称。\n"); prompt.push_str("优化不限制在原策略已有参数或少量扰动。只要 OmniQuant/FIDC 已支持,可以自由增加、修改、删除策略代码、参数、候选池、过滤函数、排序、仓位、止盈止损、调仓周期、指标因子和辅助函数;不引入手册未列出的字段或外部平台 API 名称。\n");
prompt.push_str("优化可以调整调仓周期、持仓数、市值带、filter.stock_expr、ordering.rank_expr、allocation.buy_scale、止盈止损;如上一轮无交易或质量分过低,必须先放宽过滤条件并优先使用已入库指标因子、rolling_mean/ma/vma/rolling_stddev/pct_change 等支持函数\n"); prompt.push_str("可以使用所有已入库日频字段、指标因子和表达式函数,例如 rolling_mean/ma/vma/rolling_sum/rolling_stddev/pct_change/factor/factor_value/factors;如上一轮无交易或质量分过低,必须先扩大候选覆盖并修正不可交易过滤,再优化收益\n");
prompt.push_str("优化目标:\n"); prompt.push_str("优化目标:\n");
prompt.push_str(&format!("- {}\n\n", request.objective)); prompt.push_str(&format!("- {}\n\n", request.objective));
prompt.push_str("当前策略代码如下,仅作为输入参考;回复时不要包含 Markdown 代码围栏:\n"); prompt.push_str("当前策略代码如下,仅作为输入参考;回复时不要包含 Markdown 代码围栏:\n");
+22 -2
View File
@@ -78,6 +78,9 @@ pub struct DynamicMarketCapBandSelector {
pub cap_span: f64, pub cap_span: f64,
pub xs: f64, pub xs: f64,
pub top_n: usize, pub top_n: usize,
pub padding_ratio: f64,
pub min_padding: f64,
pub max_padding: f64,
} }
impl DynamicMarketCapBandSelector { impl DynamicMarketCapBandSelector {
@@ -87,6 +90,9 @@ impl DynamicMarketCapBandSelector {
cap_span: f64, cap_span: f64,
xs: f64, xs: f64,
top_n: usize, top_n: usize,
padding_ratio: f64,
min_padding: f64,
max_padding: f64,
) -> Self { ) -> Self {
Self { Self {
base_index_level, base_index_level,
@@ -94,11 +100,14 @@ impl DynamicMarketCapBandSelector {
cap_span, cap_span,
xs, xs,
top_n, top_n,
padding_ratio,
min_padding,
max_padding,
} }
} }
pub fn demo(top_n: usize) -> Self { pub fn demo(top_n: usize) -> Self {
Self::new(2000.0, 7.0, 10.0, 4.0 / 500.0, top_n) Self::new(2000.0, 7.0, 10.0, 4.0 / 500.0, top_n, 0.5, 8.0, 20.0)
} }
pub fn regime(&self, benchmark_level: f64) -> BandRegime { pub fn regime(&self, benchmark_level: f64) -> BandRegime {
@@ -114,7 +123,18 @@ impl DynamicMarketCapBandSelector {
pub fn band_for_level(&self, benchmark_level: f64) -> (f64, f64) { pub fn band_for_level(&self, benchmark_level: f64) -> (f64, f64) {
let start = ((benchmark_level - self.base_index_level) * self.xs) + self.base_cap_floor; let start = ((benchmark_level - self.base_index_level) * self.xs) + self.base_cap_floor;
let low = start.round(); let low = start.round();
(low, low + self.cap_span) let high = low + self.cap_span;
// Apply padding to expand the range
let span = high - low;
let padding = (span * self.padding_ratio)
.max(self.min_padding)
.min(self.max_padding);
let lower_bound = (low - padding).max(0.0);
let upper_bound = high + padding;
(lower_bound, upper_bound)
} }
} }
+2 -2
View File
@@ -61,7 +61,7 @@ fn china_cost_model_applies_minimum_commission_and_stamp_tax() {
assert_eq!(buy.stamp_tax, 0.0); assert_eq!(buy.stamp_tax, 0.0);
let sell = model.calculate(d(2023, 8, 25), OrderSide::Sell, 100_000.0); let sell = model.calculate(d(2023, 8, 25), OrderSide::Sell, 100_000.0);
assert!((sell.commission - 30.0).abs() < 1e-9); assert!((sell.commission - 80.0).abs() < 1e-9);
assert!((sell.stamp_tax - 100.0).abs() < 1e-9); assert!((sell.stamp_tax - 100.0).abs() < 1e-9);
} }
@@ -112,7 +112,7 @@ fn china_cost_model_tracks_minimum_commission_per_order_id() {
assert!((first.commission - 5.0).abs() < 1e-9); assert!((first.commission - 5.0).abs() < 1e-9);
assert!(second.commission.abs() < 1e-9); assert!(second.commission.abs() < 1e-9);
assert!((third.commission - 1.6).abs() < 1e-9); assert!((third.commission - 12.6).abs() < 1e-9);
assert!((another_order.commission - 5.0).abs() < 1e-9); assert!((another_order.commission - 5.0).abs() < 1e-9);
} }
+1 -1
View File
@@ -300,7 +300,7 @@ fn engine_reinvests_dividend_receivable_in_round_lots() {
PriceField::Open, PriceField::Open,
), ),
BacktestConfig { BacktestConfig {
initial_cash: 11_005.0, initial_cash: 11_008.0,
benchmark_code: "000300.SH".to_string(), benchmark_code: "000300.SH".to_string(),
start_date: Some(buy_date), start_date: Some(buy_date),
end_date: Some(payable_date), end_date: Some(payable_date),
+2 -2
View File
@@ -492,7 +492,7 @@ fn engine_applies_successor_conversion_before_delisted_cash_settlement() {
.iter() .iter()
.find(|holding| holding.symbol == "000002.SZ") .find(|holding| holding.symbol == "000002.SZ")
.expect("successor holding exists"); .expect("successor holding exists");
assert_eq!(successor_holding.quantity, 500); assert_eq!(successor_holding.quantity, 450);
assert!( assert!(
result result
.holdings_summary .holdings_summary
@@ -503,6 +503,6 @@ fn engine_applies_successor_conversion_before_delisted_cash_settlement() {
event event
.note .note
.contains("successor_conversion 000001.SZ->000002.SZ") .contains("successor_conversion 000001.SZ->000002.SZ")
&& event.note.contains("cash=1000.00") && event.note.contains("cash=900.00")
})); }));
} }
+491 -5
View File
@@ -1,12 +1,114 @@
use chrono::{NaiveDate, NaiveTime}; use chrono::{NaiveDate, NaiveTime};
use fidc_core::{ use fidc_core::{
AlgoOrderStyle, BenchmarkSnapshot, BrokerSimulator, CandidateEligibility, ChinaAShareCostModel, AlgoOrderStyle, BenchmarkSnapshot, BrokerSimulator, CandidateEligibility, ChinaAShareCostModel,
ChinaEquityRuleHooks, DailyFactorSnapshot, DailyMarketSnapshot, DataSet, Instrument, ChinaEquityRuleHooks, DailyFactorSnapshot, DailyMarketSnapshot, DataSet, DynamicSlippageConfig,
IntradayExecutionQuote, MatchingType, OrderIntent, OrderStatus, PortfolioState, PriceField, Instrument, IntradayExecutionQuote, MatchingType, OrderIntent, OrderStatus, PortfolioState,
ProcessEventKind, SlippageModel, StrategyDecision, TargetPortfolioOrderPricing, PriceField, ProcessEventKind, SlippageModel, StrategyDecision, TargetPortfolioOrderPricing,
}; };
use std::collections::{BTreeMap, BTreeSet}; use std::collections::{BTreeMap, BTreeSet};
fn order_value_rounding_data(date: NaiveDate, symbol: &str, price: f64) -> DataSet {
DataSet::from_components(
vec![Instrument {
symbol: symbol.to_string(),
name: "Test".to_string(),
board: "SZ".to_string(),
round_lot: 100,
listed_at: None,
delisted_at: None,
status: "active".to_string(),
}],
vec![DailyMarketSnapshot {
date,
symbol: symbol.to_string(),
timestamp: Some(format!("{date} 09:33:00")),
day_open: price,
open: price,
high: price,
low: price,
close: price,
last_price: price,
bid1: price,
ask1: price,
prev_close: price,
volume: 100_000,
tick_volume: 100_000,
bid1_volume: 80_000,
ask1_volume: 80_000,
trading_phase: Some("continuous".to_string()),
paused: false,
upper_limit: price * 1.1,
lower_limit: price * 0.9,
price_tick: 0.01,
}],
vec![DailyFactorSnapshot {
date,
symbol: symbol.to_string(),
market_cap_bn: 50.0,
free_float_cap_bn: 45.0,
pe_ttm: 15.0,
turnover_ratio: Some(2.0),
effective_turnover_ratio: Some(1.8),
extra_factors: BTreeMap::new(),
}],
vec![CandidateEligibility {
date,
symbol: symbol.to_string(),
is_st: false,
is_new_listing: false,
is_paused: false,
allow_buy: true,
allow_sell: true,
is_kcb: false,
is_one_yuan: false,
}],
vec![BenchmarkSnapshot {
date,
benchmark: "000300.SH".to_string(),
open: 100.0,
close: 100.0,
prev_close: 99.0,
volume: 1_000_000,
}],
)
.expect("dataset")
}
fn execute_single_value_order(
date: NaiveDate,
data: &DataSet,
symbol: &str,
value: f64,
) -> (PortfolioState, fidc_core::BrokerExecutionReport) {
let mut portfolio = PortfolioState::new(20_000.0);
let broker = BrokerSimulator::new_with_execution_price(
ChinaAShareCostModel::default(),
ChinaEquityRuleHooks::default(),
PriceField::Open,
)
.with_strict_value_budget(true);
let report = broker
.execute(
date,
&mut portfolio,
data,
&StrategyDecision {
rebalance: false,
target_weights: BTreeMap::new(),
exit_symbols: BTreeSet::new(),
order_intents: vec![OrderIntent::Value {
symbol: symbol.to_string(),
value,
reason: "test_order_value_rounding".to_string(),
}],
notes: Vec::new(),
diagnostics: Vec::new(),
},
)
.expect("broker execution");
(portfolio, report)
}
#[test] #[test]
fn broker_executes_explicit_order_value_buy() { fn broker_executes_explicit_order_value_buy() {
let date = NaiveDate::from_ymd_opt(2024, 1, 10).unwrap(); let date = NaiveDate::from_ymd_opt(2024, 1, 10).unwrap();
@@ -122,6 +224,171 @@ fn broker_executes_explicit_order_value_buy() {
assert!(portfolio.cash() < 1_000_000.0); assert!(portfolio.cash() < 1_000_000.0);
} }
#[test]
fn broker_order_value_rounds_to_nearest_lot_when_min_lot_is_affordable() {
let date = NaiveDate::from_ymd_opt(2025, 1, 24).unwrap();
let symbol = "003017.SZ";
let data = order_value_rounding_data(date, symbol, 19.97);
let (portfolio, report) = execute_single_value_order(date, &data, symbol, 3_938.13);
assert_eq!(report.fill_events.len(), 1);
assert_eq!(report.fill_events[0].quantity, 100);
assert_eq!(portfolio.position(symbol).expect("position").quantity, 100);
}
#[test]
fn broker_order_value_budget_includes_buy_commission() {
let date = NaiveDate::from_ymd_opt(2025, 6, 23).unwrap();
let symbol = "605303.SH";
let data = order_value_rounding_data(date, symbol, 11.93);
let (portfolio, report) = execute_single_value_order(date, &data, symbol, 4_776.0);
assert_eq!(report.fill_events.len(), 1);
assert_eq!(report.fill_events[0].quantity, 300);
assert_eq!(portfolio.position(symbol).expect("position").quantity, 300);
let (portfolio, report) = execute_single_value_order(date, &data, symbol, 4_848.0);
assert_eq!(report.fill_events.len(), 1);
assert_eq!(report.fill_events[0].quantity, 400);
assert_eq!(portfolio.position(symbol).expect("position").quantity, 400);
}
#[test]
fn broker_delayed_limit_open_sell_uses_tick_price() {
let date = NaiveDate::from_ymd_opt(2025, 6, 27).unwrap();
let prev_date = NaiveDate::from_ymd_opt(2025, 6, 26).unwrap();
let symbol = "300635.SZ";
let data = DataSet::from_components_with_actions_and_quotes(
vec![Instrument {
symbol: symbol.to_string(),
name: "Test".to_string(),
board: "SZ".to_string(),
round_lot: 100,
listed_at: None,
delisted_at: None,
status: "active".to_string(),
}],
vec![DailyMarketSnapshot {
date,
symbol: symbol.to_string(),
timestamp: Some("2025-06-27 09:31:00".to_string()),
day_open: 12.55,
open: 12.55,
high: 13.16,
low: 12.26,
close: 12.36,
last_price: 12.39,
bid1: 12.39,
ask1: 12.40,
prev_close: 13.24,
volume: 329_575,
tick_volume: 10_000,
bid1_volume: 10_000,
ask1_volume: 10_000,
trading_phase: Some("continuous".to_string()),
paused: false,
upper_limit: 14.56,
lower_limit: 11.92,
price_tick: 0.01,
}],
vec![DailyFactorSnapshot {
date,
symbol: symbol.to_string(),
market_cap_bn: 50.0,
free_float_cap_bn: 45.0,
pe_ttm: 15.0,
turnover_ratio: Some(2.0),
effective_turnover_ratio: Some(1.8),
extra_factors: BTreeMap::new(),
}],
vec![CandidateEligibility {
date,
symbol: symbol.to_string(),
is_st: false,
is_new_listing: false,
is_paused: false,
allow_buy: true,
allow_sell: true,
is_kcb: false,
is_one_yuan: false,
}],
vec![BenchmarkSnapshot {
date,
benchmark: "000300.SH".to_string(),
open: 100.0,
close: 100.0,
prev_close: 99.0,
volume: 1_000_000,
}],
Vec::new(),
vec![IntradayExecutionQuote {
date,
symbol: symbol.to_string(),
timestamp: date.and_hms_opt(9, 31, 0).unwrap(),
last_price: 12.39,
bid1: 12.39,
ask1: 12.40,
bid1_volume: 10_000,
ask1_volume: 10_000,
volume_delta: 10_000,
amount_delta: 123_900.0,
trading_phase: Some("continuous".to_string()),
}],
)
.expect("dataset");
let mut portfolio = PortfolioState::new(1_000.0);
portfolio.position_mut(symbol).buy(prev_date, 800, 10.92);
let broker = BrokerSimulator::new_with_execution_price(
ChinaAShareCostModel::default(),
ChinaEquityRuleHooks::default(),
PriceField::Last,
)
.with_matching_type(MatchingType::NextTickLast)
.with_intraday_execution_start_time(NaiveTime::from_hms_opt(9, 31, 0).unwrap())
.with_volume_limit(false)
.with_liquidity_limit(false);
let report = broker
.execute(
date,
&mut portfolio,
&data,
&StrategyDecision {
rebalance: false,
target_weights: BTreeMap::new(),
exit_symbols: BTreeSet::new(),
order_intents: vec![OrderIntent::TargetValue {
symbol: symbol.to_string(),
target_value: 0.0,
reason: "delayed_limit_open_sell".to_string(),
}],
notes: Vec::new(),
diagnostics: Vec::new(),
},
)
.expect("broker execution");
assert_eq!(report.fill_events.len(), 1);
assert_eq!(report.fill_events[0].quantity, 800);
assert_eq!(report.fill_events[0].price, 12.39);
assert!(portfolio.position(symbol).is_none());
}
#[test]
fn broker_order_value_skips_when_one_lot_exceeds_budget() {
let date = NaiveDate::from_ymd_opt(2025, 1, 2).unwrap();
let symbol = "300321.SZ";
let data = order_value_rounding_data(date, symbol, 20.38);
let (portfolio, report) = execute_single_value_order(date, &data, symbol, 2_000.0);
assert!(report.fill_events.is_empty());
assert!(portfolio.position(symbol).is_none());
}
#[test] #[test]
fn broker_executes_order_shares_and_order_lots() { fn broker_executes_order_shares_and_order_lots() {
let date = NaiveDate::from_ymd_opt(2024, 1, 10).unwrap(); let date = NaiveDate::from_ymd_opt(2024, 1, 10).unwrap();
@@ -778,7 +1045,7 @@ fn broker_executes_order_percent_and_target_percent() {
) )
.expect("percent execution"); .expect("percent execution");
assert_eq!(percent_report.fill_events.len(), 1); assert_eq!(percent_report.fill_events.len(), 1);
assert_eq!(percent_report.fill_events[0].quantity, 10_000); assert_eq!(percent_report.fill_events[0].quantity, 9_900);
let mut target_percent_portfolio = PortfolioState::new(1_000_000.0); let mut target_percent_portfolio = PortfolioState::new(1_000_000.0);
let target_percent_report = broker let target_percent_report = broker
@@ -1218,6 +1485,110 @@ fn broker_applies_price_ratio_slippage_on_snapshot_fills() {
assert!((report.fill_events[0].price - 10.1).abs() < 1e-9); assert!((report.fill_events[0].price - 10.1).abs() < 1e-9);
} }
#[test]
fn broker_applies_dynamic_slippage_on_snapshot_fills() {
let date = NaiveDate::from_ymd_opt(2024, 1, 10).unwrap();
let data = DataSet::from_components(
vec![Instrument {
symbol: "000002.SZ".to_string(),
name: "Test".to_string(),
board: "SZ".to_string(),
round_lot: 100,
listed_at: None,
delisted_at: None,
status: "active".to_string(),
}],
vec![DailyMarketSnapshot {
date,
symbol: "000002.SZ".to_string(),
timestamp: Some("2024-01-10 10:18:00".to_string()),
day_open: 10.0,
open: 10.0,
high: 10.1,
low: 9.9,
close: 10.0,
last_price: 10.0,
bid1: 9.99,
ask1: 10.01,
prev_close: 10.0,
volume: 100_000,
tick_volume: 100_000,
bid1_volume: 80_000,
ask1_volume: 80_000,
trading_phase: Some("continuous".to_string()),
paused: false,
upper_limit: 11.0,
lower_limit: 9.0,
price_tick: 0.01,
}],
vec![DailyFactorSnapshot {
date,
symbol: "000002.SZ".to_string(),
market_cap_bn: 50.0,
free_float_cap_bn: 45.0,
pe_ttm: 15.0,
turnover_ratio: Some(2.0),
effective_turnover_ratio: Some(1.8),
extra_factors: BTreeMap::new(),
}],
vec![CandidateEligibility {
date,
symbol: "000002.SZ".to_string(),
is_st: false,
is_new_listing: false,
is_paused: false,
allow_buy: true,
allow_sell: true,
is_kcb: false,
is_one_yuan: false,
}],
vec![BenchmarkSnapshot {
date,
benchmark: "000300.SH".to_string(),
open: 100.0,
close: 100.0,
prev_close: 99.0,
volume: 1_000_000,
}],
)
.expect("dataset");
let mut portfolio = PortfolioState::new(1_000_000.0);
let broker = BrokerSimulator::new_with_execution_price(
ChinaAShareCostModel::default(),
ChinaEquityRuleHooks::default(),
PriceField::Open,
)
.with_slippage_model(SlippageModel::Dynamic(DynamicSlippageConfig::new(
0.5, 0.3, 0.1,
)));
let report = broker
.execute(
date,
&mut portfolio,
&data,
&StrategyDecision {
rebalance: false,
target_weights: BTreeMap::new(),
exit_symbols: BTreeSet::new(),
order_intents: vec![OrderIntent::Value {
symbol: "000002.SZ".to_string(),
value: 100_000.0,
reason: "dynamic_slippage".to_string(),
}],
notes: Vec::new(),
diagnostics: Vec::new(),
},
)
.expect("broker execution");
assert_eq!(report.fill_events.len(), 1);
let expected_ratio = ((10.0 * report.fill_events[0].quantity as f64) / (100_000.0 * 10.0))
* 0.5
+ ((10.1 - 9.9) / 10.0) * 0.3;
assert!((report.fill_events[0].price - 10.0 * (1.0 + expected_ratio)).abs() < 1e-9);
}
#[test] #[test]
fn broker_applies_tick_size_slippage_on_intraday_last_fills() { fn broker_applies_tick_size_slippage_on_intraday_last_fills() {
let date = NaiveDate::from_ymd_opt(2024, 1, 10).unwrap(); let date = NaiveDate::from_ymd_opt(2024, 1, 10).unwrap();
@@ -1438,6 +1809,121 @@ fn broker_rejects_intraday_last_order_without_execution_quotes() {
assert!(portfolio.position("000002.SZ").is_none()); assert!(portfolio.position("000002.SZ").is_none());
} }
#[test]
fn broker_executes_intraday_last_on_start_quote_without_trade_delta() {
let date = NaiveDate::from_ymd_opt(2024, 1, 10).unwrap();
let data = DataSet::from_components_with_actions_and_quotes(
vec![Instrument {
symbol: "000002.SZ".to_string(),
name: "Test".to_string(),
board: "SZ".to_string(),
round_lot: 100,
listed_at: None,
delisted_at: None,
status: "active".to_string(),
}],
vec![DailyMarketSnapshot {
date,
symbol: "000002.SZ".to_string(),
timestamp: Some("2024-01-10 09:33:00".to_string()),
day_open: 15.0,
open: 15.0,
high: 15.5,
low: 14.8,
close: 15.2,
last_price: 15.2,
bid1: 15.19,
ask1: 15.21,
prev_close: 15.0,
volume: 100_000,
tick_volume: 100_000,
bid1_volume: 80_000,
ask1_volume: 80_000,
trading_phase: Some("continuous".to_string()),
paused: false,
upper_limit: 16.5,
lower_limit: 13.5,
price_tick: 0.01,
}],
vec![DailyFactorSnapshot {
date,
symbol: "000002.SZ".to_string(),
market_cap_bn: 50.0,
free_float_cap_bn: 45.0,
pe_ttm: 15.0,
turnover_ratio: Some(2.0),
effective_turnover_ratio: Some(1.8),
extra_factors: BTreeMap::new(),
}],
vec![CandidateEligibility {
date,
symbol: "000002.SZ".to_string(),
is_st: false,
is_new_listing: false,
is_paused: false,
allow_buy: true,
allow_sell: true,
is_kcb: false,
is_one_yuan: false,
}],
vec![BenchmarkSnapshot {
date,
benchmark: "000300.SH".to_string(),
open: 100.0,
close: 100.0,
prev_close: 99.0,
volume: 1_000_000,
}],
Vec::new(),
vec![IntradayExecutionQuote {
date,
symbol: "000002.SZ".to_string(),
timestamp: date.and_hms_opt(9, 33, 0).unwrap(),
last_price: 15.2,
bid1: 15.19,
ask1: 15.21,
bid1_volume: 8,
ask1_volume: 8,
volume_delta: 0,
amount_delta: 0.0,
trading_phase: Some("continuous".to_string()),
}],
)
.expect("dataset");
let mut portfolio = PortfolioState::new(1_000_000.0);
let broker = BrokerSimulator::new_with_execution_price(
ChinaAShareCostModel::default(),
ChinaEquityRuleHooks::default(),
PriceField::Last,
)
.with_intraday_execution_start_time(chrono::NaiveTime::from_hms_opt(9, 33, 0).unwrap());
let report = broker
.execute(
date,
&mut portfolio,
&data,
&StrategyDecision {
rebalance: false,
target_weights: BTreeMap::new(),
exit_symbols: BTreeSet::new(),
order_intents: vec![OrderIntent::Value {
symbol: "000002.SZ".to_string(),
value: 4_000.0,
reason: "start_quote".to_string(),
}],
notes: Vec::new(),
diagnostics: Vec::new(),
},
)
.expect("broker execution");
assert_eq!(report.fill_events.len(), 1);
assert_eq!(report.fill_events[0].quantity, 200);
assert!((report.fill_events[0].price - 15.2).abs() < 1e-9);
assert_eq!(report.order_events[0].status, OrderStatus::Filled);
}
#[test] #[test]
fn broker_cancels_market_order_remainder_when_intraday_quote_liquidity_exhausted() { fn broker_cancels_market_order_remainder_when_intraday_quote_liquidity_exhausted() {
let date = NaiveDate::from_ymd_opt(2024, 1, 10).unwrap(); let date = NaiveDate::from_ymd_opt(2024, 1, 10).unwrap();
@@ -2256,7 +2742,7 @@ fn broker_executes_algo_twap_percent_across_window_quotes() {
exit_symbols: BTreeSet::new(), exit_symbols: BTreeSet::new(),
order_intents: vec![OrderIntent::AlgoPercent { order_intents: vec![OrderIntent::AlgoPercent {
symbol: "000002.SZ".to_string(), symbol: "000002.SZ".to_string(),
percent: 0.0036, percent: 0.0037,
style: AlgoOrderStyle::Twap, style: AlgoOrderStyle::Twap,
start_time: Some(NaiveTime::from_hms_opt(10, 0, 0).unwrap()), start_time: Some(NaiveTime::from_hms_opt(10, 0, 0).unwrap()),
end_time: Some(NaiveTime::from_hms_opt(10, 30, 0).unwrap()), end_time: Some(NaiveTime::from_hms_opt(10, 30, 0).unwrap()),