distclassipy 0.1.6a0__tar.gz → 0.2.0a0__tar.gz

{distclassipy-0.1.6a0 → distclassipy-0.2.0a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: distclassipy
-Version: 0.1.6a0
+Version: 0.2.0a0
 Summary: A python package for a distance-based classifier which can use several different distance metrics.
 Author-email: Siddharth Chaini <sidchaini@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -694,7 +694,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: joblib>=1.3.2
-Requires-Dist: numpy<2,>=1.25.2
+Requires-Dist: numpy>=1.25.2
 Requires-Dist: pandas>=2.0.3
 Requires-Dist: scikit-learn>=1.2.2
 
@@ -740,9 +740,9 @@ X, y = make_classification(
     random_state=0,
     shuffle=False,
 )
-clf = dcpy.DistanceMetricClassifier(metric="canberra")
+clf = dcpy.DistanceMetricClassifier()
 clf.fit(X, y)
-print(clf.predict([[0, 0, 0, 0]]))
+print(clf.predict([[0, 0, 0, 0]]), metric="canberra")
 ```
 
 ## Features

{distclassipy-0.1.6a0 → distclassipy-0.2.0a0}/README.md

@@ -40,9 +40,9 @@ X, y = make_classification(
     random_state=0,
     shuffle=False,
 )
-clf = dcpy.DistanceMetricClassifier(metric="canberra")
+clf = dcpy.DistanceMetricClassifier()
 clf.fit(X, y)
-print(clf.predict([[0, 0, 0, 0]]))
+print(clf.predict([[0, 0, 0, 0]]), metric="canberra")
 ```
 
 ## Features

{distclassipy-0.1.6a0 → distclassipy-0.2.0a0}/distclassipy/__init__.py

@@ -25,4 +25,4 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 from .classifier import DistanceMetricClassifier  # noqa
 from .distances import Distance  # noqa
 
-__version__ = "0.1.6a0"
+__version__ = "0.2.0a0"

{distclassipy-0.1.6a0 → distclassipy-0.2.0a0}/distclassipy/classifier.py

@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-import warnings
 from typing import Callable
 
 import numpy as np
@@ -29,7 +28,6 @@ import pandas as pd
 import scipy
 
 from sklearn.base import BaseEstimator, ClassifierMixin
-from sklearn.neighbors import KernelDensity
 from sklearn.utils.multiclass import unique_labels
 from sklearn.utils.validation import check_X_y, check_array, check_is_fitted
 
@@ -42,6 +40,52 @@ METRIC_SOURCES_ = {
 }
 
 
+def initialize_metric_function(metric):
+    """Set the metric function based on the provided metric.
+
+    If the metric is a string, the function will look for a corresponding
+    function in scipy.spatial.distance or distances.Distance. If the metric
+    is a function, it will be used directly.
+    """
+    if callable(metric):
+        metric_fn_ = metric
+        metric_arg_ = metric
+
+    elif isinstance(metric, str):
+        metric_str_lowercase = metric.lower()
+        metric_found = False
+        for package_str, source in METRIC_SOURCES_.items():
+
+            # Don't use scipy for jaccard as their implementation only works with
+            # booleans - use custom jaccard instead
+            if (
+                package_str == "scipy.spatial.distance"
+                and metric_str_lowercase == "jaccard"
+            ):
+                continue
+
+            if hasattr(source, metric_str_lowercase):
+                metric_fn_ = getattr(source, metric_str_lowercase)
+                metric_found = True
+
+                # Use the string as an argument if it belongs to scipy as it is
+                # optimized
+                metric_arg_ = (
+                    metric if package_str == "scipy.spatial.distance" else metric_fn_
+                )
+                break
+        if not metric_found:
+            raise ValueError(
+                f"{metric} metric not found. Please pass a string of the "
+                "name of a metric in scipy.spatial.distance or "
+                "distances.Distance, or pass a metric function directly. For a "
+                "list of available metrics, see: "
+                "https://sidchaini.github.io/DistClassiPy/distances.html or "
+                "https://docs.scipy.org/doc/scipy/reference/spatial.distance.html"
+            )
+    return metric_fn_, metric_arg_
+
+
 class DistanceMetricClassifier(BaseEstimator, ClassifierMixin):
     """A distance-based classifier that supports different distance metrics.
 
@@ -55,8 +99,6 @@ class DistanceMetricClassifier(BaseEstimator, ClassifierMixin):
 
     Parameters
     ----------
-    metric : str or callable, default="euclidean"
-        The distance metric to use for calculating the distance between features.
     scale : bool, default=True
         Whether to scale the distance between the test object and the centroid for a
         class in the feature space. If True, the data will be scaled based on the
@@ -71,47 +113,15 @@ class DistanceMetricClassifier(BaseEstimator, ClassifierMixin):
 
         .. versionadded:: 0.1.0
 
-    calculate_kde : bool, default=False
-        Whether to calculate a kernel density estimate based confidence parameter.
-        .. deprecated:: 0.2.0
-            This parameter will be removed in a future version and only the
-            distance confidence parameter will be available.
-    calculate_1d_dist : bool, default=False
-        Whether to calculate the 1-dimensional distance based confidence parameter.
-        .. deprecated:: 0.2.0
-            This parameter will be removed in a future version and only the
-            distance confidence parameter will be available.
-        Whether to calculate the 1-dimensional distance based confidence parameter.
 
     Attributes
     ----------
-    metric : str or callable
-        The distance metric used for classification.
     scale : bool
         Indicates whether the data is scaled.
     central_stat : str
         The statistic used for calculating central tendency.
     dispersion_stat : str
         The statistic used for calculating dispersion.
-    calculate_kde : bool
-        Indicates whether a kernel density estimate is calculated.
-        .. deprecated:: 0.2.0
-            This parameter will be removed in a future version.
-    calculate_1d_dist : bool
-        Indicates whether 1-dimensional distances are calculated.
-        .. deprecated:: 0.2.0
-            This parameter will be removed in a future version.
-
-    See Also
-    --------
-    scipy.spatial.dist : Other distance metrics provided in SciPy
-    distclassipy.Distance : Distance metrics included with DistClassiPy
-
-    Notes
-    -----
-    If using distance metrics supported by SciPy, it is desirable to pass a string,
-    which allows SciPy to use an optimized C version of the code instead of the slower
-    Python version.
 
     References
     ----------
@@ -134,77 +144,14 @@ class DistanceMetricClassifier(BaseEstimator, ClassifierMixin):
 
     def __init__(
         self,
-        metric: str | Callable = "euclidean",
         scale: bool = True,
         central_stat: str = "median",
         dispersion_stat: str = "std",
-        calculate_kde: bool = True,  # deprecated in 0.2.0
-        calculate_1d_dist: bool = True,  # deprecated in 0.2.0
     ):
         """Initialize the classifier with specified parameters."""
-        self.metric = metric
         self.scale = scale
         self.central_stat = central_stat
         self.dispersion_stat = dispersion_stat
-        if calculate_kde:
-            warnings.warn(
-                "calculate_kde is deprecated and will be removed in version 0.2.0",
-                DeprecationWarning,
-            )
-        self.calculate_kde = calculate_kde
-
-        if calculate_1d_dist:
-            warnings.warn(
-                "calculate_1d_dist is deprecated and will be removed in version 0.2.0",
-                DeprecationWarning,
-            )
-        self.calculate_1d_dist = calculate_1d_dist
-
-    def initialize_metric_function(self):
-        """Set the metric function based on the provided metric.
-
-        If the metric is a string, the function will look for a corresponding
-        function in scipy.spatial.distance or distances.Distance. If the metric
-        is a function, it will be used directly.
-        """
-        if callable(self.metric):
-            self.metric_fn_ = self.metric
-            self.metric_arg_ = self.metric
-
-        elif isinstance(self.metric, str):
-            metric_str_lowercase = self.metric.lower()
-            metric_found = False
-            for package_str, source in METRIC_SOURCES_.items():
-
-                # Don't use scipy for jaccard as their implementation only works with
-                # booleans - use custom jaccard instead
-                if (
-                    package_str == "scipy.spatial.distance"
-                    and metric_str_lowercase == "jaccard"
-                ):
-                    continue
-
-                if hasattr(source, metric_str_lowercase):
-                    self.metric_fn_ = getattr(source, metric_str_lowercase)
-                    metric_found = True
-
-                    # Use the string as an argument if it belongs to scipy as it is
-                    # optimized
-                    self.metric_arg_ = (
-                        self.metric
-                        if package_str == "scipy.spatial.distance"
-                        else self.metric_fn_
-                    )
-                    break
-            if not metric_found:
-                raise ValueError(
-                    f"{self.metric} metric not found. Please pass a string of the "
-                    "name of a metric in scipy.spatial.distance or "
-                    "distances.Distance, or pass a metric function directly. For a "
-                    "list of available metrics, see: "
-                    "https://sidchaini.github.io/DistClassiPy/distances.html or "
-                    "https://docs.scipy.org/doc/scipy/reference/spatial.distance.html"
-                )
 
     def fit(self, X: np.array, y: np.array, feat_labels: list[str] = None):
         """Calculate the feature space centroid for all classes.
@@ -236,8 +183,6 @@ class DistanceMetricClassifier(BaseEstimator, ClassifierMixin):
             1
         ]  # Number of features seen during fit - required for sklearn compatibility.
 
