mergeron 2025.739290.1__py3-none-any.whl → 2025.739290.3__py3-none-any.whl

mergeron/__init__.py

@@ -12,7 +12,7 @@ from ruamel import yaml
 
 _PKG_NAME: str = Path(__file__).parent.stem
 
-VERSION = "2025.739290.1"
+VERSION = "2025.739290.3"
 
 __version__ = VERSION
 

mergeron/core/ftc_merger_investigations_data.py

@@ -8,13 +8,16 @@ Reported row and column totals from source data are not stored.
 
 """
 
+from __future__ import annotations
+
 import shutil
 from collections.abc import Mapping, Sequence
+from dataclasses import dataclass
 from importlib import resources
 from operator import itemgetter
 from pathlib import Path
 from types import MappingProxyType
-from typing import Any, NamedTuple
+from typing import Any
 
 import msgpack  # type: ignore
 import msgpack_numpy as m  # type: ignore
@@ -23,8 +26,9 @@ import re2 as re  # type: ignore
 import urllib3
 from bs4 import BeautifulSoup
 from numpy.testing import assert_array_equal
+from ruamel import yaml
 
-from .. import _PKG_NAME, DATA_DIR, VERSION, ArrayBIGINT  # noqa: TID252
+from .. import _PKG_NAME, DATA_DIR, EMPTY_ARRAYINT, VERSION, ArrayBIGINT  # noqa: TID252
 
 __version__ = VERSION
 
@@ -89,11 +93,27 @@ CNT_FCOUNT_DICT = {
 }
 
 
-class INVTableData(NamedTuple):
+@dataclass(slots=True, frozen=True)
+class INVTableData:
     industry_group: str
     additional_evidence: str
     data_array: ArrayBIGINT
 
+    @classmethod
+    def to_yaml(
+        cls, _r: yaml.representer.SafeRepresenter, _d: INVTableData
+    ) -> yaml.MappingNode:
+        _ret: yaml.MappingNode = _r.represent_mapping(
+            f"!{cls.__name__}", {_a: getattr(_d, _a) for _a in _d.__dataclass_fields__}
+        )
+        return _ret
+
+    @classmethod
+    def from_yaml(
+        cls, _c: yaml.constructor.SafeConstructor, _n: yaml.MappingNode
+    ) -> INVTableData:
+        return cls(**_c.construct_mapping(_n))
+
 
 type INVData = Mapping[str, Mapping[str, Mapping[str, INVTableData]]]
 type _INVData_in = dict[str, dict[str, dict[str, INVTableData]]]
@@ -278,10 +298,13 @@ def _construct_new_period_data(
                 _invdata_cuml_sub_table.data_array,
             )
 
-            _invdata_base_sub_table = _invdata_base[_table_type].get(_table_no, None)
+            _invdata_base_sub_table = _invdata_base[_table_type].get(
+                _table_no, INVTableData("", "", EMPTY_ARRAYINT)
+            )
 
             (_invdata_base_ind_group, _invdata_base_evid_cond, _invdata_base_array) = (
-                _invdata_base_sub_table or ("", "", None)
+                getattr(_invdata_base_sub_table, _a)
+                for _a in ("industry_group", "additional_evidence", "data_array")
             )
 
             # Some tables can't be constructed due to inconsistencies in the data

mergeron/core/guidelines_boundaries.py

@@ -43,6 +43,21 @@ class HMGThresholds:
     cmcr: float
     ipr: float
 
+    @classmethod
+    def to_yaml(
+        cls, _r: yaml.representer.SafeRepresenter, _d: HMGThresholds
+    ) -> yaml.MappingNode:
+        _ret: yaml.MappingNode = _r.represent_mapping(
+            f"!{cls.__name__}", {_a: getattr(_d, _a) for _a in _d.__dataclass_fields__}
+        )
+        return _ret
+
+    @classmethod
+    def from_yaml(
+        cls, _c: yaml.constructor.SafeConstructor, _n: yaml.MappingNode
+    ) -> HMGThresholds:
+        return cls(**_c.construct_mapping(_n))
+
 
 @this_yaml.register_class
 @frozen

mergeron/gen/__init__.py

@@ -40,7 +40,7 @@ __version__ = VERSION
 DEFAULT_FCOUNT_WTS = np.asarray((_nr := np.arange(6, 0, -1)) / _nr.sum(), float)
 
 
-@dataclass
+@dataclass(slots=True, frozen=True)
 class SeedSequenceData:
     share: SeedSequence
     pcm: SeedSequence
@@ -654,3 +654,20 @@ for _typ in (
             ),
         ),
     )
+
+for _typ in (MarketSampleData, SeedSequenceData, UPPTestsCounts):
+    _, _ = (
+        this_yaml.representer.add_representer(
+            _typ,
+            lambda _r, _d: _r.represent_mapping(
+                f"!{_d.__class__.__name__}",
+                {_a: getattr(_d, _a) for _a in _d.__dataclass_fields__},
+            ),
+        ),
+        this_yaml.constructor.add_constructor(
+            _typ,
+            lambda _c, _n: globals().get(
+                _n.tag.lstrip("!")(**_c.construct_mapping(_n))
+            ),
+        ),
+    )

mergeron/gen/data_generation_functions.py

@@ -46,8 +46,8 @@ def gen_share_data(
     _sample_size: int,
     _share_spec: ShareSpec,
     _fcount_rng_seed_seq: SeedSequence | None,
-    _mktshr_rng_seed_seq: SeedSequence | None = None,
-    _nthreads: int = NTHREADS,
+    _mktshr_rng_seed_seq: SeedSequence,
+    _nthreads: int,
     /,
 ) -> ShareDataSample:
     """Helper function for generating share data.
