Refactoring (#326)

benedikt-schesch · Aug 12, 2024 · 2fd2923 · 2fd2923
1 parent c3accc0
commit 2fd2923
Show file tree

Hide file tree

Showing 31 changed files with 16 additions and 32 deletions.
diff --git 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
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/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
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/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
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/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)])