mlquantify 0.1.14__tar.gz → 0.1.16__tar.gz

{mlquantify-0.1.14/mlquantify.egg-info → mlquantify-0.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mlquantify
-Version: 0.1.14
+Version: 0.1.16
 Summary: Quantification Library
 Home-page: https://github.com/luizfernandolj/QuantifyML/tree/master
 Maintainer: Luiz Fernando Luth Junior

mlquantify-0.1.16/VERSION.txt

@@ -0,0 +1 @@
+0.1.16

{mlquantify-0.1.14 → mlquantify-0.1.16}/mlquantify/adjust_counting/_adjustment.py

@@ -2,6 +2,7 @@ import numpy as np
 from abc import abstractmethod
 from scipy.optimize import minimize
 import warnings
+from sklearn.metrics import confusion_matrix
 
 from mlquantify.adjust_counting._base import BaseAdjustCount
 from mlquantify.adjust_counting._counting import CC, PCC
@@ -203,13 +204,13 @@ class MatrixAdjustment(BaseAdjustCount):
         self.CM = np.zeros((n_class, n_class))
 
         if self.solver == 'optim':
-            priors = np.array(list(CC().aggregate(train_y_pred).values()))
+            priors = np.array(list(CC().aggregate(train_y_pred, train_y_values).values()))
             self.CM = self._compute_confusion_matrix(train_y_pred, train_y_values, priors)
-            prevs_estim = self._get_estimations(predictions > priors)
+            prevs_estim = self._get_estimations(predictions > priors, train_y_values)
             prevalence = self._solve_optimization(prevs_estim, priors)
         else:
-            self.CM = self._compute_confusion_matrix(train_y_pred)
-            prevs_estim = self._get_estimations(predictions)
+            self.CM = self._compute_confusion_matrix(train_y_pred, train_y_values)
+            prevs_estim = self._get_estimations(predictions, train_y_values)
             prevalence = self._solve_linear(prevs_estim)
         
         return prevalence
@@ -260,11 +261,11 @@ class MatrixAdjustment(BaseAdjustCount):
         result = minimize(objective, init, constraints=constraints, bounds=bounds)
         return result.x if result.success else priors
 
-    def _get_estimations(self, predictions):
+    def _get_estimations(self, predictions, train_y_values):
         """Return prevalence estimates using CC (crisp) or PCC (probabilistic)."""
         if uses_soft_predictions(self):
             return np.array(list(PCC().aggregate(predictions).values()))
-        return np.array(list(CC().aggregate(predictions).values()))
+        return np.array(list(CC().aggregate(predictions, train_y_values).values()))
 
     @abstractmethod
     def _compute_confusion_matrix(self, predictions, *args):
@@ -389,8 +390,11 @@ class GAC(CrispLearnerQMixin, MatrixAdjustment):
     def __init__(self, learner=None):
         super().__init__(learner=learner, solver='linear')
     
-    def _compute_confusion_matrix(self, predictions):
-        prev_estim = self._get_estimations(predictions)
+    def _compute_confusion_matrix(self, predictions, y_values):
+        self.CM = confusion_matrix(y_values, predictions, labels=self.classes_).T
+        self.CM = self.CM.astype(float)
+        prev_estim = self.CM.sum(axis=0)
+
         for i, _ in enumerate(self.classes_):
             if prev_estim[i] == 0:
                 self.CM[i, i] = 1
@@ -448,13 +452,16 @@ class GPAC(SoftLearnerQMixin, MatrixAdjustment):
     def __init__(self, learner=None):
         super().__init__(learner=learner, solver='linear')
     
-    def _compute_confusion_matrix(self, posteriors):
-        prev_estim = self._get_estimations(posteriors)
-        for i, _ in enumerate(self.classes_):
-            if prev_estim[i] == 0:
-                self.CM[i, i] = 1
-            else:
-                self.CM[:, i] /= prev_estim[i]
+    def _compute_confusion_matrix(self, posteriors, y_values):
+        n_classes = len(self.classes_)
+        confusion = np.eye(n_classes)
+
+        for i, class_label in enumerate(self.classes_):
+            indices = (y_values == class_label)
+            if np.any(indices):
+                confusion[i] = posteriors[indices].mean(axis=0)
+        
+        self.CM = confusion.T
         return self.CM
 
 

{mlquantify-0.1.14 → mlquantify-0.1.16/mlquantify.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mlquantify
-Version: 0.1.14
+Version: 0.1.16
 Summary: Quantification Library
 Home-page: https://github.com/luizfernandolj/QuantifyML/tree/master
 Maintainer: Luiz Fernando Luth Junior

mlquantify-0.1.14/VERSION.txt

@@ -1 +0,0 @@
-0.1.14