优化修改正常

scripts/optimizer/ea_batch_optimizer.py

@@ -13,12 +13,12 @@ from ea_config_parser import load_ea_config, load_all_ea_configs, EAConfig
 from parameter_constraint import create_constraint_engine
 from smart_search import SmartSearch
 from analyze_results import ResultAnalyzer
-from mt5_paths import auto_detect_data_dir
 
 
 class EABatchOptimizer:
-    def __init__(self, base_dir: str = 'optimizer'):
+    def __init__(self, base_dir: str = 'optimizer', mt5_data_dir: str = ''):
         self.base_dir = base_dir
+        self.mt5_data_dir = mt5_data_dir
         self.configs_dir = os.path.join(base_dir, 'configs')
         self.set_files_dir = os.path.join(base_dir, 'set_files')
         self.reports_dir = os.path.join(base_dir, 'reports')
@@ -97,8 +97,11 @@ class EABatchOptimizer:
         ini_path = os.path.join(self.configs_dir, ini_filename)
         set_filename = ea_config.ea_name + '_optimization.set'
 
-        data_dir = auto_detect_data_dir() or r'C:\Users\Administrator\AppData\Roaming\MetaQuotes\Terminal\010E047102812FC0C18890992854220E'
-        mt5_tester_dir = os.path.join(data_dir, 'MQL5', 'Profiles', 'Tester')
+        if not self.mt5_data_dir:
+            raise FileNotFoundError(
+                "EABatchOptimizer: mt5_data_dir 未设置。请在 GUI '回测配置' 里设置 MT5 数据目录"
+            )
+        mt5_tester_dir = os.path.join(self.mt5_data_dir, 'MQL5', 'Profiles', 'Tester')
         set_path = os.path.join(mt5_tester_dir, set_filename)
 
         date_from = test_config.get('from_date', '2025.01.01')