Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug # 406 which does not support categorical variables #434

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions mapie/conformity_scores/residual_conformity_scores.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from mapie._machine_precision import EPSILON
from mapie._typing import ArrayLike, NDArray
from mapie.conformity_scores import ConformityScore
from mapie.wrap_arrays import wrap_ndarray_and_dataframe


class AbsoluteConformityScore(ConformityScore):
Expand Down Expand Up @@ -377,6 +378,8 @@ def get_signed_conformity_scores(
(X, y, y_pred,
self.residual_estimator_,
random_state) = self._check_parameters(X, y, y_pred)
# Wrap numpy or pandas array transparently to handle indexing
X = wrap_ndarray_and_dataframe(X)

full_indexes = np.argwhere(
np.logical_not(np.isnan(y_pred))
Expand Down
44 changes: 44 additions & 0 deletions mapie/wrap_arrays.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
from typing import Union
import numpy as np
import pandas as pd
from mapie._typing import NDArray


class wrap_ndarray_and_dataframe:

def __init__(self, X_array: Union[NDArray | pd.DataFrame]):
"""
This class is a wrapper for numpy arrays and pandas DataFrames.
It is used to handle the indexing access to the data
in a consistent way.

Parameters
----------
X_array: Union[NDArray | pd.DataFrame]
The data to wrap, either a numpy array or a pandas DataFrame.
"""
self.X_array = X_array
if isinstance(X_array, pd.DataFrame):
self.X_array = pd.DataFrame(X_array, columns=X_array.columns)
self.X_array = self.X_array.astype(self.X_array.dtypes.to_dict())

def __getitem__(self, i: int):
"""
This method is used to handle the indexing access to X_array.

Parameters
----------
i: int
Index to access.

Returns
-------
NDArray
The data at index i.
"""
if isinstance(self.X_array, pd.DataFrame):
return self.X_array.iloc[i].values
elif isinstance(self.X_array, np.ndarray):
return self.X_array[i]
else:
raise ValueError("Input must be a numpy array or pandas DataFrame")
Loading