-        self.initialize_metric_function()
-
         if feat_labels is None:
             feat_labels = [f"Feature_{x}" for x in range(X.shape[1])]
 
@@ -281,30 +226,15 @@ class DistanceMetricClassifier(BaseEstimator, ClassifierMixin):
             )
             self.df_iqr_ = df_iqr
 
-        if self.calculate_kde:
-            warnings.warn(
-                "KDE calculation is deprecated and will be removed in version 0.2.0",
-                DeprecationWarning,
-            )
-            self.kde_dict_ = {}
-
-            for cl in self.classes_:
-                subX = X[y == cl]
-                # Implement the following in an if-else to save computational time.
-                # kde = KernelDensity(bandwidth='scott', metric=self.metric)
-                # kde.fit(subX)
-                kde = KernelDensity(
-                    bandwidth="scott",
-                    metric="pyfunc",
-                    metric_params={"func": self.metric_fn_},
-                )
-                kde.fit(subX)
-                self.kde_dict_[cl] = kde
         self.is_fitted_ = True
 
         return self
 
-    def predict(self, X: np.array):
+    def predict(
+        self,
+        X: np.array,
+        metric: str | Callable = "euclidean",
+    ):
         """Predict the class labels for the provided X.
 
         The prediction is based on the distance of each data point in the input sample
@@ -315,18 +245,33 @@ class DistanceMetricClassifier(BaseEstimator, ClassifierMixin):
         ----------
         X : array-like of shape (n_samples, n_features)
             The input samples.
+        metric : str or callable, default="euclidean"
+            The distance metric to use for calculating the distance between features.
 
         Returns
         -------
         y : ndarray of shape (n_samples,)
             The predicted classes.
+
+        See Also
+        --------
+        scipy.spatial.dist : Other distance metrics provided in SciPy
+        distclassipy.Distance : Distance metrics included with DistClassiPy
+
+        Notes
+        -----
+        If using distance metrics supported by SciPy, it is desirable to pass a string,
+        which allows SciPy to use an optimized C version of the code instead of the
+        slower Python version.
         """
         check_is_fitted(self, "is_fitted_")
         X = check_array(X)
 
