diff --git a/results/combined/plots/all/cost_with_manual.pdf b/results/combined/plots/all/cost_with_manual.pdf index 6925e799c3..16f5b0afa6 100644 Binary files a/results/combined/plots/all/cost_with_manual.pdf and b/results/combined/plots/all/cost_with_manual.pdf differ diff --git a/results/combined/plots/all/cost_without_manual.pdf b/results/combined/plots/all/cost_without_manual.pdf index 7f54558553..f35b87cb68 100644 Binary files a/results/combined/plots/all/cost_without_manual.pdf and b/results/combined/plots/all/cost_without_manual.pdf differ diff --git a/results/combined/plots/all/heatmap.pdf b/results/combined/plots/all/heatmap.pdf index 59d7e980b9..573018a70c 100644 Binary files a/results/combined/plots/all/heatmap.pdf and b/results/combined/plots/all/heatmap.pdf differ diff --git a/results/combined/plots/git/cost_with_manual.pdf b/results/combined/plots/git/cost_with_manual.pdf index efc4a8b8aa..c32c92deb9 100644 Binary files a/results/combined/plots/git/cost_with_manual.pdf and b/results/combined/plots/git/cost_with_manual.pdf differ diff --git a/results/combined/plots/git/cost_without_manual.pdf b/results/combined/plots/git/cost_without_manual.pdf index f386cbfef4..3cf0ce321a 100644 Binary files a/results/combined/plots/git/cost_without_manual.pdf and b/results/combined/plots/git/cost_without_manual.pdf differ diff --git a/results/combined/plots/git/heatmap.pdf b/results/combined/plots/git/heatmap.pdf index cefff91f55..1c4a49a6d1 100644 Binary files a/results/combined/plots/git/heatmap.pdf and b/results/combined/plots/git/heatmap.pdf differ diff --git a/results/combined/plots/tools/cost_with_manual.pdf b/results/combined/plots/tools/cost_with_manual.pdf index 3df8abd2fc..476a901dcb 100644 Binary files a/results/combined/plots/tools/cost_with_manual.pdf and b/results/combined/plots/tools/cost_with_manual.pdf differ diff --git a/results/combined/plots/tools/cost_without_manual.pdf b/results/combined/plots/tools/cost_without_manual.pdf index aa0a404a14..0ca1bc1ee7 100644 Binary files a/results/combined/plots/tools/cost_without_manual.pdf and b/results/combined/plots/tools/cost_without_manual.pdf differ diff --git a/results/combined/plots/tools/heatmap.pdf b/results/combined/plots/tools/heatmap.pdf index 8f5d2bb71c..9be96abf42 100644 Binary files a/results/combined/plots/tools/heatmap.pdf and b/results/combined/plots/tools/heatmap.pdf differ diff --git a/results/combined/tables/all/table_feature_main_summary.tex b/results/combined/tables/all/table_feature_main_summary.tex index f702ef09d7..33ba401a03 100644 --- a/results/combined/tables/all/table_feature_main_summary.tex +++ b/results/combined/tables/all/table_feature_main_summary.tex @@ -1,9 +1,12 @@ % Do not edit. This file is automatically generated. -\begin{tabular}{c|c c|c c|c c} +\setlength{\tabcolsep}{.285\tabcolsep} +\begin{tabular}{c|cc|cc|cc} Tool & - \multicolumn{2}{c|}{Correct Merges} & - \multicolumn{2}{c|}{Unhandled Merges} & - \multicolumn{2}{c}{Incorrect Merges} \\ + \multicolumn{6}{c}{Merges} \\ \cline{2-7} + & + \multicolumn{2}{c|}{Correct} & + \multicolumn{2}{c|}{Unhandled} & + \multicolumn{2}{c}{Incorrect} \\ & \multicolumn{1}{c}{Main} & \multicolumn{1}{c|}{Other} & @@ -11,7 +14,6 @@ \multicolumn{1}{c|}{Other} & \multicolumn{1}{c}{Main} & \multicolumn{1}{c}{Other} \\ - & \% & \% & \% & \% & \% & \% \\ \hline Gitmerge-ort & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ Gitmerge-ort-ignorespace & 56\% & 38\% & 41\% & 60\% & 3\% & 2\% \\ diff --git a/results/combined/tables/git/table_feature_main_summary.tex b/results/combined/tables/git/table_feature_main_summary.tex index 90918369d5..5bdc0bb87d 100644 --- a/results/combined/tables/git/table_feature_main_summary.tex +++ b/results/combined/tables/git/table_feature_main_summary.tex @@ -1,9 +1,12 @@ % Do not edit. This file is automatically generated. -\begin{tabular}{c|c c|c c|c c} +\setlength{\tabcolsep}{.285\tabcolsep} +\begin{tabular}{c|cc|cc|cc} Tool & - \multicolumn{2}{c|}{Correct Merges} & - \multicolumn{2}{c|}{Unhandled Merges} & - \multicolumn{2}{c}{Incorrect Merges} \\ + \multicolumn{6}{c}{Merges} \\ \cline{2-7} + & + \multicolumn{2}{c|}{Correct} & + \multicolumn{2}{c|}{Unhandled} & + \multicolumn{2}{c}{Incorrect} \\ & \multicolumn{1}{c}{Main} & \multicolumn{1}{c|}{Other} & @@ -11,7 +14,6 @@ \multicolumn{1}{c|}{Other} & \multicolumn{1}{c}{Main} & \multicolumn{1}{c}{Other} \\ - & \% & \% & \% & \% & \% & \% \\ \hline Gitmerge-ort & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ Gitmerge-ort-ignorespace & 56\% & 38\% & 41\% & 60\% & 3\% & 2\% \\ diff --git a/results/combined/tables/tools/table_feature_main_summary.tex b/results/combined/tables/tools/table_feature_main_summary.tex index eba43e48f9..5b0c301089 100644 --- a/results/combined/tables/tools/table_feature_main_summary.tex +++ b/results/combined/tables/tools/table_feature_main_summary.tex @@ -1,9 +1,12 @@ % Do not edit. This file is automatically generated. -\begin{tabular}{c|c c|c c|c c} +\setlength{\tabcolsep}{.285\tabcolsep} +\begin{tabular}{c|cc|cc|cc} Tool & - \multicolumn{2}{c|}{Correct Merges} & - \multicolumn{2}{c|}{Unhandled Merges} & - \multicolumn{2}{c}{Incorrect Merges} \\ + \multicolumn{6}{c}{Merges} \\ \cline{2-7} + & + \multicolumn{2}{c|}{Correct} & + \multicolumn{2}{c|}{Unhandled} & + \multicolumn{2}{c}{Incorrect} \\ & \multicolumn{1}{c}{Main} & \multicolumn{1}{c|}{Other} & @@ -11,7 +14,6 @@ \multicolumn{1}{c|}{Other} & \multicolumn{1}{c}{Main} & \multicolumn{1}{c}{Other} \\ - & \% & \% & \% & \% & \% & \% \\ \hline Gitmerge-ort & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ Gitmerge-ort-ignorespace & 56\% & 38\% & 41\% & 60\% & 3\% & 2\% \\ diff --git a/results/greatest_hits/plots/all/cost_with_manual.pdf b/results/greatest_hits/plots/all/cost_with_manual.pdf index 0cda3c5a61..36fd3631da 100644 Binary files a/results/greatest_hits/plots/all/cost_with_manual.pdf and b/results/greatest_hits/plots/all/cost_with_manual.pdf differ diff --git a/results/greatest_hits/plots/all/cost_without_manual.pdf b/results/greatest_hits/plots/all/cost_without_manual.pdf index 344d01bb77..f32d8a291d 100644 Binary files a/results/greatest_hits/plots/all/cost_without_manual.pdf and b/results/greatest_hits/plots/all/cost_without_manual.pdf differ diff --git a/results/greatest_hits/plots/all/heatmap.pdf b/results/greatest_hits/plots/all/heatmap.pdf index d09ab1f374..ef16634bee 100644 Binary files a/results/greatest_hits/plots/all/heatmap.pdf and b/results/greatest_hits/plots/all/heatmap.pdf differ diff --git a/results/greatest_hits/plots/git/cost_with_manual.pdf b/results/greatest_hits/plots/git/cost_with_manual.pdf index 4f8b4d9396..bd5de9e283 100644 Binary files a/results/greatest_hits/plots/git/cost_with_manual.pdf and b/results/greatest_hits/plots/git/cost_with_manual.pdf differ diff --git a/results/greatest_hits/plots/git/cost_without_manual.pdf b/results/greatest_hits/plots/git/cost_without_manual.pdf index d487528536..4f8fc09b42 100644 Binary files a/results/greatest_hits/plots/git/cost_without_manual.pdf and b/results/greatest_hits/plots/git/cost_without_manual.pdf differ diff --git a/results/greatest_hits/plots/git/heatmap.pdf b/results/greatest_hits/plots/git/heatmap.pdf index b1dfb632d6..d86066f3be 100644 Binary files a/results/greatest_hits/plots/git/heatmap.pdf and b/results/greatest_hits/plots/git/heatmap.pdf differ diff --git a/results/greatest_hits/plots/tools/cost_with_manual.pdf b/results/greatest_hits/plots/tools/cost_with_manual.pdf index 25879360d1..8d55395663 100644 Binary files a/results/greatest_hits/plots/tools/cost_with_manual.pdf and b/results/greatest_hits/plots/tools/cost_with_manual.pdf differ diff --git a/results/greatest_hits/plots/tools/cost_without_manual.pdf b/results/greatest_hits/plots/tools/cost_without_manual.pdf index 8479b85a04..5651685e6e 100644 Binary files a/results/greatest_hits/plots/tools/cost_without_manual.pdf and b/results/greatest_hits/plots/tools/cost_without_manual.pdf differ diff --git a/results/greatest_hits/plots/tools/heatmap.pdf b/results/greatest_hits/plots/tools/heatmap.pdf index 3df80e5be6..62712df573 100644 Binary files a/results/greatest_hits/plots/tools/heatmap.pdf and b/results/greatest_hits/plots/tools/heatmap.pdf differ diff --git a/results/greatest_hits/tables/all/table_feature_main_summary.tex b/results/greatest_hits/tables/all/table_feature_main_summary.tex index dcfbe90cdd..d742868d3d 100644 --- a/results/greatest_hits/tables/all/table_feature_main_summary.tex +++ b/results/greatest_hits/tables/all/table_feature_main_summary.tex @@ -1,9 +1,12 @@ % Do not edit. This file is automatically generated. -\begin{tabular}{c|c c|c c|c c} +\setlength{\tabcolsep}{.285\tabcolsep} +\begin{tabular}{c|cc|cc|cc} Tool & - \multicolumn{2}{c|}{Correct Merges} & - \multicolumn{2}{c|}{Unhandled Merges} & - \multicolumn{2}{c}{Incorrect Merges} \\ + \multicolumn{6}{c}{Merges} \\ \cline{2-7} + & + \multicolumn{2}{c|}{Correct} & + \multicolumn{2}{c|}{Unhandled} & + \multicolumn{2}{c}{Incorrect} \\ & \multicolumn{1}{c}{Main} & \multicolumn{1}{c|}{Other} & @@ -11,7 +14,6 @@ \multicolumn{1}{c|}{Other} & \multicolumn{1}{c}{Main} & \multicolumn{1}{c}{Other} \\ - & \% & \% & \% & \% & \% & \% \\ \hline Gitmerge-ort & 53\% & 32\% & 43\% & 66\% & 4\% & 2\% \\ Gitmerge-ort-ignorespace & 54\% & 34\% & 42\% & 64\% & 3\% & 3\% \\ diff --git a/results/greatest_hits/tables/git/table_feature_main_summary.tex b/results/greatest_hits/tables/git/table_feature_main_summary.tex index 7e77582e47..cabade8882 100644 --- a/results/greatest_hits/tables/git/table_feature_main_summary.tex +++ b/results/greatest_hits/tables/git/table_feature_main_summary.tex @@ -1,9 +1,12 @@ % Do not edit. This file is automatically generated. -\begin{tabular}{c|c c|c c|c c} +\setlength{\tabcolsep}{.285\tabcolsep} +\begin{tabular}{c|cc|cc|cc} Tool & - \multicolumn{2}{c|}{Correct Merges} & - \multicolumn{2}{c|}{Unhandled Merges} & - \multicolumn{2}{c}{Incorrect Merges} \\ + \multicolumn{6}{c}{Merges} \\ \cline{2-7} + & + \multicolumn{2}{c|}{Correct} & + \multicolumn{2}{c|}{Unhandled} & + \multicolumn{2}{c}{Incorrect} \\ & \multicolumn{1}{c}{Main} & \multicolumn{1}{c|}{Other} & @@ -11,7 +14,6 @@ \multicolumn{1}{c|}{Other} & \multicolumn{1}{c}{Main} & \multicolumn{1}{c}{Other} \\ - & \% & \% & \% & \% & \% & \% \\ \hline Gitmerge-ort & 53\% & 32\% & 43\% & 66\% & 4\% & 2\% \\ Gitmerge-ort-ignorespace & 54\% & 34\% & 42\% & 64\% & 3\% & 3\% \\ diff --git a/results/greatest_hits/tables/tools/table_feature_main_summary.tex b/results/greatest_hits/tables/tools/table_feature_main_summary.tex index b081f9c775..406c178081 100644 --- a/results/greatest_hits/tables/tools/table_feature_main_summary.tex +++ b/results/greatest_hits/tables/tools/table_feature_main_summary.tex @@ -1,9 +1,12 @@ % Do not edit. This file is automatically generated. -\begin{tabular}{c|c c|c c|c c} +\setlength{\tabcolsep}{.285\tabcolsep} +\begin{tabular}{c|cc|cc|cc} Tool & - \multicolumn{2}{c|}{Correct Merges} & - \multicolumn{2}{c|}{Unhandled Merges} & - \multicolumn{2}{c}{Incorrect Merges} \\ + \multicolumn{6}{c}{Merges} \\ \cline{2-7} + & + \multicolumn{2}{c|}{Correct} & + \multicolumn{2}{c|}{Unhandled} & + \multicolumn{2}{c}{Incorrect} \\ & \multicolumn{1}{c}{Main} & \multicolumn{1}{c|}{Other} & @@ -11,7 +14,6 @@ \multicolumn{1}{c|}{Other} & \multicolumn{1}{c}{Main} & \multicolumn{1}{c}{Other} \\ - & \% & \% & \% & \% & \% & \% \\ \hline Gitmerge-ort & 53\% & 32\% & 43\% & 66\% & 4\% & 2\% \\ Gitmerge-ort-ignorespace & 54\% & 34\% & 42\% & 64\% & 3\% & 3\% \\ diff --git a/results/reaper/plots/all/cost_with_manual.pdf b/results/reaper/plots/all/cost_with_manual.pdf index 534542fe15..947513e9da 100644 Binary files a/results/reaper/plots/all/cost_with_manual.pdf and b/results/reaper/plots/all/cost_with_manual.pdf differ diff --git a/results/reaper/plots/all/cost_without_manual.pdf b/results/reaper/plots/all/cost_without_manual.pdf index c72d4befec..6ab8b72a29 100644 Binary files a/results/reaper/plots/all/cost_without_manual.pdf and b/results/reaper/plots/all/cost_without_manual.pdf differ diff --git a/results/reaper/plots/all/heatmap.pdf b/results/reaper/plots/all/heatmap.pdf index caff54d8aa..c2d05c1ba0 100644 Binary files a/results/reaper/plots/all/heatmap.pdf and b/results/reaper/plots/all/heatmap.pdf differ diff --git a/results/reaper/plots/git/cost_with_manual.pdf b/results/reaper/plots/git/cost_with_manual.pdf index 55305bc8b9..92fc6a135f 100644 Binary files a/results/reaper/plots/git/cost_with_manual.pdf and b/results/reaper/plots/git/cost_with_manual.pdf differ diff --git a/results/reaper/plots/git/cost_without_manual.pdf b/results/reaper/plots/git/cost_without_manual.pdf index 7fac22b434..c60cc0add6 100644 Binary files a/results/reaper/plots/git/cost_without_manual.pdf and b/results/reaper/plots/git/cost_without_manual.pdf differ diff --git a/results/reaper/plots/git/heatmap.pdf b/results/reaper/plots/git/heatmap.pdf index 97fbbf00d2..480e61e641 100644 Binary files a/results/reaper/plots/git/heatmap.pdf and b/results/reaper/plots/git/heatmap.pdf differ diff --git a/results/reaper/plots/tools/cost_with_manual.pdf b/results/reaper/plots/tools/cost_with_manual.pdf index bda869d54c..ca4d8bc365 100644 Binary files a/results/reaper/plots/tools/cost_with_manual.pdf and b/results/reaper/plots/tools/cost_with_manual.pdf differ diff --git a/results/reaper/plots/tools/cost_without_manual.pdf b/results/reaper/plots/tools/cost_without_manual.pdf index ee15cf97d6..f148ed885b 100644 Binary files a/results/reaper/plots/tools/cost_without_manual.pdf and b/results/reaper/plots/tools/cost_without_manual.pdf differ diff --git a/results/reaper/plots/tools/heatmap.pdf b/results/reaper/plots/tools/heatmap.pdf index 01ca6ce171..e5fd6c4bc2 100644 Binary files a/results/reaper/plots/tools/heatmap.pdf and b/results/reaper/plots/tools/heatmap.pdf differ diff --git a/results/reaper/tables/all/table_feature_main_summary.tex b/results/reaper/tables/all/table_feature_main_summary.tex index 03e62d0b69..33b47d30c5 100644 --- a/results/reaper/tables/all/table_feature_main_summary.tex +++ b/results/reaper/tables/all/table_feature_main_summary.tex @@ -1,9 +1,12 @@ % Do not edit. This file is automatically generated. -\begin{tabular}{c|c c|c c|c c} +\setlength{\tabcolsep}{.285\tabcolsep} +\begin{tabular}{c|cc|cc|cc} Tool & - \multicolumn{2}{c|}{Correct Merges} & - \multicolumn{2}{c|}{Unhandled Merges} & - \multicolumn{2}{c}{Incorrect Merges} \\ + \multicolumn{6}{c}{Merges} \\ \cline{2-7} + & + \multicolumn{2}{c|}{Correct} & + \multicolumn{2}{c|}{Unhandled} & + \multicolumn{2}{c}{Incorrect} \\ & \multicolumn{1}{c}{Main} & \multicolumn{1}{c|}{Other} & @@ -11,7 +14,6 @@ \multicolumn{1}{c|}{Other} & \multicolumn{1}{c}{Main} & \multicolumn{1}{c}{Other} \\ - & \% & \% & \% & \% & \% & \% \\ \hline Gitmerge-ort & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ Gitmerge-ort-ignorespace & 57\% & 38\% & 41\% & 59\% & 3\% & 3\% \\ diff --git a/results/reaper/tables/git/table_feature_main_summary.tex b/results/reaper/tables/git/table_feature_main_summary.tex index f583b8c36f..be146a0397 100644 --- a/results/reaper/tables/git/table_feature_main_summary.tex +++ b/results/reaper/tables/git/table_feature_main_summary.tex @@ -1,9 +1,12 @@ % Do not edit. This file is automatically generated. -\begin{tabular}{c|c c|c c|c c} +\setlength{\tabcolsep}{.285\tabcolsep} +\begin{tabular}{c|cc|cc|cc} Tool & - \multicolumn{2}{c|}{Correct Merges} & - \multicolumn{2}{c|}{Unhandled Merges} & - \multicolumn{2}{c}{Incorrect Merges} \\ + \multicolumn{6}{c}{Merges} \\ \cline{2-7} + & + \multicolumn{2}{c|}{Correct} & + \multicolumn{2}{c|}{Unhandled} & + \multicolumn{2}{c}{Incorrect} \\ & \multicolumn{1}{c}{Main} & \multicolumn{1}{c|}{Other} & @@ -11,7 +14,6 @@ \multicolumn{1}{c|}{Other} & \multicolumn{1}{c}{Main} & \multicolumn{1}{c}{Other} \\ - & \% & \% & \% & \% & \% & \% \\ \hline Gitmerge-ort & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ Gitmerge-ort-ignorespace & 57\% & 38\% & 41\% & 59\% & 3\% & 3\% \\ diff --git a/results/reaper/tables/tools/table_feature_main_summary.tex b/results/reaper/tables/tools/table_feature_main_summary.tex index f931bba18d..d9156a784c 100644 --- a/results/reaper/tables/tools/table_feature_main_summary.tex +++ b/results/reaper/tables/tools/table_feature_main_summary.tex @@ -1,9 +1,12 @@ % Do not edit. This file is automatically generated. -\begin{tabular}{c|c c|c c|c c} +\setlength{\tabcolsep}{.285\tabcolsep} +\begin{tabular}{c|cc|cc|cc} Tool & - \multicolumn{2}{c|}{Correct Merges} & - \multicolumn{2}{c|}{Unhandled Merges} & - \multicolumn{2}{c}{Incorrect Merges} \\ + \multicolumn{6}{c}{Merges} \\ \cline{2-7} + & + \multicolumn{2}{c|}{Correct} & + \multicolumn{2}{c|}{Unhandled} & + \multicolumn{2}{c}{Incorrect} \\ & \multicolumn{1}{c}{Main} & \multicolumn{1}{c|}{Other} & @@ -11,7 +14,6 @@ \multicolumn{1}{c|}{Other} & \multicolumn{1}{c}{Main} & \multicolumn{1}{c}{Other} \\ - & \% & \% & \% & \% & \% & \% \\ \hline Gitmerge-ort & 54\% & 36\% & 44\% & 62\% & 2\% & 2\% \\ Gitmerge-ort-ignorespace & 57\% & 38\% & 41\% & 59\% & 3\% & 3\% \\ diff --git a/src/python/latex_output.py b/src/python/latex_output.py index d6d0f241b8..a7a5f602d4 100755 --- a/src/python/latex_output.py +++ b/src/python/latex_output.py @@ -250,11 +250,14 @@ def build_table2(main_df: pd.DataFrame, merge_tools: List[str], feature) -> str: LaTeX table with the results of the merge tools """ table2 = """% Do not edit. This file is automatically generated. -\\begin{tabular}{c|c c|c c|c c} +\\setlength{\\tabcolsep}{.285\\tabcolsep} +\\begin{tabular}{c|cc|cc|cc} Tool & - \\multicolumn{2}{c|}{Correct Merges} & - \\multicolumn{2}{c|}{Unhandled Merges} & - \\multicolumn{2}{c}{Incorrect Merges} \\\\ + \\multicolumn{6}{c}{Merges} \\\\ \\cline{2-7} + & + \\multicolumn{2}{c|}{Correct} & + \\multicolumn{2}{c|}{Unhandled} & + \\multicolumn{2}{c}{Incorrect} \\\\ & \\multicolumn{1}{c}{Main} & \\multicolumn{1}{c|}{Other} & @@ -262,7 +265,6 @@ def build_table2(main_df: pd.DataFrame, merge_tools: List[str], feature) -> str: \\multicolumn{1}{c|}{Other} & \\multicolumn{1}{c}{Main} & \\multicolumn{1}{c}{Other} \\\\ - & \\% & \\% & \\% & \\% & \\% & \\% \\\\ \\hline\n""" for _, merge_tool in enumerate(merge_tools):