Skip to content

Commit

Permalink
Update test data
Browse files Browse the repository at this point in the history
  • Loading branch information
@benedikt-schesch
benedikt-schesch committed May 15, 2024
1 parent 8fd9dd3 commit 611b406
Show file tree
Hide file tree
Showing 11 changed files with 208 additions and 8 deletions.
7 changes: 6 additions & 1 deletion src/python/latex_output.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,8 +388,13 @@ def merge_two_states(
# Cost plot
max_cost_intersection = 0
for idx, merge_tool in enumerate(merge_tools):
if incorrect[idx] == 0:
continue
max_cost_intersection = max(
max_cost_intersection, unhandled[idx] * 1 / incorrect[idx]
max_cost_intersection,
((unhandled[idx] + incorrect[idx] + correct[idx]) - unhandled[idx])
* 1.0
/ incorrect[idx],
)

_, ax = plt.subplots()
Expand Down
14 changes: 7 additions & 7 deletions test/small-goal-files/result.csv
View file

Large diffs are not rendered by default.

30 changes: 30 additions & 0 deletions test/small-goal-files/tables/all/table_feature_main_summary.tex
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
% 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 & 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\% \\
Gitmerge-recursive-histogram & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-recursive-ignorespace & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-recursive-minimal & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-recursive-myers & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
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\% \\
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\% \\
\end{tabular}
23 changes: 23 additions & 0 deletions test/small-goal-files/tables/all/table_summary.tex
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
% 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 & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-histogram & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-minimal & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-myers & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
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\% \\
Hires-Merge & 3 & 50\% & 3 & 50\% & 0 & 0\% \\
Spork & 5 & 83\% & 1 & 17\% & 0 & 0\% \\
IntelliMerge & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
\end{tabular}
24 changes: 24 additions & 0 deletions test/small-goal-files/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 & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-histogram & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-minimal & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-myers & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
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\% \\
Hires-Merge & 3 & 50\% & 3 & 50\% & 0 & 0\% \\
Spork & 5 & 83\% & 1 & 17\% & 0 & 0\% \\
IntelliMerge & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Oracle tool & 5 & 83\% & 1 & 17\% & 0 & 0\% \\
\end{tabular}
24 changes: 24 additions & 0 deletions test/small-goal-files/tables/git/table_feature_main_summary.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}{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 & 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\% \\
Gitmerge-recursive-histogram & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-recursive-ignorespace & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-recursive-minimal & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
Gitmerge-recursive-myers & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\
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\% \\
\end{tabular}
17 changes: 17 additions & 0 deletions test/small-goal-files/tables/git/table_summary.tex
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
% 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 & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-histogram & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-minimal & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-myers & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-patience & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-resolve & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
\end{tabular}
18 changes: 18 additions & 0 deletions test/small-goal-files/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 & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-histogram & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-minimal & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-myers & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-recursive-patience & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Gitmerge-resolve & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Oracle tool & 5 & 83\% & 1 & 17\% & 0 & 0\% \\
\end{tabular}
24 changes: 24 additions & 0 deletions test/small-goal-files/tables/tools/table_feature_main_summary.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}{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 & 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\% \\
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\% \\
\end{tabular}
17 changes: 17 additions & 0 deletions test/small-goal-files/tables/tools/table_summary.tex
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
% 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 & 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\% \\
Hires-Merge & 3 & 50\% & 3 & 50\% & 0 & 0\% \\
Spork & 5 & 83\% & 1 & 17\% & 0 & 0\% \\
IntelliMerge & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
\end{tabular}
18 changes: 18 additions & 0 deletions test/small-goal-files/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 & 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\% \\
Hires-Merge & 3 & 50\% & 3 & 50\% & 0 & 0\% \\
Spork & 5 & 83\% & 1 & 17\% & 0 & 0\% \\
IntelliMerge & 2 & 33\% & 4 & 67\% & 0 & 0\% \\
Oracle tool & 5 & 83\% & 1 & 17\% & 0 & 0\% \\
\end{tabular}

0 comments on commit 611b406

Please sign in to comment.