+        metric_fn_, metric_arg_ = initialize_metric_function(metric)
+
         if not self.scale:
             dist_arr = scipy.spatial.distance.cdist(
-                XA=X, XB=self.df_centroid_.to_numpy(), metric=self.metric_arg_
+                XA=X, XB=self.df_centroid_.to_numpy(), metric=metric_arg_
             )
 
         else:
@@ -343,16 +288,18 @@ class DistanceMetricClassifier(BaseEstimator, ClassifierMixin):
                 w = wtdf.loc[cl].to_numpy()  # 1/std dev
                 XB = XB * w  # w is for this class only
                 XA = X * w  # w is for this class only
-                cl_dist = scipy.spatial.distance.cdist(
-                    XA=XA, XB=XB, metric=self.metric_arg_
-                )
+                cl_dist = scipy.spatial.distance.cdist(XA=XA, XB=XB, metric=metric_arg_)
                 dist_arr_list.append(cl_dist)
             dist_arr = np.column_stack(dist_arr_list)
 
         y_pred = self.classes_[dist_arr.argmin(axis=1)]
         return y_pred
 
-    def predict_and_analyse(self, X: np.array):
+    def predict_and_analyse(
+        self,
+        X: np.array,
+        metric: str | Callable = "euclidean",
+    ):
         """Predict the class labels for the provided X and perform analysis.
 
         The prediction is based on the distance of each data point in the input sample
@@ -366,18 +313,35 @@ class DistanceMetricClassifier(BaseEstimator, ClassifierMixin):
         ----------
         X : array-like of shape (n_samples, n_features)
             The input samples.
+        metric : str or callable, default="euclidean"
+            The distance metric to use for calculating the distance between features.
+
 
         Returns
         -------
         y : ndarray of shape (n_samples,)
             The predicted classes.
+
+        See Also
+        --------
+        scipy.spatial.dist : Other distance metrics provided in SciPy
+        distclassipy.Distance : Distance metrics included with DistClassiPy
+
+        Notes
+        -----
+        If using distance metrics supported by SciPy, it is desirable to pass a string,
+        which allows SciPy to use an optimized C version of the code instead
+        of the slower Python version.
+
         """
         check_is_fitted(self, "is_fitted_")
         X = check_array(X)
 
