Skip to content

Commit

Permalink
Add X_plus.sh scripts that fix up the result of X.sh (#353)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mernst
mernst authored Sep 24, 2024
1 parent 69861f6 commit 89b376f
Show file tree
Hide file tree
Showing 3,575 changed files with 84,744 additions and 51,788 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions .github/workflows/check-style.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ jobs:
run: sudo apt update && sudo apt install shellcheck devscripts
- name: Check style
run: make check-style
- name: Check script diffs
run: pwd && cd src/scripts/merge_tools && ./check-implementations.sh
7 changes: 6 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
all: style gradle-assemble
all: check-style gradle-assemble

fix-style: fix-python-style fix-java-style

Expand Down Expand Up @@ -146,6 +146,11 @@ run-all:
./run_greatest_hits.sh --no_timing
./run_reaper.sh --no_timing

run-all-without-small-test:
./run_combined.sh
./run_greatest_hits.sh --no_timing
./run_reaper.sh --no_timing

small-test-diff:
python3 test/check_equal_csv.py --actual_folder results/small/ --goal_folder test/small-goal-files/
@echo
Expand Down
9 changes: 4 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,11 @@ To run style checking run `make style`.

To investigate differences between two mergers:

* edit file `src/python/utils/select_from_results.py` to reflect the differences you are interested in.
* run `src/python/utils/select_from_results.py` to create a .csv database containing only the differences.
* Edit file `src/python/utils/select_from_results.py` to reflect the differences you are interested in.
* Run `src/python/utils/select_from_results.py` to create a .csv database containing only the differences.
* Set `DELETE_WORKDIRS` to `false` in `src/python/variables.py`.
* run `src/python/replay_merge.py --idx INDEX` (maybe add `-test`) for the index of the merge you are interested in.

If the merge is in the small test, you may need to add `--merges_csv ./test/small-goal-files/result.csv`.
* Run `src/python/replay_merge.py --idx INDEX` (maybe add `-test`) for the index of the merge you are interested in.
If the merge is in the small test, you may need to add `--merges_csv ./test/small-goal-files/result.csv`.

## Overwriting results manually

Expand Down
22 changes: 11 additions & 11 deletions results/combined/defs.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
\def\combinedReposSampled{1120\xspace}
\def\combinedMergesSampled{6035\xspace}
\def\combinedReposYieldedFull{1\xspace}
\def\combinedReposTotal{1117\xspace}
\def\combinedMergesTotal{6002\xspace}
\def\combinedReposTotal{1116\xspace}
\def\combinedMergesTotal{5983\xspace}

% Results
\def\combinedAverageTriesUntilPass{1.0153583862232984\xspace}
\def\combinedNumberofMergesWith1TriesUntilPass{69138\xspace}
\def\combinedNumberofMergesWith3TriesUntilPass{158\xspace}
\def\combinedNumberofMergesWith5TriesUntilPass{55\xspace}
\def\combinedNumberofMergesWith2TriesUntilPass{404\xspace}
\def\combinedNumberofMergesWith4TriesUntilPass{44\xspace}
\def\combinedSporkOverOrtCorrect{516\xspace}
\def\combinedAverageTriesUntilPass{1.0138133934137565\xspace}
\def\combinedNumberofMergesWith1TriesUntilPass{90637\xspace}
\def\combinedNumberofMergesWith3TriesUntilPass{167\xspace}
\def\combinedNumberofMergesWith5TriesUntilPass{70\xspace}
\def\combinedNumberofMergesWith2TriesUntilPass{514\xspace}
\def\combinedNumberofMergesWith4TriesUntilPass{45\xspace}
\def\combinedSporkOverOrtCorrect{512\xspace}
\def\combinedSporkOverOrtIncorrect{487\xspace}
\def\combinedMainBranchMerges{3534\xspace}
\def\combinedMainBranchMerges{3524\xspace}
\def\combinedMainBranchMergesPercent{59\xspace}
\def\combinedOtherBranchMerges{2468\xspace}
\def\combinedOtherBranchMerges{2459\xspace}
\def\combinedOtherBranchMergesPercent{41\xspace}
\def\combinedReposJava{42092\xspace}

Expand Down
2 changes: 1 addition & 1 deletion results/combined/inconsistent_results.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,adjacent_ignorespace,adjacent_ignorespace_merge_fingerprint,imports,imports_merge_fingerprint,imports_ignorespace,imports_ignorespace_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,version_numbers_ignorespace,version_numbers_ignorespace_merge_fingerprint,repository,Oracle tool
idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,adjacent_ignorespace,adjacent_ignorespace_merge_fingerprint,imports,imports_merge_fingerprint,imports_ignorespace,imports_ignorespace_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,version_numbers_ignorespace,version_numbers_ignorespace_merge_fingerprint,repository,Oracle tool
244-2,244,2,refs/heads/master,d616ff21adfb6b2525ca6fc9a5c945053a5fd627,bf0b95ed01f0d3b31e4b6357312e7a20366b58f7,74f5edf2cceec3806b69fe157a58de99d5e36cc2,,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,21bf856f56036bbd34a06c75561d85e998d0fca8ed980a3d13b8dd68b4c5de46,Tests_passed,True,True,True,True,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Merge_failed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,da8c62208a3131912761c4d210ca8386df0f5e584fbfa3343be6a92e57788d77,Tests_passed,da8c62208a3131912761c4d210ca8386df0f5e584fbfa3343be6a92e57788d77,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,Tests_passed,0317b85725bfcb3cecaa467399d36c06a7bc2e12cf673bbd2d30deffe2649254,allan-huang/remote-procedure-call,Tests_passed
681-36,681,36,refs/heads/ea,651fafcf0cdc3bbb18890955b02061bfc5f85c64,9ab050a11428838af56ad7479904209a7040b29b,b7d01c6ec8e5bdf57ecd47ed93b19624b5ba6c77,,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,True,True,True,True,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Merge_failed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,eed80cf2eb766308de18d2f9ae8e85339f69b7262b7bdf9a5e423071ae0b395e,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,Tests_passed,a1c7b9a06a19fa0710ccf8a461b9dc04dcb2c418ff5cd6d33f6b00b1d472e900,openhft/chronicle-threads,Tests_passed
3183-5,3183,5,refs/heads/master,09c65cd9540ef816799eb0540ec463ec912a300a,590e67d0d93811d58b9454be6a0c9178e7f2ba3f,fc2a9e2cffc52f1f4392b5552555196d7e41dc49,,b1fc4677d158a76fd8a141595ff1c8791f73abced5b525bfd20fa515589570b7,Tests_passed,66af1d880972b5291a442f2ae4572de0c31e6146d48a15a4422715f1d8a235b8,Tests_passed,True,True,True,True,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,2315c69fcc2e365ecb080f71ba5aa638eba509672698db069a8d5d897a7e660c,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,2315c69fcc2e365ecb080f71ba5aa638eba509672698db069a8d5d897a7e660c,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Merge_failed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,2315c69fcc2e365ecb080f71ba5aa638eba509672698db069a8d5d897a7e660c,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,2315c69fcc2e365ecb080f71ba5aa638eba509672698db069a8d5d897a7e660c,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,2315c69fcc2e365ecb080f71ba5aa638eba509672698db069a8d5d897a7e660c,Tests_passed,b022c6b42c420c170feaedea792a116dc55f77727b58a99f8c7aca315b9585c5,Tests_passed,2315c69fcc2e365ecb080f71ba5aa638eba509672698db069a8d5d897a7e660c,accla/d4m_api_java,Tests_passed
Expand Down
Binary file modified results/combined/merges_analyzer_histograms.pdf
View file
Binary file not shown.
Loading

0 comments on commit 89b376f

Please sign in to comment.