Merge branch 'esecfse22' into main

pmbittner · pmbittner · commit a4a61838b5ed · 2022-07-08T16:01:58.000+02:00
diff --git a/.run/DiffTreeMiner.run.xml b/.run/DiffTreeMiner.run.xml
diff --git a/.run/GenAutomationResults.run.xml b/.run/GenAutomationResults.run.xml
@@ -1,8 +1,10 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="GenAutomationResults" type="Application" factoryName="Application">
+    <option name="ALTERNATIVE_JRE_PATH" value="openjdk-16" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="org.variantsync.diffdetective.validation.FindMedianCommitTime" />
-    <module name="DiffDetective" />
-    <option name="PROGRAM_PARAMETERS" value="results/difftrees" />
+    <module name="diffdetective" />
+    <option name="PROGRAM_PARAMETERS" value="results/validation/current" />
     <extension name="coverage">
       <pattern>
         <option name="PATTERN" value="mining.*" />
diff --git a/.run/GenUltimateResults.run.xml b/.run/GenUltimateResults.run.xml
@@ -1,8 +1,10 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="GenUltimateResults" type="Application" factoryName="Application">
+    <option name="ALTERNATIVE_JRE_PATH" value="openjdk-16" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="org.variantsync.diffdetective.tablegen.MiningResultAccumulator" />
-    <module name="DiffDetective" />
-    <option name="PROGRAM_PARAMETERS" value="results/difftrees results/difftrees/" />
+    <module name="diffdetective" />
+    <option name="PROGRAM_PARAMETERS" value="results/validation/current results/validation/current" />
     <extension name="coverage">
       <pattern>
         <option name="PATTERN" value="mining.*" />
diff --git a/.run/Validation.run.xml b/.run/Validation.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Validation" type="Application" factoryName="Application" nameIsGenerated="true">
     <option name="MAIN_CLASS_NAME" value="org.variantsync.diffdetective.validation.Validation" />
-    <module name="DiffDetective" />
+    <module name="diffdetective" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/src/main/java/org/variantsync/diffdetective/tablegen/styles/ShortTable.java b/src/main/java/org/variantsync/diffdetective/tablegen/styles/ShortTable.java
@@ -96,8 +96,8 @@ private static List<ColumnDefinition> columns(final ShortTable t, final TriFunct
         }
 
         cols.add(col("runtime", DASH_RIGHT, row -> t.makeReadable(row.results().runtimeInSeconds) + "s"));
-        cols.add(col("avg. runtime per\\\\ processed commit", RIGHT, row -> t.makeReadable(row.automationResult().avgTimeMS()) + "ms"));
-        cols.add(col("median runtime per\\\\ processed commit", RIGHT, row -> t.makeReadable(row.automationResult().median().milliseconds()) + "ms"));
+        cols.add(col("avg. runtime~/\\\\ processed commit", RIGHT, row -> t.makeReadable(row.automationResult().avgTimeMS()) + "ms"));
+        cols.add(col("median runtime~/\\\\ processed commit", RIGHT, row -> t.makeReadable(row.automationResult().median().milliseconds()) + "ms"));
 
         return cols;
     }

Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,8 @@ private static List<ColumnDefinition> columns(final ShortTable t, final TriFunct`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`cols.add(col("runtime", DASH_RIGHT, row -> t.makeReadable(row.results().runtimeInSeconds) + "s"));`
`99`		`- cols.add(col("avg. runtime per\\\\ processed commit", RIGHT, row -> t.makeReadable(row.automationResult().avgTimeMS()) + "ms"));`
`100`		`- cols.add(col("median runtime per\\\\ processed commit", RIGHT, row -> t.makeReadable(row.automationResult().median().milliseconds()) + "ms"));`
	`99`	`+ cols.add(col("avg. runtime~/\\\\ processed commit", RIGHT, row -> t.makeReadable(row.automationResult().avgTimeMS()) + "ms"));`
	`100`	`+ cols.add(col("median runtime~/\\\\ processed commit", RIGHT, row -> t.makeReadable(row.automationResult().median().milliseconds()) + "ms"));`
`101`	`101`
`102`	`102`	`return cols;`
`103`	`103`	`}`