+        metric_fn_, metric_arg_ = initialize_metric_function(metric)
+
         if not self.scale:
             dist_arr = scipy.spatial.distance.cdist(
-                XA=X, XB=self.df_centroid_.to_numpy(), metric=self.metric_arg_
+                XA=X, XB=self.df_centroid_.to_numpy(), metric=metric_arg_
             )
 
         else:
@@ -394,9 +358,7 @@ class DistanceMetricClassifier(BaseEstimator, ClassifierMixin):
                 w = wtdf.loc[cl].to_numpy()  # 1/std dev
                 XB = XB * w  # w is for this class only
                 XA = X * w  # w is for this class only
-                cl_dist = scipy.spatial.distance.cdist(
-                    XA=XA, XB=XB, metric=self.metric_arg_
-                )
+                cl_dist = scipy.spatial.distance.cdist(XA=XA, XB=XB, metric=metric_arg_)
                 dist_arr_list.append(cl_dist)
             dist_arr = np.column_stack(dist_arr_list)
 
@@ -409,78 +371,15 @@ class DistanceMetricClassifier(BaseEstimator, ClassifierMixin):
 
         y_pred = self.classes_[dist_arr.argmin(axis=1)]
 
-        if self.calculate_kde:
-            warnings.warn(
-                "KDE calculation in predict_and_analyse is deprecated "
-                "and will be removed in version 0.2.0",
-                DeprecationWarning,
-            )
-            # NEW: Rescale in terms of median likelihoods - calculate here
-            scale_factors = np.exp(
-                [
-                    self.kde_dict_[cl].score_samples(
-                        self.df_centroid_.loc[cl].to_numpy().reshape(1, -1)
-                    )[0]
-                    for cl in self.classes_
-                ]
-            )
-
-            likelihood_arr = []
-            for k in self.kde_dict_.keys():
-                log_pdf = self.kde_dict_[k].score_samples(X)
-                likelihood_val = np.exp(log_pdf)
-                likelihood_arr.append(likelihood_val)
-            self.likelihood_arr_ = np.array(likelihood_arr).T
-
-            # NEW: Rescale in terms of median likelihoods - rescale here
-            self.likelihood_arr_ = self.likelihood_arr_ / scale_factors
-        if self.calculate_1d_dist:
-            warnings.warn(
-                "calculate_1d_dist is deprecated and will be removed in version 0.2.0",
-                DeprecationWarning,
-            )
-            conf_cl = []
-            Xdf_temp = pd.DataFrame(data=X, columns=self.df_centroid_.columns)
-            for cl in self.classes_:
-                sum_1d_dists = np.zeros(shape=(len(Xdf_temp)))
-                for feat in Xdf_temp.columns:
-                    dists = scipy.spatial.distance.cdist(
-                        XA=np.zeros(shape=(1, 1)),
-                        XB=(self.df_centroid_.loc[cl] - Xdf_temp)[feat]
-                        .to_numpy()
-                        .reshape(-1, 1),
-                        metric=self.metric_arg_,
-                    ).ravel()
-                    if self.scale and self.dispersion_stat == "std":
-                        sum_1d_dists = sum_1d_dists + dists / self.df_std_.loc[cl, feat]
-                    elif self.scale and self.dispersion_stat == "std":
-                        sum_1d_dists = sum_1d_dists + dists / self.df_iqr_.loc[cl, feat]
-                    else:
-                        sum_1d_dists = sum_1d_dists + dists
-                confs = 1 / np.clip(sum_1d_dists, a_min=np.finfo(float).eps, a_max=None)
-                conf_cl.append(confs)
-            conf_cl = np.array(conf_cl)
-            self.conf_cl_ = conf_cl
         self.analyis_ = True
 
         return y_pred
 
