mergeron 2024.739145.1__tar.gz → 2024.739145.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mergeron
-Version: 2024.739145.1
+Version: 2024.739145.3
 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.1 → mergeron-2024.739145.3}/pyproject.toml

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

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

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

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

@@ -102,8 +102,8 @@ def hhi_delta_boundary(_dh_val: float = 0.01, /, *, dps: int = 5) -> GuidelinesB
 
     # Boundary points
     _dh_half = np.vstack((
-        np.column_stack((_s_1, _s_2)),
-        np.array([(mpf("0.0"), mpf("1.0"))]),
+        np.column_stack((_s_1, _s_2)).astype(np.float64),
+        np.array([(mpf("0.0"), mpf("1.0"))], np.float64),
     ))
     _dh_bdry_pts = np.vstack((_dh_half[::-1], _dh_half[1:, ::-1]))
 
@@ -133,9 +133,10 @@ def hhi_pre_contrib_boundary(
 
     _bdry_step_sz = mp.power(10, -dps)
     # Range-limit is 0 less a step, which is -1 * step-size
-    _s_1 = np.array(mp.arange(_s_mid, -_bdry_step_sz, -_bdry_step_sz), np.float64)
-    _s_2 = np.sqrt(_hhi_contrib - _s_1**2).astype(np.float64)
-    _bdry_pts_mid = np.column_stack((_s_1, _s_2))
+    _s_1 = np.array(mp.arange(_s_mid, -_bdry_step_sz, -_bdry_step_sz))
+    _s_2 = np.sqrt(_hhi_contrib - _s_1**2)
+    _bdry_pts_mid = np.column_stack((_s_1, _s_2)).astype(np.float64)
+
     return GuidelinesBoundary(
         np.vstack((_bdry_pts_mid[::-1], _bdry_pts_mid[1:, ::-1])),
         round(float(mp.pi * _hhi_contrib / 4), dps),
@@ -304,7 +305,7 @@ def shrratio_boundary_wtd_avg(
     _s_mid = mp.fdiv(_delta_star, 1 + _delta_star)
 
     # initial conditions
-    _gbdry_points = [(_s_mid, _s_mid)]
+    _gbdry_points: list[tuple[MPFloat, MPFloat]] | ArrayDouble = [(_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
 
@@ -374,7 +375,7 @@ def shrratio_boundary_wtd_avg(
         _s_2_oddsum -= _s_1_pre
 
     _s_intcpt = _shrratio_boundary_intcpt(
-        _s_1_pre,
+        _s_2_pre,
         _delta_star,
         _r_val,
         recapture_form=recapture_form,
@@ -400,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))
-    _gbd_pts_arr = np.array(_gbdry_points).astype(np.float64)
+    _gbdry_points = np.array(_gbdry_points).astype(np.float64)
 
     # Points defining boundary to point-of-symmetry
     return GuidelinesBoundary(
-        np.vstack((_gbd_pts_arr[::-1], _gbd_pts_arr[1:, ::-1])),
+        np.vstack((_gbdry_points[::-1], _gbdry_points[1:, ::-1])),
         round(float(_gbdry_area_total), dps),
     )
 

{mergeron-2024.739145.1 → mergeron-2024.739145.3}/src/mergeron/gen/upp_tests.py

@@ -331,7 +331,7 @@ def initialize_hd5(
     _h5_title = f"HMG version: {_hmg_pub_year}; Test regime: {_test_regime}"
     if _h5_path.is_file():
         _h5_path.unlink()
-    _h5_file = ptb.open_file(_h5_path, mode="w", title=_h5_title)
+    _h5_file = ptb.open_file(_h5_path, mode="w", title=_h5_title)  # pyright: ignore
     _save_data_to_file: SaveData = (True, _h5_file, _h5_file.root)
     _next_subgroup_name_root = "enf_{}_{}_{}_{}".format(
         _hmg_pub_year,