Merge remote-tracking branch 'origin/remove_parallel_support' into fu…

…ll_timing_results

.github/workflows/check-reproducibility-inconsistent-results.yml

@@ -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

.github/workflows/check-reproducibility.yml

@@ -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

.github/workflows/check-style.yml

@@ -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

.github/workflows/small-test.yml

@@ -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

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Benedikt Schesch
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -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
@@ -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
@@ -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.
@@ -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.

run.sh

@@ -193,16 +193,9 @@ else
         --n_merges "$total_merges"
 fi
 
-echo "run.sh: about to run split_repos.py"
-python3 src/python/split_repos.py \
-    --repos_csv "$OUT_DIR/repos_head_passes.csv" \
-    --machine_id "$machine_id" \
-    --num_machines "$num_machines" \
-    --output_file "$OUT_DIR/local_repos.csv"
-
-echo "run.sh: about to run split_repos.py"
+echo "run.sh: about to run merge_analyzer.py"
 python3 src/python/merge_analyzer.py \
-    --repos_head_passes_csv "$OUT_DIR/local_repos.csv" \
+    --repos_head_passes_csv "$OUT_DIR/repos_head_passes.csv" \
     --merges_path "$OUT_DIR/merges_sampled/" \
     --output_dir "$OUT_DIR/merges_analyzed/" \
     --n_sampled_merges "$N_MERGES" \