Skip to content

Commit

Permalink
Added data (#308)
Browse files Browse the repository at this point in the history
  • Loading branch information
@benedikt-schesch
benedikt-schesch authored Jun 8, 2024
1 parent 19ea8c9 commit a738374
Show file tree
Hide file tree
Showing 37 changed files with 70 additions and 50 deletions.
Binary file modified results/combined/plots/all/cost_with_manual.pdf
View file
Binary file not shown.
Binary file modified results/combined/plots/all/cost_without_manual.pdf
View file
Binary file not shown.
Binary file modified results/combined/plots/all/heatmap.pdf
View file
Binary file not shown.
Binary file modified results/combined/plots/git/cost_with_manual.pdf
View file
Binary file not shown.
Binary file modified results/combined/plots/git/cost_without_manual.pdf
View file
Binary file not shown.
Binary file modified results/combined/plots/git/heatmap.pdf
View file
Binary file not shown.
Binary file modified results/combined/plots/tools/cost_with_manual.pdf
View file
Binary file not shown.
Binary file modified results/combined/plots/tools/cost_without_manual.pdf
View file
Binary file not shown.
Binary file modified results/combined/plots/tools/heatmap.pdf
View file
Binary file not shown.
12 changes: 7 additions & 5 deletions results/combined/tables/all/table_feature_main_summary.tex
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
% 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} &
\multicolumn{1}{c}{Main} &
\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\% \\
Expand Down
12 changes: 7 additions & 5 deletions results/combined/tables/git/table_feature_main_summary.tex
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
% 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} &
\multicolumn{1}{c}{Main} &
\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\% \\
Expand Down
12 changes: 7 additions & 5 deletions results/combined/tables/tools/table_feature_main_summary.tex
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
% 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} &
\multicolumn{1}{c}{Main} &
\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\% \\
Expand Down
Binary file modified results/greatest_hits/plots/all/cost_with_manual.pdf
View file
Binary file not shown.
Binary file modified results/greatest_hits/plots/all/cost_without_manual.pdf
View file
Binary file not shown.
Binary file modified results/greatest_hits/plots/all/heatmap.pdf
View file
Binary file not shown.
Binary file modified results/greatest_hits/plots/git/cost_with_manual.pdf
View file
Binary file not shown.
Binary file modified results/greatest_hits/plots/git/cost_without_manual.pdf
View file
Binary file not shown.
Binary file modified results/greatest_hits/plots/git/heatmap.pdf
View file
Binary file not shown.
Binary file modified results/greatest_hits/plots/tools/cost_with_manual.pdf
View file
Binary file not shown.
Binary file modified results/greatest_hits/plots/tools/cost_without_manual.pdf
View file
Binary file not shown.
Binary file modified results/greatest_hits/plots/tools/heatmap.pdf
View file
Binary file not shown.
12 changes: 7 additions & 5 deletions results/greatest_hits/tables/all/table_feature_main_summary.tex
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
% 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} &
\multicolumn{1}{c}{Main} &
\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\% \\
Expand Down
12 changes: 7 additions & 5 deletions results/greatest_hits/tables/git/table_feature_main_summary.tex
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
% 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} &
\multicolumn{1}{c}{Main} &
\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\% \\
Expand Down
12 changes: 7 additions & 5 deletions results/greatest_hits/tables/tools/table_feature_main_summary.tex
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
% 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} &
\multicolumn{1}{c}{Main} &
\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\% \\
Expand Down
Binary file modified results/reaper/plots/all/cost_with_manual.pdf
View file
Binary file not shown.
Binary file modified results/reaper/plots/all/cost_without_manual.pdf
View file
Binary file not shown.
Binary file modified results/reaper/plots/all/heatmap.pdf
View file
Binary file not shown.
Binary file modified results/reaper/plots/git/cost_with_manual.pdf
View file
Binary file not shown.
Binary file modified results/reaper/plots/git/cost_without_manual.pdf
View file
Binary file not shown.
Binary file modified results/reaper/plots/git/heatmap.pdf
View file
Binary file not shown.
Binary file modified results/reaper/plots/tools/cost_with_manual.pdf
View file
Binary file not shown.
Binary file modified results/reaper/plots/tools/cost_without_manual.pdf
View file
Binary file not shown.
Binary file modified results/reaper/plots/tools/heatmap.pdf
View file
Binary file not shown.
12 changes: 7 additions & 5 deletions results/reaper/tables/all/table_feature_main_summary.tex
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
% 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} &
\multicolumn{1}{c}{Main} &
\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\% \\
Expand Down
12 changes: 7 additions & 5 deletions results/reaper/tables/git/table_feature_main_summary.tex
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
% 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} &
\multicolumn{1}{c}{Main} &
\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\% \\
Expand Down
12 changes: 7 additions & 5 deletions results/reaper/tables/tools/table_feature_main_summary.tex
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
% 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} &
\multicolumn{1}{c}{Main} &
\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\% \\
Expand Down
12 changes: 7 additions & 5 deletions src/python/latex_output.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,19 +250,21 @@ 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} &
\\multicolumn{1}{c}{Main} &
\\multicolumn{1}{c|}{Other} &
\\multicolumn{1}{c}{Main} &
\\multicolumn{1}{c}{Other} \\\\
& \\% & \\% & \\% & \\% & \\% & \\% \\\\
\\hline\n"""

for _, merge_tool in enumerate(merge_tools):
Expand Down

0 comments on commit a738374

Please sign in to comment.