diff --git a/results/combined/plots/all/cost_with_manual.pdf b/results/combined/plots/all/cost_with_manual.pdf index 46c069cf11..c85e2211ba 100644 Binary files a/results/combined/plots/all/cost_with_manual.pdf and b/results/combined/plots/all/cost_with_manual.pdf differ diff --git a/results/combined/plots/all/cost_without_manual.pdf b/results/combined/plots/all/cost_without_manual.pdf index 573737606d..cfc94184ea 100644 Binary files a/results/combined/plots/all/cost_without_manual.pdf and b/results/combined/plots/all/cost_without_manual.pdf differ diff --git a/results/combined/plots/all/heatmap.pdf b/results/combined/plots/all/heatmap.pdf index 2294acc9d4..a960027e1a 100644 Binary files a/results/combined/plots/all/heatmap.pdf and b/results/combined/plots/all/heatmap.pdf differ diff --git a/results/combined/plots/git/cost_with_manual.pdf b/results/combined/plots/git/cost_with_manual.pdf index e5699cbe25..6f34f4bfa0 100644 Binary files a/results/combined/plots/git/cost_with_manual.pdf and b/results/combined/plots/git/cost_with_manual.pdf differ diff --git a/results/combined/plots/git/cost_without_manual.pdf b/results/combined/plots/git/cost_without_manual.pdf index 178614394e..e346c25d96 100644 Binary files a/results/combined/plots/git/cost_without_manual.pdf and b/results/combined/plots/git/cost_without_manual.pdf differ diff --git a/results/combined/plots/git/heatmap.pdf b/results/combined/plots/git/heatmap.pdf index 837f99b855..daf33246d4 100644 Binary files a/results/combined/plots/git/heatmap.pdf and b/results/combined/plots/git/heatmap.pdf differ diff --git a/results/combined/plots/tools/cost_with_manual.pdf b/results/combined/plots/tools/cost_with_manual.pdf index dbc5da6091..1f63004785 100644 Binary files a/results/combined/plots/tools/cost_with_manual.pdf and b/results/combined/plots/tools/cost_with_manual.pdf differ diff --git a/results/combined/plots/tools/cost_without_manual.pdf b/results/combined/plots/tools/cost_without_manual.pdf index a7a651b76f..80b7896e4f 100644 Binary files a/results/combined/plots/tools/cost_without_manual.pdf and b/results/combined/plots/tools/cost_without_manual.pdf differ diff --git a/results/combined/plots/tools/heatmap.pdf b/results/combined/plots/tools/heatmap.pdf index af6b784f9c..b60f8aca52 100644 Binary files a/results/combined/plots/tools/heatmap.pdf and b/results/combined/plots/tools/heatmap.pdf differ diff --git a/results/combined/tables/all/table_run_time.tex b/results/combined/tables/all/table_run_time.tex new file mode 100644 index 0000000000..109cdb36ec --- /dev/null +++ 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 new file mode 100644 index 0000000000..a203a3f93c --- /dev/null +++ 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 new file mode 100644 index 0000000000..f2757d202a --- /dev/null +++ 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 index b3d3136e37..91be22c78d 100644 Binary files a/results/greatest_hits/plots/all/cost_with_manual.pdf and b/results/greatest_hits/plots/all/cost_with_manual.pdf differ diff --git a/results/greatest_hits/plots/all/cost_without_manual.pdf b/results/greatest_hits/plots/all/cost_without_manual.pdf index da0266e809..df2f3e71f2 100644 Binary files a/results/greatest_hits/plots/all/cost_without_manual.pdf and b/results/greatest_hits/plots/all/cost_without_manual.pdf differ diff --git a/results/greatest_hits/plots/all/heatmap.pdf b/results/greatest_hits/plots/all/heatmap.pdf index b96c122191..f2d7b567af 100644 Binary files a/results/greatest_hits/plots/all/heatmap.pdf and b/results/greatest_hits/plots/all/heatmap.pdf differ diff --git a/results/greatest_hits/plots/git/cost_with_manual.pdf b/results/greatest_hits/plots/git/cost_with_manual.pdf index eb75e19ebb..f5706195c4 100644 Binary files a/results/greatest_hits/plots/git/cost_with_manual.pdf and b/results/greatest_hits/plots/git/cost_with_manual.pdf differ diff --git a/results/greatest_hits/plots/git/cost_without_manual.pdf b/results/greatest_hits/plots/git/cost_without_manual.pdf index 99eb5da45c..b985278c42 100644 Binary files a/results/greatest_hits/plots/git/cost_without_manual.pdf and b/results/greatest_hits/plots/git/cost_without_manual.pdf differ diff --git a/results/greatest_hits/plots/git/heatmap.pdf b/results/greatest_hits/plots/git/heatmap.pdf index d11593bdae..1ebf447e15 100644 Binary files a/results/greatest_hits/plots/git/heatmap.pdf and b/results/greatest_hits/plots/git/heatmap.pdf differ diff --git a/results/greatest_hits/plots/tools/cost_with_manual.pdf b/results/greatest_hits/plots/tools/cost_with_manual.pdf index 638cd82290..4e8e012845 100644 Binary files a/results/greatest_hits/plots/tools/cost_with_manual.pdf and b/results/greatest_hits/plots/tools/cost_with_manual.pdf differ diff --git a/results/greatest_hits/plots/tools/cost_without_manual.pdf b/results/greatest_hits/plots/tools/cost_without_manual.pdf index 737d873c6d..574f08a2d0 100644 Binary files a/results/greatest_hits/plots/tools/cost_without_manual.pdf and b/results/greatest_hits/plots/tools/cost_without_manual.pdf differ diff --git a/results/greatest_hits/plots/tools/heatmap.pdf b/results/greatest_hits/plots/tools/heatmap.pdf index b611316ead..3182b81c42 100644 Binary files a/results/greatest_hits/plots/tools/heatmap.pdf and b/results/greatest_hits/plots/tools/heatmap.pdf differ diff --git a/results/greatest_hits/tables/all/table_run_time.tex b/results/greatest_hits/tables/all/table_run_time.tex new file mode 100644 index 0000000000..b757844cd4 --- /dev/null +++ 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 new file mode 100644 index 0000000000..b36c632bab --- /dev/null +++ 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 new file mode 100644 index 0000000000..c1ef75f147 --- /dev/null +++ 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 index bc49d1398f..f291a26683 100644 Binary files a/results/reaper/plots/all/cost_with_manual.pdf and b/results/reaper/plots/all/cost_with_manual.pdf differ diff --git a/results/reaper/plots/all/cost_without_manual.pdf b/results/reaper/plots/all/cost_without_manual.pdf index b6f4f448c1..ee8624dd5b 100644 Binary files a/results/reaper/plots/all/cost_without_manual.pdf and b/results/reaper/plots/all/cost_without_manual.pdf differ diff --git a/results/reaper/plots/all/heatmap.pdf b/results/reaper/plots/all/heatmap.pdf index c96aae2925..f216dcbb7b 100644 Binary files a/results/reaper/plots/all/heatmap.pdf and b/results/reaper/plots/all/heatmap.pdf differ diff --git a/results/reaper/plots/git/cost_with_manual.pdf b/results/reaper/plots/git/cost_with_manual.pdf index fe136d64da..9c12a4b929 100644 Binary files a/results/reaper/plots/git/cost_with_manual.pdf and b/results/reaper/plots/git/cost_with_manual.pdf differ diff --git a/results/reaper/plots/git/cost_without_manual.pdf b/results/reaper/plots/git/cost_without_manual.pdf index 162c85d75a..2373873db7 100644 Binary files a/results/reaper/plots/git/cost_without_manual.pdf and b/results/reaper/plots/git/cost_without_manual.pdf differ diff --git a/results/reaper/plots/git/heatmap.pdf b/results/reaper/plots/git/heatmap.pdf index e4e8d6ad5c..0887fe2d3c 100644 Binary files a/results/reaper/plots/git/heatmap.pdf and b/results/reaper/plots/git/heatmap.pdf differ diff --git a/results/reaper/plots/tools/cost_with_manual.pdf b/results/reaper/plots/tools/cost_with_manual.pdf index 3f138c23ed..93313a8fee 100644 Binary files a/results/reaper/plots/tools/cost_with_manual.pdf and b/results/reaper/plots/tools/cost_with_manual.pdf differ diff --git a/results/reaper/plots/tools/cost_without_manual.pdf b/results/reaper/plots/tools/cost_without_manual.pdf index de10e16052..7e12ab603b 100644 Binary files a/results/reaper/plots/tools/cost_without_manual.pdf and b/results/reaper/plots/tools/cost_without_manual.pdf differ diff --git a/results/reaper/plots/tools/heatmap.pdf b/results/reaper/plots/tools/heatmap.pdf index b8bf3b6595..d084c2d333 100644 Binary files a/results/reaper/plots/tools/heatmap.pdf and b/results/reaper/plots/tools/heatmap.pdf differ diff --git a/run.sh b/run.sh index 9edc981fe1..8f200b39ee 100755 --- 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" \