Просмотр исходного кода

Reduce nesting in computing comparison tuples.

Alberth 4 лет назад
Родитель
Сommit
f30868c555

+ 11 - 6
jplag/src/main/java/de/jplag/strategy/AbstractComparisonStrategy.java

@@ -55,15 +55,20 @@ public abstract class AbstractComparisonStrategy implements ComparisonStrategy {
      */
     protected static List<SubmissionTuple> buildComparisonTuples(List<Submission> submissions) {
         List<SubmissionTuple> tuples = new ArrayList<>();
+
         for (int i = 0; i < (submissions.size() - 1); i++) {
             Submission first = submissions.get(i);
-            if (first.getTokenList() != null) {
-                for (int j = (i + 1); j < submissions.size(); j++) {
-                    Submission second = submissions.get(j);
-                    if (second.getTokenList() != null) {
-                        tuples.add(new SubmissionTuple(first, second));
-                    }
+            if (first.getTokenList() == null) {
+                continue;
+            }
+
+            for (int j = (i + 1); j < submissions.size(); j++) {
+                Submission second = submissions.get(j);
+                if (second.getTokenList() == null) {
+                    continue;
                 }
+
+                tuples.add(new SubmissionTuple(first, second));
             }
         }
         return tuples;