From c3420c6a02d099d16a6fa8ed9358f816eefe7cf4 Mon Sep 17 00:00:00 2001
From: Benedikt Schesch <bschesch@amazon.com>
Date: Wed, 15 May 2024 22:58:31 -0700
Subject: [PATCH] Updated test results

---
 .../tables/all/table_feature_main_summary.tex |  6 ++--
 .../all/table_main_feature_summary_oracle.tex | 31 +++++++++++++++++++
 .../tables/all/table_summary.tex              |  6 ++--
 .../tables/all/table_summary_with_oracle.tex  |  6 ++--
 .../git/table_main_feature_summary_oracle.tex | 25 +++++++++++++++
 .../tools/table_feature_main_summary.tex      |  6 ++--
 .../table_main_feature_summary_oracle.tex     | 25 +++++++++++++++
 .../tables/tools/table_summary.tex            |  6 ++--
 .../tools/table_summary_with_oracle.tex       |  6 ++--
 9 files changed, 99 insertions(+), 18 deletions(-)
 create mode 100644 test/small-goal-files/tables/all/table_main_feature_summary_oracle.tex
 create mode 100644 test/small-goal-files/tables/git/table_main_feature_summary_oracle.tex
 create mode 100644 test/small-goal-files/tables/tools/table_main_feature_summary_oracle.tex

diff --git a/test/small-goal-files/tables/all/table_feature_main_summary.tex b/test/small-goal-files/tables/all/table_feature_main_summary.tex
index 2a8e9b05df..a74682c140 100644
--- a/test/small-goal-files/tables/all/table_feature_main_summary.tex
+++ b/test/small-goal-files/tables/all/table_feature_main_summary.tex
@@ -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}
diff --git a/test/small-goal-files/tables/all/table_main_feature_summary_oracle.tex b/test/small-goal-files/tables/all/table_main_feature_summary_oracle.tex
new file mode 100644
index 0000000000..e8713a623c
--- /dev/null
+++ b/test/small-goal-files/tables/all/table_main_feature_summary_oracle.tex
@@ -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}
diff --git a/test/small-goal-files/tables/all/table_summary.tex b/test/small-goal-files/tables/all/table_summary.tex
index dc9c1b0a12..585df98f50 100644
--- a/test/small-goal-files/tables/all/table_summary.tex
+++ b/test/small-goal-files/tables/all/table_summary.tex
@@ -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}
diff --git a/test/small-goal-files/tables/all/table_summary_with_oracle.tex b/test/small-goal-files/tables/all/table_summary_with_oracle.tex
index f3e09d2a87..dfde3d499c 100644
--- a/test/small-goal-files/tables/all/table_summary_with_oracle.tex
+++ b/test/small-goal-files/tables/all/table_summary_with_oracle.tex
@@ -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}
diff --git a/test/small-goal-files/tables/git/table_main_feature_summary_oracle.tex b/test/small-goal-files/tables/git/table_main_feature_summary_oracle.tex
new file mode 100644
index 0000000000..da1275d070
--- /dev/null
+++ b/test/small-goal-files/tables/git/table_main_feature_summary_oracle.tex
@@ -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}
diff --git a/test/small-goal-files/tables/tools/table_feature_main_summary.tex b/test/small-goal-files/tables/tools/table_feature_main_summary.tex
index 33bbfd0544..32dc88c09a 100644
--- a/test/small-goal-files/tables/tools/table_feature_main_summary.tex
+++ b/test/small-goal-files/tables/tools/table_feature_main_summary.tex
@@ -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}
diff --git a/test/small-goal-files/tables/tools/table_main_feature_summary_oracle.tex b/test/small-goal-files/tables/tools/table_main_feature_summary_oracle.tex
new file mode 100644
index 0000000000..b2443c5532
--- /dev/null
+++ b/test/small-goal-files/tables/tools/table_main_feature_summary_oracle.tex
@@ -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}
diff --git a/test/small-goal-files/tables/tools/table_summary.tex b/test/small-goal-files/tables/tools/table_summary.tex
index 17a138062c..8937ce3f4c 100644
--- a/test/small-goal-files/tables/tools/table_summary.tex
+++ b/test/small-goal-files/tables/tools/table_summary.tex
@@ -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}
diff --git a/test/small-goal-files/tables/tools/table_summary_with_oracle.tex b/test/small-goal-files/tables/tools/table_summary_with_oracle.tex
index cddd701040..4ce04692f0 100644
--- a/test/small-goal-files/tables/tools/table_summary_with_oracle.tex
+++ b/test/small-goal-files/tables/tools/table_summary_with_oracle.tex
@@ -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}