Merge branch 'cleaning' of github.com:VariantSync/DiffDetective into cleaning

Author: pmbittner

Dockerfile

@@ -49,7 +49,7 @@ WORKDIR /home/sherlock
 # Copy the compiled JAR file from the first stage into the second stage
 # Syntax: COPY --from=STAGE_ID SOURCE_PATH TARGET_PATH
 WORKDIR /home/sherlock/holmes
-COPY --from=0 /home/user/target/DiffDetectiveRunner.jar .
+COPY --from=0 /home/user/target/diffdetective-1.0.0-jar-with-dependencies.jar ./DiffDetective.jar
 WORKDIR /home/sherlock
 
 # Copy the setup

docker/execute.sh

@@ -1,32 +1,32 @@
 #! /bin/bash
 
 if [ "$1" == '' ]; then
-  echo "Either fully run DiffDetective as presented in the paper (replication) or a do quick setup validation (validation)."
+  echo "Either fully run DiffDetective as presented in the paper (replication) or a do quick setup verification (verification)."
   echo "-- Examples --"
   echo "Run replication: './execute.sh replication'"
-  echo "Validate the setup: './execute.sh validation'"
+  echo "Validate the setup: './execute.sh verification'"
   exit
 fi
 cd /home/sherlock || exit
-if [ "$1" == 'replication' ] || [ "$1" == 'validation' ]; then
+if [ "$1" == 'replication' ] || [ "$1" == 'verification' ]; then
   cd holmes || exit
   if [ "$1" == 'replication' ]; then
     echo "Running full replication. Depending on your system, this will require several hours or even a few days."
-    java -jar DiffDetectiveRunner.jar docs/datasets.md
-  elif [ "$1" == 'validation' ]; then
-    echo "Running a short validation."
-    java -jar DiffDetectiveRunner.jar docs/validation/datasets.md
+    java -cp DiffDetective.jar org.variantsync.diffdetective.validation.Validation
+  elif [ "$1" == 'verification' ]; then
+    echo "Running a short verification."
+    java -cp DiffDetective.jar org.variantsync.diffdetective.validation.Validation docs/verification/datasets.md
   fi
-  echo "Starting evaluation."
+  echo "Collecting results."
   cp -r results/* ../results/
-  java -cp DiffDetectiveRunner.jar mining.FindMedianCommitTime ../results/difftrees
-  java -cp DiffDetectiveRunner.jar mining.tablegen.MiningResultAccumulator ../results/difftrees ../results/difftrees
+  java -cp DiffDetective.jar org.variantsync.diffdetective.validation.FindMedianCommitTime ../results/validation/current
+  java -cp DiffDetective.jar org.variantsync.diffdetective.tablegen.MiningResultAccumulator ../results/validation/current ../results/validation/current
   echo "The results are located in the 'results' directory."
 else
   echo "INVALID ARGUMENT: $1"
-  echo "Either fully run DiffDetective as presented in the paper (replication) or a do quick setup validation (validation)."
+  echo "Either fully run DiffDetective as presented in the paper (replication) or a do quick setup verification (verification)."
   echo "-- Examples --"
   echo "Run replication: './execute.sh replication'"
-  echo "Validate the setup: './execute.sh validation'"
+  echo "Validate the setup: './execute.sh verification'"
   exit
 fi

docs/validation/validation_histogram.png

@@ -61,7 +61,7 @@ public static void main(final String[] args) throws IOException {
      */
     public static AutomationResult getResultOfDirectory(final Path directory) throws IOException {
         if (!Files.isDirectory(directory)) {
-            throw new IllegalArgumentException("Expected path to directory but the given path is not a directory!");
+            throw new IllegalArgumentException("Expected path to directory but "+ directory +" is not a directory!");
         }
 
         // This stream needs {@code O(n log(n))} time (because of the sort) and {@code O(n)} space