Merge branch 'main' of github.com:benedikt-schesch/AST-Merging-Evalua…

…tion
benedikt-schesch · Jun 8, 2024 · 94ae115 · 94ae115
2 parents 9345242 + 833ab76
commit 94ae115
Show file tree

Hide file tree

Showing 84 changed files with 2,274 additions and 2,749 deletions.
diff --git a/.github/workflows/check-reproducibility-inconsistent-results.yml b/.github/workflows/check-reproducibility-inconsistent-results.yml
@@ -37,6 +37,8 @@ jobs:
     - run: echo "LOGURU_COLORIZE=NO" >> $GITHUB_ENV
     - name: Build
       run: cd src/scripts/merge_tools/merging && ./gradlew shadowJar
+    - name: Free Disk Space
+      uses: jlumbroso/free-disk-space@main
     - name: make check-merges-reproducibility
       run: |
         python3 src/python/utils/build_inconsistent_merges.py

diff --git a/.github/workflows/check-reproducibility.yml b/.github/workflows/check-reproducibility.yml
@@ -37,6 +37,8 @@ jobs:
     - run: echo "LOGURU_COLORIZE=NO" >> $GITHUB_ENV
     - name: Build
       run: cd src/scripts/merge_tools/merging && ./gradlew shadowJar
+    - name: Free Disk Space
+      uses: jlumbroso/free-disk-space@main
     - name: make check-merges-reproducibility
       run: |
         head -n 151 results/combined/result.csv > temp.csv && mv temp.csv results/combined/result.csv

diff --git a/Makefile b/Makefile
@@ -143,6 +143,9 @@ check-merges-reproducibility:
 	@set -e; \
 	for idx in $(shell tail -n +2 $(CSV_RESULTS) | awk -F, '{print $$1}'); do \
 		src/python/replay_merge.py --testing --merges_csv $(CSV_RESULTS) -skip_build -delete_workdir --idx $$idx; \
+		df -h; \
+		du -sh repos; \
+		du -sh *; \
 	done
 
 protect-repos:

diff --git a/results/combined/defs.tex b/results/combined/defs.tex
@@ -11,15 +11,15 @@
 \def\combinedReposSampled{1120\xspace}
 \def\combinedMergesSampled{6038\xspace}
 \def\combinedReposYieldedFull{1\xspace}
-\def\combinedReposTotal{1100\xspace}
-\def\combinedMergesTotal{5694\xspace}
+\def\combinedReposTotal{1097\xspace}
+\def\combinedMergesTotal{5656\xspace}
 
 % Results
-\def\combinedSporkOverOrtCorrect{505\xspace}
-\def\combinedSporkOverOrtIncorrect{444\xspace}
-\def\combinedMainBranchMerges{3397\xspace}
+\def\combinedSporkOverOrtCorrect{495\xspace}
+\def\combinedSporkOverOrtIncorrect{451\xspace}
+\def\combinedMainBranchMerges{3376\xspace}
 \def\combinedMainBranchMergesPercent{60\xspace}
-\def\combinedOtherBranchMerges{2297\xspace}
+\def\combinedOtherBranchMerges{2280\xspace}
 \def\combinedOtherBranchMergesPercent{40\xspace}
 \def\combinedReposJava{42092\xspace}
 

diff --git a/results/combined/plots/all/cost_with_manual.pdf b/results/combined/plots/all/cost_with_manual.pdf