mergeron 2024.739099.1__tar.gz → 2024.739099.2__tar.gz

{mergeron-2024.739099.1 → mergeron-2024.739099.2}/PKG-INFO

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

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

{mergeron-2024.739099.1 → mergeron-2024.739099.2}/src/mergeron/__init__.py

@@ -9,7 +9,7 @@ from numpy.typing import NBitBase, NDArray
 
 _PKG_NAME: str = Path(__file__).parent.stem
 
-VERSION = "2024.739099.1"
+VERSION = "2024.739099.2"
 
 __version__ = VERSION
 

{mergeron-2024.739099.1 → mergeron-2024.739099.2}/src/mergeron/core/guidelines_boundary_functions.py

@@ -667,7 +667,7 @@ def shrratio_boundary_max(
     """
 
     # _r_val is not needed for max boundary, but is specified for consistency
-    # of function call with other shrratio_mgnsym_boundary functions
+    # of function call with other share-ratio boundary functions
     del _r_val
     _delta_star = mpf(f"{_delta_star}")
     _s_intcpt = _delta_star
@@ -883,9 +883,9 @@ def boundary_plot(*, mktshares_plot_flag: bool = True) -> tuple[Any, ...]:
         mktshares_plot_flag: bool = False,
         mktshares_axlbls_flag: bool = False,
     ) -> mpa.Axes:
-        # Set the width of axis gridlines, and tick marks:
+        # Set the width of axis grid lines, and tick marks:
         # both axes, both major and minor ticks
-        # Frame, grid, and facecolor
+        # Frame, grid, and face color
         for _spos0 in "left", "bottom":
             _ax1.spines[_spos0].set_linewidth(0.5)
             _ax1.spines[_spos0].set_zorder(5)

{mergeron-2024.739099.1 → mergeron-2024.739099.2}/src/mergeron/gen/__init__.py

@@ -1,5 +1,5 @@
 """
-Defines constants and containers for industry data generation and testing
+Defines constants and containers for industry data generation and testing.
 
 """
 

{mergeron-2024.739099.1 → mergeron-2024.739099.2}/src/mergeron/gen/_data_generation_functions.py

@@ -148,7 +148,7 @@ def _gen_market_shares_uniform(
     )
     _mrng.fill()
     # Convert draws on U[0, 1] to Uniformly-distributed draws on simplex, s_1 + s_2 <= 1
-    _frmshr_array = np.sort(_frmshr_array, axis=1)
+    _frmshr_array.sort(axis=1)
     _frmshr_array = np.column_stack((
         _frmshr_array[:, 0],
         _frmshr_array[:, 1] - _frmshr_array[:, 0],
@@ -471,11 +471,6 @@ def _gen_margin_price_data(
                     1 + _m1_nr,
                 )
                 _mnl_test_array = (_pcm_array[:, [1]] >= 0) & (_pcm_array[:, [1]] <= 1)
-            else:
-                # Generate i.i.d. PCMs
-                # Construct price_array = 1/ (1 - pcm_array)
-                # Rgenerate MNL test
-                pass
 
             _margin_data = MarginDataSample(_pcm_array[:, :2], _mnl_test_array)
             del _price_array_here

{mergeron-2024.739099.1 → mergeron-2024.739099.2}/src/mergeron/gen/enforcement_stats.py

@@ -121,7 +121,7 @@ if not (_out_path := DATA_DIR.joinpath(f"{_PKG_NAME}.cls")).is_file():
 
 
 if not (_DOTTEX := DATA_DIR / Rf"{_PKG_NAME}_TikZTableSettings.tex").is_file():
-    # Write to dottex
+    # Write to LaTeX table settings file
     with resources.as_file(
         resources.files(f"{_PKG_NAME}.data.jinja2_LaTeX_templates").joinpath(
             "setup_tikz_tables.tex"
@@ -667,7 +667,7 @@ def _stats_formatted_row(
     match _return_type_sel:
         case StatsReturnSelector.RIN:
             _stats_row_ci = np.array([
-                _propn_ci(*g, method="Wilson")
+                propn_ci(*g, method="Wilson")
                 for g in zip(_stats_row_cnt[1:], _stats_row_tot[1:], strict=True)
             ])
             return [
@@ -722,7 +722,7 @@ def stats_print_rows(
     print()
 
 
-def _propn_ci(
+def propn_ci(
     _npos: ArrayINT[TI] | int = 4,
     _nobs: ArrayINT[TI] | int = 10,
     /,

{mergeron-2024.739099.1 → mergeron-2024.739099.2}/src/mergeron/gen/upp_tests.py

@@ -260,7 +260,7 @@ def enf_cnts(
         )
         _enf_cnts_sim_byfirmcount_array[0] = 2
 
-    # Clearance/enfrocement counts --- by delta
+    # Clearance/enforcement counts --- by delta
     _hhi_delta_ranged = esl.hhi_delta_ranger(_hhi_delta)
     _enf_cnts_sim_bydelta_array = -1 * np.ones(_stats_rowlen, np.int64)
     for _hhi_delta_lim in esl.HHI_DELTA_KNOTS[:-1]:
@@ -282,7 +282,7 @@ def enf_cnts(
 
     _enf_cnts_sim_bydelta_array = _enf_cnts_sim_bydelta_array[1:]
 
-    # Clearance/enfrocement counts --- by zone
+    # Clearance/enforcement counts --- by zone
     try:
         _hhi_zone_post_ranged = esl.hhi_zone_post_ranger(_hhi_post)
     except ValueError as _err:
@@ -367,23 +367,11 @@ def gen_upp_test_arrays(
         out=_guppi_array,
     )
 
-    _cmcr_array = np.empty_like(_market_data.divr_array)
-    np.divide(
-        np.einsum("ij,ij->ij", _market_data.pcm_array, _market_data.divr_array),
-        np.einsum("ij,ij->ij", 1 - _market_data.pcm_array, 1 - _market_data.divr_array),
-        out=_cmcr_array,
-    )
-
     _ipr_array = np.empty_like(_market_data.divr_array)
-    np.divide(
-        np.einsum("ij,ij->ij", _market_data.pcm_array, _market_data.divr_array),
-        1 - _market_data.divr_array,
-        out=_ipr_array,
-    )
+    np.divide(_guppi_array, (1 - _market_data.divr_array[:, ::-1]), out=_ipr_array)
 
-    # This one needs further testing:
-    # _ipr_array_alt = np.empty_like(_market_data.divr_array)
-    # np.divide(_guppi_array, (1 - _market_data.divr_array[:, ::-1]), out=_ipr_array_alt)
+    _cmcr_array = np.empty_like(_market_data.divr_array)
+    np.divide(_ipr_array, 1 - _market_data.pcm_array, out=_cmcr_array)
 
     _test_measure_seq = (_market_data.divr_array, _guppi_array, _cmcr_array, _ipr_array)