@@ -69,9 +69,9 @@ def gen_share_data(
 
     """
 
-    _recapture_form, _dist_type_mktshr, _dist_parms_mktshr, _firm_count_prob_wts = (
+    _dist_type_mktshr, _firm_count_prob_wts, _dist_parms_mktshr, _recapture_form = (
         getattr(_share_spec, _f)
-        for _f in ("recapture_form", "dist_type", "dist_parms", "firm_counts_weights")
+        for _f in ("dist_type", "firm_counts_weights", "dist_parms", "recapture_form")
     )
 
     _ssz = _sample_size
@@ -126,8 +126,8 @@ def gen_share_data(
 def gen_market_shares_uniform(
     _s_size: int,
     _dist_parms_mktshr: ArrayDouble,
-    _mktshr_rng_seed_seq: SeedSequence | None = None,
-    _nthreads: int = NTHREADS,
+    _mktshr_rng_seed_seq: SeedSequence,
+    _nthreads: int,
     /,
 ) -> ShareDataSample:
     """Generate merging-firm shares from Uniform distribution on the 3-D simplex.
@@ -159,13 +159,12 @@ def gen_market_shares_uniform(
         nthreads=_nthreads,
     )
     _mrng.fill()
-    # Convert draws on U[0, 1] to Uniformly-distributed draws on simplex, s_1 + s_2 <= 1
-    _frmshr_array.sort(axis=1)
 
-    _frmshr_array = np.array(
-        (_frmshr_array[:, 0], _frmshr_array[:, 1] - _frmshr_array[:, 0]),
-        _frmshr_array.dtype,
-    ).T  # faster than np.stack() and variants
+    # Convert draws on U[0, 1] to Uniformly-distributed draws on simplex, s_1 + s_2 <= 1
+    _frmshr_array = np.hstack((
+        _frmshr_array.min(axis=1, keepdims=True),
+        np.abs(np.diff(_frmshr_array, axis=1)),
+    ))
 
     # Keep only share combinations representing feasible mergers
     # This is a no-op for 64-bit floats, but is necessary for smaller floats
@@ -199,8 +198,8 @@ def _gen_market_shares_dirichlet_multimarket(
     _dist_type_dir: SHRDistribution,
     _dist_parms_dir: ArrayDouble,
     _firm_count_wts: ArrayDouble,
-    _fcount_rng_seed_seq: SeedSequence | None = None,
-    _mktshr_rng_seed_seq: SeedSequence | None = None,
+    _fcount_rng_seed_seq: SeedSequence | None,
+    _mktshr_rng_seed_seq: SeedSequence,
     _nthreads: int = NTHREADS,
     /,
 ) -> ShareDataSample:
@@ -341,8 +340,8 @@ def gen_market_shares_dirichlet(
     _dir_alphas: ArrayDouble,
     _s_size: int,
     _recapture_form: RECForm,
-    _mktshr_rng_seed_seq: SeedSequence | None = None,
-    _nthreads: int = NTHREADS,
+    _mktshr_rng_seed_seq: SeedSequence,
+    _nthreads: int,
     /,
 ) -> ShareDataSample:
     """Dirichlet-distributed shares with fixed firm-count.
@@ -497,7 +496,7 @@ def gen_margin_price_data(
     _hsr_filing_test_type: SSZConstant,
     _pcm_rng_seed_seq: SeedSequence,
     _pr_rng_seed_seq: SeedSequence | None,
-    _nthreads: int = NTHREADS,
+    _nthreads: int,
     /,
 ) -> tuple[MarginDataSample, PriceDataSample]:
     """Generate margin and price data for mergers in the sample.
@@ -680,8 +679,8 @@ def _gen_margin_data(
     _price_array: ArrayDouble,
     _aggregate_purchase_prob: ArrayDouble,
     _pcm_spec: PCMSpec,
-    _pcm_rng_seed_seq: SeedSequence | None,
-    _nthreads: int = NTHREADS,
+    _pcm_rng_seed_seq: SeedSequence,
+    _nthreads: int,
     /,
 ) -> MarginDataSample:
     _dist_type_pcm, _dist_firm2_pcm, _dist_parms_pcm = (

{mergeron-2025.739290.1.dist-info → mergeron-2025.739290.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mergeron
-Version: 2025.739290.1
+Version: 2025.739290.3
 Summary: Analyze merger enforcement policy using Python
 License: MIT
 Keywords: merger policy analysis,merger guidelines,merger screening,policy presumptions,concentration standards,upward pricing pressure,GUPPI

{mergeron-2025.739290.1.dist-info → mergeron-2025.739290.3.dist-info}/RECORD

@@ -1,8 +1,8 @@
-mergeron/__init__.py,sha256=fxabxjXrodvYcQtmpl6jv21ZGl-RPBI18ECzPQ60MPY,3515
+mergeron/__init__.py,sha256=LOHcLKtaYWz9mCtT37NNkZrHrHF6G3IPqfxMc30UdJY,3515
 mergeron/core/__init__.py,sha256=qYRA1D4Gx-WSkICqiueWLWPedkWmb_CIn7fgvN7unk4,182
 mergeron/core/empirical_margin_distribution.py,sha256=byO11ROGVQcmbZVWdVJkJ906WnHhx7jcoL5BbxPmX7I,8688
-mergeron/core/ftc_merger_investigations_data.py,sha256=9AT-phfkn0NHJvn9lcpbH8ExWZStYW47KQjNjDGS3qc,28709
-mergeron/core/guidelines_boundaries.py,sha256=4twCwb7see2nbBV5wSKPg-Let9huex3CxqgAY-JG-2g,17239
+mergeron/core/ftc_merger_investigations_data.py,sha256=13yEg7L3wpR2XU4v7WAfSH-lIDk0eRv31i0LY39Fk4w,29452
+mergeron/core/guidelines_boundaries.py,sha256=1d-ToNnX-lQpcj4ucfxwwa9Vu2dcQTx8DPJKEZ7SmEM,17723
 mergeron/core/guidelines_boundary_functions.py,sha256=4vMz5DQ72fgj7leUlVJvXBrxdZAeDJP7FoGBEVXDdeQ,34866
 mergeron/core/guidelines_boundary_functions_extra.py,sha256=qL1zT-Xgj2qD2EyBRR87APoVc47MkGM02xYQhNgwEvg,11216
 mergeron/core/pseudorandom_numbers.py,sha256=8_MBHIvWjVZUN4Et7Tt3J1NzWxuzq9vtzFkycW5rBaQ,9918
@@ -12,12 +12,12 @@ mergeron/data/damodaran_margin_data_dict.msgpack,sha256=sr6s4L69kposEpzGI7jpPb4U
 mergeron/data/ftc_invdata.msgpack,sha256=WBFHgi7Ld4R-h2zL2Zc3TOIlKqVrbVFMH1LoI4-T-M0,264664
 mergeron/demo/__init__.py,sha256=KtjBlZOl7jwBCAUhrTJB9PdrN39YLYytNiSUSM_gRmA,62
 mergeron/demo/visualize_empirical_margin_distribution.py,sha256=kDwPfhsBjsQdYPyhe4KZG2guB_xHhPaCrvn8fezIz4M,2354
-mergeron/gen/__init__.py,sha256=t1RswXk-L6olOhj5XqPekd8je8Za7NUFuSo3fuM2Wts,21787
+mergeron/gen/__init__.py,sha256=Y_7KBS4YHaFZO9P8phE-pAyhV6eA2a1bGUtfy7c2cfs,22352
 mergeron/gen/data_generation.py,sha256=IBWo-Al2ApHnjVQyIUV35x0OnoMgliJfqy5YrbBCVgo,16101
-mergeron/gen/data_generation_functions.py,sha256=LwqbCYSqK2PfFrHhZaTOaF7UtlsVnhm0Ykmfgf3P-G4,27187
+mergeron/gen/data_generation_functions.py,sha256=RqPTjCAyYJkOvbLdbgnBJUFJ7ecE1UvPB1rvBhfimy0,26988
 mergeron/gen/enforcement_stats.py,sha256=z_Kjw1OwLue5B-tKFlmEoyGDusi9D6c77foRCmiNGqQ,11532
 mergeron/gen/upp_tests.py,sha256=VTh0rDd0cJ70MwkvRDYx27LWMaA1BPThXfd3D1HKX-E,12489
 mergeron/py.typed,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-mergeron-2025.739290.1.dist-info/METADATA,sha256=Y7cBEZaZAuOWsdpYKSQjNOjebKCGtYLO1nz8AEwDGFE,14541
-mergeron-2025.739290.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-mergeron-2025.739290.1.dist-info/RECORD,,
+mergeron-2025.739290.3.dist-info/METADATA,sha256=r7BI1s7ThvmlPwnf-WJuHJ2-PS_6oTl6ub7M6oC32hE,14541
+mergeron-2025.739290.3.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+mergeron-2025.739290.3.dist-info/RECORD,,