Plot updates (#300)

benedikt-schesch · Jun 6, 2024 · c10873d · c10873d
1 parent c2886f3
commit c10873d
Show file tree

Hide file tree

Showing 116 changed files with 14,072 additions and 23,388 deletions.
diff --git a/results/combined/plots/all/cost_with_manual.pdf b/results/combined/plots/all/cost_with_manual.pdf
diff --git a/results/combined/plots/all/cost_with_manual.pgf b/results/combined/plots/all/cost_with_manual.pgf
diff --git a/results/combined/plots/all/cost_with_oracle.pdf b/results/combined/plots/all/cost_with_oracle.pdf
diff --git a/results/combined/plots/all/cost_with_oracle.pgf b/results/combined/plots/all/cost_with_oracle.pgf
diff --git a/results/combined/plots/all/cost_without_manual.pdf b/results/combined/plots/all/cost_without_manual.pdf
diff --git a/results/combined/plots/all/cost_without_manual.pgf b/results/combined/plots/all/cost_without_manual.pgf
diff --git a/results/combined/plots/all/heatmap.pdf b/results/combined/plots/all/heatmap.pdf
diff --git a/results/combined/plots/git/cost_with_manual.pdf b/results/combined/plots/git/cost_with_manual.pdf
diff --git a/results/combined/plots/git/cost_with_manual.pgf b/results/combined/plots/git/cost_with_manual.pgf
diff --git a/results/combined/plots/git/cost_with_oracle.pdf b/results/combined/plots/git/cost_with_oracle.pdf
diff --git a/results/combined/plots/git/cost_with_oracle.pgf b/results/combined/plots/git/cost_with_oracle.pgf
diff --git a/results/combined/plots/git/cost_without_manual.pdf b/results/combined/plots/git/cost_without_manual.pdf
diff --git a/results/combined/plots/git/cost_without_manual.pgf b/results/combined/plots/git/cost_without_manual.pgf
diff --git a/results/combined/plots/git/heatmap.pdf b/results/combined/plots/git/heatmap.pdf
diff --git a/results/combined/plots/tools/cost_with_manual.pdf b/results/combined/plots/tools/cost_with_manual.pdf
diff --git a/results/combined/plots/tools/cost_with_manual.pgf b/results/combined/plots/tools/cost_with_manual.pgf
diff --git a/results/combined/plots/tools/cost_with_oracle.pdf b/results/combined/plots/tools/cost_with_oracle.pdf
diff --git a/results/combined/plots/tools/cost_with_oracle.pgf b/results/combined/plots/tools/cost_with_oracle.pgf
diff --git a/results/combined/plots/tools/cost_without_manual.pdf b/results/combined/plots/tools/cost_without_manual.pdf
diff --git a/results/combined/plots/tools/cost_without_manual.pgf b/results/combined/plots/tools/cost_without_manual.pgf
diff --git a/results/combined/plots/tools/heatmap.pdf b/results/combined/plots/tools/heatmap.pdf
diff --git a/results/combined/result.csv b/results/combined/result.csv
diff --git a/results/combined/tables/all/table_feature_main_summary.tex b/results/combined/tables/all/table_feature_main_summary.tex
@@ -11,8 +11,8 @@
             \multicolumn{2}{c|}{Other Branches} &
             \multicolumn{2}{c}{Main Branch} &
             \multicolumn{2}{c}{Other Branches} \\
-            \hline
             & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\
+            \hline
             Gitmerge-ort                     &  1825 &  54\% &   821 &  36\% &  1486 &  44\% &  1427 &  62\% &    88 &   3\% &    49 &   2\% \\
             Gitmerge-ort-ignorespace         &  1911 &  56\% &   870 &  38\% &  1394 &  41\% &  1366 &  59\% &    94 &   3\% &    61 &   3\% \\
             Gitmerge-recursive-histogram     &  1825 &  54\% &   821 &  36\% &  1486 &  44\% &  1427 &  62\% &    88 &   3\% &    49 &   2\% \\

diff --git a/results/combined/tables/all/table_main_feature_summary_oracle.tex b/results/combined/tables/all/table_main_feature_summary_oracle.tex
diff --git a/results/combined/tables/all/table_run_time.tex b/results/combined/tables/all/table_run_time.tex
diff --git a/results/combined/tables/all/table_summary.tex b/results/combined/tables/all/table_summary.tex
@@ -1,9 +1,9 @@
 % 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} \\
