Update Figures (#292)

benedikt-schesch · May 16, 2024 · d77ff05 · d77ff05
1 parent d04f734
commit d77ff05
Show file tree

Hide file tree

Showing 120 changed files with 25,999 additions and 16,758 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@
 
 To install all the Python requirements, create a conda or mamba environment:
 
+
 With conda:
 
 ```bash
@@ -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.
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_with_manual.pgf b/results/combined/plots/all/cost_with_manual.pgf
diff --git a/results/combined/plots/all/cost_with_oracle.pdf b/results/combined/plots/all/cost_with_oracle.pdf