mergeron 2025.739439.6__tar.gz → 2025.739439.9__tar.gz

{mergeron-2025.739439.6 → mergeron-2025.739439.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mergeron
-Version: 2025.739439.6
+Version: 2025.739439.9
 Summary: Python for analyzing merger enforcement policy
 License: MIT
 Keywords: merger enforcement policy,merger guidelines,merger screening,enforcement presumptions,concentration standards,diversion ratio,upward pricing pressure,GUPPI

{mergeron-2025.739439.6 → mergeron-2025.739439.9}/pyproject.toml

@@ -15,7 +15,7 @@ keywords = [
     "upward pricing pressure",
     "GUPPI",
 ]
-version = "2025.739439.6"
+version = "2025.739439.9"
 requires-python = ">=3.13,<4.0"
 
 # Classifiers list: https://pypi.org/classifiers/
@@ -170,7 +170,9 @@ ignore = [
     # sphinx (as setup here) gives different results with TypeAlias and typing statement
     "UP040",
 ]
-isort.split-on-trailing-comma = false
+
+[tool.ruff.lint.isort]
+split-on-trailing-comma = false
 
 [tool.ruff.lint.pydocstyle]
 convention = "numpy"

{mergeron-2025.739439.6 → mergeron-2025.739439.9}/src/mergeron/__init__.py

@@ -15,7 +15,7 @@ from ruamel import yaml
 
 _PKG_NAME: str = Path(__file__).parent.name
 
-VERSION = "2025.739439.6"
+VERSION = "2025.739439.9"
 
 __version__ = VERSION
 

{mergeron-2025.739439.6 → mergeron-2025.739439.9}/src/mergeron/core/__init__.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable, Mapping
+from collections.abc import Mapping
 from decimal import Decimal
 from types import MappingProxyType
 from typing import Any
@@ -40,15 +40,6 @@ class GuidelinesBoundary:
     """Area under the boundary."""
 
 
-@frozen
-class GuidelinesBoundaryCallable:
-    """A function to generate Guidelines boundary points, along with area and knot."""
-
-    boundary_function: Callable[[ArrayDouble], ArrayDouble]
-    area: float
-    s_naught: float = 0
-
-
 @frozen
 class INVTableData:
     """Represents individual table of FTC merger investigations data."""

{mergeron-2025.739439.6 → mergeron-2025.739439.9}/src/mergeron/core/guidelines_boundary_functions.py

@@ -224,14 +224,14 @@ def diversion_share_boundary_wtd_avg(
     dps: int = 5,
 ) -> GuidelinesBoundary:
     R"""
-    Share combinations on the share-weighted average diversion ratio boundary.
+    Share combinations on the share-weighted average diversion share boundary.
 
     Parameters
     ----------
     _delta_star
-        Diversion share (:math:`\overline{d} / \overline{r}`)
+        Diversion share, :math:`\overline{d} / \overline{r}` or :math:`\overline{g} / (m^* \cdot \overline{r})`.
     _r_val
-        recapture ratio
+        Recapture ratio.
     agg_method
         Whether "arithmetic mean", "geometric mean", or "distance".
     weighting
@@ -424,7 +424,7 @@ def diversion_share_boundary_xact_avg(
     dps: int = 5,
 ) -> GuidelinesBoundary:
     R"""
-    Share combinations for the exact average diversion/share-ratio boundary.
+    Share combinations for the exact average diversion share boundary.
 
     Notes
     -----
@@ -462,9 +462,9 @@ def diversion_share_boundary_xact_avg(
     Parameters
     ----------
     _delta_star
-        Diversion share (:math:`\overline{d} / \overline{r}`).
+        Diversion share, :math:`\overline{d} / \overline{r}` or :math:`\overline{g} / (m^* \cdot \overline{r})`.
     _r_val
-        Recapture ratio
+        Recapture ratio.
     recapture_form
         Whether recapture-ratio is MNL-consistent ("inside-out") or has fixed
         value for both merging firms ("proportional").
@@ -591,7 +591,7 @@ def diversion_share_boundary_min(
     Parameters
     ----------
     _delta_star
-        Diversion share (:math:`\overline{d} / \overline{r}`).
+        Diversion share, :math:`\overline{d} / \overline{r}` or :math:`\overline{g} / (m^* \cdot \overline{r})`.
     _r_val
         Recapture ratio.
     recapture_form
@@ -635,7 +635,7 @@ def diversion_share_boundary_max(
     Parameters
     ----------
     _delta_star
-        Diversion share (:math:`\overline{d} / \overline{r}`).
+        Diversion share, :math:`\overline{d} / \overline{r}` or :math:`\overline{g} / (m^* \cdot \overline{r})`.
     _
         Placeholder for recapture ratio included for consistency with other
         share-ratio boundary functions.
@@ -704,9 +704,9 @@ def lerp[LerpT: (float, MPFloat, ArrayDouble, ArrayBIGINT)](
     Parameters
     ----------
     _x1, _x2
-        bounds :math:`x_1, x_2` to interpolate between.
+        Interpolation bounds :math:`x_1, x_2`.
     _r
-        interpolation weight :math:`r` assigned to :math:`x_2`
+        Interpolation weight :math:`r` assigned to :math:`x_2`
 
     Returns
     -------
@@ -728,14 +728,15 @@ def lerp[LerpT: (float, MPFloat, ArrayDouble, ArrayBIGINT)](
 
 
     """
-    if not 0 <= _r <= 1:
-        raise ValueError("Specified interpolation weight must lie in [0, 1].")
-    elif _r == 0:
-        return _x1
-    elif _r == 1:
-        return _x2
-    else:
-        return fma(_x2, _r, fma(_x1, -_r, _x1))
+    match _r:
+        case 0:
+            return _x1
+        case 1:
+            return _x2
+        case _:
+            if not 0 <= _r <= 1:
+                raise ValueError("Specified interpolation weight must lie in [0, 1].")
+            return fma(_x2, _r, fma(_x1, -_r, _x1))
 
 
 def round_cust(

mergeron-2025.739439.9/src/mergeron/perks/__init__.py

@@ -0,0 +1,20 @@
+"""Constants, types, objects and functions used within this sub-package."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+
+from attrs import frozen
+
+from .. import VERSION, ArrayDouble  # noqa: TID252
+
+__version__ = VERSION
+
+
+@frozen
+class GuidelinesBoundaryCallable:
+    """A function to generate Guidelines boundary points, along with area and knot."""
+
+    boundary_function: Callable[[ArrayDouble], ArrayDouble]
+    area: float
+    s_naught: float = 0

{mergeron-2025.739439.6/src/mergeron/core → mergeron-2025.739439.9/src/mergeron/perks}/guidelines_boundary_functions_extra.py

@@ -6,17 +6,19 @@ and may provide improved precision than core functions, but tend to have
 poor performance
 
 """
+from __future__ import annotations
 
 from typing import Literal
 
 import numpy as np
 from mpmath import mp, mpf  # type: ignore
-from scipy.spatial.distance import minkowski as distance_function  # type: ignore
+from scipy.spatial.distance import minkowski  # type: ignore
 from sympy import lambdify, simplify, solve, symbols  # type: ignore
 
 from .. import DEFAULT_REC_RATIO, VERSION  # noqa: TID252
-from . import GuidelinesBoundary, GuidelinesBoundaryCallable, MPFloat
-from . import guidelines_boundary_functions as gbf
+from ..core import GuidelinesBoundary, MPFloat  # noqa: TID252
+from ..core import guidelines_boundary_functions as gbf  # noqa: TID252
+from . import GuidelinesBoundaryCallable
 
 __version__ = VERSION
 
@@ -108,9 +110,9 @@ def diversion_share_boundary_qdtr_wtd_avg(
     Parameters
     ----------
     _delta_star
-        corollary to GUPPI bound (:math:`\overline{g} / (m^* \cdot \overline{r})`)
+        Diversion share, :math:`\overline{d} / \overline{r}` or :math:`\overline{g} / (m^* \cdot \overline{r})`.
     _r_val
-        recapture ratio
+        Recapture ratio.
     weighting
         Whether "own-share" or "cross-product-share" (or None for simple, unweighted average)
     recapture_form
@@ -229,9 +231,9 @@ def diversion_share_boundary_distance(
     Parameters
     ----------
     _delta_star
-        corollary to GUPPI bound (:math:`\overline{g} / (m^* \cdot \overline{r})`)
+        Diversion share, :math:`\overline{d} / \overline{r}` or :math:`\overline{g} / (m^* \cdot \overline{r})`.
     _r_val
-        recapture ratio
+        Recapture ratio.
     agg_method
         Whether "arithmetic mean" or "distance".
     weighting
@@ -290,11 +292,11 @@ def diversion_share_boundary_distance(
 
             match agg_method:
                 case "arithmetic mean":
-                    delta_test = distance_function(
+                    delta_test = minkowski(
                         (de_1, de_2), (0.0, 0.0), p=1, w=weights_i
                     )
                 case "distance":
-                    delta_test = distance_function(
+                    delta_test = minkowski(
                         (de_1, de_2), (0.0, 0.0), p=2, w=weights_i
                     )
 
@@ -409,9 +411,9 @@ def diversion_share_boundary_xact_avg_mp(
     Parameters
     ----------
     _delta_star
-        Diversion share (:math:`\overline{d} / \overline{r}`).
+        Diversion share, :math:`\overline{d} / \overline{r}` or :math:`\overline{g} / (m^* \cdot \overline{r})`.
     _r_val
-        Recapture ratio
+        Recapture ratio.
     recapture_form
         Whether recapture-ratio is MNL-consistent ("inside-out") or has fixed
         value for both merging firms ("proportional").
@@ -529,14 +531,14 @@ def _diversion_share_boundary_wtd_avg_autoroot(
     dps: int = 5,
 ) -> GuidelinesBoundary:
     R"""
-    Share combinations on the share-weighted average diversion ratio boundary.
+    Share combinations on the share-weighted average diversion share boundary.
 
     Parameters
     ----------
     _delta_star
-        Diversion share (:math:`\overline{d} / \overline{r}`)
+        Diversion share, :math:`\overline{d} / \overline{r}` or :math:`\overline{g} / (m^* \cdot \overline{r})`.
     _r_val
-        recapture ratio
+        Recapture ratio.
     agg_method
         Whether "arithmetic mean", "geometric mean", or "distance".
     weighting