aisp 0.1.33__tar.gz → 0.1.34__tar.gz

{aisp-0.1.33 → aisp-0.1.34}/PKG-INFO

@@ -1,15 +1,15 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: aisp
-Version: 0.1.33
+Version: 0.1.34
 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>
-License: LGPL-3.0 license
+License-Expression: LGPL-3.0-only
 Project-URL: Homepage, https://ais-package.github.io/
 Project-URL: Documentation, https://ais-package.github.io/docs/intro
 Project-URL: Source Code, https://github.com/AIS-Package/aisp
 Project-URL: Tracker, https://github.com/AIS-Package/aisp/issues
-Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
+Keywords: Artificial Immune Systems,classification,Natural computing,machine learning,artificial intelligence
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
@@ -23,6 +23,7 @@ License-File: LICENSE
 Requires-Dist: numpy>=1.22.4
 Requires-Dist: scipy>=1.8.1
 Requires-Dist: tqdm>=4.64.1
+Dynamic: license-file
 
 <div align = center> 
 

aisp-0.1.34/aisp/NSA/__init__.py

@@ -0,0 +1,18 @@
+"""Module (NSA) Negative Selection Algorithm
+
+NSAs simulate the maturation process of T-cells in the immune system, where these \
+cells learn to distinguish between self and non-self. Only T-cells capable \
+of recognizing non-self elements are preserved.
+
+----
+
+Os NSAs simulam o processo de maturação das células-T no sistema imunológico, onde \
+essas células aprendem a distinguir entre o próprio e não-próprio.
+Apenas as células-T capazes de reconhecer elementos não-próprios são preservadas.
+
+"""
+from ._negative_selection import BNSA, RNSA
+
+__author__ = "João Paulo da Silva Barros"
+__all__ = ["RNSA", "BNSA"]
+__version__ = "0.1.34"

{aisp-0.1.33 → aisp-0.1.34}/aisp/NSA/_base.py

@@ -156,7 +156,7 @@ class Base:
                 "The array X contains values that are not composed only of 0 and 1."
             )
 
-    def _score(self, X: npt.NDArray, y: list) -> float:
+    def score(self, X: npt.NDArray, y: list) -> float:
         """
         Score function calculates forecast accuracy.
 

{aisp-0.1.33 → aisp-0.1.34}/aisp/NSA/_negative_selection.py

@@ -89,10 +89,18 @@ class RNSA(Base):
         * classes (``npt.NDArray``): lista com as classes de saída.
     """
 
-    def __init__(self, N: int = 100, r: float = 0.05, r_s: float = 0.0001, k: int = 1,
-                 metric: Literal["manhattan", "minkowski", "euclidean"] = "euclidean", max_discards: int = 1000,
-                 seed: int = None, algorithm: Literal["default-NSA", "V-detector"] = "default-NSA",
-                 **kwargs: Dict[str, Union[bool, str, float]]):
+    def __init__(
+        self,
+        N: int = 100,
+        r: float = 0.05,
+        r_s: float = 0.0001,
+        k: int = 1,
+        metric: Literal["manhattan", "minkowski", "euclidean"] = "euclidean",
+        max_discards: int = 1000,
+        seed: int = None,
+        algorithm: Literal["default-NSA", "V-detector"] = "default-NSA",
+        **kwargs: Dict[str, Union[bool, str, float]],
+    ):
         """
         Negative Selection class constructor (``RNSA``).
 
@@ -458,8 +466,12 @@ class RNSA(Base):
         """
         return slice_index_list_by_class(self.classes, y)
 
-    def __checks_valid_detector(self, X: npt.NDArray = None, vector_x: npt.NDArray = None,
-                                samples_index_class: npt.NDArray = None):
+    def __checks_valid_detector(
+        self,
+        X: npt.NDArray = None,
+        vector_x: npt.NDArray = None,
+        samples_index_class: npt.NDArray = None,
+    ):
         """
         Function to check if the detector has a valid non-proper ``r`` radius for the class.
 
@@ -712,52 +724,6 @@ class RNSA(Base):
                         return False
             return True, new_detector_r
 
-    def score(self, X: npt.NDArray, y: list) -> float:
-        """
-        Score function calculates forecast accuracy.
-
-        Details:
-        ---
-        This function performs the prediction of X and checks how many elements are equal between \
-        vector y and y_predicted. This function was added for compatibility with some scikit-learn \
-        functions.
-
-        Parameters:
-        -----------
-
-        * X (np.ndarray): Feature set with shape (n_samples, n_features).
-        * y (np.ndarray): True values with shape (n_samples,).
-
-        Returns:
-        -------
-
-        accuracy: float
-            The accuracy of the model.
-
-        ---
-
-        Função score calcular a acurácia da previsão.
-
-        Details:
-        ---
-        Esta função realiza a previsão de X e verifica quantos elementos são iguais entre o vetor \
-        y e y_previsto. Essa função foi adicionada para oferecer compatibilidade com algumas \
-        funções do scikit-learn.
-
-        Parameters:
-        ---
-
-        * X (np.ndarray): Conjunto de características com shape (n_samples, n_features).
-        * y (np.ndarray): Valores verdadeiros com shape (n_samples,).
-
-        returns:
-        ---
-
-        * accuracy (float): A acurácia do modelo.
-
-        """
-        return super()._score(X, y)
-
     def get_params(self, deep: bool = True) -> dict:
         return {
             "N": self.N,
@@ -816,9 +782,16 @@ class BNSA(Base):
 
     """
 
