aisp 0.1.40__tar.gz → 0.1.41__tar.gz

{aisp-0.1.40 → aisp-0.1.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aisp
-Version: 0.1.40
+Version: 0.1.41
 Summary: Package with techniques of artificial immune systems.
 Author-email: João Paulo da Silva Barros <jpsilvabarr@gmail.com>
 Maintainer-email: Alison Zille Lopes <alisonzille@gmail.com>

{aisp-0.1.40 → aisp-0.1.41}/aisp/base/_classifier.py

@@ -1,10 +1,11 @@
 """Base class for classification algorithm."""
 
 from abc import ABC, abstractmethod
-from typing import Optional
+from typing import Optional, Union
 
 import numpy.typing as npt
 
+from ..utils import slice_index_list_by_class
 from ..utils.metrics import accuracy_score
 
 
@@ -14,6 +15,8 @@ class BaseClassifier(ABC):
     and implementing the ``get_params`` method.
     """
 
+    classes: Optional[Union[npt.NDArray, list]] = None
+
     @abstractmethod
     def fit(self, X: npt.NDArray, y: npt.NDArray, verbose: bool = True):
         """
@@ -77,6 +80,23 @@ class BaseClassifier(ABC):
         y_pred = self.predict(X)
         return accuracy_score(y, y_pred)
 
+    def _slice_index_list_by_class(self, y: npt.NDArray) -> dict:
+        """
+        The function ``_slice_index_list_by_class(...)``, separates the indices of the lines \
+        according to the output class, to loop through the sample array, only in positions where \
+        the output is the class being trained.
+
+        Parameters
+        ----------
+        * y (npt.NDArray): Receives a ``y``[``N sample``] array with the output classes of the \
+            ``X`` sample array.
+
+        returns
+        ----------
+        * dict: A dictionary with the list of array positions(``y``), with the classes as key.
+        """
+        return slice_index_list_by_class(self.classes, y)
+
     def get_params(self, deep: bool = True) -> dict:  # pylint: disable=W0613
         """
         The get_params function Returns a dictionary with the object's main parameters.

{aisp-0.1.40 → aisp-0.1.41}/aisp/nsa/_negative_selection.py

@@ -12,7 +12,6 @@ from ._ns_core import (
     check_detector_rnsa_validity,
 )
 from ..exceptions import MaxDiscardsReachedError
-from ..utils import slice_index_list_by_class
 from ..utils.distance import (
     min_distance_to_class_vectors,
     get_metric_code,
@@ -111,6 +110,11 @@ class RNSA(BaseNSA):
         self._detectors: Union[dict, None] = None
         self.classes: npt.NDArray = None
 
+    @property
+    def detectors(self) -> Dict[str, list[Detector]]:
+        """Returns the trained detectors, organized by class."""
+        return self._detectors
+
     def fit(self, X: npt.NDArray, y: npt.NDArray, verbose: bool = True):
         """
         The function ``fit(...)``, performs the training according to ``X`` and ``y``, using the
@@ -141,7 +145,7 @@ class RNSA(BaseNSA):
         # Dictionary that will store detectors with classes as keys.
         list_detectors_by_class = {}
         # Separates the classes for training.
-        sample_index = self.__slice_index_list_by_class(y)
+        sample_index = self._slice_index_list_by_class(y)
         # Progress bar for generating all detectors.
         if verbose:
             progress = tqdm(
@@ -168,7 +172,9 @@ class RNSA(BaseNSA):
                 # If the detector is valid, add it to the list of valid detectors.
                 if valid_detector is not False:
                     discard_count = 0
-                    radius = valid_detector[1] if self.algorithm == "V-detector" else None
+                    radius = (
+                        valid_detector[1] if self.algorithm == "V-detector" else None
+                    )
                     valid_detectors_set.append(Detector(vector_x, radius))
                     if verbose:
                         progress.update(1)
@@ -178,7 +184,7 @@ class RNSA(BaseNSA):
                         raise MaxDiscardsReachedError(_class_)
 
             # Add detectors, with classes as keys in the dictionary.
-            list_detectors_by_class[_class_] = np.array(valid_detectors_set)
+            list_detectors_by_class[_class_] = valid_detectors_set
         # Notify completion of detector generation for the classes.
         if verbose:
             progress.set_description(
@@ -253,24 +259,6 @@ class RNSA(BaseNSA):
                 c.append(max(average_distance, key=average_distance.get))
         return np.array(c)
 
-    def __slice_index_list_by_class(self, y: npt.NDArray) -> dict:
-        """
-        The function ``__slice_index_list_by_class(...)``, separates the indices of the lines
-        according to the output class, to loop through the sample array, only in positions where
-        the output is the class being trained.
-
-        Parameters
-        ----------
-        * y (npt.NDArray)
-            Receives a ``y``[``N sample``] array with the output classes of the \
-            ``X`` sample array.
-
-        Returns
-        ----------
-        * dict: A dictionary with the list of array positions(``y``), with the classes as key.
-        """
-        return slice_index_list_by_class(self.classes, y)
-
     def __checks_valid_detector(
         self, x_class: npt.NDArray = None, vector_x: npt.NDArray = None
     ) -> Union[bool, tuple[bool, float]]:
@@ -503,6 +491,11 @@ class BNSA(BaseNSA):
         self._detectors: Optional[dict] = None
         self._detectors_stack: npt.NDArray = None
 
+    @property
+    def detectors(self) -> Dict[str, npt.NDArray[np.bool_]]:
+        """Returns the trained detectors, organized by class."""
+        return self._detectors
+
     def fit(self, X: npt.NDArray, y: npt.NDArray, verbose: bool = True):
         """
         The function ``fit(...)``, performs the training according to ``X`` and ``y``, using the
@@ -531,7 +524,7 @@ class BNSA(BaseNSA):
         # Dictionary that will store detectors with classes as keys.
         list_detectors_by_class = {}
         # Separates the classes for training.
-        sample_index: dict = self.__slice_index_list_by_class(y)
+        sample_index: dict = self._slice_index_list_by_class(y)
         # Progress bar for generating all detectors.
         if verbose:
             progress = tqdm(
@@ -662,21 +655,3 @@ class BNSA(BaseNSA):
                 class_differences[_class_] = distances.sum() / self.N
 
         c.append(max(class_differences, key=class_differences.get))
-
-    def __slice_index_list_by_class(self, y: npt.NDArray) -> dict:
-        """
-        The function ``__slice_index_list_by_class(...)``, separates the indices of the lines
-        according to the output class, to loop through the sample array, only in positions where
-        the output is the class being trained.
-
-        Parameters
-        ----------
-        * y (``npt.NDArray``):
-            Receives a ``y``[``N sample``] array with the output classes of the ``X``
-            sample array.
-
-        Returns
-        ----------
-        * dict: A dictionary with the list of array positions(``y``), with the classes as key.
-        """
-        return slice_index_list_by_class(self.classes, y)

{aisp-0.1.40 → aisp-0.1.41}/aisp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aisp
-Version: 0.1.40
+Version: 0.1.41
 Summary: Package with techniques of artificial immune systems.
 Author-email: João Paulo da Silva Barros <jpsilvabarr@gmail.com>
 Maintainer-email: Alison Zille Lopes <alisonzille@gmail.com>

{aisp-0.1.40 → aisp-0.1.41}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aisp"
-version = "0.1.40"
+version = "0.1.41"
 authors = [
   { name="João Paulo da Silva Barros", email="jpsilvabarr@gmail.com" },
 ]