+\begin{tabular}{l|c c|c c|c c|}
+        Tool & \multicolumn{6}{c|}{Merges} \\ \cline{2-7}
+        & \multicolumn{2}{c|}{Correct} &
+        \multicolumn{2}{c|}{Unhandled} &
+        \multicolumn{2}{c|}{Incorrect} \\
         & \# & \% & \# & \% & \# & \% \\
         \hline
 Gitmerge-ort                     &  2646 &  46\% &  2913 &  51\% &   137 &   2\% \\

diff --git a/results/combined/tables/all/table_summary_with_oracle.tex b/results/combined/tables/all/table_summary_with_oracle.tex
diff --git a/results/combined/tables/git/table_feature_main_summary.tex b/results/combined/tables/git/table_feature_main_summary.tex
@@ -11,8 +11,8 @@
             \multicolumn{2}{c|}{Other Branches} &
             \multicolumn{2}{c}{Main Branch} &
             \multicolumn{2}{c}{Other Branches} \\
-            \hline
             & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\
+            \hline
             Gitmerge-ort                     &  1825 &  54\% &   821 &  36\% &  1486 &  44\% &  1427 &  62\% &    88 &   3\% &    49 &   2\% \\
             Gitmerge-ort-ignorespace         &  1911 &  56\% &   870 &  38\% &  1394 &  41\% &  1366 &  59\% &    94 &   3\% &    61 &   3\% \\
             Gitmerge-recursive-histogram     &  1825 &  54\% &   821 &  36\% &  1486 &  44\% &  1427 &  62\% &    88 &   3\% &    49 &   2\% \\

diff --git a/results/combined/tables/git/table_main_feature_summary_oracle.tex b/results/combined/tables/git/table_main_feature_summary_oracle.tex
diff --git a/results/combined/tables/git/table_run_time.tex b/results/combined/tables/git/table_run_time.tex
diff --git a/results/combined/tables/git/table_summary.tex b/results/combined/tables/git/table_summary.tex
@@ -1,9 +1,9 @@
 % 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} \\
+\begin{tabular}{l|c c|c c|c c|}
+        Tool & \multicolumn{6}{c|}{Merges} \\ \cline{2-7}
+        & \multicolumn{2}{c|}{Correct} &
+        \multicolumn{2}{c|}{Unhandled} &
+        \multicolumn{2}{c|}{Incorrect} \\
         & \# & \% & \# & \% & \# & \% \\
         \hline
 Gitmerge-ort                     &  2646 &  46\% &  2913 &  51\% &   137 &   2\% \\

diff --git a/results/combined/tables/git/table_summary_with_oracle.tex b/results/combined/tables/git/table_summary_with_oracle.tex
diff --git a/results/combined/tables/tools/table_feature_main_summary.tex b/results/combined/tables/tools/table_feature_main_summary.tex
@@ -11,8 +11,8 @@
             \multicolumn{2}{c|}{Other Branches} &
             \multicolumn{2}{c}{Main Branch} &
             \multicolumn{2}{c}{Other Branches} \\
-            \hline
             & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\
+            \hline
             Gitmerge-ort                     &  1825 &  54\% &   821 &  36\% &  1486 &  44\% &  1427 &  62\% &    88 &   3\% &    49 &   2\% \\
             Gitmerge-ort-ignorespace         &  1911 &  56\% &   870 &  38\% &  1394 &  41\% &  1366 &  59\% &    94 &   3\% &    61 &   3\% \\
             Adjacent+ort                     &  1959 &  58\% &   946 &  41\% &  1307 &  38\% &  1268 &  55\% &   133 &   4\% &    83 &   4\% \\

diff --git a/results/combined/tables/tools/table_main_feature_summary_oracle.tex b/results/combined/tables/tools/table_main_feature_summary_oracle.tex
diff --git a/results/combined/tables/tools/table_run_time.tex b/results/combined/tables/tools/table_run_time.tex
diff --git a/results/combined/tables/tools/table_summary.tex b/results/combined/tables/tools/table_summary.tex
@@ -1,9 +1,9 @@
 % 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} \\
+\begin{tabular}{l|c c|c c|c c|}
+        Tool & \multicolumn{6}{c|}{Merges} \\ \cline{2-7}
+        & \multicolumn{2}{c|}{Correct} &
+        \multicolumn{2}{c|}{Unhandled} &
+        \multicolumn{2}{c|}{Incorrect} \\
         & \# & \% & \# & \% & \# & \% \\
         \hline
 Gitmerge-ort                     &  2646 &  46\% &  2913 &  51\% &   137 &   2\% \\

diff --git a/results/combined/tables/tools/table_summary_with_oracle.tex b/results/combined/tables/tools/table_summary_with_oracle.tex
diff --git a/results/greatest_hits/plots/all/cost_with_manual.pdf b/results/greatest_hits/plots/all/cost_with_manual.pdf