Illustration change + renaming

README.md

@@ -149,7 +149,9 @@ To run style checking run `make style`.
 
     * latex_output.py -> Output latex code for the resulting plots and table.
 
-    * merge_analyzer.py -> Compares merges that produce different output.
+    * merge_analyzer.py -> Analyzes a merge to determine if it should be tested.
+
+    * merges_sampler.py -> Samples merges to be tested.
 
     * get_repos.py -> Downloads the repos list.
 

run.sh

@@ -93,7 +93,7 @@ java -cp build/libs/astmergeevaluation-all.jar \
 
 # Sample 20*<n_merges> merges
 read -ra merge_comparator_flags <<<"${comparator_flags}"
-python3 src/python/sample_merges.py \
+python3 src/python/merges_sampler.py \
     --repos_head_passes_csv "$OUT_DIR/repos_head_passes.csv" \
     --merges_path "$OUT_DIR/merges/" \
     --output_dir "$OUT_DIR/merges_sampled/" \

src/python/sample_merges.py → src/python/merges_sampler.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 """ Samples n_merges for each repository.
-usage: python3 sample_merges.py --repos_head_passes_csv <path_to_repos_head_passes.csv>
+usage: python3 merges_sampler.py --repos_head_passes_csv <path_to_repos_head_passes.csv>
                                 --merges_path <path_to_merges>
                                 --output_dir <output_dir>
                                 --include_trivial_merges (optional)
@@ -43,7 +43,7 @@
         )
         if not merge_list_file.exists():
             print(
-                "sample_merges:",
+                "merges_sampler:",
                 repo_slug,
                 "does not have a list of merges. Missing file: ",
                 merge_list_file,
@@ -52,7 +52,7 @@
 
         if output_file.exists():
             print(
-                "sample_merges: Skipping",
+                "merges_sampler: Skipping",
                 repo_slug,
                 "because it is already computed.",
             )
@@ -61,7 +61,7 @@
             merges = pd.read_csv(merge_list_file, header=0, index_col="idx")
         except pd.errors.EmptyDataError:
             print(
-                "sample_merges: Skipping",
+                "merges_sampler: Skipping",
                 repo_slug,
                 "because it does not contain any merges.",
             )