Skip to content

Commit

Permalink
Added updated plots
Browse files Browse the repository at this point in the history
  • Loading branch information
Benedikt Schesch committed May 15, 2024
1 parent 8ba56e9 commit 8fd9dd3
Show file tree
Hide file tree
Showing 95 changed files with 24,028 additions and 16,693 deletions.
Binary file modified results/combined/plots/all/cost_with_manual.pdf
View file
Binary file not shown.
385 changes: 154 additions & 231 deletions results/combined/plots/all/cost_with_manual.pgf
View file

Large diffs are not rendered by default.

Binary file added results/combined/plots/all/cost_with_oracle.pdf
View file
Binary file not shown.
989 changes: 989 additions & 0 deletions results/combined/plots/all/cost_with_oracle.pgf
View file

Large diffs are not rendered by default.

Binary file modified results/combined/plots/all/cost_without_manual.pdf
View file
Binary file not shown.
369 changes: 146 additions & 223 deletions results/combined/plots/all/cost_without_manual.pgf
View file

Large diffs are not rendered by default.

Binary file modified results/combined/plots/all/heatmap.pdf
View file
Binary file not shown.
295 changes: 153 additions & 142 deletions results/combined/plots/all/heatmap.pgf
View file

Large diffs are not rendered by default.

Binary file modified results/combined/plots/git/cost_with_manual.pdf
View file
Binary file not shown.
289 changes: 106 additions & 183 deletions results/combined/plots/git/cost_with_manual.pgf
View file

Large diffs are not rendered by default.

Binary file added results/combined/plots/git/cost_with_oracle.pdf
View file
Binary file not shown.
785 changes: 785 additions & 0 deletions results/combined/plots/git/cost_with_oracle.pgf
View file

Large diffs are not rendered by default.

Binary file modified results/combined/plots/git/cost_without_manual.pdf
View file
Binary file not shown.
273 changes: 98 additions & 175 deletions results/combined/plots/git/cost_without_manual.pgf
View file

Large diffs are not rendered by default.

Binary file modified results/combined/plots/git/heatmap.pdf
View file
Binary file not shown.
137 changes: 74 additions & 63 deletions results/combined/plots/git/heatmap.pgf
View file

Large diffs are not rendered by default.

Binary file modified results/combined/plots/tools/cost_with_manual.pdf
View file
Binary file not shown.
289 changes: 106 additions & 183 deletions results/combined/plots/tools/cost_with_manual.pgf
View file

Large diffs are not rendered by default.

Binary file added results/combined/plots/tools/cost_with_oracle.pdf
View file
Binary file not shown.
785 changes: 785 additions & 0 deletions results/combined/plots/tools/cost_with_oracle.pgf
View file

Large diffs are not rendered by default.

Binary file modified results/combined/plots/tools/cost_without_manual.pdf
View file
Binary file not shown.
273 changes: 98 additions & 175 deletions results/combined/plots/tools/cost_without_manual.pgf
View file

Large diffs are not rendered by default.

Binary file modified results/combined/plots/tools/heatmap.pdf
View file
Binary file not shown.
133 changes: 72 additions & 61 deletions results/combined/plots/tools/heatmap.pgf
View file

Large diffs are not rendered by default.

