Slight changes to the report json format

core/src/main/java/de/jplag/JPlagResult.java

@@ -23,7 +23,7 @@ public class JPlagResult {
     private final int[] similarityDistribution; // 10-element array representing the similarity distribution of the detected matches.
 
     private List<ClusteringResult<Submission>> clusteringResult;
-    private final int SIMILARITY_DISTRIBUTION_SIZE = 10;
+    private final int SIMILARITY_DISTRIBUTION_SIZE = 100;
 
     public JPlagResult(List<JPlagComparison> comparisons, SubmissionSet submissions, long durationInMillis, JPlagOptions options) {
         // sort by similarity (descending)

core/src/test/java/de/jplag/reporting/reportobject/mapper/MetricMapperTest.java

@@ -19,8 +19,14 @@
 import de.jplag.reporting.reportobject.model.TopComparison;
 
 public class MetricMapperTest {
-    private static final List<Integer> EXPECTED_AVG_DISTRIBUTION = List.of(29, 23, 19, 17, 13, 11, 7, 5, 3, 2);
-    private static final List<Integer> EXPECTED_MAX_DISTRIBUTION = List.of(50, 48, 20, 13, 10, 1, 3, 1, 0, 0);
+    private static final List<Integer> EXPECTED_AVG_DISTRIBUTION = List.of(1, 0, 0, 2, 3, 15, 5, 2, 16, 5, 2, 18, 3, 21, 2, 1, 5, 0, 14, 32, 25, 4, 2,
+            12, 3, 2, 5, 5, 0, 5, 1, 5, 2, 5, 4, 5, 3, 5, 18, 21, 30, 4, 3, 10, 2, 3, 17, 28, 4, 10, 2, 4, 3, 0, 2, 20, 4, 0, 19, 5, 25, 9, 4, 18, 1,
+            1, 1, 0, 31, 15, 35, 38, 40, 43, 45, 49, 50, 50, 50, 53, 60, 71, 73, 74, 80, 83, 87, 93, 95, 99, 102, 105, 106, 110, 113, 113, 117, 117,
+            122, 124);
+    private static final List<Integer> EXPECTED_MAX_DISTRIBUTION = List.of(130, 129, 124, 116, 114, 110, 110, 108, 103, 101, 99, 97, 96, 92, 82, 81,
+            70, 67, 64, 63, 59, 56, 52, 50, 50, 50, 49, 47, 43, 5, 6, 11, 4, 2, 3, 20, 37, 5, 0, 2, 33, 30, 19, 4, 5, 24, 40, 6, 3, 9, 2, 3, 18, 3, 5,
+            1, 4, 1, 0, 0, 5, 5, 14, 5, 42, 4, 18, 0, 0, 10, 4, 3, 17, 33, 4, 4, 3, 4, 39, 0, 20, 2, 4, 9, 0, 5, 0, 8, 23, 4, 2, 39, 3, 4, 1, 0, 3,
+            33, 2, 1);
     private final MetricMapper metricMapper = new MetricMapper(Submission::getName);
 
     @Test

report-viewer/src/components/DistributionDiagram.vue

@@ -23,7 +23,7 @@ const props = defineProps({
   }
 })
 
-const maxVal = ref(Math.max(...props.distribution.distribution))
+const maxVal = ref(Math.max(...props.distribution.getTenthPercentileFormattedValues()))
 const labels = [
   '91-100%',
   '81-90%',
@@ -51,7 +51,7 @@ const chartData = ref({
   datasets: [
     {
       ...dataSetStyle.value,
-      data: props.distribution.distribution
+      data: props.distribution.getTenthPercentileFormattedValues()
     }
   ]
 })
@@ -109,12 +109,12 @@ watch(
       datasets: [
         {
           ...dataSetStyle.value,
-          data: val.distribution
+          data: val.getTenthPercentileFormattedValues()
         }
       ]
     }
 
-    maxVal.value = Math.max(...val.distribution)
+    maxVal.value = Math.max(...val.getTenthPercentileFormattedValues())
     options.value.scales.x.suggestedMax = maxVal.value + 5
   }
 )

report-viewer/src/model/Distribution.ts

@@ -1,11 +1,12 @@
-export default class Distribution {
-  private readonly _distribution: Array<number>
+export default abstract class Distribution {
+  protected readonly _distribution: Array<number>
 
   constructor(distribution: Array<number>) {
     this._distribution = distribution
   }
 
-  get distribution(): Array<number> {
-    return this._distribution
-  }
+  /**
+   * Returns the distribution summed at every tenth percentile
+   */
+  public abstract getTenthPercentileFormattedValues(): Array<number>
 }

report-viewer/src/model/PercentileDistribution.ts

@@ -0,0 +1,18 @@
+import Distribution from './Distribution'
+
+export default class HundredValueDistribution extends Distribution {
+  constructor(distribution: number[]) {
+    super(distribution)
+  }
+
+  /**
+   * Returns the distribution summed at every tenth percentile
+   */
+  public getTenthPercentileFormattedValues(): number[] {
+    const tenValueArray = new Array<number>(10).fill(0)
+    for (let i = 0; i < 100; i++) {
+      tenValueArray[Math.floor(i / 10)] += this._distribution[i]
+    }
+    return tenValueArray
+  }
+}

report-viewer/src/model/TenthPercentileDistribution.ts

@@ -0,0 +1,11 @@
+import Distribution from './Distribution'
+
+export default class TenValueDistribution extends Distribution {
+  constructor(distribution: number[]) {
+    super(distribution)
+  }
+
+  public getTenthPercentileFormattedValues(): number[] {
+    return this._distribution
+  }
+}

report-viewer/src/model/factories/OverviewFactory.ts

@@ -7,6 +7,8 @@ import versionJson from '@/version.json'
 import Distribution from '../Distribution'
 import MetricType from '../MetricType'
 import { BaseFactory } from './BaseFactory'
+import PercentileDistribution from '../PercentileDistribution'
+import TenValueDistribution from '../TenthPercentileDistribution'
 
 export class OverviewFactory extends BaseFactory {
   static reportViewerVersion: Version =
@@ -68,18 +70,47 @@ export class OverviewFactory extends BaseFactory {
   private static extractDistributions(
     json: Record<string, unknown>
   ): Record<MetricType, Distribution> {
-    const distributionsMap = json.distributions as Record<string, Array<number>>
+    if (json.distributions) {
+      return this.extractDistributionsFromMap(json.distributions as Record<string, Array<number>>)
+    } else if (json.metrics) {
+      return this.extractDistributionsFromMetrics(json.metrics as Array<Record<string, unknown>>)
+    }
+    throw new Error('No distributions found')
+  }
+
+  private static extractDistributionsFromMap(
+    distributionsMap: Record<string, Array<number>>
+  ): Record<MetricType, Distribution> {
     const distributions = {} as Record<MetricType, Distribution>
     for (const [key, value] of Object.entries(distributionsMap)) {
-      distributions[key as MetricType] = new Distribution(value as Array<number>)
+      distributions[key as MetricType] = new PercentileDistribution(value as Array<number>)
     }
     return distributions
   }
 
+  private static extractDistributionsFromMetrics(
+    metrics: Array<Record<string, unknown>>
+  ): Record<MetricType, Distribution> {
+    return {
+      [MetricType.AVERAGE]: new TenValueDistribution(metrics[0].distribution as Array<number>),
+      [MetricType.MAXIMUM]: new TenValueDistribution(metrics[1].distribution as Array<number>)
+    }
+  }
+
   private static extractTopComparisons(
     json: Record<string, unknown>
   ): Array<ComparisonListElement> {
-    const jsonComparisons = json.top_comparisons as Array<Record<string, unknown>>
+    if (json.top_comparisons) {
+      return this.extractTopComparisonsFromMap(
+        json.top_comparisons as Array<Record<string, unknown>>
+      )
+    } else if (json.metrics) {
+      return this.extractTopComparisonsFromMetrics(json.metrics as Array<Record<string, unknown>>)
+    }
+    throw new Error('No top comparisons found')
+  }
+
+  private static extractTopComparisonsFromMap(jsonComparisons: Array<Record<string, unknown>>) {
     const comparisons = [] as Array<ComparisonListElement>
     let counter = 0
     for (const topComparison of jsonComparisons) {
@@ -93,6 +124,40 @@ export class OverviewFactory extends BaseFactory {
     }
     return comparisons
   }
+
+  private static extractTopComparisonsFromMetrics(metrics: Array<Record<string, unknown>>) {
+    const averageSimilarities: Map<string, number> = new Map<string, number>()
+    const comparisons = [] as Array<ComparisonListElement>
+
+    // Average
+    for (const comparison of metrics[0].topComparisons as Array<Record<string, unknown>>) {
+      averageSimilarities.set(
+        (comparison.first_submission as string) + '-' + (comparison.second_submission as string),
+        comparison.similarity as number
+      )
+    }
+
+    // Max
+    let counter = 0
+    for (const comparison of metrics[1].topComparisons as Array<Record<string, unknown>>) {
+      const avg = averageSimilarities.get(
+        (comparison.first_submission as string) + '-' + (comparison.second_submission as string)
+      )
+      comparisons.push({
+        sortingPlace: counter++,
+        id: counter,
+        firstSubmissionId: comparison.first_submission as string,
+        secondSubmissionId: comparison.second_submission as string,
+        similarities: {
+          [MetricType.AVERAGE]: avg as number,
+          [MetricType.MAXIMUM]: comparison.similarity as number
+        }
+      })
+    }
+
+    return comparisons
+  }
+
   private static extractClusters(json: Record<string, unknown>): Array<Cluster> {
     if (!json.clusters) {
       return []