Renamed datasets in Results to more appropriate optimization_results

Author: jsnel

glotaran/project/result.py

@@ -34,7 +34,7 @@ class SavingOptions(BaseModel):
 class Result(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True, extra="forbid")
 
-    datasets: dict[str, OptimizationResult]
+    optimization_results: dict[str, OptimizationResult]
     experiments: dict[str, ExperimentModel]
     optimization_info: OptimizationInfo
     initial_parameters: Parameters
@@ -65,7 +65,7 @@ def save(
 
         data_path = path / "data"
         data_path.mkdir(exist_ok=True)
-        for label, data in self.datasets.items():
+        for label, data in self.optimization_results.items():
             dataset_path = data_path / f"{label}.{options.data_format}"
             result_dict["data"][label] = str(dataset_path)
             if options.data_filter is not None:

glotaran/project/scheme.py

@@ -83,7 +83,7 @@ def optimize(
             optimization_info=optimization_info, parameters=optimized_parameters
         )
         return Result(
-            datasets=optimized_data,
+            optimization_results=optimized_data,
             experiments=self.experiments,
             optimization_info=optimization_info,
             initial_parameters=parameters,

glotaran/utils/io.py

@@ -432,13 +432,13 @@ def create_clp_guide_dataset(
     """
     if isinstance(result, xr.Dataset):
         dataset = result
-    elif dataset_name is None or dataset_name not in result.datasets:
+    elif dataset_name is None or dataset_name not in result.optimization_results:
         raise ValueError(
             f"Unknown dataset {dataset_name!r}. "
-            f"Known datasets are:\n {list(result.datasets.keys())}"
+            f"Known datasets are:\n {list(result.optimization_results.keys())}"
         )
     else:
-        dataset = result.datasets[dataset_name]
+        dataset = result.optimization_results[dataset_name]
     if clp_label not in dataset.clp_label:
         raise ValueError(
             f"Unknown clp_label {clp_label!r}. "