Skip to content

Commit

Permalink
Updated test results
Browse files Browse the repository at this point in the history
  • Loading branch information
Benedikt Schesch committed May 16, 2024
1 parent 1767a07 commit c3420c6
Show file tree
Hide file tree
Showing 9 changed files with 99 additions and 18 deletions.
6 changes: 3 additions & 3 deletions test/small-goal-files/tables/all/table_feature_main_summary.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
Gitmerge-recursive-patience & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-resolve & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
Adjacent+ort & 3 & 75\% & 1 & 50\% & 1 & 25\% & 1 & 50\% & 0 & 0\% & 0 & 0\% \\
Imports+ort & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
Imports+ort-ignorespace & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
Imports+ort & 2 & 50\% & 1 & 50\% & 2 & 50\% & 1 & 50\% & 0 & 0\% & 0 & 0\% \\
Imports+ort-ignorespace & 2 & 50\% & 1 & 50\% & 2 & 50\% & 1 & 50\% & 0 & 0\% & 0 & 0\% \\
Hires-Merge & 3 & 75\% & 0 & 0\% & 1 & 25\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
Spork & 4 & 100\% & 1 & 50\% & 0 & 0\% & 1 & 50\% & 0 & 0\% & 0 & 0\% \\
IntelliMerge & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
IntelliMerge & 2 & 50\% & 1 & 50\% & 1 & 25\% & 1 & 50\% & 1 & 25\% & 0 & 0\% \\
\end{tabular}
31 changes: 31 additions & 0 deletions test/small-goal-files/tables/all/table_main_feature_summary_oracle.tex
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
% Do not edit. This file is automatically generated.
\begin{tabular}{c|c c c c|c c c c|c c c c}
Tool &
\multicolumn{4}{c|}{Correct Merges} &
\multicolumn{4}{c|}{Unhandled Merges} &
\multicolumn{4}{c}{Incorrect Merges} \\
&
\multicolumn{2}{c}{Main Branch} &
\multicolumn{2}{c|}{Other Branches} &
\multicolumn{2}{c}{Main Branch} &
\multicolumn{2}{c|}{Other Branches} &
\multicolumn{2}{c}{Main Branch} &
\multicolumn{2}{c}{Other Branches} \\
\hline
& \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\
Gitmerge-ort & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-ort-ignorespace & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-recursive-histogram & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-recursive-ignorespace & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-recursive-minimal & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-recursive-myers & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-recursive-patience & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-resolve & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Adjacent+ort & 1 & 50\% & 3 & 75\% & 1 & 50\% & 1 & 25\% & 0 & 0\% & 0 & 0\% \\
Imports+ort & 1 & 50\% & 2 & 50\% & 1 & 50\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Imports+ort-ignorespace & 1 & 50\% & 2 & 50\% & 1 & 50\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Hires-Merge & 0 & 0\% & 3 & 75\% & 2 & 100\% & 1 & 25\% & 0 & 0\% & 0 & 0\% \\
Spork & 1 & 50\% & 4 & 100\% & 1 & 50\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\
IntelliMerge & 1 & 50\% & 2 & 50\% & 1 & 50\% & 1 & 25\% & 0 & 0\% & 1 & 25\% \\
Oracle tool & 1 & 50\% & 4 & 100\% & 1 & 50\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\
\end{tabular}
6 changes: 3 additions & 3 deletions test/small-goal-files/tables/all/table_summary.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
Gitmerge-recursive-patience & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-resolve & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Adjacent+ort & 4 & 67\% & 2 & 33\% & 0 & 0\% \\
Imports+ort & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Imports+ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Imports+ort & 3 & 50\% & 3 & 50\% & 0 & 0\% \\
Imports+ort-ignorespace & 3 & 50\% & 3 & 50\% & 0 & 0\% \\
Hires-Merge & 3 & 50\% & 3 & 50\% & 0 & 0\% \\
Spork & 5 & 83\% & 1 & 17\% & 0 & 0\% \\
IntelliMerge & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
IntelliMerge & 3 & 50\% & 2 & 33\% & 1 & 17\% \\
\end{tabular}
6 changes: 3 additions & 3 deletions test/small-goal-files/tables/all/table_summary_with_oracle.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
Gitmerge-recursive-patience & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-resolve & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Adjacent+ort & 4 & 67\% & 2 & 33\% & 0 & 0\% \\
Imports+ort & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Imports+ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Imports+ort & 3 & 50\% & 3 & 50\% & 0 & 0\% \\
Imports+ort-ignorespace & 3 & 50\% & 3 & 50\% & 0 & 0\% \\
Hires-Merge & 3 & 50\% & 3 & 50\% & 0 & 0\% \\
Spork & 5 & 83\% & 1 & 17\% & 0 & 0\% \\
IntelliMerge & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
IntelliMerge & 3 & 50\% & 2 & 33\% & 1 & 17\% \\
Oracle tool & 5 & 83\% & 1 & 17\% & 0 & 0\% \\
\end{tabular}
25 changes: 25 additions & 0 deletions test/small-goal-files/tables/git/table_main_feature_summary_oracle.tex
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
% Do not edit. This file is automatically generated.
\begin{tabular}{c|c c c c|c c c c|c c c c}
Tool &
\multicolumn{4}{c|}{Correct Merges} &
\multicolumn{4}{c|}{Unhandled Merges} &
\multicolumn{4}{c}{Incorrect Merges} \\
&
\multicolumn{2}{c}{Main Branch} &
\multicolumn{2}{c|}{Other Branches} &
\multicolumn{2}{c}{Main Branch} &
\multicolumn{2}{c|}{Other Branches} &
\multicolumn{2}{c}{Main Branch} &
\multicolumn{2}{c}{Other Branches} \\
\hline
& \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\
Gitmerge-ort & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-ort-ignorespace & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-recursive-histogram & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-recursive-ignorespace & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-recursive-minimal & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-recursive-myers & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-recursive-patience & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-resolve & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Oracle tool & 1 & 50\% & 4 & 100\% & 1 & 50\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\
\end{tabular}
6 changes: 3 additions & 3 deletions test/small-goal-files/tables/tools/table_feature_main_summary.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
Gitmerge-ort & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-ort-ignorespace & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
Adjacent+ort & 3 & 75\% & 1 & 50\% & 1 & 25\% & 1 & 50\% & 0 & 0\% & 0 & 0\% \\
Imports+ort & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
Imports+ort-ignorespace & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
Imports+ort & 2 & 50\% & 1 & 50\% & 2 & 50\% & 1 & 50\% & 0 & 0\% & 0 & 0\% \\
Imports+ort-ignorespace & 2 & 50\% & 1 & 50\% & 2 & 50\% & 1 & 50\% & 0 & 0\% & 0 & 0\% \\
Hires-Merge & 3 & 75\% & 0 & 0\% & 1 & 25\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
Spork & 4 & 100\% & 1 & 50\% & 0 & 0\% & 1 & 50\% & 0 & 0\% & 0 & 0\% \\
IntelliMerge & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
IntelliMerge & 2 & 50\% & 1 & 50\% & 1 & 25\% & 1 & 50\% & 1 & 25\% & 0 & 0\% \\
\end{tabular}
25 changes: 25 additions & 0 deletions test/small-goal-files/tables/tools/table_main_feature_summary_oracle.tex
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
% Do not edit. This file is automatically generated.
\begin{tabular}{c|c c c c|c c c c|c c c c}
Tool &
\multicolumn{4}{c|}{Correct Merges} &
\multicolumn{4}{c|}{Unhandled Merges} &
\multicolumn{4}{c}{Incorrect Merges} \\
&
\multicolumn{2}{c}{Main Branch} &
\multicolumn{2}{c|}{Other Branches} &
\multicolumn{2}{c}{Main Branch} &
\multicolumn{2}{c|}{Other Branches} &
\multicolumn{2}{c}{Main Branch} &
\multicolumn{2}{c}{Other Branches} \\
\hline
& \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\
Gitmerge-ort & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-ort-ignorespace & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Adjacent+ort & 1 & 50\% & 3 & 75\% & 1 & 50\% & 1 & 25\% & 0 & 0\% & 0 & 0\% \\
Imports+ort & 1 & 50\% & 2 & 50\% & 1 & 50\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Imports+ort-ignorespace & 1 & 50\% & 2 & 50\% & 1 & 50\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\
Hires-Merge & 0 & 0\% & 3 & 75\% & 2 & 100\% & 1 & 25\% & 0 & 0\% & 0 & 0\% \\
Spork & 1 & 50\% & 4 & 100\% & 1 & 50\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\
IntelliMerge & 1 & 50\% & 2 & 50\% & 1 & 50\% & 1 & 25\% & 0 & 0\% & 1 & 25\% \\
Oracle tool & 1 & 50\% & 4 & 100\% & 1 & 50\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\
\end{tabular}
6 changes: 3 additions & 3 deletions test/small-goal-files/tables/tools/table_summary.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
Gitmerge-ort & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Adjacent+ort & 4 & 67\% & 2 & 33\% & 0 & 0\% \\
Imports+ort & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Imports+ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Imports+ort & 3 & 50\% & 3 & 50\% & 0 & 0\% \\
Imports+ort-ignorespace & 3 & 50\% & 3 & 50\% & 0 & 0\% \\
Hires-Merge & 3 & 50\% & 3 & 50\% & 0 & 0\% \\
Spork & 5 & 83\% & 1 & 17\% & 0 & 0\% \\
IntelliMerge & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
IntelliMerge & 3 & 50\% & 2 & 33\% & 1 & 17\% \\
\end{tabular}
6 changes: 3 additions & 3 deletions test/small-goal-files/tables/tools/table_summary_with_oracle.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
Gitmerge-ort & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Adjacent+ort & 4 & 67\% & 2 & 33\% & 0 & 0\% \\
Imports+ort & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Imports+ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Imports+ort & 3 & 50\% & 3 & 50\% & 0 & 0\% \\
Imports+ort-ignorespace & 3 & 50\% & 3 & 50\% & 0 & 0\% \\
Hires-Merge & 3 & 50\% & 3 & 50\% & 0 & 0\% \\
Spork & 5 & 83\% & 1 & 17\% & 0 & 0\% \\
IntelliMerge & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
IntelliMerge & 3 & 50\% & 2 & 33\% & 1 & 17\% \\
Oracle tool & 5 & 83\% & 1 & 17\% & 0 & 0\% \\
\end{tabular}

0 comments on commit c3420c6

Please sign in to comment.