Merge remote-tracking branch 'origin/main'

# Conflicts: # crates/fidc-core/src/metrics.rs
2026-08-22 18:58:44 +08:00
parent 6fba34d2e4 375b8b2df1
commit c8cbc5dc96
9 changed files with 169 additions and 27 deletions
@@ -203,7 +203,7 @@ impl BacktestResult {
                    quantity: fill.quantity,
                    price: fill.price,
                    gross_amount: fill.gross_amount,
-                    transaction_cost: fill.commission + fill.stamp_tax,
+                    transaction_cost: fill.commission + fill.stamp_tax + fill.transfer_fee,
                    net_cash_flow: fill.net_cash_flow,
                    reason: fill.reason.clone(),
                })
@@ -2921,6 +2921,7 @@ where
            &result.equity_curve,
            &result.fills,
            &result.daily_holdings,
+            &result.account_events,
            self.aggregate_initial_cash(),
        );

@@ -3169,6 +3170,7 @@ where
                            gross_amount: reinvest_cash,
                            commission: 0.0,
                            stamp_tax: 0.0,
+                            transfer_fee: 0.0,
                            net_cash_flow: -reinvest_cash,
                            reason: "dividend_reinvestment".to_string(),
                        });