Browse Source

More similarity code deduplication.

Alberth 5 years ago
parent
commit
59abe540c3
1 changed files with 2 additions and 2 deletions
  1. 2 2
      jplag/src/main/java/de/jplag/JPlagComparison.java

+ 2 - 2
jplag/src/main/java/de/jplag/JPlagComparison.java

@@ -246,13 +246,13 @@ public class JPlagComparison implements Comparator<JPlagComparison> { // FIXME T
     }
     }
 
 
     private final float firstBasecodeSimilarity() {
     private final float firstBasecodeSimilarity() {
-        float sa = firstSubmission.getNumberOfTokens() - firstSubmission.getFiles().size();
+        float sa = firstSubmission.getSimilarityDivisor(false);
         JPlagComparison firstBaseCodeMatches = firstSubmission.getBaseCodeComparison();
         JPlagComparison firstBaseCodeMatches = firstSubmission.getBaseCodeComparison();
         return firstBaseCodeMatches.getNumberOfMatchedTokens() * 100 / sa;
         return firstBaseCodeMatches.getNumberOfMatchedTokens() * 100 / sa;
     }
     }
 
 
     private final float secondBasecodeSimilarity() {
     private final float secondBasecodeSimilarity() {
-        float sb = secondSubmission.getNumberOfTokens() - secondSubmission.getFiles().size();
+        float sb = secondSubmission.getSimilarityDivisor(false);
         JPlagComparison secondBaseCodeMatches = secondSubmission.getBaseCodeComparison();
         JPlagComparison secondBaseCodeMatches = secondSubmission.getBaseCodeComparison();
         return secondBaseCodeMatches.getNumberOfMatchedTokens() * 100 / sb;
         return secondBaseCodeMatches.getNumberOfMatchedTokens() * 100 / sb;
     }
     }