fixed merging error

ATOMScience-org · Sep 11, 2024 · b41b7d5 · b41b7d5
1 parent 49dc67b
commit b41b7d5
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/atomsci/ddm/pipeline/model_datasets.py b/atomsci/ddm/pipeline/model_datasets.py
@@ -660,7 +660,7 @@ def combined_training_data(self):
             combined_y = np.concatenate((train.y, valid.y), axis=0)
             combined_w = np.concatenate((train.w, valid.w), axis=0)
             combined_ids = np.concatenate((train.ids, valid.ids))
-        self.combined_train_valid_data = NumpyDataset(combined_X, combined_y, w=combined_w, ids=combined_ids)
+            self.combined_train_valid_data = NumpyDataset(combined_X, combined_y, w=combined_w, ids=combined_ids)
         return self.combined_train_valid_data
 
     # ****************************************************************************************
@@ -697,8 +697,7 @@ def get_subset_responses_and_weights(self, subset, transformers):
         """
         if subset not in self.subset_response_dict:
             if subset in ('train', 'valid', 'train_valid'):
-                for fold, (train, valid) in enumerate(self.train_valid_dsets):
-                    dataset = self.combined_training_data()
+                dataset = self.combined_training_data()
             elif subset == 'test':
                 dataset = self.test_dset
             else: