mlquantify 0.0.11.9__tar.gz → 0.0.11.10__tar.gz

{mlquantify-0.0.11.9 → mlquantify-0.0.11.10}/PKG-INFO

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

{mlquantify-0.0.11.9 → mlquantify-0.0.11.10}/mlquantify/__init__.py

@@ -12,16 +12,19 @@ ARGUMENTS_SETTED = False
 
 arguments = {
     "y_pred": None,
-    "posteriors": None,
+    "posteriors_train": None,
+    "posteriors_test": None,
     "y_labels": None,
-    "y_train_pred": None,
+    "y_pred_train": None,
 }
 
-def set_arguments(y_pred=None, posteriors=None, y_labels=None, y_train_pred=None):
+def set_arguments(y_pred=None, posteriors_train=None, posteriors_test=None,  y_labels=None, y_pred_train=None):
     global ARGUMENTS_SETTED
     global arguments
     arguments["y_pred"] = y_pred
-    arguments["posteriors"] = posteriors
+    arguments["posteriors_train"] = posteriors_train
+    arguments["posteriors_test"] = posteriors_test
     arguments["y_labels"] = y_labels
-    arguments["y_train_pred"] = y_train_pred
-    ARGUMENTS_SETTED = True
+    arguments["y_pred_train"] = y_pred_train
+    
+    ARGUMENTS_SETTED = True

{mlquantify-0.0.11.9 → mlquantify-0.0.11.10}/mlquantify/base.py

@@ -315,7 +315,7 @@ class AggregativeQuantifier(Quantifier, ABC):
             Training labels.
         """
         if mq.ARGUMENTS_SETTED:
-            if self.is_probabilistic and mq.arguments["posteriors"] is not None:
+            if self.is_probabilistic and mq.arguments["posteriors_test"] is not None:
                 return
             elif not self.is_probabilistic and mq.arguments["y_pred"] is not None:
                 return
@@ -343,7 +343,7 @@ class AggregativeQuantifier(Quantifier, ABC):
         else:
             if mq.ARGUMENTS_SETTED:
                 if self.is_probabilistic:
-                    return mq.arguments["posteriors"]
+                    return mq.arguments["posteriors_test"]
                 return mq.arguments["y_pred"]
             else:
                 raise ValueError("No learner object was set and no arguments were setted")

{mlquantify-0.0.11.9 → mlquantify-0.0.11.10}/mlquantify/methods/aggregative.py

@@ -385,9 +385,9 @@ class FM(AggregativeQuantifier):
             The fitted instance of FM.
         """
         # Get predicted labels and probabilities using cross-validation
-        if mq.arguments["y_labels"] is not None and mq.arguments["posteriors"] is not None:
+        if mq.arguments["y_labels"] is not None and mq.arguments["posteriors_train"] is not None:
             y_labels = mq.arguments["y_labels"]
-            probabilities = mq.arguments["posteriors"]
+            probabilities = mq.arguments["posteriors_train"]
         else:
             y_labels, probabilities = get_scores(X, y, self.learner, self.cv_folds, self.learner_fitted)
         
@@ -548,7 +548,7 @@ class GAC(AggregativeQuantifier):
             y = pd.Series(y)
 
         if self.learner_fitted or self.learner is None:
-            y_pred = mq.arguments["y_train_pred"] if mq.arguments["y_train_pred"] is not None else self.predict_learner(X)
+            y_pred = mq.arguments["y_pred_train"] if mq.arguments["y_pred_train"] is not None else self.predict_learner(X)
             y_label = y
         else:
             X_train, X_val, y_train, y_val = train_test_split(
@@ -731,7 +731,7 @@ class GPAC(AggregativeQuantifier):
             y = pd.Series(y)
 
         if self.learner_fitted or self.learner is None:
-            y_pred = mq.arguments["y_train_pred"] if mq.arguments["y_train_pred"] is not None else self.predict_learner(X)
+            y_pred = mq.arguments["y_pred_train"] if mq.arguments["y_pred_train"] is not None else self.predict_learner(X)
             y_labels = y
         else:
             X_train, X_val, y_train, y_val = train_test_split(

{mlquantify-0.0.11.9 → mlquantify-0.0.11.10}/mlquantify/methods/mixture_models.py

@@ -107,9 +107,9 @@ class MixtureModel(AggregativeQuantifier):
         self : MixtureModel
             The fitted MixtureModel instance.
         """
-        if mq.arguments["y_labels"] is not None and mq.arguments["posteriors"] is not None:
+        if mq.arguments["y_labels"] is not None and mq.arguments["posteriors_train"] is not None:
             y_labels = mq.arguments["y_labels"]
-            probabilities = mq.arguments["posteriors"]
+            probabilities = mq.arguments["posteriors_train"]
         else:
             y_labels, probabilities = get_scores(X, y, self.learner, self.cv_folds, self.learner_fitted)
 

{mlquantify-0.0.11.9 → mlquantify-0.0.11.10}/mlquantify/methods/threshold_optimization.py

@@ -122,9 +122,9 @@ class ThresholdOptimization(AggregativeQuantifier):
             The fitted quantifier object with the best threshold, TPR, and FPR.
         """
         # Get predicted labels and probabilities
-        if mq.arguments["y_labels"] is not None and mq.arguments["posteriors"] is not None:
+        if mq.arguments["y_labels"] is not None and mq.arguments["posteriors_train"] is not None:
             y_labels = mq.arguments["y_labels"]
-            probabilities = mq.arguments["posteriors"]
+            probabilities = mq.arguments["posteriors_train"]
         else:
             y_labels, probabilities = get_scores(X, y, self.learner, self.cv_folds, self.learner_fitted)
         

{mlquantify-0.0.11.9 → mlquantify-0.0.11.10}/mlquantify.egg-info/PKG-INFO

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

{mlquantify-0.0.11.9 → mlquantify-0.0.11.10}/setup.py

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