mergeron 2024.738946.0__tar.gz → 2024.738949.0__tar.gz

{mergeron-2024.738946.0 → mergeron-2024.738949.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mergeron
-Version: 2024.738946.0
+Version: 2024.738949.0
 Summary: Analysis of standards defined in Horizontal Merger Guidelines
 License: MIT
 Keywords: merger policy analysis,merger guidelines,merger screening,policy presumptions,concentration standards,upward pricing pressure,GUPPI
@@ -18,7 +18,6 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Requires-Dist: aenum (>=3.1)
 Requires-Dist: attrs (>=23.2)
 Requires-Dist: bs4 (>=0.0.1)
 Requires-Dist: certifi (>=2023.11.17)

{mergeron-2024.738946.0 → mergeron-2024.738949.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "mergeron"
 # See ./get_version_str.py
-version = "2024.738946.0"
+version = "2024.738949.0"
 description = "Analysis of standards defined in Horizontal Merger Guidelines"
 keywords = [
     "merger policy analysis",
@@ -34,7 +34,6 @@ classifiers = [
 [tool.poetry.dependencies]
 # You may need to apply the fixes in, https://github.com/python-poetry/poetry/issues/3365
 # if poetry dependency resolution appears to hang (read the page at link to the end)
-aenum = ">=3.1"
 attrs = ">=23.2"
 bs4 = ">=0.0.1"
 google-re2 = ">=1.1"

{mergeron-2024.738946.0 → mergeron-2024.738949.0}/src/mergeron/core/excel_helper.py

@@ -14,16 +14,29 @@ from .. import _PKG_NAME  # noqa: TID252
 
 __version__ = version(_PKG_NAME)
 
-from collections.abc import Sequence
-from typing import Any, ClassVar
+import enum
+from collections.abc import Mapping, Sequence
+from types import MappingProxyType
+from typing import Any
 
-import aenum  # type: ignore
 import numpy as np
 import numpy.typing as npt
 import xlsxwriter  # type: ignore
 
 
-class CFmt(aenum.UniqueEnum):  # type: ignore
+@enum.unique
+class CFmtParent(dict[str, Any], enum.ReprEnum):
+    def merge(self, _other) -> CFmtParent:
+        if isinstance(_other, CFmtParent):
+            return self.value | _other.value
+        else:
+            raise RuntimeWarning(
+                f"Object {_other!r} not valid for merge(), returned original."
+            )
+            return self.value
+
+
+class CFmt(CFmtParent):  # type: ignore
     """
     Initialize cell formats for xlsxwriter.
 
@@ -35,31 +48,31 @@ class CFmt(aenum.UniqueEnum):  # type: ignore
     See, https://xlsxwriter.readthedocs.io/format.html
     """
 
-    XL_DEFAULT: ClassVar = {"font_name": "Calibri", "font_size": 11}
-    XL_DEFAULT_2003: ClassVar = {"font_name": "Arial", "font_size": 10}
+    XL_DEFAULT = MappingProxyType({"font_name": "Calibri", "font_size": 11})
+    XL_DEFAULT_2003 = MappingProxyType({"font_name": "Arial", "font_size": 10})
 
-    A_CTR: ClassVar = {"align": "center"}
-    A_CTR_ACROSS: ClassVar = {"align": "center_across"}
-    A_LEFT: ClassVar = {"align": "left"}
-    A_RIGHT: ClassVar = {"align": "right"}
+    A_CTR = MappingProxyType({"align": "center"})
+    A_CTR_ACROSS = MappingProxyType({"align": "center_across"})
+    A_LEFT = MappingProxyType({"align": "left"})
+    A_RIGHT = MappingProxyType({"align": "right"})
 
-    BOLD: ClassVar = {"bold": True}
-    ITALIC: ClassVar = {"italic": True}
-    ULINE: ClassVar = {"underline": True}
+    BOLD = MappingProxyType({"bold": True})
+    ITALIC = MappingProxyType({"italic": True})
+    ULINE = MappingProxyType({"underline": True})
 
-    TEXT_WRAP: ClassVar = {"text_wrap": True}
-    IND_1: ClassVar = {"indent": 1}
+    TEXT_WRAP = MappingProxyType({"text_wrap": True})
+    IND_1 = MappingProxyType({"indent": 1})
 
-    DOLLAR_NUM: ClassVar = {"num_format": "[$$-409]#,##0.00"}
-    DT_NUM: ClassVar = {"num_format": "mm/dd/yyyy"}
-    QTY_NUM: ClassVar = {"num_format": "#,##0.0"}
-    PCT_NUM: ClassVar = {"num_format": "##0.000000%"}
-    AREA_NUM: ClassVar = {"num_format": "0.00000000"}
+    DOLLAR_NUM = MappingProxyType({"num_format": "[$$-409]#,##0.00"})
+    DT_NUM = MappingProxyType({"num_format": "mm/dd/yyyy"})
+    QTY_NUM = MappingProxyType({"num_format": "#,##0.0"})
+    PCT_NUM = MappingProxyType({"num_format": "##0.000000%"})
+    AREA_NUM = MappingProxyType({"num_format": "0.00000000"})
 
-    BAR_FILL: ClassVar = {"pattern": 1, "bg_color": "dfeadf"}
-    BOT_BORDER: ClassVar = {"bottom": 1, "bottom_color": "000000"}
-    TOP_BORDER: ClassVar = {"top": 1, "top_color": "000000"}
-    HDR_BORDER: ClassVar = TOP_BORDER | BOT_BORDER
+    BAR_FILL = MappingProxyType({"pattern": 1, "bg_color": "dfeadf"})
+    BOT_BORDER = MappingProxyType({"bottom": 1, "bottom_color": "000000"})
+    TOP_BORDER = MappingProxyType({"top": 1, "top_color": "000000"})
+    HDR_BORDER = TOP_BORDER | BOT_BORDER
 
 
 def matrix_to_sheet(
@@ -216,7 +229,7 @@ def xl_fmt(
         :code:`xlsxwriter` `Format`  object
 
     """
-    _cell_fmt_dict: dict[str, Any] = {}
+    _cell_fmt_dict: Mapping[str, Any] = MappingProxyType({})
     if isinstance(_cell_fmt, tuple):
         ensure_cell_format_spec_tuple(_cell_fmt)
         for _cf in _cell_fmt:

{mergeron-2024.738946.0 → mergeron-2024.738949.0}/src/mergeron/core/proportions_tests.py

@@ -7,6 +7,7 @@ Functions to estimate confidence intervals for
 
 from __future__ import annotations
 
+from dataclasses import dataclass
 from importlib.metadata import version
 
 from .. import _PKG_NAME  # noqa: TID252
@@ -14,7 +15,7 @@ from .. import _PKG_NAME  # noqa: TID252
 __version__ = version(_PKG_NAME)
 
 from collections.abc import Sequence
-from typing import Literal, NamedTuple, TypeVar
+from typing import Literal, TypeVar
 
 import numpy as np
 from numpy.typing import NBitBase, NDArray
@@ -101,12 +102,12 @@ def propn_ci(
         case "Agresti-Coull":
             _zsc = norm.ppf(1 - alpha / 2)
             _zscsq = _zsc * _zsc
-            _adjmt_t = 4 if alpha == 0.05 else _zscsq
-            _est_phat = (_npos + _adjmt_t / 2) / (_nobs + _adjmt_t)
+            _adjmt = 4 if alpha == 0.05 else _zscsq
+            _est_phat = (_npos + _adjmt / 2) / (_nobs + _adjmt)
             _est_ci_l, _est_ci_u = (
                 _est_phat + _g
                 for _g in [
-                    _f * _zsc * np.sqrt(_est_phat * (1 - _est_phat) / (_nobs + 4))
+                    _f * _zsc * np.sqrt(_est_phat * (1 - _est_phat) / (_nobs + _adjmt))
                     for _f in (-1, 1)
                 ]
             )
@@ -441,7 +442,7 @@ def _propn_diff_chisq_mn(
     )
 
 
-def propn_ci_diff_multinomial(
+def propn_diff_ci_multinomial(
     _counts: NDArray[np.integer[TI]], /, *, alpha: float = 0.05
 ) -> NDArray[np.float64]:
     """Estimate confidence intervals of pair-wise differences in multinomial proportions
@@ -475,16 +476,17 @@ def propn_ci_diff_multinomial(
     return np.column_stack([_d + _f * _d_cr * np.sqrt(_var) for _f in (-1, 1)])
 
 
-class MultinomialDiffTest(NamedTuple):
+@dataclass(slots=True, frozen=True)
+class MultinomialPropnsTest:
     estimate: np.float64
     dof: int
     critical_value: np.float64
     p_value: np.float64
 
 
-def propn_diff_multinomial_chisq(
+def propn_test_multinomial(
     _counts: NDArray[np.integer[TI]], /, *, alpha: float = 0.05
-) -> MultinomialDiffTest:
+) -> MultinomialPropnsTest:
     """Chi-square test for homogeneity of differences in multinomial proportions.
 
     Differences in multinomial proportions sum to zero.
@@ -510,9 +512,9 @@ def propn_diff_multinomial_chisq(
     _p_bar = _n / np.einsum("jk->j", _n_k / _prob)
 
     _y_sq = _n * ((1 / np.einsum("j->", _p_bar)) - 1)
-    _dof = np.array([_f - 1 for _f in _counts.shape]).prod()
+    _dof = np.array([_s - 1 for _s in _counts.shape]).prod()
     _chi_rv = chi2(_dof)
 
-    return MultinomialDiffTest(
+    return MultinomialPropnsTest(
         _y_sq, _dof, _chi_rv.ppf(1 - alpha), 1 - _chi_rv.cdf(_y_sq)
     )

{mergeron-2024.738946.0 → mergeron-2024.738949.0}/src/mergeron/examples/guidelines_enforcement_patterns.py

@@ -58,11 +58,11 @@ if __name__ == "__main__":
 
     print()
     print("Conf. intervals for differences in proportions enforced (Goodman, 1964)")
-    print(repr(pcl.propn_ci_diff_multinomial(enf_counts[:, [1, 3]])))
+    print(repr(pcl.propn_diff_ci_multinomial(enf_counts[:, [1, 3]])))
 
     print()
     print("Goodman's chi-squared test for homogeneity of enforcement patterns")
-    print(repr(pcl.propn_diff_multinomial_chisq(enf_counts[:, [1, 3]])))
+    print(repr(pcl.propn_test_multinomial(enf_counts[:, [1, 3]])))
 
     print()
     print(

{mergeron-2024.738946.0 → mergeron-2024.738949.0}/src/mergeron/examples/investigations_stats_sim_tables.py

@@ -416,7 +416,7 @@ if __name__ == "__main__":
                 merger_class,
                 invres_parm_vec,
                 mkt_sample_spec,
-                invres_stats_kwargs, # type: ignore
+                invres_stats_kwargs,  # type: ignore
             )
             table_dottex_namelist += (table_dottex_name,)
 

{mergeron-2024.738946.0 → mergeron-2024.738949.0}/src/mergeron/examples/visualize_guidelines_tests.py

@@ -277,7 +277,7 @@ if __name__ == "__main__":
         ),
     )
 
-    save_data_to_file_flag = False
+    save_data_to_file_flag = True
     if save_data_to_file_flag:
         h5_path = DATA_DIR / PROG_PATH.with_suffix(".h5").name
         (_, h5_file, h5_group), h5_subgroup_name = utl.initialize_hd5(