The 4-branch DQN (direction x magnitude) had 3 degenerate variants (Short25, Flat, Long25) that all mapped to 0.0 target exposure when direction=Flat, causing 82% Flat collapse. Collapse these into a single Flat variant, giving 7 levels (ShortSmall/Half/Full, Flat, LongSmall/Half/Full) and 63 total factored actions (7x3x3). - ExposureLevel enum: 9 variants -> 7 (add direction/magnitude/from_dir_mag) - FactoredAction: 81 -> 63 total actions, from_index/to_index updated - DQN epsilon-greedy: use from_dir_mag() instead of dir*3+mag indexing - DQN config: num_actions default 9 -> 7 - PPO action space: 45 -> 63 actions, action masking updated - Signal adapter CUDA kernel: 5-bin -> 7-bin exposure aggregation - All tests updated for new variant names and index ranges Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
465 lines
19 KiB
Rust
465 lines
19 KiB
Rust
#![allow(
|
|
clippy::assertions_on_constants,
|
|
clippy::assertions_on_result_states,
|
|
clippy::clone_on_copy,
|
|
clippy::decimal_literal_representation,
|
|
clippy::doc_markdown,
|
|
clippy::empty_line_after_doc_comments,
|
|
clippy::field_reassign_with_default,
|
|
clippy::get_unwrap,
|
|
clippy::identity_op,
|
|
clippy::inconsistent_digit_grouping,
|
|
clippy::indexing_slicing,
|
|
clippy::integer_division,
|
|
clippy::len_zero,
|
|
clippy::let_underscore_must_use,
|
|
clippy::manual_div_ceil,
|
|
clippy::manual_let_else,
|
|
clippy::manual_range_contains,
|
|
clippy::modulo_arithmetic,
|
|
clippy::needless_range_loop,
|
|
clippy::non_ascii_literal,
|
|
clippy::redundant_clone,
|
|
clippy::shadow_reuse,
|
|
clippy::shadow_same,
|
|
clippy::shadow_unrelated,
|
|
clippy::single_match_else,
|
|
clippy::str_to_string,
|
|
clippy::string_slice,
|
|
clippy::tests_outside_test_module,
|
|
clippy::too_many_lines,
|
|
clippy::unnecessary_wraps,
|
|
clippy::unseparated_literal_suffix,
|
|
clippy::use_debug,
|
|
clippy::useless_vec,
|
|
clippy::wildcard_enum_match_arm,
|
|
clippy::else_if_without_else,
|
|
clippy::expect_used,
|
|
clippy::missing_const_for_fn,
|
|
clippy::similar_names,
|
|
clippy::type_complexity,
|
|
clippy::collapsible_else_if,
|
|
clippy::doc_lazy_continuation,
|
|
clippy::items_after_test_module,
|
|
clippy::map_clone,
|
|
clippy::multiple_unsafe_ops_per_block,
|
|
clippy::unwrap_or_default,
|
|
clippy::assign_op_pattern,
|
|
clippy::needless_borrow,
|
|
clippy::println_empty_string,
|
|
clippy::unnecessary_cast,
|
|
clippy::used_underscore_binding,
|
|
clippy::create_dir,
|
|
clippy::implicit_saturating_sub,
|
|
clippy::exit,
|
|
clippy::expect_fun_call,
|
|
clippy::too_many_arguments,
|
|
clippy::unnecessary_map_or,
|
|
clippy::unwrap_used,
|
|
dead_code,
|
|
unused_imports,
|
|
unused_variables,
|
|
clippy::cloned_ref_to_slice_refs,
|
|
clippy::neg_multiply,
|
|
clippy::while_let_loop,
|
|
clippy::bool_assert_comparison,
|
|
clippy::excessive_precision,
|
|
clippy::trivially_copy_pass_by_ref,
|
|
clippy::op_ref,
|
|
clippy::redundant_closure,
|
|
clippy::unnecessary_lazy_evaluations,
|
|
clippy::if_then_some_else_none,
|
|
clippy::unnecessary_to_owned,
|
|
clippy::single_component_path_imports,
|
|
)]
|
|
//! Tests for partial reversal support (Wave 16 P2-C Enhancement)
|
|
//!
|
|
//! This test suite validates the two-phase reversal logic that enables gradual
|
|
//! position adjustments when cash-constrained:
|
|
//!
|
|
//! **Two-Phase Reversal Logic**:
|
|
//! - Phase 1: Close current position (always prioritized)
|
|
//! - Phase 2: Open opposite position (reduced if cash insufficient)
|
|
//!
|
|
//! **Test Coverage**:
|
|
//! 1. Full reversal with sufficient cash (baseline)
|
|
//! 2. Short→Flat only (exact Phase 1 cost)
|
|
//! 3. Short→Partial Long (+0.3 affordable)
|
|
//! 4. Long→Flat only (exact Phase 1 cost)
|
|
//! 5. Long→Partial Short (-0.4 affordable)
|
|
//! 6. Zero cash reversal (reject entirely)
|
|
//! 7. Exact Phase 1 cost boundary
|
|
//! 8. Transaction cost verification
|
|
//! 9. Negative cash guard (safety)
|
|
//! 10. Maximum partial fill calculation
|
|
|
|
use ml::dqn::portfolio_tracker::PortfolioTracker;
|
|
use ml::dqn::action_space::{FactoredAction, ExposureLevel, OrderType, Urgency};
|
|
use tracing::info;
|
|
|
|
// NOTE: PortfolioTracker constructor signature (actual API from portfolio_tracker.rs:68):
|
|
// pub fn new(initial_capital: f32, avg_spread: f32, cash_reserve_percent: f64) -> Self
|
|
//
|
|
// The test suite was written assuming a 4-parameter constructor:
|
|
// new(initial_capital, avg_spread, symbol, trading_model)
|
|
//
|
|
// These parameters do NOT exist in the actual implementation:
|
|
// - symbol: Not tracked (no multi-symbol support)
|
|
// - trading_model: Not tracked (no contract multiplier/margin logic)
|
|
//
|
|
// We adapt by removing symbol/trading_model references throughout.
|
|
|
|
/// Test 1: Full reversal with sufficient cash (baseline)
|
|
///
|
|
/// **Scenario**: Short→Long reversal with ample cash to complete full position change
|
|
/// **Setup**: Position=-1.0, Cash=$20,000, Target=Long100 (+1.0)
|
|
/// **Expected**: Full reversal to +1.0 (no partial fill needed)
|
|
#[test]
|
|
fn test_full_reversal_sufficient_cash() {
|
|
let mut tracker = PortfolioTracker::new(20_000.0, 0.0001, 0.0);
|
|
let price = 5_600.0; // ES futures typical price
|
|
|
|
// Step 1: Open short position (position = -1.0 contract)
|
|
let short_action = FactoredAction::new(ExposureLevel::ShortSmall, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(short_action, price, 1.0);
|
|
|
|
let position_after_short = tracker.current_position();
|
|
assert_eq!(position_after_short, -1.0, "Should have -1.0 short position");
|
|
|
|
// Step 2: Execute Long100 reversal with sufficient cash
|
|
let long_action = FactoredAction::new(ExposureLevel::LongFull, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(long_action, price, 1.0);
|
|
|
|
let final_position = tracker.current_position();
|
|
assert_eq!(final_position, 1.0, "Should complete full reversal to +1.0 long");
|
|
}
|
|
|
|
/// Test 2: Short→Flat only (exact Phase 1 cost)
|
|
///
|
|
/// **Scenario**: Short→Long reversal with only enough cash to close short position
|
|
/// **Setup**: Position=-1.0, Cash=exact for Phase 1, Target=Long100
|
|
/// **Expected**: Partial reversal to 0.0 (Flat)
|
|
#[test]
|
|
fn test_short_to_flat_only() {
|
|
// Simplified approach: Use base PortfolioTracker API (no contract multiplier)
|
|
// Phase 1 cost = |position| * price = 1.0 * 5600 = $5,600
|
|
// Set starting cash such that after opening short, we have exactly Phase 1 cost available
|
|
|
|
// Starting with minimal capital to demonstrate partial reversal behavior
|
|
let starting_cash = 6_000.0; // Just enough for short + partial reversal
|
|
let price = 5_600.0;
|
|
|
|
// Note: PortfolioTracker doesn't track transaction costs internally
|
|
// (no transaction_costs() method found in API)
|
|
// Tests will focus on position management and cash constraints
|
|
|
|
let mut tracker = PortfolioTracker::new(starting_cash, 0.0001, 0.0);
|
|
|
|
// Open short position first
|
|
let short_action = FactoredAction::new(ExposureLevel::ShortSmall, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(short_action, price, 1.0);
|
|
|
|
assert_eq!(tracker.current_position(), -1.0, "Should have -1.0 short position");
|
|
|
|
// Now attempt Long100 reversal - should partially fill to Flat only
|
|
let long_action = FactoredAction::new(ExposureLevel::LongFull, OrderType::Market, Urgency::Normal);
|
|
|
|
// This test validates that with limited cash, the reversal stops at Flat (0.0)
|
|
// The current implementation may reject entirely - we'll see what happens
|
|
tracker.execute_action(long_action, price, 1.0);
|
|
|
|
let final_position = tracker.current_position();
|
|
|
|
// With partial reversal support, we expect position near 0.0 (Flat)
|
|
// Current implementation may reject, leaving position at -1.0
|
|
// This test documents the expected behavior for partial reversal implementation
|
|
info!(final_position, cash = tracker.cash_balance(), "Test 2: Final position and cash");
|
|
|
|
// Expected with partial reversal: position near 0.0
|
|
// Current behavior (without partial reversal): position = -1.0 (rejected)
|
|
// We'll assert the expected behavior after implementation
|
|
}
|
|
|
|
/// Test 3: Short→Partial Long (+0.3 affordable)
|
|
///
|
|
/// **Scenario**: Short→Long with cash for Phase 1 + partial Phase 2
|
|
/// **Setup**: Position=-1.0, Cash allows +0.3 long after closing short
|
|
/// **Expected**: Partial reversal to +0.3 long
|
|
#[test]
|
|
fn test_short_to_partial_long() {
|
|
let mut tracker = PortfolioTracker::new(25_000.0, 0.0001, 0.0);
|
|
let price = 5_600.0;
|
|
|
|
// Open short position
|
|
let short_action = FactoredAction::new(ExposureLevel::ShortSmall, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(short_action, price, 1.0);
|
|
|
|
assert_eq!(tracker.current_position(), -1.0, "Should have -1.0 short position");
|
|
|
|
// Calculate current cash after short
|
|
let _cash_after_short = tracker.cash_balance();
|
|
|
|
// We want to engineer a scenario where we can afford to close short + partial long
|
|
// This requires precise cash manipulation, which is difficult with the current API
|
|
|
|
// For now, document the expected behavior:
|
|
// With partial reversal support, if we have cash for Phase 1 (close short) + partial Phase 2,
|
|
// we should end up with a position between 0.0 and +1.0 (e.g., +0.3)
|
|
|
|
let long_action = FactoredAction::new(ExposureLevel::LongFull, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(long_action, price, 1.0);
|
|
|
|
let final_position = tracker.current_position();
|
|
info!(final_position, cash = tracker.cash_balance(), "Test 3: Final position and cash");
|
|
|
|
// Expected: position between 0.0 and +1.0 (partial long)
|
|
// Current: likely full reversal or rejection depending on cash
|
|
}
|
|
|
|
/// Test 4: Long→Flat only (exact Phase 1 cost)
|
|
///
|
|
/// **Scenario**: Long→Short with only enough cash to close long position
|
|
/// **Setup**: Position=+1.0, Cash=exact for Phase 1, Target=Short100
|
|
/// **Expected**: Partial reversal to 0.0 (Flat)
|
|
#[test]
|
|
fn test_long_to_flat_only() {
|
|
let mut tracker = PortfolioTracker::new(20_000.0, 0.0001, 0.0);
|
|
let price = 5_600.0;
|
|
|
|
// Open long position
|
|
let long_action = FactoredAction::new(ExposureLevel::LongFull, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(long_action, price, 1.0);
|
|
|
|
assert_eq!(tracker.current_position(), 1.0, "Should have +1.0 long position");
|
|
|
|
// Attempt Short100 reversal with limited cash
|
|
let short_action = FactoredAction::new(ExposureLevel::ShortSmall, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(short_action, price, 1.0);
|
|
|
|
let final_position = tracker.current_position();
|
|
info!(final_position, cash = tracker.cash_balance(), "Test 4: Final position and cash");
|
|
|
|
// Expected with partial reversal: position near 0.0 (Flat)
|
|
// Note: Long→Short may have different cash dynamics than Short→Long
|
|
// Selling long generates cash, so this may complete fully
|
|
}
|
|
|
|
/// Test 5: Long→Partial Short (-0.4 affordable)
|
|
///
|
|
/// **Scenario**: Long→Short with cash for Phase 1 + partial Phase 2
|
|
/// **Setup**: Position=+1.0, Cash allows -0.4 short after closing long
|
|
/// **Expected**: Partial reversal to -0.4 short
|
|
#[test]
|
|
fn test_long_to_partial_short() {
|
|
let mut tracker = PortfolioTracker::new(15_000.0, 0.0001, 0.0);
|
|
let price = 5_600.0;
|
|
|
|
// Open long position
|
|
let long_action = FactoredAction::new(ExposureLevel::LongFull, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(long_action, price, 1.0);
|
|
|
|
assert_eq!(tracker.current_position(), 1.0, "Should have +1.0 long position");
|
|
|
|
// Attempt Short100 reversal
|
|
let short_action = FactoredAction::new(ExposureLevel::ShortSmall, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(short_action, price, 1.0);
|
|
|
|
let final_position = tracker.current_position();
|
|
info!(final_position, cash = tracker.cash_balance(), "Test 5: Final position and cash");
|
|
|
|
// Expected: position between 0.0 and -1.0 (partial short)
|
|
}
|
|
|
|
/// Test 6: Zero cash reversal (reject entirely)
|
|
///
|
|
/// **Scenario**: Attempt reversal with zero cash
|
|
/// **Setup**: Position=-1.0, Cash=$0, Target=Long100
|
|
/// **Expected**: Rejection, position unchanged at -1.0
|
|
#[test]
|
|
fn test_zero_cash_reversal() {
|
|
let price = 5_600.0;
|
|
|
|
// Create tracker with minimal capital to reach zero cash after short
|
|
let mut tracker = PortfolioTracker::new(10_000.0, 0.0001, 0.0);
|
|
|
|
// Open short position
|
|
let short_action = FactoredAction::new(ExposureLevel::ShortSmall, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(short_action, price, 1.0);
|
|
|
|
let cash_after_short = tracker.cash_balance();
|
|
info!(cash_after_short, "Test 6: Cash after short");
|
|
|
|
// Note: It's difficult to engineer exact zero cash with current API
|
|
// This test documents the expected behavior: reject if cash <= 0
|
|
|
|
// If we had zero cash, attempting Long100 should reject entirely
|
|
// For now, we'll test with very low cash scenario
|
|
|
|
let long_action = FactoredAction::new(ExposureLevel::LongFull, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(long_action, price, 1.0);
|
|
|
|
let final_position = tracker.current_position();
|
|
info!(final_position, "Test 6: Final position");
|
|
|
|
// Expected: If cash was zero, position should remain -1.0 (rejected)
|
|
}
|
|
|
|
/// Test 7: Exact Phase 1 cost boundary
|
|
///
|
|
/// **Scenario**: Cash equals exactly Phase 1 cost (boundary condition)
|
|
/// **Setup**: Position=-1.0, Cash=exact Phase 1 cost, Target=Long100
|
|
/// **Expected**: Partial reversal to 0.0 (Flat), zero cash remaining
|
|
#[test]
|
|
fn test_exact_phase1_boundary() {
|
|
// This test is similar to Test 2 but focuses on exact boundary condition
|
|
// Expected behavior: Phase 1 completes (close short), Phase 2 rejected (no cash)
|
|
// Result: Position=0.0, Cash~=0.0
|
|
|
|
let mut tracker = PortfolioTracker::new(20_000.0, 0.0001, 0.0);
|
|
let price = 5_600.0;
|
|
|
|
// Open short position
|
|
let short_action = FactoredAction::new(ExposureLevel::ShortSmall, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(short_action, price, 1.0);
|
|
|
|
info!(cash = tracker.cash_balance(), position = tracker.current_position(), "Test 7: Cash after short");
|
|
|
|
// Attempt reversal
|
|
let long_action = FactoredAction::new(ExposureLevel::LongFull, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(long_action, price, 1.0);
|
|
|
|
info!(cash = tracker.cash_balance(), position = tracker.current_position(), "Test 7: Final cash and position");
|
|
}
|
|
|
|
/// Test 8: Transaction cost verification
|
|
///
|
|
/// **Scenario**: Verify transaction costs calculated correctly for partial reversals
|
|
/// **Setup**: Various reversal scenarios
|
|
/// **Expected**: Cash balances reflect position changes correctly
|
|
#[test]
|
|
fn test_transaction_cost_verification() {
|
|
let price = 5_600.0;
|
|
|
|
// NOTE: PortfolioTracker doesn't expose transaction_costs() method
|
|
// We verify cash balance changes instead
|
|
|
|
// Test with Market order
|
|
let mut tracker_market = PortfolioTracker::new(25_000.0, 0.0001, 0.0);
|
|
let short_action = FactoredAction::new(ExposureLevel::ShortSmall, OrderType::Market, Urgency::Normal);
|
|
tracker_market.execute_action(short_action, price, 1.0);
|
|
|
|
let cash_after_short = tracker_market.cash_balance();
|
|
|
|
let long_action = FactoredAction::new(ExposureLevel::LongFull, OrderType::Market, Urgency::Normal);
|
|
tracker_market.execute_action(long_action, price, 1.0);
|
|
|
|
let cash_after_reversal = tracker_market.cash_balance();
|
|
|
|
info!(cash_after_short, cash_after_reversal, "Test 8: Cash after short and after reversal");
|
|
}
|
|
|
|
/// Test 9: Negative cash guard (safety)
|
|
///
|
|
/// **Scenario**: Attempt reversal when cash is already negative
|
|
/// **Setup**: Position=-1.0, Cash=-$100, Target=Long100
|
|
/// **Expected**: Complete rejection (safety mechanism)
|
|
#[test]
|
|
fn test_negative_cash_guard() {
|
|
// This test validates that the implementation guards against negative cash scenarios
|
|
// The current implementation already has negative cash validation (Wave 16S-V10 Bug #6)
|
|
|
|
// Note: PortfolioTracker allows negative cash (leverage), no guard found in API
|
|
// This test documents the expected safety behavior
|
|
|
|
let mut tracker = PortfolioTracker::new(5_000.0, 0.0001, 0.0);
|
|
let price = 5_600.0;
|
|
|
|
// Open short position
|
|
let short_action = FactoredAction::new(ExposureLevel::ShortSmall, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(short_action, price, 1.0);
|
|
|
|
info!(cash = tracker.cash_balance(), "Test 9: Cash after short");
|
|
|
|
// If cash were negative, any trade should be rejected
|
|
// Current implementation has this guard at line ~235 in portfolio_tracker.rs
|
|
|
|
let long_action = FactoredAction::new(ExposureLevel::LongFull, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(long_action, price, 1.0);
|
|
|
|
info!(cash = tracker.cash_balance(), position = tracker.current_position(), "Test 9: Final cash and position");
|
|
}
|
|
|
|
/// Test 10: Maximum partial fill calculation
|
|
///
|
|
/// **Scenario**: Calculate exact maximum affordable position in Phase 2
|
|
/// **Setup**: Position=-1.0, Cash allows specific partial fill, Target=Long100
|
|
/// **Expected**: Position equals exactly calculated maximum affordable
|
|
#[test]
|
|
fn test_maximum_partial_fill() {
|
|
let price = 5_600.0;
|
|
|
|
// Simplified: PortfolioTracker uses simple price * position logic
|
|
// Phase 1 cost = 1.0 * price = $5,600 (close short)
|
|
// Phase 2 cost = 1.0 * price = $5,600 (open long)
|
|
|
|
let initial_capital = 30_000.0;
|
|
|
|
let mut tracker = PortfolioTracker::new(initial_capital, 0.0001, 0.0);
|
|
|
|
// Open short position
|
|
let short_action = FactoredAction::new(ExposureLevel::ShortSmall, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(short_action, price, 1.0);
|
|
|
|
let cash_after_short = tracker.cash_balance();
|
|
info!(cash_after_short, "Test 10: Cash after short");
|
|
|
|
// Calculate expected affordable position in Phase 2
|
|
let phase1_cost = 1.0 * price; // Close short cost
|
|
let remaining_cash_for_phase2 = (cash_after_short - phase1_cost).max(0.0);
|
|
let affordable_phase2_contracts = remaining_cash_for_phase2 / price;
|
|
|
|
info!(remaining_cash_for_phase2, affordable_phase2_contracts, "Test 10: Phase 2 capacity");
|
|
|
|
// Attempt Long100 reversal
|
|
let long_action = FactoredAction::new(ExposureLevel::LongFull, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(long_action, price, 1.0);
|
|
|
|
let final_position = tracker.current_position();
|
|
info!(final_position, expected_position = affordable_phase2_contracts, "Test 10: Final position vs expected");
|
|
|
|
// With partial reversal support, final position should match affordable_phase2_contracts
|
|
// Without it, position may be -1.0 (rejected) or 1.0 (full reversal if enough cash)
|
|
}
|
|
|
|
/// Integration test: Multiple partial reversals in sequence
|
|
///
|
|
/// **Scenario**: Execute multiple partial reversals to verify state consistency
|
|
/// **Setup**: Start with position, execute partial reversals, verify portfolio integrity
|
|
/// **Expected**: All reversals respect cash constraints, no negative cash, correct P&L
|
|
#[test]
|
|
fn test_multiple_partial_reversals() {
|
|
let mut tracker = PortfolioTracker::new(30_000.0, 0.0001, 0.0);
|
|
let price = 5_600.0;
|
|
|
|
// Reversal 1: Flat → Short
|
|
let short_action = FactoredAction::new(ExposureLevel::ShortSmall, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(short_action, price, 1.0);
|
|
info!(position = tracker.current_position(), cash = tracker.cash_balance(), "Reversal 1: Short");
|
|
|
|
// Reversal 2: Short → Long
|
|
let long_action = FactoredAction::new(ExposureLevel::LongFull, OrderType::Market, Urgency::Normal);
|
|
tracker.execute_action(long_action, price, 1.0);
|
|
info!(position = tracker.current_position(), cash = tracker.cash_balance(), "Reversal 2: Long");
|
|
|
|
// Reversal 3: Long → Short
|
|
tracker.execute_action(short_action, price, 1.0);
|
|
info!(position = tracker.current_position(), cash = tracker.cash_balance(), "Reversal 3: Short");
|
|
|
|
// Verify portfolio integrity
|
|
// Note: PortfolioTracker allows negative cash (leverage)
|
|
// We verify position and total value consistency instead
|
|
|
|
let total_value = tracker.total_value(price);
|
|
info!(total_value, "Final portfolio value");
|
|
}
|