-    def calculate_confidence(self, method: str = "distance_inverse"):
+    def calculate_confidence(self):
         """Calculate the confidence for each prediction.
 
-        The confidence is calculated based on either the distance of each data point to
-        the centroids of the training data, optionally the kernel density estimate or
-        1-dimensional distance.
-
-        Parameters
-        ----------
-        method : {"distance_inverse", "1d_distance_inverse", "kde_likelihood"},
-                 default="distance_inverse"
-            The method to use for calculating confidence. Default is
-            'distance_inverse'.
-            .. deprecated:: 0.2.0
-                The methods '1d_distance_inverse' and
-                'kde_likelihood' will be removed in version 0.2.0.
+        The confidence is calculated as the inverse of the distance of each data point
+        to the centroids of the training data.
         """
         check_is_fitted(self, "is_fitted_")
         if not hasattr(self, "analyis_"):
@@ -490,44 +389,11 @@ class DistanceMetricClassifier(BaseEstimator, ClassifierMixin):
             )
 
         # Calculate confidence for each prediction
-        if method == "distance_inverse":
-            self.confidence_df_ = 1 / np.clip(
-                self.centroid_dist_df_, a_min=np.finfo(float).eps, a_max=None
-            )
-            self.confidence_df_.columns = [
-                x.replace("_dist", "_conf") for x in self.confidence_df_.columns
-            ]
-
-        elif method == "1d_distance_inverse":
-            warnings.warn(
-                "The '1d_distance_inverse' method is deprecated "
-                "and will be removed in version 0.2.0",
-                DeprecationWarning,
-            )
-            if not self.calculate_1d_dist:
-                raise ValueError(
-                    "method='1d_distance_inverse' is only valid if calculate_1d_dist "
-                    "is set to True"
-                )
-            self.confidence_df_ = pd.DataFrame(
-                data=self.conf_cl_.T, columns=[f"{x}_conf" for x in self.classes_]
-            )
-
-        elif method == "kde_likelihood":
-            warnings.warn(
-                "The 'kde_likelihood' method is deprecated and will be "
-                "removed in version 0.2.0",
-                DeprecationWarning,
-            )
-            if not self.calculate_kde:
-                raise ValueError(
-                    "method='kde_likelihood' is only valid if calculate_kde is set "
-                    "to True"
-                )
-
-            self.confidence_df_ = pd.DataFrame(
-                data=self.likelihood_arr_,
-                columns=[f"{x}_conf" for x in self.kde_dict_.keys()],
-            )
+        self.confidence_df_ = 1 / np.clip(
+            self.centroid_dist_df_, a_min=np.finfo(float).eps, a_max=None
+        )
+        self.confidence_df_.columns = [
+            x.replace("_dist", "_conf") for x in self.confidence_df_.columns
+        ]
 
         return self.confidence_df_.to_numpy()