mergeron 2025.739290.0__tar.gz → 2025.739290.1__tar.gz

{mergeron-2025.739290.0 → mergeron-2025.739290.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mergeron
-Version: 2025.739290.0
+Version: 2025.739290.1
 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.0 → mergeron-2025.739290.1}/pyproject.toml

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

{mergeron-2025.739290.0 → mergeron-2025.739290.1}/src/mergeron/__init__.py

@@ -6,12 +6,13 @@ from pathlib import Path
 from typing import Literal
 
 import numpy as np
+from numpy.random import SeedSequence
 from numpy.typing import NDArray
 from ruamel import yaml
 
 _PKG_NAME: str = Path(__file__).parent.stem
 
-VERSION = "2025.739290.0"
+VERSION = "2025.739290.1"
 
 __version__ = VERSION
 
@@ -66,6 +67,21 @@ type ArrayBIGINT = NDArray[np.int64]
     ),
 )
 
+# Add yaml representer, constructor for SeedSequence
+this_yaml.representer.add_representer(
+    SeedSequence,
+    lambda _r, _d: _r.represent_mapping(
+        "!SeedSequence",
+        {
+            _a: getattr(_d, _a)
+            for _a in ("entropy", "spawn_key", "pool_size", "n_children_spawned")
+        },
+    ),
+)
+this_yaml.constructor.add_constructor(
+    "!SeedSequence", lambda _c, _n, /: SeedSequence(**_c.construct_mapping(_n))
+)
+
 
 @enum.unique
 class RECForm(enum.StrEnum):

{mergeron-2025.739290.0 → mergeron-2025.739290.1}/src/mergeron/core/guidelines_boundaries.py

@@ -13,6 +13,7 @@ from typing import Literal
 import numpy as np
 from attrs import Attribute, field, frozen, validators
 from mpmath import mp, mpf  # type: ignore
