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.

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

Update Figures #292

Merged
merged 17 commits into from
May 16, 2024
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

To install all the Python requirements, create a conda or mamba environment:


With conda:

```bash
Expand Down Expand Up @@ -211,10 +212,10 @@ To run style checking run `make style`.

* jars/ -> Location for the IntelliMerge and Spork jars.


## Comparing merge algorithms

To investigate differences between two mergers:
* edit file `src/python/select_from_results.py` to reflect the differences you are interested in.
* run `src/python/select_from_results.py` to create a .csv database containing only the differences.
* run `src/python/replay_merge.py --merges_csv CSV_FILE --idx INDEX` (maybe add `-test`) for the index of the merge you are interested in.

* edit file `src/python/select_from_results.py` to reflect the differences you are interested in.
* run `src/python/select_from_results.py` to create a .csv database containing only the differences.
* run `src/python/replay_merge.py --merges_csv CSV_FILE --idx INDEX` (maybe add `-test`) for the index of the merge you are interested in.
Binary file modified results/combined/plots/all/cost_with_manual.pdf
Binary file not shown.
347 changes: 185 additions & 162 deletions results/combined/plots/all/cost_with_manual.pgf

Large diffs are not rendered by default.

Binary file not shown.
Loading