Merge pull request #327 from appliedAI-Initiative/fix/285-test-grouped

Improvements to ValuationResult

Author: mdbenito

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- Fixes in `ValuationResult`: bugs around data names, semantics of
+  `empty()`, new method `zeros()` and normalised random values
+  [PR #327](https://github.com/appliedAI-Initiative/pyDVL/pull/327)
 - **New method**: Implements generalised semi-values for data valuation,
   including Data Banzhaf and Beta Shapley, with configurable sampling strategies
   [PR #319](https://github.com/appliedAI-Initiative/pyDVL/pull/319)

requirements.txt

@@ -1,4 +1,4 @@
-deprecation>=2.0.6
+pyDeprecate>=0.3.2
 numpy>=1.20
 pandas>=1.3
 scikit-learn

src/pydvl/value/least_core/__init__.py

@@ -24,8 +24,6 @@
 from enum import Enum
 from typing import Optional
 
-from deprecation import DeprecatedWarning
-
 from pydvl.utils.utility import Utility
 from pydvl.value.least_core.montecarlo import *
 from pydvl.value.least_core.naive import *
@@ -84,11 +82,9 @@ def compute_least_core_values(
     # TODO: remove this before releasing version 0.6.0
     if kwargs:
         warnings.warn(
-            DeprecatedWarning(
-                "Passing solver options as kwargs",
-                deprecated_in="0.5.1",
-                removed_in="0.6.0",
-                details="Use solver_options instead.",
+            DeprecationWarning(
+                "Passing solver options as kwargs was deprecated in 0.5.1, will "
+                "be removed in 0.6.0. `Use solver_options` instead."
             )
         )
         if solver_options is None:

src/pydvl/value/least_core/common.py

@@ -5,7 +5,6 @@
 
 import cvxpy as cp
 import numpy as np
-from deprecation import DeprecatedWarning
 from numpy.typing import NDArray
 
 from pydvl.utils import MapReduceJob, ParallelConfig, Status, Utility
@@ -57,11 +56,10 @@ def lc_solve_problem(
     # TODO: remove this before releasing version 0.6.0
     if options:
         warnings.warn(
-            DeprecatedWarning(
-                "Passing solver options as kwargs",
-                deprecated_in="0.5.1",
-                removed_in="0.6.0",
-                details="Use solver_options instead.",
+            DeprecationWarning(
+                "Passing solver options as kwargs was deprecated in "
+                "0.5.1, will be removed in 0.6.0. `Use solver_options` "
+                "instead."
             )
         )
         if solver_options is None:
@@ -256,10 +254,7 @@ def _solve_least_core_linear_program(
     e = cp.Variable()
 
     objective = cp.Minimize(e)
-    constraints = [
-        A_eq @ x == b_eq,
-        (A_lb @ x + e * np.ones(len(A_lb))) >= b_lb,
-    ]
+    constraints = [A_eq @ x == b_eq, (A_lb @ x + e * np.ones(len(A_lb))) >= b_lb]
 
     if non_negative_subsidy:
         constraints += [e >= 0]
@@ -333,10 +328,7 @@ def _solve_egalitarian_least_core_quadratic_program(
     x = cp.Variable(n_variables)
 
     objective = cp.Minimize(cp.norm2(x))
-    constraints = [
-        A_eq @ x == b_eq,
-        (A_lb @ x + subsidy * np.ones(len(A_lb))) >= b_lb,
-    ]
+    constraints = [A_eq @ x == b_eq, (A_lb @ x + subsidy * np.ones(len(A_lb))) >= b_lb]
     problem = cp.Problem(objective, constraints)
 
     try:

src/pydvl/value/least_core/montecarlo.py

@@ -3,7 +3,6 @@
 from typing import Iterable, Optional
 
 import numpy as np
-from deprecation import DeprecatedWarning
 
 from pydvl.utils.config import ParallelConfig
 from pydvl.utils.numeric import random_powerset
@@ -17,10 +16,7 @@
 logger = logging.getLogger(__name__)
 
 
-__all__ = [
-    "montecarlo_least_core",
-    "mclc_prepare_problem",
-]
+__all__ = ["montecarlo_least_core", "mclc_prepare_problem"]
 
 
 def montecarlo_least_core(
@@ -68,11 +64,10 @@ def montecarlo_least_core(
     # TODO: remove this before releasing version 0.6.0
     if options:
         warnings.warn(
-            DeprecatedWarning(
-                "Passing solver options as kwargs",
-                deprecated_in="0.5.1",
-                removed_in="0.6.0",
-                details="Use solver_options instead.",
+            DeprecationWarning(
+                "Passing solver options as kwargs was deprecated in "
+                "0.5.1, will be removed in 0.6.0. `Use solver_options` "
+                "instead."
             )
         )
         if solver_options is None:

src/pydvl/value/least_core/naive.py

@@ -3,7 +3,6 @@
 from typing import Optional
 
 import numpy as np
-from deprecation import DeprecatedWarning
 
 from pydvl.utils import Utility, maybe_progress, powerset
 from pydvl.value.least_core.common import LeastCoreProblem, lc_solve_problem
@@ -61,11 +60,10 @@ def exact_least_core(
     # TODO: remove this before releasing version 0.6.0
     if options:
         warnings.warn(
-            DeprecatedWarning(
-                "Passing solver options as kwargs",
-                deprecated_in="0.5.1",
-                removed_in="0.6.0",
-                details="Use solver_options instead.",
+            DeprecationWarning(
+                "Passing solver options as kwargs was deprecated in "
+                "0.5.1, will "
+                "be removed in 0.6.0. `Use solver_options` instead."
             )
         )
         if solver_options is None: