duxingchen/WQ_GUI
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新工作目录子文件夹的序号

Browse Source
This commit is contained in:
zhanghuilai
2026-04-14 09:24:18 +08:00
parent 8025869b76
commit b0a94ba1e7
11 changed files with 244 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/non_empirical_retrieval.py
View File

@ -246,8 +246,8 @@ def non_empirical_retrieval(algorithm, model_info_path, coor_spectral_path, outp
if __name__ == "__main__":
algorithm= "chl_a"
model_info_path= r"E:\code\WQ\pipeline_result\work_dir\5_training_spectra\6_5_non_empirical_models\SS\SS_chl_a.json"
coor_spectral_path= r"E:\code\WQ\pipeline_result\work_dir\7_sampling\sampling_spectra.csv"
output_path= r"E:\code\WQ\pipeline_result\work_dir\8_predictions\SS_chl_a.csv"
model_info_path= r"E:\code\WQ\pipeline_result\work_dir\5_training_spectra\8_non_empirical_models\SS\SS_chl_a.json"
coor_spectral_path= r"E:\code\WQ\pipeline_result\work_dir\10_sampling\sampling_spectra.csv"
output_path= r"E:\code\WQ\pipeline_result\work_dir\11_12_13_predictions\SS_chl_a.csv"
wave_radius=5.0
non_empirical_retrieval(algorithm, model_info_path, coor_spectral_path, output_path, wave_radius)

10
src/core/water_quality_inversion_pipeline.py
View File

@ -95,11 +95,11 @@ class WaterQualityInversionPipeline:
self.deglint_dir = self.work_dir / "3_deglint"
self.processed_data_dir = self.work_dir / "4_processed_data"
self.training_spectra_dir = self.work_dir / "5_training_spectra"
self.models_dir = self.work_dir / "6_models"
self.sampling_dir = self.work_dir / "7_sampling"
self.prediction_dir = self.work_dir / "8_predictions"
self.visualization_dir = self.work_dir / "9_visualization"
self.reports_dir = self.work_dir / "10_reports"
self.models_dir = self.work_dir / "7_models"
self.sampling_dir = self.work_dir / "10_sampling"
self.prediction_dir = self.work_dir / "11_12_13_predictions"
self.visualization_dir = self.work_dir / "14_visualization"
self.reports_dir = self.work_dir / "reports"
# 创建所有子目录
for dir_path in [self.water_mask_dir, self.glint_dir, self.deglint_dir,

22
src/core/water_quality_inversion_pipeline_GUI.py
View File

@ -105,14 +105,14 @@ class WaterQualityInversionPipeline:
self.deglint_dir = self.work_dir / "3_deglint"
self.processed_data_dir = self.work_dir / "4_processed_data"
self.training_spectra_dir = self.work_dir / "5_training_spectra"
self.indices_dir = self.work_dir / "5_5_water_quality_indices"
self.models_dir = self.work_dir / "6_models"
self.non_empirical_models_dir = self.work_dir / "6_5_non_empirical_models"
self.custom_regression_dir = self.work_dir / "6_75_custom_regression"
self.sampling_dir = self.work_dir / "7_sampling"
self.prediction_dir = self.work_dir / "8_predictions"
self.visualization_dir = self.work_dir / "9_visualization"
self.reports_dir = self.work_dir / "10_reports"
self.indices_dir = self.work_dir / "6_water_quality_indices"
self.models_dir = self.work_dir / "7_models"
self.non_empirical_models_dir = self.work_dir / "8_non_empirical_models"
self.custom_regression_dir = self.work_dir / "9_custom_regression"
self.sampling_dir = self.work_dir / "10_sampling"
self.prediction_dir = self.work_dir / "11_12_13_predictions"
self.visualization_dir = self.work_dir / "14_visualization"
self.reports_dir = self.work_dir / "reports"
# 创建所有子目录
for dir_path in [self.water_mask_dir, self.glint_dir, self.deglint_dir,
@ -3379,10 +3379,10 @@ class WaterQualityInversionPipeline:
else:
# 如果output_dir为空，使用工作目录
if hasattr(self, 'work_dir') and self.work_dir is not None:
non_empirical_dir = Path(self.work_dir) / "6_5_non_empirical_models"
non_empirical_dir = Path(self.work_dir) / "8_non_empirical_models"
else:
# 如果没有工作目录，使用当前目录
non_empirical_dir = Path.cwd() / "6_5_non_empirical_models"
non_empirical_dir = Path.cwd() / "8_non_empirical_models"
non_empirical_dir.mkdir(parents=True, exist_ok=True)
# 设置默认参数
@ -3712,7 +3712,7 @@ class WaterQualityInversionPipeline:
if non_empirical_models_dir is not None:
final_models_dir = non_empirical_models_dir
else:
default_models_dir = str(self.work_dir / "6_5_non_empirical_models")
default_models_dir = str(self.work_dir / "8_non_empirical_models")
if Path(default_models_dir).exists():
final_models_dir = default_models_dir
else: