diff --git a/docs/dev/problems.md b/docs/dev/problems.md new file mode 100644 index 0000000..2b0485b --- /dev/null +++ b/docs/dev/problems.md @@ -0,0 +1 @@ +we do not properly calculate PnL and enter/exit prices \ No newline at end of file diff --git a/run_clean_dashboard.py b/run_clean_dashboard.py index 2c73a2e..d55140e 100644 --- a/run_clean_dashboard.py +++ b/run_clean_dashboard.py @@ -148,15 +148,16 @@ def start_clean_dashboard_with_training(): # Get configuration config = get_config() - # Initialize core components - from core.data_provider import DataProvider + # Initialize core components with standardized versions + from core.standardized_data_provider import StandardizedDataProvider from core.orchestrator import TradingOrchestrator from core.trading_executor import TradingExecutor - # Create data provider - data_provider = DataProvider() + # Create standardized data provider + data_provider = StandardizedDataProvider() + logger.info("StandardizedDataProvider created with BaseDataInput support") - # Create enhanced orchestrator with COB integration - stable and efficient + # Create enhanced orchestrator with standardized data provider orchestrator = TradingOrchestrator(data_provider, enhanced_rl_training=True) logger.info("Enhanced Trading Orchestrator created with COB integration") diff --git a/web/clean_dashboard.py b/web/clean_dashboard.py index 00cc9e2..0322f79 100644 --- a/web/clean_dashboard.py +++ b/web/clean_dashboard.py @@ -62,10 +62,13 @@ logging.getLogger('dash.dash').setLevel(logging.WARNING) # Import core components from core.config import get_config -from core.data_provider import DataProvider +from core.standardized_data_provider import StandardizedDataProvider from core.orchestrator import TradingOrchestrator from core.trading_executor import TradingExecutor +# Import standardized models +from NN.models.standardized_cnn import StandardizedCNN + # Import layout and component managers from web.layout_manager import DashboardLayoutManager from web.component_manager import DashboardComponentManager @@ -142,6 +145,10 @@ class CleanTradingDashboard: self.training_system = None self._initialize_enhanced_training_system() + # Initialize StandardizedCNN model + self.standardized_cnn = None + self._initialize_standardized_cnn() + # Initialize layout and component managers self.layout_manager = DashboardLayoutManager( starting_balance=self._get_initial_balance(),