improve count statements performance

Luro02 · Oct 1, 2024 · 75b15ba · 75b15ba
1 parent eb54981
commit 75b15ba
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/autograder-core/src/main/java/de/firemage/autograder/core/check/structure/DuplicateCode.java b/autograder-core/src/main/java/de/firemage/autograder/core/check/structure/DuplicateCode.java
@@ -45,7 +45,7 @@ private static boolean isAnyStatementIn(DuplicateCodeFinder.DuplicateCode duplic
     public static boolean isConsideredDuplicateCode(List<CtStatement> left, List<CtStatement> right) {
         var duplicate = new DuplicateCodeFinder.DuplicateCode(left, right);
 
-        if (duplicate.size() < MINIMUM_DUPLICATE_STATEMENT_SIZE) {
+        if (!duplicate.isMoreThanOrEqualTo(MINIMUM_DUPLICATE_STATEMENT_SIZE)) {
             return false;
         }
 

diff --git a/...grader-core/src/main/java/de/firemage/autograder/core/integrated/DuplicateCodeFinder.java b/...grader-core/src/main/java/de/firemage/autograder/core/integrated/DuplicateCodeFinder.java
@@ -108,6 +108,19 @@ private static int countStatements(CtStatement ctStatement) {
             return Math.max(count, 1);
         }
 
+        public boolean isMoreThanOrEqualTo(int threshold) {
+            int size = 0;
+            // TODO: this could be optimized in the future by stopping getElements when the threshold is reached
+            for (var statement : this.left) {
+                size += countStatements(statement);
+                if (size >= threshold) {
+                    return true;
+                }
+            }
+
+            return Math.max(size, 1) >= threshold;
+        }
+
         public List<StructuralEqualsVisitor.Difference> differences() {
             return StreamSupport.stream(zip(this.left, this.right).spliterator(), false)
                 .flatMap(entry -> StructuralEqualsVisitor.findDifferences(entry.getKey(), entry.getValue()).stream())