diff --git a/results/combined/defs.tex b/results/combined/defs.tex index a31ae676ec..b53ffe5f33 100644 --- a/results/combined/defs.tex +++ b/results/combined/defs.tex @@ -16,16 +16,11 @@ % Results \def\combinedAverageTriesUntilPass{1.0149383127709237\xspace} -\def\combinedNumberofTriesUntilPass1{44569\xspace} -\def\combinedNumberofTriesUntilPass2{256\xspace} -\def\combinedNumberofTriesUntilPass3{99\xspace} -\def\combinedNumberofTriesUntilPass4{26\xspace} -\def\combinedNumberofTriesUntilPass5{35\xspace} -\def\combinedNumberofTriesUntilPass6{0\xspace} -\def\combinedNumberofTriesUntilPass7{0\xspace} -\def\combinedNumberofTriesUntilPass8{0\xspace} -\def\combinedNumberofTriesUntilPass9{0\xspace} -\def\combinedNumberofTriesUntilPass10{0\xspace} +\def\combinedNumberofMergesWith1TriesUntilPass{44569\xspace} +\def\combinedNumberofMergesWith3TriesUntilPass{99\xspace} +\def\combinedNumberofMergesWith5TriesUntilPass{35\xspace} +\def\combinedNumberofMergesWith2TriesUntilPass{256\xspace} +\def\combinedNumberofMergesWith4TriesUntilPass{26\xspace} \def\combinedSporkOverOrtCorrect{515\xspace} \def\combinedSporkOverOrtIncorrect{487\xspace} \def\combinedMainBranchMerges{3532\xspace} diff --git a/results/combined/plots/all/cost_with_manual.pdf b/results/combined/plots/all/cost_with_manual.pdf index c1211e9bc0..c1c4d00356 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 4ba50eaf06..fb23c95fce 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 8befe3b357..c8b28f05ff 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 82d04f6b5c..e46af9b7bc 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 9d2f86fd31..4c382ad00e 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 a7acb34a87..f72a29bb87 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 6938798351..b7781a3d16 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 5936f595bc..06475fae2a 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 7a7c88bad9..6d71cf6b2e 100644 Binary files a/results/combined/plots/tools/heatmap.pdf and b/results/combined/plots/tools/heatmap.pdf differ diff --git a/results/greatest_hits/defs.tex b/results/greatest_hits/defs.tex index b7f90c7acb..90f8c8c79e 100644 --- a/results/greatest_hits/defs.tex +++ b/results/greatest_hits/defs.tex @@ -16,16 +16,9 @@ % Results \def\greatestHitsAverageTriesUntilPass{1.0005064573309699\xspace} -\def\greatestHitsNumberofTriesUntilPass1{7895\xspace} -\def\greatestHitsNumberofTriesUntilPass2{2\xspace} -\def\greatestHitsNumberofTriesUntilPass3{1\xspace} -\def\greatestHitsNumberofTriesUntilPass4{0\xspace} -\def\greatestHitsNumberofTriesUntilPass5{0\xspace} -\def\greatestHitsNumberofTriesUntilPass6{0\xspace} -\def\greatestHitsNumberofTriesUntilPass7{0\xspace} -\def\greatestHitsNumberofTriesUntilPass8{0\xspace} -\def\greatestHitsNumberofTriesUntilPass9{0\xspace} -\def\greatestHitsNumberofTriesUntilPass10{0\xspace} +\def\greatestHitsNumberofMergesWith1TriesUntilPass{7895\xspace} +\def\greatestHitsNumberofMergesWith2TriesUntilPass{2\xspace} +\def\greatestHitsNumberofMergesWith3TriesUntilPass{1\xspace} \def\greatestHitsSporkOverOrtCorrect{96\xspace} \def\greatestHitsSporkOverOrtIncorrect{84\xspace} \def\greatestHitsMainBranchMerges{524\xspace} diff --git a/results/greatest_hits/plots/all/cost_with_manual.pdf b/results/greatest_hits/plots/all/cost_with_manual.pdf index 7f988695e7..5eca5b984c 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 b438bc2c73..b8e05197d3 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 a4a9bb1a3f..c2e0023a1c 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 47b7b2b120..7c83bf0f31 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 de7855701e..39adc18d88 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 cbcc13caa8..e91207c633 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 d4deb0b79e..8284575e19 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 52e2dc34fe..41df74c4ac 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 8d72597a8a..696fcd3593 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/reaper/defs.tex b/results/reaper/defs.tex index c48930982e..3b8c5adc88 100644 --- a/results/reaper/defs.tex +++ b/results/reaper/defs.tex @@ -16,16 +16,11 @@ % Results \def\reaperAverageTriesUntilPass{1.016290604940673\xspace} -\def\reaperNumberofTriesUntilPass1{40713\xspace} -\def\reaperNumberofTriesUntilPass2{256\xspace} -\def\reaperNumberofTriesUntilPass3{98\xspace} -\def\reaperNumberofTriesUntilPass4{26\xspace} -\def\reaperNumberofTriesUntilPass5{35\xspace} -\def\reaperNumberofTriesUntilPass6{0\xspace} -\def\reaperNumberofTriesUntilPass7{0\xspace} -\def\reaperNumberofTriesUntilPass8{0\xspace} -\def\reaperNumberofTriesUntilPass9{0\xspace} -\def\reaperNumberofTriesUntilPass10{0\xspace} +\def\reaperNumberofMergesWith1TriesUntilPass{40713\xspace} +\def\reaperNumberofMergesWith3TriesUntilPass{98\xspace} +\def\reaperNumberofMergesWith5TriesUntilPass{35\xspace} +\def\reaperNumberofMergesWith2TriesUntilPass{256\xspace} +\def\reaperNumberofMergesWith4TriesUntilPass{26\xspace} \def\reaperSporkOverOrtCorrect{454\xspace} \def\reaperSporkOverOrtIncorrect{444\xspace} \def\reaperMainBranchMerges{3260\xspace} diff --git a/results/reaper/plots/all/cost_with_manual.pdf b/results/reaper/plots/all/cost_with_manual.pdf index 6b7e8d0c4b..d137c03fca 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 8ac7a4b0e2..7b73dc9af5 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 2808b5c70f..98df250d02 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 b560174d42..14b406f55d 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 4d33033c04..9e15f01e40 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 2462fecb28..e8859cdf53 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 673e1eae52..5eb1287031 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 1d0966caf8..20ced47956 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 585d67da97..ead726c4fa 100644 Binary files a/results/reaper/plots/tools/heatmap.pdf and b/results/reaper/plots/tools/heatmap.pdf differ diff --git a/src/python/latex_output.py b/src/python/latex_output.py index 7e55bdccec..1388fff943 100755 --- a/src/python/latex_output.py +++ b/src/python/latex_output.py @@ -806,9 +806,10 @@ def main(): if t not in tries_count: tries_count[t] = 0 tries_count[t] += 1 - for t in range(1, 11): + for t in tries_count: output += latex_def( - run_name_camel_case + f"NumberofTriesUntilPass{t}", tries_count.get(t, 0) + run_name_camel_case + f"NumberofMergesWith{t}TriesUntilPass", + tries_count.get(t, 0), ) spork_correct = len(result_df[result_df["spork"].isin(MERGE_CORRECT_NAMES)])