+from ruamel import yaml
 
 from .. import (  # noqa: TID252
     DEFAULT_REC_RATIO,
@@ -21,6 +22,7 @@ from .. import (  # noqa: TID252
     HMGPubYear,
     RECForm,
     UPPAggrSelector,
+    this_yaml,
 )
 from . import guidelines_boundary_functions as gbfn
 
@@ -42,6 +44,7 @@ class HMGThresholds:
     ipr: float
 
 
+@this_yaml.register_class
 @frozen
 class GuidelinesThresholds:
     """
@@ -147,7 +150,24 @@ class GuidelinesThresholds:
             ),
         )
 
+    @classmethod
+    def to_yaml(
+        cls, _r: yaml.representer.SafeRepresenter, _d: GuidelinesThresholds
+    ) -> yaml.MappingNode:
+        _ret: yaml.MappingNode = _r.represent_mapping(
+            f"!{cls.__name__}",
+            {_a.name: getattr(_d, _a.name) for _a in _d.__attrs_attrs__},
+        )
+        return _ret
+
+    @classmethod
+    def from_yaml(
+        cls, _c: yaml.constructor.SafeConstructor, _n: yaml.MappingNode
+    ) -> GuidelinesThresholds:
+        return cls(**_c.construct_mapping(_n))
 
+
+@this_yaml.register_class
 @frozen
 class ConcentrationBoundary:
     """Concentration parameters, boundary coordinates, and area under concentration boundary."""
@@ -184,12 +204,12 @@ class ConcentrationBoundary:
         kw_only=False, default=5, validator=validators.instance_of(int)
     )
 
-    coordinates: ArrayDouble = field(init=False, kw_only=True)
-    """Market-share pairs as Cartesian coordinates of points on the concentration boundary."""
-
     area: float = field(init=False, kw_only=True)
     """Area under the concentration boundary."""
 
+    coordinates: ArrayDouble = field(init=False, kw_only=True)
+    """Market-share pairs as Cartesian coordinates of points on the concentration boundary."""
+
     def __attrs_post_init__(self, /) -> None:
         match self.measure_name:
             case "ΔHHI":
@@ -202,10 +222,31 @@ class ConcentrationBoundary:
                 _conc_fn = gbfn.hhi_post_contrib_boundary
 
         _boundary = _conc_fn(self.threshold, dps=self.precision)
-        object.__setattr__(self, "coordinates", _boundary.coordinates)
         object.__setattr__(self, "area", _boundary.area)
+        object.__setattr__(self, "coordinates", _boundary.coordinates)
+
+    @classmethod
+    def to_yaml(
+        cls, _r: yaml.representer.SafeRepresenter, _d: ConcentrationBoundary
+    ) -> yaml.MappingNode:
+        _ret: yaml.MappingNode = _r.represent_mapping(
+            f"!{cls.__name__}",
+            {
+                _a.name: getattr(_d, _a.name)
+                for _a in _d.__attrs_attrs__
+                if _a.name not in ("area", "coordinates")
+            },
+        )
+        return _ret
 
+    @classmethod
+    def from_yaml(
+        cls, _c: yaml.constructor.SafeConstructor, _n: yaml.MappingNode
+    ) -> ConcentrationBoundary:
+        return cls(**_c.construct_mapping(_n))
 
+
+@this_yaml.register_class
 @frozen
 class DiversionRatioBoundary:
     """
@@ -310,12 +351,12 @@ class DiversionRatioBoundary:
 
     """
 
-    coordinates: ArrayDouble = field(init=False, kw_only=True)
-    """Market-share pairs as Cartesian coordinates of points on the diversion ratio boundary."""
-
     area: float = field(init=False, kw_only=True)
     """Area under the diversion ratio boundary."""
 
+    coordinates: ArrayDouble = field(init=False, kw_only=True)
+    """Market-share pairs as Cartesian coordinates of points on the diversion ratio boundary."""
+
     def __attrs_post_init__(self, /) -> None:
         _share_ratio = critical_share_ratio(
             self.diversion_ratio, r_bar=self.recapture_ratio
@@ -359,8 +400,28 @@ class DiversionRatioBoundary:
                 _upp_agg_kwargs |= {"agg_method": _aggregator, "weighting": _wgt_type}
 
         _boundary = _upp_agg_fn(_share_ratio, self.recapture_ratio, **_upp_agg_kwargs)
-        object.__setattr__(self, "coordinates", _boundary.coordinates)
         object.__setattr__(self, "area", _boundary.area)
+        object.__setattr__(self, "coordinates", _boundary.coordinates)
+
+    @classmethod
+    def to_yaml(
+        cls, _r: yaml.representer.SafeRepresenter, _d: DiversionRatioBoundary
+    ) -> yaml.MappingNode:
+        _ret: yaml.MappingNode = _r.represent_mapping(
+            f"!{cls.__name__}",
+            {
+                _a.name: getattr(_d, _a.name)
+                for _a in _d.__attrs_attrs__
+                if _a.name not in ("area", "coordinates")
+            },
+        )
+        return _ret
+
+    @classmethod
+    def from_yaml(
+        cls, _c: yaml.constructor.SafeConstructor, _n: yaml.MappingNode
+    ) -> DiversionRatioBoundary:
+        return cls(**_c.construct_mapping(_n))
 
 
 def guppi_from_delta(

{mergeron-2025.739290.0 → mergeron-2025.739290.1}/src/mergeron/core/pseudorandom_numbers.py

@@ -16,7 +16,7 @@ import numpy as np
 from attrs import Attribute, Converter, define, field
 from numpy.random import PCG64DXSM, Generator, SeedSequence
 
-from .. import NTHREADS, VERSION, ArrayDouble, ArrayFloat, this_yaml  # noqa: TID252
+from .. import NTHREADS, VERSION, ArrayDouble, ArrayFloat  # noqa: TID252
 
 __version__ = VERSION
 
@@ -24,22 +24,6 @@ DEFAULT_DIST_PARMS: ArrayFloat = np.array([0.0, 1.0], float)
 DEFAULT_BETA_DIST_PARMS: ArrayFloat = np.array([1.0, 1.0], float)
 
 
-# Add yaml representer, constructor for SeedSequence
-this_yaml.representer.add_representer(
-    SeedSequence,
-    lambda _r, _d: _r.represent_mapping(
-        "!SeedSequence",
-        {
-            _a: getattr(_d, _a)
-            for _a in ("entropy", "spawn_key", "pool_size", "n_children_spawned")
-        },
-    ),
-)
-this_yaml.constructor.add_constructor(
-    "!SeedSequence", lambda _c, _n, /: SeedSequence(**_c.construct_mapping(_n))
-)
-
-
 def prng(_s: SeedSequence | None = None, /) -> np.random.Generator:
     """Adopt the PCG64DXSM bit-generator, the future default in numpy.default_rng().
 

{mergeron-2025.739290.0 → mergeron-2025.739290.1}/src/mergeron/gen/data_generation.py

@@ -34,7 +34,7 @@ from .data_generation_functions import (
     gen_margin_price_data,
     gen_share_data,
 )
-from .upp_tests import SaveData, compute_upp_test_counts
+from .upp_tests import compute_upp_test_counts
 
 __version__ = VERSION
 
@@ -51,12 +51,6 @@ class SamplingFunctionKWArgs(TypedDict, total=False):
     nthreads: int
     """number of parallel threads to use"""
 
-    save_data_to_file: SaveData
-    """optionally save data to HDF5 file"""
-
-    saved_array_name_suffix: str
-    """optionally specify a suffix for the HDF5 array names"""
-
 
 def _seed_data_conv(_v: SeedSequenceData | None, _i: MarketSample) -> SeedSequenceData:
     if isinstance(_v, SeedSequenceData):
@@ -104,9 +98,9 @@ class MarketSample:
             and _v.firm2_pcm_constraint == FM2Constraint.MNL
         ):
             raise ValueError(
-                f'Specification of "recapture_form", "{self.share_spec.recapture_form}" '
-                "requires Firm 2 margin must have property, "
-                f'"{FM2Constraint.IID}" or "{FM2Constraint.SYM}".'
+                f'Specification of "PCMSpec.firm2_pcm_constraint", as {FM2Constraint.MNL!r} '
+                f'requires that "ShareSpec.recapture_form" be {RECForm.INOUT!r} '
+                f"or {RECForm.OUTIN!r}, not {RECForm.FIXED!r} as presently specified"
             )
 
     price_spec: PriceSpec = field(
@@ -484,7 +478,7 @@ class MarketSample:
             {
                 _a.name: getattr(_d, _a.name)
                 for _a in _d.__attrs_attrs__
-                if _a.type not in (MarketSampleData, UPPTestsCounts)
+                if _a.name not in ("data", "enf_counts")
             },
         )
         return _ret