Skip to content

Commit

Permalink
Merge pull request #485 from scikit-learn-contrib/473-replace-assert-…
Browse files Browse the repository at this point in the history
…nparray_equal-by-nptestingassert_array_equal-in-all-mapie-unit-tests

473 replace assert nparray equal by nptestingassert array equal in all mapie unit tests
  • Loading branch information
BaptisteCalot authored Jul 23, 2024
2 parents 0293f2d + 17f56cd commit 8583e6b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
1 change: 1 addition & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ History
0.8.x (2024-xx-xx)
------------------

* Replace `assert np.array_equal` by `np.testing.assert_array_equal` in Mapie unit tests
* Replace `github.com/simai-ml/MAPIE` by `github.com/scikit-learn-contrib/MAPIE`in all Mapie files
* Extend `ConformityScore` to support regression (with `BaseRegressionScore`) and to support classification (with `BaseClassificationScore`)
* Extend `EnsembleEstimator` to support regression (with `EnsembleRegressor`) and to support classification (with `EnsembleClassifier`)
Expand Down
6 changes: 4 additions & 2 deletions mapie/tests/test_classification.py
Original file line number Diff line number Diff line change
Expand Up @@ -1380,8 +1380,10 @@ def test_results_with_groups() -> None:
# (array([1, 2, 4, 5]), array([0, 3]))]
conformity_scores_0 = np.array([[1.], [0.], [0.], [1.], [1.], [1.]])
conformity_scores_1 = np.array([[1.], [1.], [1.], [1.], [1.], [1.]])
assert np.array_equal(mapie0.conformity_scores_, conformity_scores_0)
assert np.array_equal(mapie1.conformity_scores_, conformity_scores_1)
np.testing.assert_array_equal(mapie0.conformity_scores_,
conformity_scores_0)
np.testing.assert_array_equal(mapie1.conformity_scores_,
conformity_scores_1)


@pytest.mark.parametrize(
Expand Down
6 changes: 4 additions & 2 deletions mapie/tests/test_regression.py
Original file line number Diff line number Diff line change
Expand Up @@ -563,8 +563,10 @@ def test_results_with_groups() -> None:
y_pred_1 = [15, 10, 5, 15, 10, 5]
conformity_scores_0 = np.abs(y - y_pred_0)
conformity_scores_1 = np.abs(y - y_pred_1)
assert np.array_equal(mapie0.conformity_scores_, conformity_scores_0)
assert np.array_equal(mapie1.conformity_scores_, conformity_scores_1)
np.testing.assert_array_equal(mapie0.conformity_scores_,
conformity_scores_0)
np.testing.assert_array_equal(mapie1.conformity_scores_,
conformity_scores_1)


@pytest.mark.parametrize("strategy", [*STRATEGIES])
Expand Down

0 comments on commit 8583e6b

Please sign in to comment.