12,082 changes: 6,041 additions & 6,041 deletions results/combined/result.csv
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions results/combined/tables/all/table_summary.tex
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
% Do not edit. This file is automatically generated.
\begin{tabular}{l|c c|c c|c c}
Tool &
\multicolumn{2}{c|}{Correct Merges} &
\multicolumn{2}{c|}{Unhandled Merges} &
\multicolumn{2}{c}{Incorrect Merges} \\
& \# & \% & \# & \% & \# & \% \\
\hline
Tool &
\multicolumn{2}{c|}{Correct Merges} &
\multicolumn{2}{c|}{Unhandled Merges} &
\multicolumn{2}{c}{Incorrect Merges} \\
& \# & \% & \# & \% & \# & \% \\
\hline
Gitmerge-ort & 2773 & 46\% & 3128 & 52\% & 139 & 2\% \\
Gitmerge-ort-ignorespace & 2920 & 48\% & 2962 & 49\% & 158 & 3\% \\
Gitmerge-recursive-histogram & 2773 & 46\% & 3128 & 52\% & 139 & 2\% \\
Expand Down
24 changes: 24 additions & 0 deletions results/combined/tables/all/table_summary_with_oracle.tex
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
% Do not edit. This file is automatically generated.
\begin{tabular}{l|c c|c c|c c}
Tool &
\multicolumn{2}{c|}{Correct Merges} &
\multicolumn{2}{c|}{Unhandled Merges} &
\multicolumn{2}{c}{Incorrect Merges} \\
& \# & \% & \# & \% & \# & \% \\
\hline
Gitmerge-ort & 2773 & 46\% & 3128 & 52\% & 139 & 2\% \\
Gitmerge-ort-ignorespace & 2920 & 48\% & 2962 & 49\% & 158 & 3\% \\
Gitmerge-recursive-histogram & 2773 & 46\% & 3128 & 52\% & 139 & 2\% \\
Gitmerge-recursive-ignorespace & 2920 & 48\% & 2959 & 49\% & 161 & 3\% \\
Gitmerge-recursive-minimal & 2773 & 46\% & 3127 & 52\% & 140 & 2\% \\
Gitmerge-recursive-myers & 2773 & 46\% & 3127 & 52\% & 140 & 2\% \\
Gitmerge-recursive-patience & 2776 & 46\% & 3124 & 52\% & 140 & 2\% \\
Gitmerge-resolve & 2728 & 45\% & 3173 & 53\% & 139 & 2\% \\
Adjacent+ort & 3042 & 50\% & 2773 & 46\% & 225 & 4\% \\
Imports+ort & 2803 & 46\% & 3056 & 51\% & 181 & 3\% \\
Imports+ort-ignorespace & 2953 & 49\% & 2883 & 48\% & 204 & 3\% \\
Hires-Merge & 3067 & 51\% & 2776 & 46\% & 197 & 3\% \\
Spork & 3291 & 54\% & 2123 & 35\% & 626 & 10\% \\
IntelliMerge & 2769 & 46\% & 3092 & 51\% & 179 & 3\% \\
Oracle tool & 3844 & 64\% & 2098 & 35\% & 98 & 2\% \\
\end{tabular}
12 changes: 6 additions & 6 deletions results/combined/tables/git/table_summary.tex
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
% Do not edit. This file is automatically generated.
\begin{tabular}{l|c c|c c|c c}
Tool &
\multicolumn{2}{c|}{Correct Merges} &
\multicolumn{2}{c|}{Unhandled Merges} &
\multicolumn{2}{c}{Incorrect Merges} \\
& \# & \% & \# & \% & \# & \% \\
\hline
Tool &
\multicolumn{2}{c|}{Correct Merges} &
\multicolumn{2}{c|}{Unhandled Merges} &
\multicolumn{2}{c}{Incorrect Merges} \\
& \# & \% & \# & \% & \# & \% \\
\hline
Gitmerge-ort & 2773 & 46\% & 3128 & 52\% & 139 & 2\% \\
Gitmerge-ort-ignorespace & 2920 & 48\% & 2962 & 49\% & 158 & 3\% \\
Gitmerge-recursive-histogram & 2773 & 46\% & 3128 & 52\% & 139 & 2\% \\
Expand Down
18 changes: 18 additions & 0 deletions results/combined/tables/git/table_summary_with_oracle.tex
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
% Do not edit. This file is automatically generated.
\begin{tabular}{l|c c|c c|c c}
Tool &
\multicolumn{2}{c|}{Correct Merges} &
\multicolumn{2}{c|}{Unhandled Merges} &
\multicolumn{2}{c}{Incorrect Merges} \\
& \# & \% & \# & \% & \# & \% \\
\hline
Gitmerge-ort & 2773 & 46\% & 3128 & 52\% & 139 & 2\% \\
Gitmerge-ort-ignorespace & 2920 & 48\% & 2962 & 49\% & 158 & 3\% \\
Gitmerge-recursive-histogram & 2773 & 46\% & 3128 & 52\% & 139 & 2\% \\
Gitmerge-recursive-ignorespace & 2920 & 48\% & 2959 & 49\% & 161 & 3\% \\
Gitmerge-recursive-minimal & 2773 & 46\% & 3127 & 52\% & 140 & 2\% \\
Gitmerge-recursive-myers & 2773 & 46\% & 3127 & 52\% & 140 & 2\% \\
Gitmerge-recursive-patience & 2776 & 46\% & 3124 & 52\% & 140 & 2\% \\
Gitmerge-resolve & 2728 & 45\% & 3173 & 53\% & 139 & 2\% \\
Oracle tool & 3844 & 64\% & 2098 & 35\% & 98 & 2\% \\
\end{tabular}
12 changes: 6 additions & 6 deletions results/combined/tables/tools/table_summary.tex
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
% Do not edit. This file is automatically generated.
\begin{tabular}{l|c c|c c|c c}
Tool &
\multicolumn{2}{c|}{Correct Merges} &
\multicolumn{2}{c|}{Unhandled Merges} &
\multicolumn{2}{c}{Incorrect Merges} \\
& \# & \% & \# & \% & \# & \% \\
\hline
Tool &
\multicolumn{2}{c|}{Correct Merges} &
\multicolumn{2}{c|}{Unhandled Merges} &
\multicolumn{2}{c}{Incorrect Merges} \\
& \# & \% & \# & \% & \# & \% \\
\hline
Gitmerge-ort & 2773 & 46\% & 3128 & 52\% & 139 & 2\% \\
Gitmerge-ort-ignorespace & 2920 & 48\% & 2962 & 49\% & 158 & 3\% \\
Adjacent+ort & 3042 & 50\% & 2773 & 46\% & 225 & 4\% \\
Expand Down
18 changes: 18 additions & 0 deletions results/combined/tables/tools/table_summary_with_oracle.tex
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
% Do not edit. This file is automatically generated.
\begin{tabular}{l|c c|c c|c c}
Tool &
\multicolumn{2}{c|}{Correct Merges} &
\multicolumn{2}{c|}{Unhandled Merges} &
\multicolumn{2}{c}{Incorrect Merges} \\
& \# & \% & \# & \% & \# & \% \\
\hline
Gitmerge-ort & 2773 & 46\% & 3128 & 52\% & 139 & 2\% \\
Gitmerge-ort-ignorespace & 2920 & 48\% & 2962 & 49\% & 158 & 3\% \\
Adjacent+ort & 3042 & 50\% & 2773 & 46\% & 225 & 4\% \\
Imports+ort & 2803 & 46\% & 3056 & 51\% & 181 & 3\% \\
Imports+ort-ignorespace & 2953 & 49\% & 2883 & 48\% & 204 & 3\% \\
Hires-Merge & 3067 & 51\% & 2776 & 46\% & 197 & 3\% \\
Spork & 3291 & 54\% & 2123 & 35\% & 626 & 10\% \\
IntelliMerge & 2769 & 46\% & 3092 & 51\% & 179 & 3\% \\
Oracle tool & 3844 & 64\% & 2098 & 35\% & 98 & 2\% \\
\end{tabular}
Binary file modified results/greatest_hits/plots/all/cost_with_manual.pdf
View file
Binary file not shown.
Loading

0 comments on commit 8fd9dd3

Please sign in to comment.