Skip to content

Commit a84fab1

Browse files
correct linting
1 parent 42de00f commit a84fab1

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

mapie/estimator/regressor.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ def fit_multi_estimators(
481481
) -> RegressorMixin:
482482

483483
n_samples = _num_samples(y)
484-
estimators: list[RegressorMixin] = []
484+
estimators: List[RegressorMixin] = []
485485

486486
if self.cv == "prefit":
487487

@@ -533,11 +533,13 @@ def fit_single_estimator(
533533
if self.cv == "prefit":
534534
self.single_estimator_ = self.estimator
535535
else:
536+
cv = cast(BaseCrossValidator, self.cv)
537+
train_indexes = [index for index, _ in cv.split(X, y, groups)][0]
538+
full_indexes = np.arange(_num_samples(X))
536539
if self.use_split_method_:
537-
cv = cast(BaseCrossValidator, self.cv)
538-
indexes = [index for index, _ in cv.split(X, y, groups)][0]
540+
indexes = train_indexes
539541
else:
540-
indexes = np.arange(_num_samples(X))
542+
indexes = full_indexes
541543

542544
self.single_estimator_ = self._fit_oof_estimator(
543545
clone(self.estimator),

mapie/regression/regression.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ def init_fit(
534534
sample_weight: Optional[ArrayLike] = None,
535535
groups: Optional[ArrayLike] = None,
536536
**kwargs: Any
537-
) -> MapieRegressor:
537+
):
538538

539539
self._fit_params = kwargs.pop('fit_params', {})
540540

mapie_v1/regression.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ def __init__(
320320
verbose: int = 0,
321321
random_state: Optional[Union[int, np.random.RandomState]] = None
322322
) -> None:
323-
323+
324324
self.mapie_regressor = MapieRegressor(
325325
estimator=self.estimator,
326326
method=method,
@@ -362,8 +362,10 @@ def fit(
362362
Self
363363
The fitted CrossConformalRegressor instance.
364364
"""
365-
self.mapie_regressor.init_fit(X, y, fit_params=fit_params)
366-
self.mapie_regressor.fit_estimator(X, y)
365+
X, y, sample_weight, groups = self.init_fit(
366+
X, y, fit_params=fit_params
367+
)
368+
self.mapie_regressor.fit_estimator(X, y, sample_weight, groups)
367369

368370
def conformalize(
369371
self,

0 commit comments

Comments
 (0)