mergeron 2024.739145.3__tar.gz → 2024.739145.4__tar.gz

{mergeron-2024.739145.3 → mergeron-2024.739145.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mergeron
-Version: 2024.739145.3
+Version: 2024.739145.4
 Summary: Merger Policy Analysis using Python
 License: MIT
 Keywords: merger policy analysis,merger guidelines,merger screening,policy presumptions,concentration standards,upward pricing pressure,GUPPI

{mergeron-2024.739145.3 → mergeron-2024.739145.4}/pyproject.toml

@@ -13,7 +13,7 @@ keywords = [
     "upward pricing pressure",
     "GUPPI",
 ]
-version = "2024.739145.3"
+version = "2024.739145.4"
 
 # Classifiers list: https://pypi.org/classifiers/
 classifiers = [

{mergeron-2024.739145.3 → mergeron-2024.739145.4}/src/mergeron/__init__.py

@@ -8,7 +8,7 @@ from numpy.typing import NDArray
 
 _PKG_NAME: str = Path(__file__).parent.stem
 
-VERSION = "2024.739145.3"
+VERSION = "2024.739145.4"
 
 __version__ = VERSION
 

{mergeron-2024.739145.3 → mergeron-2024.739145.4}/src/mergeron/core/guidelines_boundaries.py

@@ -6,6 +6,7 @@ with a canvas on which to draw boundaries for Guidelines standards.
 
 from __future__ import annotations
 
+import decimal
 from dataclasses import dataclass
 from typing import Literal
 
@@ -112,52 +113,41 @@ class GuidelinesThresholds:
             HMGThresholds(
                 _dh_s,
                 _fc := int(np.ceil(1 / _hhi_p)),
-                _r := gbfn.round_cust(_fc / (_fc + 1), frac=0.05),
-                _g_s := guppi_from_delta(_dh_s, m_star=1.0, r_bar=_r),
-                _dr := (1 - _r),
+                _r := float(_r_s := gbfn.round_cust(_fc / (_fc + 1), frac=0.05)),
+                _g := float(guppi_from_delta(_dh_s, m_star=1.0, r_bar=_r)),
+                _dr := float(1 - _r_s),
                 _cmcr := 0.03,  # Not strictly a Guidelines standard
-                _ipr := _g_s,  # Not strictly a Guidelines standard
+                _ipr := _g,  # Not strictly a Guidelines standard
             ),
         )
 
         object.__setattr__(
-            self,
-            "presumption",
-            HMGThresholds(
-                _dh_p,
-                _fc,
-                _r,
-                _g_p := guppi_from_delta(_dh_p, m_star=1.0, r_bar=_r),
-                _dr,
-                _cmcr,
-                _ipr := _g_p,
-            ),
+            self, "presumption", HMGThresholds(_dh_p, _fc, _r, _g, _dr, _cmcr, _ipr)
         )
 
-        # imputed_presumption is relevant for 2010 Guidelines
-        # merger to symmetry in numbers-equivalent of post-merger HHI
+        # imputed_presumption is relevant for presumptions implicating
+        # mergers *to* symmetry in numbers-equivalent of post-merger HHI
+        # as in 2010 U.S.Guidelines and 2004 EU Commission Guidelines
         object.__setattr__(
             self,
             "imputed_presumption",
             (
                 HMGThresholds(
-                    _dh_i := 2 * (0.5 / _fc) ** 2,
+                    2 * (0.5 / _fc) ** 2,
                     _fc,
-                    _r_i := gbfn.round_cust((_fc - 1 / 2) / (_fc + 1 / 2), frac=0.05),
-                    _g_i := guppi_from_delta(_dh_p, m_star=1.0, r_bar=_r_i),
-                    1 / 2 * (1 - _r_i),
+                    float(
+                        _r_i := gbfn.round_cust(
+                            (_fc - 1 / 2) / (_fc + 1 / 2), frac=0.05
+                        )
+                    ),
+                    _g,
+                    float((1 - _r_i) / 2),
                     _cmcr,
-                    _g_i,
+                    _ipr := _g,
                 )
                 if self.pub_year in (2004, 2010)
                 else HMGThresholds(
-                    _dh_i := 2 * (1 / (_fc + 1)) ** 2,
-                    _fc,
-                    _r,
-                    _g_i := guppi_from_delta(_dh_p, m_star=1.0, r_bar=_r),
-                    _dr,
-                    _cmcr,
-                    _g_i,
+                    2 * (1 / (_fc + 1)) ** 2, _fc, _r, _g, _dr, _cmcr, _ipr
                 )
             ),
         )
@@ -169,10 +159,7 @@ class ConcentrationBoundary:
 
     measure_name: Literal[
         "ΔHHI", "Combined share", "Pre-merger HHI", "Post-merger HHI"
-    ] = field(
-        kw_only=False,
-        default="ΔHHI",  # pyright: ignore
-    )
+    ] = field(kw_only=False, default="ΔHHI")
 
     @measure_name.validator  # pyright: ignore
     def __mnv(
@@ -193,7 +180,7 @@ class ConcentrationBoundary:
         _instance: ConcentrationBoundary, _attribute: Attribute[float], _value: float, /
     ) -> None:
         if not 0 <= _value <= 1:
