mergeron 2025.739319.2__tar.gz → 2025.739319.3__tar.gz

{mergeron-2025.739319.2 → mergeron-2025.739319.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mergeron
-Version: 2025.739319.2
+Version: 2025.739319.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.739319.2 → mergeron-2025.739319.3}/pyproject.toml

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

{mergeron-2025.739319.2 → mergeron-2025.739319.3}/src/mergeron/__init__.py

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

{mergeron-2025.739319.2 → mergeron-2025.739319.3}/src/mergeron/gen/__init__.py

@@ -405,6 +405,15 @@ class PCMSpec:
     pcm_restriction: PCMRestriction = field(kw_only=True, default=PCMRestriction.IID)
     """See :class:`PCMRestriction`"""
 
+    @pcm_restriction.validator
+    def __prv(_i: PCMSpec, _a: Attribute[PCMRestriction], _v: PCMRestriction) -> None:
+        if _v == PCMRestriction.MNL and _i.dist_type == PCMDistribution.EMPR:
+            print(
+                "NOTE: Estimated Firm 2 parameters will not be consistent with "
+                "the empirical distribution of margins in the source data. For "
+                "consistency, respecify pcm_spec.pcm_restriction = PCMRestriction.IID."
+            )
+
 
 @this_yaml.register_class
 @enum.unique

{mergeron-2025.739319.2 → mergeron-2025.739319.3}/src/mergeron/gen/data_generation_functions.py

@@ -28,9 +28,9 @@ from ..core.pseudorandom_numbers import (  # noqa: TID252
 from . import (
     DEFAULT_BETA_BND_DIST_PARMS,
     DEFAULT_FCOUNT_WTS,
-    PCMRestriction,
     MarginDataSample,
     PCMDistribution,
+    PCMRestriction,
     PCMSpec,
     PriceDataSample,
     PriceSpec,
@@ -665,9 +665,8 @@ def _gen_margin_data(
     _nthreads: int,
     /,
 ) -> MarginDataSample:
-    dist_type_pcm, dist_parms_pcm, dist_firm2_pcm = (
-        getattr(_pcm_spec, _f)
-        for _f in ("dist_type", "dist_parms", "pcm_restriction")
+    dist_type_pcm, dist_parms_pcm, pcm_restriction_ = (
+        getattr(_pcm_spec, _f) for _f in ("dist_type", "dist_parms", "pcm_restriction")
     )
 
     pcm_array = (
@@ -680,7 +679,10 @@ def _gen_margin_data(
     beta_min, beta_max = [0.0] * 2  # placeholder
     if dist_type_pcm == PCMDistribution.EMPR:
         pcm_array = margin_data_resampler(
-            dist_parms_pcm, sample_size=pcm_array.shape, seed_sequence=_pcm_rng_seed_seq, nthreads=_nthreads
+            dist_parms_pcm,
+            sample_size=pcm_array.shape,
+            seed_sequence=_pcm_rng_seed_seq,
+            nthreads=_nthreads,
         )
     else:
         dist_type_: Literal["Beta", "Uniform"]
@@ -721,16 +723,10 @@ def _gen_margin_data(
         pcm_array = (beta_max - beta_min) * pcm_array + beta_min
         del beta_min, beta_max
 
-    if dist_firm2_pcm == PCMRestriction.SYM:
+    if pcm_restriction_ == PCMRestriction.SYM:
         pcm_array = np.hstack((pcm_array,) * _frmshr_array.shape[1])
-    if dist_firm2_pcm == PCMRestriction.MNL:
+    if pcm_restriction_ == PCMRestriction.MNL:
         # Impose FOCs from profit-maximization with MNL demand
-        if dist_type_pcm == PCMDistribution.EMPR:
-            print(
-                "NOTE: Estimated Firm 2 parameters will not be consistent with "
-                "the empirical distribution of margins in the source data. For "
-                "consistency, respecify pcm_spec.pcm_restriction = PCMRestriction.IID."
-            )
         purchase_prob_array = _aggregate_purchase_prob * _frmshr_array
 
         pcm_array[:, [1]] = np.divide(

{mergeron-2025.739319.2 → mergeron-2025.739319.3}/src/mergeron/gen/enforcement_stats.py

@@ -335,10 +335,13 @@ def enf_cnts_byconczone(_cnts_array: ArrayBIGINT, /) -> ArrayBIGINT:
         # Logical-and of multiple vectors:
         hhi_zone_test = (
             1
-            * np.stack([
-                cnts_byhhipostanddelta[:, _idx] == _val
-                for _idx, _val in enumerate(zone_val)
-            ], axis=1)
+            * np.stack(
+                [
+                    cnts_byhhipostanddelta[:, _idx] == _val
+                    for _idx, _val in enumerate(zone_val)
+                ],
+                axis=1,
+            )
         ).prod(axis=1) == 1
 
         cnts_byconczone = np.vstack((

{mergeron-2025.739319.2 → mergeron-2025.739319.3}/src/mergeron/gen/data_generation.py

@@ -26,10 +26,10 @@ from .. import (  # noqa: TID252  # noqa
 from ..core import guidelines_boundaries as gbl  # noqa: TID252
 from ..core.guidelines_boundaries import HMGThresholds  # noqa: TID252
 from . import (
-    PCMRestriction,
     INVResolution,  # noqa: F401
     MarketSampleData,
     PCMDistribution,
+    PCMRestriction,
     PCMSpec,
     PriceSpec,
     SeedSequenceData,