mlquantify 0.1.4__tar.gz → 0.1.6__tar.gz

{mlquantify-0.1.4/mlquantify.egg-info → mlquantify-0.1.6}/PKG-INFO

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

mlquantify-0.1.6/VERSION.txt

@@ -0,0 +1 @@
+0.1.6

{mlquantify-0.1.4 → mlquantify-0.1.6}/mlquantify/evaluation/protocol.py

@@ -1,4 +1,5 @@
 from abc import ABC, abstractmethod
+from logging import warning
 import numpy as np
 from typing import Generator, Tuple
 from tqdm import tqdm
@@ -77,18 +78,11 @@ class Protocol(ABC):
         Generator[np.ndarray, np.ndarray]
             A generator that yields the indices for each split.
         """
-        indices = np.arange(X.shape[0])
-        for idx in self._split_indices_masks(X, y):
-            indexes = indices[idx]
-            yield indexes
-
-    def _split_indices_masks(self, X: np.ndarray, y: np.ndarray) -> Generator[Tuple[np.ndarray, np.ndarray]]:
         for idx in self._iter_indices(X, y):
+            if len(idx) > len(X):
+                warning(f"Batch size {len(idx)} exceeds dataset size {len(X)}. Replacement sampling will be used.")
+            yield idx
 
-            mask = np.zeros(X.shape[0], dtype=bool)
-            mask[idx] = True 
-
-            yield mask
 
     @abstractmethod
     def _iter_indices(self, X, y):

{mlquantify-0.1.4 → mlquantify-0.1.6}/mlquantify/methods/meta.py

@@ -7,7 +7,7 @@ from sklearn.model_selection import GridSearchCV, cross_val_predict
 from ..evaluation import measures
 from ..base import Quantifier
 from ..utils.method import getHist, hellinger
-from ..utils.general import make_prevs, normalize_prevalence, parallel, generate_artificial_indexes
+from ..utils.general import make_prevs, normalize_prevalence, parallel, get_indexes_with_prevalence
 
 class Ensemble(Quantifier):
     """Ensemble of Quantification Models.
@@ -401,7 +401,7 @@ def _delayed_new_sample(args):
         print(f'\tfit-start for prev {str(np.round(prev, 3))}, sample_size={sample_size}')
     model = deepcopy(base_quantifier)
 
-    sample_index = generate_artificial_indexes(y, prev, sample_size, np.unique(y))
+    sample_index = get_indexes_with_prevalence(y, prev, sample_size)
     X_sample = np.take(X, sample_index, axis=0)
     y_sample = np.take(y, sample_index, axis=0)
     #print(X_sample)

{mlquantify-0.1.4 → mlquantify-0.1.6/mlquantify.egg-info}/PKG-INFO

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

mlquantify-0.1.4/VERSION.txt

@@ -1 +0,0 @@
-0.1.4