-    def __init__(self, N: int = 100, aff_thresh: float = 0.1, max_discards: int = 1000, seed: int = None,
-                 no_label_sample_selection: Literal["max_average_difference", "max_nearest_difference"] =
-                 "max_average_difference"):
+    def __init__(
+        self,
+        N: int = 100,
+        aff_thresh: float = 0.1,
+        max_discards: int = 1000,
+        seed: int = None,
+        no_label_sample_selection: Literal[
+            "max_average_difference", "max_nearest_difference"
+        ] = "max_average_difference",
+    ):
         """
         Constructor of the Negative Selection class (``BNSA``).
 
@@ -1133,55 +1106,6 @@ class BNSA(Base):
         """
         return slice_index_list_by_class(self.classes, y)
 
-    def score(self, X: npt.NDArray, y: list) -> float:
-        """
-        Score function calculates forecast accuracy.
-
-        Details:
-        ---
-        This function performs the prediction of X and checks how many elements are equal between vector \
-        y and y_predicted. This function was added for compatibility with some scikit-learn functions.
-
-        Parameters:
-        -----------
-
-        X: np.ndarray
-            Feature set with shape (n_samples, n_features).
-        y: np.ndarray
-            True values with shape (n_samples,).
-
-        Returns:
-        -------
-
-        accuracy: float
-            The accuracy of the model.
-
-        ---
-
-        Função score calcular a acurácia da previsão.
-
-        Details:
-        ---
-        Esta função realiza a previsão de X e verifica quantos elementos são iguais entre o vetor y \
-        e y_previsto.
-        Essa função foi adicionada para oferecer compatibilidade com algumas funções do scikit-learn.
-
-        Parameters:
-        ---
-
-        * X : np.ndarray
-            Conjunto de características com shape (n_samples, n_features).
-        * y : np.ndarray
-            Valores verdadeiros com shape (n_samples,).
-
-        returns:
-        ---
-
-        accuracy : float
-            A acurácia do modelo.
-        """
-        return super()._score(X, y)
-
     def get_params(self, deep: bool = True) -> dict:
         return {
             "N": self.N,

{aisp-0.1.33 → aisp-0.1.34}/aisp.egg-info/PKG-INFO

@@ -1,15 +1,15 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: aisp
-Version: 0.1.33
+Version: 0.1.34
 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>
-License: LGPL-3.0 license
+License-Expression: LGPL-3.0-only
 Project-URL: Homepage, https://ais-package.github.io/
 Project-URL: Documentation, https://ais-package.github.io/docs/intro
 Project-URL: Source Code, https://github.com/AIS-Package/aisp
 Project-URL: Tracker, https://github.com/AIS-Package/aisp/issues
-Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
+Keywords: Artificial Immune Systems,classification,Natural computing,machine learning,artificial intelligence
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
@@ -23,6 +23,7 @@ License-File: LICENSE
 Requires-Dist: numpy>=1.22.4
 Requires-Dist: scipy>=1.8.1
 Requires-Dist: tqdm>=4.64.1
+Dynamic: license-file
 
 <div align = center> 
 

{aisp-0.1.33 → aisp-0.1.34}/aisp.egg-info/top_level.txt

@@ -1,3 +1,4 @@
+NSA
 aisp
 dist
 docs

{aisp-0.1.33 → aisp-0.1.34}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=61.0"]
+requires = ["setuptools >= 77.0.3"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools]
@@ -7,7 +7,7 @@ packages = {find = {exclude = ["*test*", "*tests", "*tests/*", ".venv", ".idea",
 
 [project]
 name = "aisp"
-version = "0.1.33"
+version = "0.1.34"
 authors = [
   { name="João Paulo da Silva Barros", email="jpsilvabarr@gmail.com" },
 ]
@@ -21,11 +21,10 @@ description = "Package with techniques of artificial immune systems."
 readme = "README.md"
 
 requires-python = ">= 3.8.10"
-
-license = {text = "LGPL-3.0 license"}
+license = "LGPL-3.0-only"
+license-files = ["LICENSE"]
 
 classifiers = [
-    "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
@@ -38,14 +37,9 @@ classifiers = [
 dependencies = [
     "numpy>=1.22.4",
     "scipy>=1.8.1",
-    "tqdm>=4.64.1",
+    "tqdm>=4.64.1"
 ]
 
-[tool.poetry]
-readme = "README.md"
-
-repository = "https://github.com/AIS-Package/aisp"
-
 keywords = ["Artificial Immune Systems", "classification", "Natural computing", "machine learning", "artificial intelligence"]
 
 [project.urls]

aisp-0.1.33/aisp/NSA/__init__.py

@@ -1,5 +0,0 @@
-from ._negative_selection import BNSA, RNSA
-
-__author__ = "João Paulo da Silva Barros"
-__all__ = ["RNSA", "BNSA"]
-__version__ = "0.1.33"