Add timing (#301)

benedikt-schesch · Jun 6, 2024 · c391cfc · c391cfc
1 parent 1ebf695
commit c391cfc
Show file tree

Hide file tree

Showing 34 changed files with 117 additions and 0 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_without_manual.pdf b/results/combined/plots/all/cost_without_manual.pdf
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_without_manual.pdf b/results/combined/plots/git/cost_without_manual.pdf
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_without_manual.pdf b/results/combined/plots/tools/cost_without_manual.pdf
diff --git a/results/combined/plots/tools/heatmap.pdf b/results/combined/plots/tools/heatmap.pdf
diff --git a/results/combined/tables/all/table_run_time.tex b/results/combined/tables/all/table_run_time.tex
@@ -0,0 +1,25 @@
+% Do not edit.  This file is automatically generated.
+\begin{tabular}{c|c|c|c}
+    & \multicolumn{3}{c}{Run time (seconds)} \\
+    Tool & Mean & Median & Max \\
+    \hline
+    Gitmerge-ort                     & 0.04 & 0.04 & 1.19 \\
+    Gitmerge-ort-ignorespace         & 0.04 & 0.04 & 1.22 \\
+    Gitmerge-recursive-histogram     & 0.05 & 0.04 & 2.97 \\
+    Gitmerge-recursive-ignorespace   & 0.05 & 0.04 & 2.14 \\
+    Gitmerge-recursive-minimal       & 0.05 & 0.04 & 2.13 \\
+    Gitmerge-recursive-myers         & 0.05 & 0.04 & 2.11 \\
+    Gitmerge-recursive-patience      & 0.05 & 0.04 & 3.05 \\
+    Gitmerge-resolve                 & 0.24 & 0.17 & 5.02 \\
+    Hires-Merge                      & 0.23 & 0.13 & 17.3 \\
+    Spork                            & 2.56 & 1.06 & 653 \\
+    IntelliMerge                     & 1.04 & 0.50 & 89.3 \\
+    Plumelib-ort                     & 0.53 & 0.26 & 56.1 \\
+    Plumelib-ort-ignorespace         & 0.53 & 0.26 & 56.1 \\
+    Plumelib-ort-adjacent            & 0.16 & 0.09 & 10.1 \\
+    Plumelib-ort-adjacent-ignorespace & 0.15 & 0.09 & 10.00 \\
+    Plumelib-ort-imports             & 0.50 & 0.25 & 54.5 \\
+    Plumelib-ort-imports-ignorespace & 0.51 & 0.25 & 54.5 \\
+    Plumelib-ort-version-number      & 0.17 & 0.09 & 10.3 \\
+    Plumelib-ort-version-number-ignorespace & 0.15 & 0.09 & 10.1 \\
+\end{tabular}
diff --git a/results/combined/tables/git/table_run_time.tex b/results/combined/tables/git/table_run_time.tex
@@ -0,0 +1,14 @@
+% Do not edit.  This file is automatically generated.
+\begin{tabular}{c|c|c|c}
+    & \multicolumn{3}{c}{Run time (seconds)} \\
+    Tool & Mean & Median & Max \\
+    \hline
+    Gitmerge-ort                     & 0.04 & 0.04 & 1.19 \\
+    Gitmerge-ort-ignorespace         & 0.04 & 0.04 & 1.22 \\
+    Gitmerge-recursive-histogram     & 0.05 & 0.04 & 2.97 \\
+    Gitmerge-recursive-ignorespace   & 0.05 & 0.04 & 2.14 \\
+    Gitmerge-recursive-minimal       & 0.05 & 0.04 & 2.13 \\
+    Gitmerge-recursive-myers         & 0.05 & 0.04 & 2.11 \\
+    Gitmerge-recursive-patience      & 0.05 & 0.04 & 3.05 \\
+    Gitmerge-resolve                 & 0.24 & 0.17 & 5.02 \\
+\end{tabular}
diff --git a/results/combined/tables/tools/table_run_time.tex b/results/combined/tables/tools/table_run_time.tex
@@ -0,0 +1,19 @@
+% Do not edit.  This file is automatically generated.
+\begin{tabular}{c|c|c|c}
+    & \multicolumn{3}{c}{Run time (seconds)} \\
+    Tool & Mean & Median & Max \\
+    \hline
+    Gitmerge-ort                     & 0.04 & 0.04 & 1.19 \\
+    Gitmerge-ort-ignorespace         & 0.04 & 0.04 & 1.22 \\
+    Hires-Merge                      & 0.23 & 0.13 & 17.3 \\
+    Spork                            & 2.56 & 1.06 & 653 \\
+    IntelliMerge                     & 1.04 & 0.50 & 89.3 \\
+    Plumelib-ort                     & 0.53 & 0.26 & 56.1 \\
+    Plumelib-ort-ignorespace         & 0.53 & 0.26 & 56.1 \\
+    Plumelib-ort-adjacent            & 0.16 & 0.09 & 10.1 \\
+    Plumelib-ort-adjacent-ignorespace & 0.15 & 0.09 & 10.00 \\
+    Plumelib-ort-imports             & 0.50 & 0.25 & 54.5 \\
+    Plumelib-ort-imports-ignorespace & 0.51 & 0.25 & 54.5 \\
+    Plumelib-ort-version-number      & 0.17 & 0.09 & 10.3 \\
+    Plumelib-ort-version-number-ignorespace & 0.15 & 0.09 & 10.1 \\
+\end{tabular}
diff --git a/results/greatest_hits/plots/all/cost_with_manual.pdf b/results/greatest_hits/plots/all/cost_with_manual.pdf
diff --git a/results/greatest_hits/plots/all/cost_without_manual.pdf b/results/greatest_hits/plots/all/cost_without_manual.pdf
diff --git a/results/greatest_hits/plots/all/heatmap.pdf b/results/greatest_hits/plots/all/heatmap.pdf
diff --git a/results/greatest_hits/plots/git/cost_with_manual.pdf b/results/greatest_hits/plots/git/cost_with_manual.pdf
diff --git a/results/greatest_hits/plots/git/cost_without_manual.pdf b/results/greatest_hits/plots/git/cost_without_manual.pdf
diff --git a/results/greatest_hits/plots/git/heatmap.pdf b/results/greatest_hits/plots/git/heatmap.pdf
diff --git a/results/greatest_hits/plots/tools/cost_with_manual.pdf b/results/greatest_hits/plots/tools/cost_with_manual.pdf
diff --git a/results/greatest_hits/plots/tools/cost_without_manual.pdf b/results/greatest_hits/plots/tools/cost_without_manual.pdf
diff --git a/results/greatest_hits/plots/tools/heatmap.pdf b/results/greatest_hits/plots/tools/heatmap.pdf
diff --git a/results/greatest_hits/tables/all/table_run_time.tex b/results/greatest_hits/tables/all/table_run_time.tex
@@ -0,0 +1,25 @@
+% Do not edit.  This file is automatically generated.
+\begin{tabular}{c|c|c|c}
+    & \multicolumn{3}{c}{Run time (seconds)} \\
+    Tool & Mean & Median & Max \\
+    \hline
+    Gitmerge-ort                     & 0.05 & 0.05 & 0.14 \\
+    Gitmerge-ort-ignorespace         & 0.05 & 0.05 & 0.14 \\
+    Gitmerge-recursive-histogram     & 0.06 & 0.05 & 0.25 \\
+    Gitmerge-recursive-ignorespace   & 0.06 & 0.05 & 0.25 \\
+    Gitmerge-recursive-minimal       & 0.06 & 0.05 & 0.26 \\
+    Gitmerge-recursive-myers         & 0.06 & 0.05 & 0.25 \\
+    Gitmerge-recursive-patience      & 0.06 & 0.05 & 0.26 \\
+    Gitmerge-resolve                 & 0.26 & 0.19 & 2.24 \\
+    Hires-Merge                      & 0.20 & 0.13 & 1.94 \\
+    Spork                            & 1.74 & 1.03 & 19.0 \\
+    IntelliMerge                     & 1.53 & 0.66 & 17.4 \\
+    Plumelib-ort                     & 0.51 & 0.27 & 5.44 \\
+    Plumelib-ort-ignorespace         & 0.50 & 0.28 & 5.36 \\
+    Plumelib-ort-adjacent            & 0.17 & 0.10 & 2.65 \\
+    Plumelib-ort-adjacent-ignorespace & 0.16 & 0.09 & 2.35 \\
+    Plumelib-ort-imports             & 0.46 & 0.27 & 4.29 \\
+    Plumelib-ort-imports-ignorespace & 0.47 & 0.27 & 4.15 \\
+    Plumelib-ort-version-number      & 0.19 & 0.10 & 4.26 \\
+    Plumelib-ort-version-number-ignorespace & 0.16 & 0.10 & 2.63 \\
+\end{tabular}
diff --git a/results/greatest_hits/tables/git/table_run_time.tex b/results/greatest_hits/tables/git/table_run_time.tex
@@ -0,0 +1,14 @@
+% Do not edit.  This file is automatically generated.
+\begin{tabular}{c|c|c|c}
+    & \multicolumn{3}{c}{Run time (seconds)} \\
+    Tool & Mean & Median & Max \\
+    \hline
+    Gitmerge-ort                     & 0.05 & 0.05 & 0.14 \\
+    Gitmerge-ort-ignorespace         & 0.05 & 0.05 & 0.14 \\
+    Gitmerge-recursive-histogram     & 0.06 & 0.05 & 0.25 \\
+    Gitmerge-recursive-ignorespace   & 0.06 & 0.05 & 0.25 \\
+    Gitmerge-recursive-minimal       & 0.06 & 0.05 & 0.26 \\
+    Gitmerge-recursive-myers         & 0.06 & 0.05 & 0.25 \\
+    Gitmerge-recursive-patience      & 0.06 & 0.05 & 0.26 \\
+    Gitmerge-resolve                 & 0.26 & 0.19 & 2.24 \\
+\end{tabular}
diff --git a/results/greatest_hits/tables/tools/table_run_time.tex b/results/greatest_hits/tables/tools/table_run_time.tex
@@ -0,0 +1,19 @@
+% Do not edit.  This file is automatically generated.
+\begin{tabular}{c|c|c|c}
+    & \multicolumn{3}{c}{Run time (seconds)} \\
+    Tool & Mean & Median & Max \\
+    \hline
+    Gitmerge-ort                     & 0.05 & 0.05 & 0.14 \\
+    Gitmerge-ort-ignorespace         & 0.05 & 0.05 & 0.14 \\
+    Hires-Merge                      & 0.20 & 0.13 & 1.94 \\
+    Spork                            & 1.74 & 1.03 & 19.0 \\
+    IntelliMerge                     & 1.53 & 0.66 & 17.4 \\
+    Plumelib-ort                     & 0.51 & 0.27 & 5.44 \\
+    Plumelib-ort-ignorespace         & 0.50 & 0.28 & 5.36 \\
+    Plumelib-ort-adjacent            & 0.17 & 0.10 & 2.65 \\
+    Plumelib-ort-adjacent-ignorespace & 0.16 & 0.09 & 2.35 \\
+    Plumelib-ort-imports             & 0.46 & 0.27 & 4.29 \\
+    Plumelib-ort-imports-ignorespace & 0.47 & 0.27 & 4.15 \\
+    Plumelib-ort-version-number      & 0.19 & 0.10 & 4.26 \\
+    Plumelib-ort-version-number-ignorespace & 0.16 & 0.10 & 2.63 \\
+\end{tabular}
diff --git a/results/reaper/plots/all/cost_with_manual.pdf b/results/reaper/plots/all/cost_with_manual.pdf
diff --git a/results/reaper/plots/all/cost_without_manual.pdf b/results/reaper/plots/all/cost_without_manual.pdf
diff --git a/results/reaper/plots/all/heatmap.pdf b/results/reaper/plots/all/heatmap.pdf
diff --git a/results/reaper/plots/git/cost_with_manual.pdf b/results/reaper/plots/git/cost_with_manual.pdf
diff --git a/results/reaper/plots/git/cost_without_manual.pdf b/results/reaper/plots/git/cost_without_manual.pdf
diff --git a/results/reaper/plots/git/heatmap.pdf b/results/reaper/plots/git/heatmap.pdf
diff --git a/results/reaper/plots/tools/cost_with_manual.pdf b/results/reaper/plots/tools/cost_with_manual.pdf
diff --git a/results/reaper/plots/tools/cost_without_manual.pdf b/results/reaper/plots/tools/cost_without_manual.pdf
diff --git a/results/reaper/plots/tools/heatmap.pdf b/results/reaper/plots/tools/heatmap.pdf
diff --git a/run.sh b/run.sh
@@ -67,6 +67,7 @@ if [ "$only_plotting" = true ]; then
         --run_name "$RUN_NAME" \
         --merges_path "$OUT_DIR/merges/" \
         --tested_merges_path "$OUT_DIR/merges_tested/" \
+        --timed_merges_path "$OUT_DIR/merges_timed/" \
         --analyzed_merges_path "$OUT_DIR/merges_analyzed/" \
         --full_repos_csv "$REPOS_CSV_WITH_HASHES" \
         --repos_head_passes_csv "$OUT_DIR/repos_head_passes.csv" \