Removed non-common tokens from GST

jplag · Jan 19, 2025 · c1ec6c2 · c1ec6c2
1 parent e4025ac
commit c1ec6c2
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 14 deletions.
diff --git a/core/src/main/java/de/jplag/GreedyStringTiling.java b/core/src/main/java/de/jplag/GreedyStringTiling.java
@@ -98,14 +98,29 @@ public final JPlagComparison compare(Submission firstSubmission, Submission seco
      * @return the comparison results.
      */
     private JPlagComparison compareInternal(Submission leftSubmission, Submission rightSubmission) {
-        int[] leftValues = tokenValueListFromSubmission(leftSubmission);
-        int[] rightValues = tokenValueListFromSubmission(rightSubmission);
-
-        boolean[] leftMarked = calculateInitiallyMarked(leftSubmission);
-        boolean[] rightMarked = calculateInitiallyMarked(rightSubmission);
-
-        SubsequenceHashLookupTable leftLookupTable = subsequenceHashLookupTableForSubmission(leftSubmission, leftMarked);
-        SubsequenceHashLookupTable rightLookupTable = subsequenceHashLookupTableForSubmission(rightSubmission, rightMarked);
+        List<Class<?>> contextsLeft = leftSubmission.getTokenList().stream().map(it -> it.getLanguage().getTokenContexts()).reduce((left, right) -> {
+            List<Class<?>> leftContexts = new ArrayList<>(left);
+            leftContexts.retainAll(right);
+            return leftContexts;
+        }).get();
+        List<Class<?>> contextsRight = rightSubmission.getTokenList().stream().map(it -> it.getLanguage().getTokenContexts())
+                .reduce((left, right) -> {
+                    List<Class<?>> leftContexts = new ArrayList<>(left);
+                    leftContexts.retainAll(right);
+                    return leftContexts;
+                }).get();
+
+        List<Class<?>> contexts = new ArrayList<>(contextsLeft);
+        contexts.retainAll(contextsRight);
+
+        int[] leftValues = tokenValueListFromSubmission(leftSubmission, contexts);
+        int[] rightValues = tokenValueListFromSubmission(rightSubmission, contexts);
+
+        boolean[] leftMarked = calculateInitiallyMarked(leftSubmission, contexts);
+        boolean[] rightMarked = calculateInitiallyMarked(rightSubmission, contexts);
+
+        SubsequenceHashLookupTable leftLookupTable = subsequenceHashLookupTableForSubmission(leftSubmission, leftMarked, contexts);
+        SubsequenceHashLookupTable rightLookupTable = subsequenceHashLookupTableForSubmission(rightSubmission, rightMarked, contexts);
 
         int maximumMatchLength;
         List<Match> globalMatches = new ArrayList<>();
@@ -195,28 +210,28 @@ private void addMatchIfNotOverlapping(List<Match> matches, Match match) {
         matches.add(match);
     }
 
-    private boolean[] calculateInitiallyMarked(Submission submission) {
+    private boolean[] calculateInitiallyMarked(Submission submission, List<Class<?>> contexts) {
         Set<Token> baseCodeTokens = baseCodeMarkings.get(submission);
-        List<Token> tokens = submission.getTokenList();
+        List<Token> tokens = submission.getTokenList(contexts);
         boolean[] result = new boolean[tokens.size()];
         for (int i = 0; i < result.length; i++) {
             result[i] = tokens.get(i).getType().isExcludedFromMatching() || (baseCodeTokens != null && baseCodeTokens.contains(tokens.get(i)));
         }
         return result;
     }
 
-    private SubsequenceHashLookupTable subsequenceHashLookupTableForSubmission(Submission submission, boolean[] marked) {
+    private SubsequenceHashLookupTable subsequenceHashLookupTableForSubmission(Submission submission, boolean[] marked, List<Class<?>> contexts) {
         return cachedHashLookupTables.computeIfAbsent(submission,
-                (key -> new SubsequenceHashLookupTable(minimumMatchLength, tokenValueListFromSubmission(key), marked)));
+                (key -> new SubsequenceHashLookupTable(minimumMatchLength, tokenValueListFromSubmission(key, contexts), marked)));
     }
 
     /**
      * Converts the tokens of the submission to a list of values.
      * @param submission The submission from which to convert the tokens.
      */
-    private int[] tokenValueListFromSubmission(Submission submission) {
+    private int[] tokenValueListFromSubmission(Submission submission, List<Class<?>> contexts) {
         return cachedTokenValueLists.computeIfAbsent(submission, (key -> {
-            List<Token> tokens = key.getTokenList();
+            List<Token> tokens = key.getTokenList(contexts);
             int[] tokenValueList = new int[tokens.size()];
             for (int i = 0; i < tokens.size(); i++) {
                 TokenType type = tokens.get(i).getType();

diff --git a/core/src/main/java/de/jplag/Submission.java b/core/src/main/java/de/jplag/Submission.java
@@ -140,6 +140,10 @@ public List<Token> getTokenList() {
         return tokenList;
     }
 
+    public List<Token> getTokenList(List<Class<?>> contexts) {
+        return tokenList.stream().filter(it -> contexts.contains(it.getType().getContext())).toList();
+    }
+
     /**
      * @return Whether a comparison between the submission and the base code is available.
      */