fix merge conflicts

Author: gmartinonQM

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.0
+current_version = 0.2.1
 commit = True
 tag = True
 

doc/conf.py

@@ -85,7 +85,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = "0.2.0"
+version = "0.2.1"
 # The full version, including alpha/beta/rc tags.
 release = version
 

doc/quick_start.rst

@@ -66,18 +66,30 @@ The estimated prediction intervals can then be plotted as follows.
     
     from matplotlib import pyplot as plt
     from mapie.metrics import coverage_score
+
+    coverage_scores = [
+        coverage_score(y, y_preds[:, 1, i], y_preds[:, 2, i])
+        for i, _ in enumerate(alpha)
+    ]
+
     plt.xlabel("x")
     plt.ylabel("y")
     plt.scatter(X, y, alpha=0.3)
     plt.plot(X, y_preds[:, 0, 0], color="C1")
     order = np.argsort(X[:, 0])
     plt.plot(X[order], y_preds[order][:, 1, 1], color="C1", ls="--")
     plt.plot(X[order], y_preds[order][:, 2, 1], color="C1", ls="--")
-    plt.fill_between(X[order].ravel(), y_preds[:, 1, 0][order].ravel(), y_preds[:, 2, 0][order].ravel(), alpha=0.2)
-    coverage_scores = [coverage_score(y, y_preds[:, 1, i], y_preds[:, 2, i]) for i, _ in enumerate(alpha)]
+    plt.fill_between(
+        X[order].ravel(),
+        y_preds[:, 1, 0][order].ravel(),
+        y_preds[:, 2, 0][order].ravel(),
+        alpha=0.2
+    )
     plt.title(
-        f"Target and effective coverages for alpha={alpha[0]:.2f}: ({1-alpha[0]:.3f}, {coverage_scores[0]:.3f})\n" +
-        f"Target and effective coverages for alpha={alpha[1]:.2f}: ({1-alpha[1]:.3f}, {coverage_scores[1]:.3f})"
+        f"Target and effective coverages for "
+        f"alpha={alpha[0]:.2f}: ({1-alpha[0]:.3f}, {coverage_scores[0]:.3f})\n"
+        f"Target and effective coverages for "
+        f"alpha={alpha[1]:.2f}: ({1-alpha[1]:.3f}, {coverage_scores[1]:.3f})"
     )
     plt.show()
 

examples/plot_toy_model.py

@@ -22,6 +22,11 @@
 mapie.fit(X, y)
 y_preds = mapie.predict(X)
 
+coverage_scores = [
+    coverage_score(y, y_preds[:, 1, i], y_preds[:, 2, i])
+    for i, _ in enumerate(alpha)
+]
+
 plt.xlabel("x")
 plt.ylabel("y")
 plt.scatter(X, y, alpha=0.3)
@@ -35,10 +40,6 @@
     y_preds[:, 2, 0][order].ravel(),
     alpha=0.2
 )
-coverage_scores = [
-    coverage_score(y, y_preds[:, 1, i], y_preds[:, 2, i])
-    for i, _ in enumerate(alpha)
-]
 plt.title(
     f"Target and effective coverages for "
     f"alpha={alpha[0]:.2f}: ({1-alpha[0]:.3f}, {coverage_scores[0]:.3f})\n"

mapie/_version.py

@@ -1 +1 @@
-__version__ = "0.2.0"
+__version__ = "0.2.1"

mapie/estimators.py

@@ -294,9 +294,9 @@ def _check_cv(
             if cv >= 2:
                 return KFold(n_splits=cv)
         if (
-            isinstance(cv, KFold) or
-            isinstance(cv, LeaveOneOut) or
-            cv == "prefit"
+            isinstance(cv, KFold)
+            or isinstance(cv, LeaveOneOut)
+            or cv == "prefit"
         ):
             return cv
         raise ValueError(
@@ -442,12 +442,11 @@ def _fit_and_predict_oof_model(
         """
         X_train, y_train, X_val = X[train_index], y[train_index], X[val_index]
         if sample_weight is None:
-            sample_weight_train = None
+            estimator = fit_estimator(estimator, X_train, y_train)
         else:
-            sample_weight_train = sample_weight[train_index]
-        estimator = fit_estimator(
-            estimator, X_train, y_train, sample_weight_train
-        )
+            estimator = fit_estimator(
+                estimator, X_train, y_train, sample_weight[train_index]
+            )
         y_pred = estimator.predict(X_val)
         val_id = np.full_like(y_pred, k)
         return estimator, y_pred, val_id, val_index

setup.py

@@ -3,7 +3,7 @@
 
 
 DISTNAME = "MAPIE"
-VERSION = "0.2.0"
+VERSION = "0.2.1"
 DESCRIPTION = (
     "A scikit-learn-compatible module"
     "for estimating prediction intervals."