moving the function

Author: bruAristimunha

moabb/evaluations/evaluations.py

@@ -259,15 +259,15 @@ def _evaluate(
                                 emissions_data.emissions if emissions_data else np.nan
                             )
 
-                        _ensure_fitted(cvclf)
-
                         if self.hdf5_path is not None and self.save_model:
                             _save_model_cv(
                                 model=cvclf,
                                 save_path=model_save_path,
                                 cv_index=cv_ind,
                             )
 
+                        _ensure_fitted(cvclf)
+
                         score = scorer(cvclf, X_[test], y_[test])
                         acc.append(score)
 
@@ -612,15 +612,15 @@ def evaluate(
                         emissions_data = tracker.stop_task()
                         emissions = emissions_data.emissions if emissions_data else np.nan
 
-                    _ensure_fitted(cvclf)
-
                     if self.hdf5_path is not None and self.save_model:
                         _save_model_cv(
                             model=cvclf,
                             save_path=model_save_path,
                             cv_index=str(cv_ind),
                         )
 
+                    _ensure_fitted(cvclf)
+
                     model_list.append(cvclf)
                     score = scorer(cvclf, X[test], y[test])
 
@@ -810,8 +810,6 @@ def evaluate(
                     emissions_data = tracker.stop_task()
                     emissions = emissions_data.emissions if emissions_data else np.nan
 
-                _ensure_fitted(cvclf)
-
                 if self.hdf5_path is not None and self.save_model:
                     model_save_path = _create_save_path(
                         hdf5_path=self.hdf5_path,
@@ -826,6 +824,8 @@ def evaluate(
                         model=cvclf, save_path=model_save_path, cv_index=str(cv_ind)
                     )
 
+                _ensure_fitted(cvclf)
+
                 # we eval on each session
                 for session in np.unique(sessions[test]):
                     ix = sessions[test] == session