mergeron 2024.739123.2__tar.gz → 2024.739123.8__tar.gz

{mergeron-2024.739123.2 → mergeron-2024.739123.8}/PKG-INFO

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

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

{mergeron-2024.739123.2 → mergeron-2024.739123.8}/src/mergeron/__init__.py

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

{mergeron-2024.739123.2 → mergeron-2024.739123.8}/src/mergeron/core/ftc_merger_investigations_data.py

@@ -165,7 +165,7 @@ def construct_data(
 
     # Create data for industries with no evidence on entry
     for _data_period in _invdata:
-        _construct_no_entry_evidence_data(_invdata, _data_period)
+        _construct_no_evidence_data(_invdata, _data_period)
 
     # Create a list of exclusions to named industries in the base period,
     #   for construction of aggregate enforcement statistics where feasible
@@ -202,37 +202,47 @@ def construct_data(
     return MappingProxyType(_invdata)
 
 
-def _construct_no_entry_evidence_data(_invdata: INVData, _data_period: str, /) -> None:
+def _construct_no_evidence_data(_invdata: INVData, _data_period: str, /) -> None:
     _invdata_ind_grp = "All Markets"
-    _invdata_evid_cond = "No Entry Evidence"
-
-    _invdata_sub_evid_cond_conc = _invdata[_data_period]["ByHHIandDelta"]
-    _invdata_sub_evid_cond_conc["Table 9.X"] = INVTableData(
-        _invdata_ind_grp,
-        _invdata_evid_cond,
-        np.column_stack((
-            _invdata_sub_evid_cond_conc["Table 3.1"].data_array[:, :2],
+    _table_nos_map = dict(
+        zip(
             (
-                _invdata_sub_evid_cond_conc["Table 3.1"].data_array[:, 2:]
-                - _invdata_sub_evid_cond_conc["Table 9.1"].data_array[:, 2:]
-                - _invdata_sub_evid_cond_conc["Table 9.2"].data_array[:, 2:]
+                "No Entry Evidence",
+                "No Evidence on Customer Complaints",
+                "No Evidence on Hot Documents",
             ),
-        )),
-    )
-
-    _invdata_sub_evid_cond_fcount = _invdata[_data_period]["ByFirmCount"]
-    _invdata_sub_evid_cond_fcount["Table 10.X"] = INVTableData(
-        _invdata_ind_grp,
-        _invdata_evid_cond,
-        np.column_stack((
-            _invdata_sub_evid_cond_fcount["Table 4.1"].data_array[:, :1],
             (
-                _invdata_sub_evid_cond_fcount["Table 4.1"].data_array[:, 1:]
-                - _invdata_sub_evid_cond_fcount["Table 10.1"].data_array[:, 1:]
-                - _invdata_sub_evid_cond_fcount["Table 10.2"].data_array[:, 1:]
+                {"ByHHIandDelta": "Table 9.X", "ByFirmCount": "Table 10.X"},
+                {"ByHHIandDelta": "Table 7.X", "ByFirmCount": "Table 8.X"},
+                {"ByHHIandDelta": "Table 5.X", "ByFirmCount": "Table 6.X"},
             ),
-        )),
+            strict=True,
+        )
     )
+    for _invdata_evid_cond in (
+        "No Entry Evidence",
+        "No Evidence on Customer Complaints",
+        "No Evidence on Hot Documents",
+    ):
+        for _stats_grp in ("ByHHIandDelta", "ByFirmCount"):
+            _invdata_sub_evid_cond_conc = _invdata[_data_period][_stats_grp]
+
+            _dtn = _table_nos_map[_invdata_evid_cond]["ByHHIandDelta"]
+            _stn0 = "Table 3.1" if _stats_grp == "ByHHIandDelta" else "Table 4.1"
+            _stn1, _stn2 = (_dtn.replace(".X", f".{_i}") for _i in ("1", "2"))
+
+            _invdata_sub_evid_cond_conc[_dtn] = INVTableData(
+                _invdata_ind_grp,
+                _invdata_evid_cond,
+                np.column_stack((
+                    _invdata_sub_evid_cond_conc[_stn0].data_array[:, :2],
+                    (
+                        _invdata_sub_evid_cond_conc[_stn0].data_array[:, 2:]
+                        - _invdata_sub_evid_cond_conc[_stn1].data_array[:, 2:]
+                        - _invdata_sub_evid_cond_conc[_stn2].data_array[:, 2:]
+                    ),
+                )),
+            )
 
 
 def _construct_new_period_data(

{mergeron-2024.739123.2 → mergeron-2024.739123.8}/src/mergeron/data/jinja2_LaTeX_templates/ftcinvdata_summarypaired_table_template.tex.jinja2

@@ -14,32 +14,44 @@
 	((* set obs_merger_class_0 = "Markets with, ``" + tmpl_data.obs_merger_class_0 + "''" *))
 ((* endif *))
 
+((* if tmpl_data.obs_summary_type == 'ByConcZone' *))
+	((* set hdrcol_align = "left" *))
+((* else *))
+	((* set hdrcol_align = "center" *))
+((* endif *))
+
 ((* set obs_merger_class_1 = "Markets with, ``" + tmpl_data.obs_merger_class_1 + "''" *))
 
+
+
 	\centering
-	\caption{FTC Merger Investigations Data}\label{tbl:FTCInvData_\JINVAR{- obs_summary_type }}
-	{\footnotesize \JINVAR{ obs_summary_type_title }  \\
-		Grouped by Entry Conditions and Reporting Period \\[0.5\baselineskip]}
+	\caption{FTC Merger Investigations Data}\label{tbl:FTCInvData_\JINVAR{- tmpl_data.obs_summary_type }}
+	{\footnotesize
+        \JINVAR{ tmpl_data.obs_summary_type_title }  \\
+		Grouped by Entry Conditions and Reporting Period \\[0.5\baselineskip]
+    }
 	\begin{tikzpicture}[auto, font = \sffamily]
-		\begin{pgfonlayer}{background}
-			\matrix[
-                datatable,
-                nodes = {text width = 27pt,},
-                column 1/.style = {nodes = {
-                    hdrtext,
-                    text width=\JINVAR{ hdrcol_width -}, fill=OBSHDRFill,
-                    },},
-                record matrix dimensions,
-            ] (invres_rate_raw) {
-                \JINVAR{ tmpl_data.invdata_datstr -}
+        \matrix[
+            datatable,
+            nodes = {text width = 27pt,},
+            column 1/.style = {nodes = {
+                hdrtext,
+                text width=\JINVAR{ tmpl_data.hdrcol_width -}, fill=OBSHDRFill,
+                align=\JINVAR{ hdrcol_align -},
+                },},
+            record matrix dimensions,
+        ] (invres_rate_raw) {
+            \JINVAR{ tmpl_data.invdata_datstr -}
         };
-			% Horizontal scoring for totals
-			\draw[color = OBSHDRFill, line width = 1pt] (invres_rate_raw-\the\tnr-1.north west) -- (invres_rate_raw-\the\tnr-\the\tnc.north east);
-			% Vertical scoring for column groups
-			\draw[color = OBSHDRFill, line width = 1pt] (invres_rate_raw-1-3.north east) -- (invres_rate_raw-\the\tnr-3.south east);
-			\draw[color = OBSHDRFill, line width = 1pt] (invres_rate_raw-1-5.north east) -- (invres_rate_raw-\the\tnr-5.south east);
-			\draw[color = OBSHDRFill, line width = 1pt] (invres_rate_raw-1-7.north east) -- (invres_rate_raw-\the\tnr-7.south east);
-		\end{pgfonlayer}
+        % Horizontal scoring for totals
+        \draw[color = OBSHDRFill, line width = 1pt]
+            ($(invres_rate_raw-\the\tnr-2.north west) + (- \JINVAR{ tmpl_data.hdrcol_width } - 6pt + 0.25\pgflinewidth, 0pt)$)
+            -- (invres_rate_raw-\the\tnr-\the\tnc.north east)
+        ;
+        % Vertical scoring for column groups
+        \draw[color = OBSHDRFill, line width = 1pt] (invres_rate_raw-1-3.north east) -- (invres_rate_raw-\the\tnr-3.south east);
+        \draw[color = OBSHDRFill, line width = 1pt] (invres_rate_raw-1-5.north east) -- (invres_rate_raw-\the\tnr-5.south east);
+        \draw[color = OBSHDRFill, line width = 1pt] (invres_rate_raw-1-7.north east) -- (invres_rate_raw-\the\tnr-7.south east);
 
 
         %% Header column - row heads - description
@@ -120,9 +132,9 @@
     %     \item Fed. Trade Comm'n (2003), at note~\cref{fn:FTCInvData1996to2003}
     %     \item Fed. Trade Comm'n (2011), at note~\cref{fn:FTCInvData1996to2011}
     % \end{itemize}
-    \JINVAR{- tmpl_data.invdata_notestr -}
+    \JINVAR{ tmpl_data.invdata_notestr }
     \vspace{\baselineskip}
-    \JINVAR{ tmpl_data.invdata_sourcestr -}
+    \JINVAR{ tmpl_data.invdata_sourcestr }
     }
     \vspace{\baselineskip}
 \end{table}

{mergeron-2024.739123.2 → mergeron-2024.739123.8}/src/mergeron/data/jinja2_LaTeX_templates/setup_tikz_tables.tex

@@ -24,13 +24,17 @@
             ifthenelse(iseven(\pgfmatrixcurrentrow),1,3))}
         %\typeout{\the\pgfmatrixcurrentcolumn,\pgfmatrixcurrentrow->\itest}
         \ifcase\itest
-        \tikzset{fill=OBSHDRFill}%
+        \tikzset{fill=none}%
         \or
         \tikzset{fill=DataFill}%
         \else
         \tikzset{fill=white}%
         \fi
     },
+    get matrix dims/.code={
+        \global\tnc=\pgf@matrix@numberofcolumns
+        \global\tnr=\pgfmatrixcurrentrow
+    },
     % If you only have numbers, text depth = 0ex; if text, text depth = 0.25ex, (may need tweaking for alignment across cells)
     anytext/.style = {
         font = \sffamily\scriptsize\addfontfeatures{Numbers={Monospaced,Lining}},
@@ -66,9 +70,6 @@
             fill = none,
             green_bar_filler,
         },
-        % every even row/.style = {
-        %     nodes = {fill = DataFill}
-        % },
     },
     hdrtable/.style = {
         anytable,

{mergeron-2024.739123.2 → mergeron-2024.739123.8}/src/mergeron/gen/enforcement_stats.py

@@ -48,12 +48,16 @@ class IndustryGroup(enum.StrEnum):
 
 @enum.unique
 class OtherEvidence(enum.StrEnum):
+    UR = "Unrestricted on additional evidence"
     HD = "Hot Documents Identified"
-    CC = "Strong Customer Complaints"
-    NE = "No Entry Evidence"
+    HN = "No Hot Documents Identified"
+    HU = "No Evidence on Hot Documents"
+    CN = "No Strong Customer Complaints"
+    CS = "Strong Customer Complaints"
+    CU = "No Evidence on Customer Complaints"
     ED = "Entry Difficult"
     EE = "Entry Easy"
-    UR = "Unrestricted on additional evidence"
+    NE = "No Entry Evidence"
 
 
 @enum.unique
@@ -90,13 +94,13 @@ moe_tmpl = Template(R"""
     """)
 
 # Define the LaTeX jinja environment
-# http://eosrei.net/articles/2015/11/LaTeX-templates-python-and-jinja2-generate-pdfs
-# The context manager does not point to a templates folder, so it doesn't work here
-# So, we brute-force a solution
-
-_tmpl_folder = re.search(
-    r"'(.*)'", str(resources.files(f"{_PKG_NAME}.data.jinja2_LaTeX_templates"))
-)[0].strip("'")
+_tmpl_resource = resources.files(f"{_PKG_NAME}.data.jinja2_LaTeX_templates")
+_tmpl_folder = DATA_DIR.joinpath(_tmpl_resource.name)
+with resources.as_file(
+    resources.files(f"{_PKG_NAME}.data.jinja2_LaTeX_templates")
+) as _tmpl_src:
+    if not _tmpl_folder.is_dir():
+        shutil.copytree(_tmpl_src, _tmpl_folder)
 
 LaTeX_jinja_env = Environment(
     block_start_string=R"((*",
@@ -115,22 +119,11 @@ LaTeX_jinja_env = Environment(
 
 # Place files related to rendering LaTeX in output data directory
 if not (_out_path := DATA_DIR.joinpath(f"{_PKG_NAME}.cls")).is_file():
-    with resources.as_file(
-        resources.files(f"{_PKG_NAME}.data.jinja2_LaTeX_templates").joinpath(
-            "{_PKG_NAME}.cls"
-        )
-    ) as _in_path:
-        shutil.copy2(_in_path, _out_path)
-
+    shutil.move(_tmpl_folder / _out_path.name, _out_path)
 
+# Write to LaTeX table settings file
 if not (_DOTTEX := DATA_DIR / Rf"{_PKG_NAME}_TikZTableSettings.tex").is_file():
-    # Write to LaTeX table settings file
-    with resources.as_file(
-        resources.files(f"{_PKG_NAME}.data.jinja2_LaTeX_templates").joinpath(
-            "setup_tikz_tables.tex"
-        )
-    ) as _tex_path:
-        shutil.copy2(_tex_path, _DOTTEX)
+    shutil.move(_tmpl_folder.joinpath("setup_tikz_tables.tex"), _DOTTEX)
 
 
 LTX_ARRAY_LINEEND = "\\\\\n"
@@ -168,6 +161,32 @@ hhi_delta_ranger, hhi_zone_post_ranger = (
     for _f in (HHI_DELTA_KNOTS, HHI_POST_ZONE_KNOTS)
 )
 
+
+HMG_PRESUMPTION_ZONE_MAP = {
+    HHI_POST_ZONE_KNOTS[0]: {
+        HHI_DELTA_KNOTS[0]: (0, 0, 0),
+        HHI_DELTA_KNOTS[1]: (0, 0, 0),
+        HHI_DELTA_KNOTS[2]: (0, 0, 0),
+    },
+    HHI_POST_ZONE_KNOTS[1]: {
+        HHI_DELTA_KNOTS[0]: (0, 1, 1),
+        HHI_DELTA_KNOTS[1]: (1, 1, 2),
+        HHI_DELTA_KNOTS[2]: (1, 1, 2),
+    },
+    HHI_POST_ZONE_KNOTS[2]: {
+        HHI_DELTA_KNOTS[0]: (0, 2, 1),
+        HHI_DELTA_KNOTS[1]: (1, 2, 3),
+        HHI_DELTA_KNOTS[2]: (2, 2, 4),
+    },
+}
+
+ZONE_VALS = np.unique(
+    np.vstack([
+        tuple(HMG_PRESUMPTION_ZONE_MAP[_k].values()) for _k in HMG_PRESUMPTION_ZONE_MAP
+    ]),
+    axis=0,
+)
+
 ZONE_STRINGS = {
     0: R"Green Zone (Safeharbor)",
     1: R"Yellow Zone",
@@ -182,10 +201,10 @@ ZONE_DETAIL_STRINGS_HHI = {
 
 ZONE_DETAIL_STRINGS_DELTA = {
     0: "",
-    1: Rf"ΔHHI < \text{{{HHI_DELTA_KNOTS[1]} pts.}}",
-    2: Rf"ΔHHI ⩾ \text{{{HHI_DELTA_KNOTS[1]} pts.}}",
-    3: R"ΔHHI ∈ \text{{[{}, {}) pts.}}".format(*HHI_DELTA_KNOTS[1:3]),
-    4: Rf"ΔHHI ⩾ \text{{{HHI_DELTA_KNOTS[2]} pts.}}",
+    1: Rf"ΔHHI < {HHI_DELTA_KNOTS[1]} pts.",
+    2: Rf"ΔHHI ⩾ {HHI_DELTA_KNOTS[1]} pts.}}",
+    3: R"ΔHHI ∈ [{}, {}) pts.".format(*HHI_DELTA_KNOTS[1:3]),
+    4: Rf"ΔHHI ⩾ {HHI_DELTA_KNOTS[2]} pts.",
 }
 
 ZONE_STRINGS_LATEX = {
@@ -211,31 +230,6 @@ ZONE_DETAIL_STRINGS_DELTA_LATEX = {
     4: Rf"\Delta HHI \geqslant \text{{{HHI_DELTA_KNOTS[2]} pts.}}",
 }
 
-HMG_PRESUMPTION_ZONE_MAP = {
-    HHI_POST_ZONE_KNOTS[0]: {
-        HHI_DELTA_KNOTS[0]: (0, 0, 0),
-        HHI_DELTA_KNOTS[1]: (0, 0, 0),
-        HHI_DELTA_KNOTS[2]: (0, 0, 0),
-    },
-    HHI_POST_ZONE_KNOTS[1]: {
-        HHI_DELTA_KNOTS[0]: (0, 1, 1),
-        HHI_DELTA_KNOTS[1]: (1, 1, 2),
-        HHI_DELTA_KNOTS[2]: (1, 1, 2),
-    },
-    HHI_POST_ZONE_KNOTS[2]: {
-        HHI_DELTA_KNOTS[0]: (0, 2, 1),
-        HHI_DELTA_KNOTS[1]: (1, 2, 3),
-        HHI_DELTA_KNOTS[2]: (2, 2, 4),
-    },
-}
-
-ZONE_VALS = np.unique(
-    np.vstack([
-        tuple(HMG_PRESUMPTION_ZONE_MAP[_k].values()) for _k in HMG_PRESUMPTION_ZONE_MAP
-    ]),
-    axis=0,
-)
-
 
 def enf_stats_output(
     _data_array_dict: fid.INVData,
@@ -277,8 +271,13 @@ def enf_stats_output(
         _enf_spec,
     )
 
+    _print_format: Literal["text", "LaTeX"] = "text" if print_to_screen else "LaTeX"
     _enf_stats_hdr_list, _enf_stats_dat_list = _enf_stats_table_func(
-        _enf_stats_cnts, None, return_type_sel=return_type_sel, sort_order=sort_order
+        _enf_stats_cnts,
+        None,
+        return_type_sel=return_type_sel,
+        sort_order=sort_order,
+        print_format=_print_format,
     )
 
     if print_to_screen:
@@ -289,7 +288,9 @@ def enf_stats_output(
             f"{_table_ind_group};",
             _table_evid_cond,
         )
-        stats_print_rows(_enf_stats_hdr_list, _enf_stats_dat_list)
+        stats_print_rows(
+            _enf_stats_hdr_list, _enf_stats_dat_list, print_format=_print_format
+        )
 
     return _enf_stats_hdr_list, _enf_stats_dat_list
 
@@ -472,7 +473,7 @@ def enf_cnts_byconczone(_cnts_array: ArrayBIGINT, /) -> ArrayBIGINT:
 
         for _hhi_zone_delta_lim in HHI_DELTA_KNOTS[:3]:
             _delta_test = (
-                (_hhi_delta_ranged > HHI_DELTA_KNOTS[1])
+                (_hhi_delta_ranged >= _hhi_zone_delta_lim)
                 if _hhi_zone_delta_lim == HHI_DELTA_KNOTS[2]
                 else (_hhi_delta_ranged == _hhi_zone_delta_lim)
             )
@@ -528,12 +529,10 @@ def enf_stats_table_onedim(
     *,
     return_type_sel: StatsReturnSelector = StatsReturnSelector.CNT,
     sort_order: SortSelector = SortSelector.UCH,
-    print_format: Literal["text", "LaTeX"] = "text",
+    print_format: Literal["text", "LaTeX"] = "LaTeX",
 ) -> tuple[list[str], list[list[str]]]:
     _ndim_in: int = 1
-    _dim_hdr_dict = {
-        _v: (_k if _k == "TOTAL" else f"{_k}") for _k, _v in fid.CNT_FCOUNT_DICT.items()
-    } | {
+    _dim_hdr_dict = {_v: _k for _k, _v in fid.CNT_FCOUNT_DICT.items()} | {
         _v: (
             "[2500, 5000]"
             if _k == "2,500 +"
@@ -583,7 +582,7 @@ def enf_stats_table_byzone(
     *,
     return_type_sel: StatsReturnSelector = StatsReturnSelector.CNT,
     sort_order: SortSelector = SortSelector.UCH,
-    print_format: Literal["text", "LaTeX"] = "text",
+    print_format: Literal["text", "LaTeX"] = "LaTeX",
 ) -> tuple[list[str], list[list[str]]]:
     _ndim_in: int = ZONE_VALS.shape[1]
 
@@ -624,7 +623,7 @@ def enf_stats_table_byzone(
             if print_format == "LaTeX":
                 _stats_text_color = "HiCoYellow" if _conc_zone == 1 else "BrightGreen"
                 _stats_hdr_list += [
-                    R"{} {{ \({}{}\) }};".format(
+                    R"{} {{\null\hfill \({}{}\) }};".format(
                         rf"\node[text = {_stats_text_color}, fill = white, align = right]",
                         ZONE_DETAIL_STRINGS_HHI_LATEX[_stats_byzone_detail[1]],
                         (
@@ -702,6 +701,8 @@ def _stats_formatted_row(
 def stats_print_rows(
     _enf_stats_hdr_list: list[str],
     _enf_stats_dat_list: list[list[str]],
+    /,
+    *,
     print_format: Literal["text", "LaTeX"] = "text",
 ) -> None:
     for _idx, _hdr in enumerate(_enf_stats_hdr_list):
@@ -851,7 +852,7 @@ def render_table_pdf(
         cwd=DATA_DIR,
     )
     if _run_rc:
-        subprocess.run("LaTeXmk -quiet -c".split(), check=True, cwd=DATA_DIR)  # noqa: S603
+        subprocess.run("latexmk -quiet -c".split(), check=True, cwd=DATA_DIR)  # noqa: S603
     del _run_rc
 
     print(