Use crop abbreviation from crop parameter

burggraaff · Jun 4, 2024 · b02b441 · b02b441
1 parent ec9af2e
commit b02b441
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/fpcup/nn/dataset.py b/fpcup/nn/dataset.py
@@ -10,6 +10,7 @@
 from torch import Tensor, tensor
 from torch.utils.data import DataLoader, Dataset, TensorDataset
 
+from ..crop import CROP2ABBREVIATION
 from ..io import load_combined_ensemble_summary
 from ..model import InputSummary, Summary
 from ..typing import Optional, PathOrStr
@@ -18,10 +19,11 @@
 ### CONSTANTS
 # Temporary: keep it simple
 CROP = "barley"
+CROP_ABBREVIATION = CROP2ABBREVIATION[CROP]
 VARIETY = "Spring_barley_301"
 SOILTYPE = "ec3"
-pattern = f"*_{SOILTYPE}_B*"
-# pattern = f"*_B*"
+pattern = f"*_{SOILTYPE}_{CROP_ABBREVIATION}*"
+# pattern = f"*_{CROP_ABBREVIATION}*"
 pattern_suffix = pattern + ".wsum"