Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added latest timing data #379

Merged
merged 7 commits into from
Sep 27, 2024
Merged

Added latest timing data #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6aea58a
Remove parallel support
benedikt-schesch Sep 27, 2024
5db440a
More fixes
benedikt-schesch Sep 27, 2024
d1518f0
Added latest timing data
benedikt-schesch Sep 27, 2024
7bf21c1
Fix for github actions
benedikt-schesch Sep 27, 2024
5960c32
Merge remote-tracking branch 'origin/remove_parallel_support' into fu…
benedikt-schesch Sep 27, 2024
d34ba8d
Update test results
benedikt-schesch Sep 27, 2024
ddb5685
Merge remote-tracking branch 'origin/remove_parallel_support' into fu…
benedikt-schesch Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .github/workflows/check-reproducibility-inconsistent-results.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
with:
python-version: 3.12
auto-update-conda: true
mamba-version: "*"
channels: conda-forge,defaults
activate-environment: AST
environment-file: environment.yml
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/check-reproducibility.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
with:
python-version: 3.12
auto-update-conda: true
mamba-version: "*"
channels: conda-forge,defaults
activate-environment: AST
environment-file: environment.yml
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/check-style.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ jobs:
with:
python-version: 3.12
auto-update-conda: true
mamba-version: "*"
channels: conda-forge,defaults
activate-environment: AST
environment-file: environment.yml
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/small-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
with:
python-version: 3.12
auto-update-conda: true
mamba-version: "*"
channels: conda-forge,defaults
activate-environment: AST
environment-file: environment.yml
Expand Down
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ venv
**/*_explanation.txt
cache-small/
apache-maven-3.9.2/
results/local_repos.csv
machines.txt
.valid_merges
cache/
Expand Down
18 changes: 1 addition & 17 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ conda env create -f environment.yml
conda activate AST
```

With mamba (faster https://github.com/mamba-org/mamba):
With mamba (faster <https://github.com/mamba-org/mamba>):

```bash
mamba env create -f environment.yml
Expand Down Expand Up @@ -101,12 +101,6 @@ The final result is found in `results/result_adjusted.csv`.
Directory `results/merges` contains all the merges for each repo.
Directory `results/merges_tested` contains all the merges that have been tested.

To execute `run_combined.sh` on multiple machines in parallel create a machine address list in `machines.txt` and run:

```bash
./src/scripts/utils/run_multiple_machines.sh main machines.txt <project_path_on_machine>
```

#### If `make small-test` fails

If `make small-test` fails in a branch that you wish to merge into the main
Expand Down Expand Up @@ -188,8 +182,6 @@ To run style checking run `make style`.

* repo.py -> Contains the Repo class which represents a repo.

* split_repos.py -> Splits the repos for parallel execution.

* write_head_hashes.py -> Writes the head hashes of all repos to a file.

* add_jacoco_gradle.py -> Adds jacoco to gradle projects.
Expand All @@ -202,14 +194,6 @@ To run style checking run `make style`.

* merge_tools/ -> Contains all the merge tools scripts.

* utils/

* run_remotely.sh -> Runs the full stack on a remote machine.

* run_multiple_machine.sh -> Runs the full stack on multiple remote machines.

* diff_statistics.py -> Various diff commands to compare the results of two merges.

* src/main/java/astmergeevaluation/FindMergeCommits.java -> Finds all merge commits in a repo.

* input_data/ -> Input data, which is a list of repositories; see its README.md.
Expand Down
4,073 changes: 0 additions & 4,073 deletions results/combined/local_repos.csv
View file
Open in desktop

This file was deleted.

Binary file modified results/combined/merges_analyzer_histograms.pdf
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions results/combined/merges_timed/47deg/firebrand.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time
5,refs/heads/master,766c135387b5f3eb7e464cc6730527eeb95baa7d,776567ef4e502d276d9b7f6a3c3ba70754fcabde,a42a9aa74631bb76921f1e76125f192aacbc0782,,True,True,True,13,31,147,2,True,13,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,True,Tests_passed,212c71215f2ad341af9344ea1ee08861fec2e90712b0e55cc698cda58ad403f5,True,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,16608a58bd15233ca38f9e5e235e92a8fc5df8f5a88d608ecbe1adb2cabafeac,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,e20dfe24a4e22564b4f5583eadb310bef587d0a4d5f890333b72d7ea6905e7be,Tests_failed,b336d00b45896445ff0cf8de2fcfdca273c57d8dc1347ee34704a5847569b1d3,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,0.012896537780761719,0.013041973114013672,0.014720678329467773,0.021646499633789062,0.015526533126831055,0.014889001846313477,0.015382051467895508,0.04253840446472168,0.07213640213012695,1.2309420108795166,0.5644748210906982,0.04004669189453125,0.06865620613098145,0.03979325294494629,0.06742548942565918,0.06205630302429199
idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,test merge,union_diff_files,left parent test result,left_tree_fingerprint,parents pass,right parent test result,right_tree_fingerprint,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,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint,gitmerge_ort_run_time,gitmerge_ort_ignorespace_run_time,gitmerge_recursive_histogram_run_time,gitmerge_recursive_myers_ignorespace_run_time,gitmerge_recursive_minimal_run_time,gitmerge_recursive_myers_run_time,gitmerge_recursive_patience_run_time,gitmerge_resolve_run_time,git_hires_merge_run_time,spork_run_time,intellimerge_run_time,adjacent_run_time,imports_run_time,version_numbers_run_time,ivn_run_time,ivn_ignorespace_run_time,gitmerge_ort_plus_run_time,gitmerge_ort_ignorespace_plus_run_time,gitmerge_recursive_histogram_plus_run_time,gitmerge_recursive_myers_ignorespace_plus_run_time,gitmerge_recursive_minimal_plus_run_time,gitmerge_recursive_myers_plus_run_time,gitmerge_recursive_patience_plus_run_time,gitmerge_resolve_plus_run_time,git_hires_merge_plus_run_time,spork_plus_run_time,intellimerge_plus_run_time,adjacent_plus_run_time,imports_plus_run_time,version_numbers_plus_run_time,ivn_plus_run_time,ivn_ignorespace_plus_run_time
5,refs/heads/master,766c135387b5f3eb7e464cc6730527eeb95baa7d,776567ef4e502d276d9b7f6a3c3ba70754fcabde,a42a9aa74631bb76921f1e76125f192aacbc0782,,True,True,True,13,31,147,2,True,13,Tests_passed,80632aa34a6b480c8013bc957a129a08d8896848e62295f1787dc23d9d51a4f0,True,Tests_passed,212c71215f2ad341af9344ea1ee08861fec2e90712b0e55cc698cda58ad403f5,True,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,16608a58bd15233ca38f9e5e235e92a8fc5df8f5a88d608ecbe1adb2cabafeac,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,e20dfe24a4e22564b4f5583eadb310bef587d0a4d5f890333b72d7ea6905e7be,Tests_failed,b336d00b45896445ff0cf8de2fcfdca273c57d8dc1347ee34704a5847569b1d3,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,Tests_passed,43b9bcfcce986863563f0844ec182bf09ac7a09467a0033b96e00df62a3dab34,0.012896537780761719,0.013041973114013672,0.014720678329467773,0.021646499633789062,0.015526533126831055,0.014889001846313477,0.015382051467895508,0.04253840446472168,0.07213640213012695,1.2309420108795166,0.5644748210906982,0.04004669189453125,0.06865620613098145,0.03979325294494629,0.06742548942565918,0.06205630302429199,0.06316733360290527,0.06530332565307617,0.06674742698669434,0.06381368637084961,0.06529831886291504,0.06418371200561523,0.06486797332763672,0.10125136375427246,0.09738397598266602,1.2239487171173096,0.6188781261444092,0.06580519676208496,0.06622195243835449,0.06671762466430664,0.06669974327087402,0.06281089782714844
Loading