-            raise ValueError("Concentration threshold must lie between 0 and 1.")  # pyright: ignore
+            raise ValueError("Concentration threshold must lie between 0 and 1.")
 
     precision: int = field(
         kw_only=False, default=5, validator=validators.instance_of(int)
@@ -337,6 +324,7 @@ class DiversionRatioBoundary:
             "recapture_form": getattr(self.recapture_form, "value", "inside-out"),
             "dps": self.precision,
         }
+
         match self.agg_method:
             case UPPAggrSelector.DIS:
                 _upp_agg_fn = gbfn.shrratio_boundary_wtd_avg
@@ -381,7 +369,7 @@ def guppi_from_delta(
     *,
     m_star: float = 1.00,
     r_bar: float = DEFAULT_REC_RATE,
-) -> float:
+) -> decimal.Decimal:
     """
     Translate ∆HHI bound to GUPPI bound.
 
@@ -443,7 +431,7 @@ def share_from_guppi(
     *,
     m_star: float = 1.00,
     r_bar: float = DEFAULT_REC_RATE,
-) -> float:
+) -> decimal.Decimal:
     """
     Symmetric-firm share for given GUPPI, margin, and recapture ratio.
 

{mergeron-2024.739145.3 → mergeron-2024.739145.4}/src/mergeron/core/guidelines_boundary_functions.py

@@ -305,7 +305,7 @@ def shrratio_boundary_wtd_avg(
     _s_mid = mp.fdiv(_delta_star, 1 + _delta_star)
 
     # initial conditions
-    _gbdry_points: list[tuple[MPFloat, MPFloat]] | ArrayDouble = [(_s_mid, _s_mid)]
+    _gbdry_points = [(_s_mid, _s_mid)]
     _s_1_pre, _s_2_pre = _s_mid, _s_mid
     _s_2_oddval, _s_2_oddsum, _s_2_evnsum = True, 0.0, 0.0
 
@@ -401,11 +401,11 @@ def shrratio_boundary_wtd_avg(
         _gbdry_area_total = float(2 * _gbd_prtlarea - mp.power(_s_mid, "2"))
 
     _gbdry_points.append((mpf("0.0"), _s_intcpt))
-    _gbdry_points = np.array(_gbdry_points).astype(np.float64)
+    _gbdry_array = np.array(_gbdry_points).astype(np.float64)
 
     # Points defining boundary to point-of-symmetry
     return GuidelinesBoundary(
-        np.vstack((_gbdry_points[::-1], _gbdry_points[1:, ::-1])),
+        np.vstack((_gbdry_array[::-1], _gbdry_array[1:, ::-1])),
         round(float(_gbdry_area_total), dps),
     )
 
@@ -851,7 +851,9 @@ def _shrratio_boundary_intcpt(
                 ),
                 2 * mpf(f"{_r_val}"),
             )
-        case None if agg_method == "arithmetic mean" and recapture_form == "proportional":
+        case None if (
+            agg_method == "arithmetic mean" and recapture_form == "proportional"
+        ):
             _s_intcpt = mp.fsub(_delta_star + 1 / 2, mp.fabs(_delta_star - 1 / 2))
         case _:
             _s_intcpt = _s_2_pre
@@ -859,12 +861,9 @@ def _shrratio_boundary_intcpt(
     return _s_intcpt
 
 
-def lerp(
-    _x1: int | float | MPFloat | ArrayDouble | ArrayBIGINT = 3,
-    _x2: int | float | MPFloat | ArrayDouble | ArrayBIGINT = 1,
-    _r: float | MPFloat = 0.25,
-    /,
-) -> float | MPFloat | ArrayDouble:
+def lerp[LerpT: (float, MPFloat, ArrayDouble, ArrayBIGINT)](
+    _x1: LerpT, _x2: LerpT, _r: float = 0.25, /
+) -> LerpT:
     """
     From the function of the same name in the C++ standard [2]_
 
@@ -901,10 +900,8 @@ def lerp(
         return _x1
     elif _r == 1:
         return _x2
-    elif _r == 0.5:
-        return 1 / 2 * (_x1 + _x2)
     else:
-        return _r * _x2 + (1 - _r) * _x1
+        return _r * _x2 + (1 - _r) * _x1  # pyright: ignore
 
 
 def round_cust(
@@ -913,7 +910,7 @@ def round_cust(
     *,
     frac: float = 0.005,
     rounding_mode: str = "ROUND_HALF_UP",
-) -> float:
+) -> decimal.Decimal:
     """
     Custom rounding, to the nearest 0.5% by default.
 
@@ -960,7 +957,7 @@ def round_cust(
 
     _n, _f, _e = (decimal.Decimal(f"{_g}") for _g in [_num, frac, 1])
 
-    return float(_f * (_n / _f).quantize(_e, rounding=rounding_mode))
+    return _f * (_n / _f).quantize(_e, rounding=rounding_mode)
 
 
 def boundary_plot(*, mktshares_plot_flag: bool = True) -> tuple[Any, ...]: