mlquantify 0.1.0__tar.gz → 0.1.2__tar.gz

{mlquantify-0.1.0 → mlquantify-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: mlquantify
-Version: 0.1.0
+Version: 0.1.2
 Summary: Quantification Library
 Home-page: https://github.com/luizfernandolj/QuantifyML/tree/master
 Maintainer: Luiz Fernando Luth Junior
@@ -58,7 +58,7 @@ pip install mlquantify
 If you only want to update, run the code below:
 
 ```bash
-pip install --update mlquantify
+pip install --upgrade mlquantify
 ```
 
 ___

{mlquantify-0.1.0 → mlquantify-0.1.2}/README.md

@@ -27,7 +27,7 @@ pip install mlquantify
 If you only want to update, run the code below:
 
 ```bash
-pip install --update mlquantify
+pip install --upgrade mlquantify
 ```
 
 ___

{mlquantify-0.1.0 → mlquantify-0.1.2}/mlquantify/methods/threshold_optimization.py

@@ -1,5 +1,6 @@
 from abc import abstractmethod
 import numpy as np
+import warnings
 from sklearn.base import BaseEstimator
 
 from ..base import AggregativeQuantifier
@@ -446,9 +447,8 @@ class MS(ThresholdOptimization):
     {0: 0.3991228070175439, 1: 0.6008771929824561}
     """
 
-    def __init__(self, learner: BaseEstimator=None, threshold: float = 0.5):
+    def __init__(self, learner: BaseEstimator=None):
         super().__init__(learner)
-        self.threshold = threshold
 
     def best_tprfpr(self, thresholds: np.ndarray, tprs: np.ndarray, fprs: np.ndarray) -> tuple:
         """
@@ -481,11 +481,42 @@ class MS(ThresholdOptimization):
         ValueError
             If `thresholds`, `tprs`, or `fprs` are empty or have mismatched lengths.
         """
-        # Compute median TPR and FPR
-        tpr = np.median(tprs)
-        fpr = np.median(fprs)
 
-        return (self.threshold, tpr, fpr)
+        return (thresholds, tprs, fprs)
+
+    def _predict_method(self, X) -> dict:
+        """
+        Predicts class prevalences using the adjusted threshold.
+
+        Parameters
+        ----------
+        X : pd.DataFrame or np.ndarray
+            The input features for prediction.
+
+        Returns
+        -------
+        np.ndarray
+            An array of predicted prevalences for the classes.
+        """
+        # Get predicted probabilities for the positive class
+        probabilities = self.predict_learner(X)[:, 1]
+        
+        prevs = []
+        
+        for thr, tpr, fpr in zip(self.threshold, self.tpr, self.fpr):
+            cc_output = len(probabilities[probabilities >= thr]) / len(probabilities)
+            
+            if tpr - fpr == 0:
+                prevalence = cc_output
+            else:
+                prev = np.clip((cc_output - fpr) / (tpr - fpr), 0, 1)
+                prevs.append(prev)
+        
+        prevalence = np.median(prevs)
+        
+        prevalences = [1 - prevalence, prevalence]
+
+        return np.asarray(prevalences)
 
     
 
@@ -570,33 +601,63 @@ class MS2(ThresholdOptimization):
             - The median threshold value for cases meeting the condition (float).
             - The median true positive rate for cases meeting the condition (float).
             - The median false positive rate for cases meeting the condition (float).
-
+        
         Raises
         ------
         ValueError
-            If no cases satisfy the condition `|TPR - FPR| > 0.25` or if the 
-            input arrays are empty or have mismatched lengths.
+            If no cases satisfy the condition `|TPR - FPR| > 0.25`.
+        Warning
+            If all TPR or FPR values are zero.
         """
+        # Check if all TPR or FPR values are zero
+        if np.all(tprs == 0) or np.all(fprs == 0):
+            warnings.warn("All TPR or FPR values are zero.")
+        
         # Identify indices where the condition is satisfied
         indices = np.where(np.abs(tprs - fprs) > 0.25)[0]
         if len(indices) == 0:
-            raise ValueError("No cases meet the condition |TPR - FPR| > 0.25.")
+            warnings.warn("No cases satisfy the condition |TPR - FPR| > 0.25.")
+            indices = np.where(np.abs(tprs - fprs) >= 0)[0]
+            
+        thresholds_ = thresholds[indices]
+        tprs_ = tprs[indices]
+        fprs_ = fprs[indices]
 
-        # Compute medians for the selected cases
-        threshold = np.median(thresholds[indices])
-        tpr = np.median(tprs[indices])
-        fpr = np.median(fprs[indices])
-
-        return (threshold, tpr, fpr)
-
-    
-    
-    
-    
+        return (thresholds_, tprs_, fprs_)
 
+    def _predict_method(self, X) -> dict:
+        """
+        Predicts class prevalences using the adjusted threshold.
 
+        Parameters
+        ----------
+        X : pd.DataFrame or np.ndarray
+            The input features for prediction.
 
+        Returns
+        -------
+        np.ndarray
+            An array of predicted prevalences for the classes.
+        """
+        # Get predicted probabilities for the positive class
+        probabilities = self.predict_learner(X)[:, 1]
+        
+        prevs = []
+        
+        for thr, tpr, fpr in zip(self.threshold, self.tpr, self.fpr):
+            cc_output = len(probabilities[probabilities >= thr]) / len(probabilities)
+            
+            if tpr - fpr == 0:
+                prevalence = cc_output
+            else:
+                prev = np.clip((cc_output - fpr) / (tpr - fpr), 0, 1)
+                prevs.append(prev)
+        
+        prevalence = np.median(prevs)
+        
+        prevalences = [1 - prevalence, prevalence]
 
+        return np.asarray(prevalences)
 
 class PACC(ThresholdOptimization):
     """

{mlquantify-0.1.0 → mlquantify-0.1.2}/mlquantify/model_selection.py

@@ -131,7 +131,7 @@ class GridSearchQ(Quantifier):
                  model: Quantifier,
                  param_grid: dict,
                  protocol: str = 'app',
-                 n_prevs: int = None,
+                 n_prevs: int = 100,
                  n_repetitions: int = 1,
                  scoring: Union[List[str], str] = "ae",
                  refit: bool = True,

{mlquantify-0.1.0 → mlquantify-0.1.2}/mlquantify.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: mlquantify
-Version: 0.1.0
+Version: 0.1.2
 Summary: Quantification Library
 Home-page: https://github.com/luizfernandolj/QuantifyML/tree/master
 Maintainer: Luiz Fernando Luth Junior
@@ -58,7 +58,7 @@ pip install mlquantify
 If you only want to update, run the code below:
 
 ```bash
-pip install --update mlquantify
+pip install --upgrade mlquantify
 ```
 
 ___

{mlquantify-0.1.0 → mlquantify-0.1.2}/setup.py

@@ -6,7 +6,7 @@ here = pathlib.Path(__file__).parent.resolve()
 
 long_description = (here / 'README.md').read_text(encoding='utf-8')
 
-VERSION = '0.1.0'
+VERSION = '0.1.2'
 DESCRIPTION = 'Quantification Library'
 
 # Setting up