Browse Source

Remove unused code in NormalComparisonStrategy

Philipp Bauch 6 years ago
parent
commit
a3ffd72538
1 changed files with 6 additions and 20 deletions
  1. 6 20
      jplag/src/main/java/jplag/strategy/NormalComparisonStrategy.java

+ 6 - 20
jplag/src/main/java/jplag/strategy/NormalComparisonStrategy.java

@@ -7,9 +7,7 @@ import jplag.JPlagComparison;
 import jplag.GSTiling;
 import jplag.GSTiling;
 import jplag.JPlagOptions;
 import jplag.JPlagOptions;
 import jplag.JPlagResult;
 import jplag.JPlagResult;
-import jplag.SortedVector;
 import jplag.Submission;
 import jplag.Submission;
-import jplag.clustering.Cluster;
 
 
 public class NormalComparisonStrategy extends AbstractComparisonStrategy {
 public class NormalComparisonStrategy extends AbstractComparisonStrategy {
 
 
@@ -26,13 +24,6 @@ public class NormalComparisonStrategy extends AbstractComparisonStrategy {
       compareSubmissionsToBaseCode(submissions, baseCodeSubmission);
       compareSubmissionsToBaseCode(submissions, baseCodeSubmission);
     }
     }
 
 
-    // Result vectors
-    SortedVector<JPlagComparison> avgMatches = new SortedVector<>(
-        new JPlagComparison.AvgComparator());
-    SortedVector<JPlagComparison> maxMatches = new SortedVector<>(
-        new JPlagComparison.MaxComparator());
-    // TODO: Why is minMatches missing?
-
     long timeBeforeStartInMillis = System.currentTimeMillis();
     long timeBeforeStartInMillis = System.currentTimeMillis();
     int i, j, numberOfSubmissions = submissions.size();
     int i, j, numberOfSubmissions = submissions.size();
     Submission s1, s2;
     Submission s1, s2;
@@ -66,22 +57,17 @@ public class NormalComparisonStrategy extends AbstractComparisonStrategy {
         if (isAboveSimilarityThreshold(comparison)) {
         if (isAboveSimilarityThreshold(comparison)) {
           comparisons.add(comparison);
           comparisons.add(comparison);
         }
         }
-
-        // Previously:
-        // registerMatch(comparison, avgMatches, maxMatches, null, i, j);
       }
       }
     }
     }
 
 
     long durationInMillis = System.currentTimeMillis() - timeBeforeStartInMillis;
     long durationInMillis = System.currentTimeMillis() - timeBeforeStartInMillis;
 
 
-    Cluster cluster = null;
-
-    // TODO
-//    if (options.getClusterType() != ClusterType.NONE) {
-//      cluster = this.clusters.calculateClustering(submissions);
-//    }
-
-    // return new JPlagResult(cluster, avgMatches, maxMatches, null);
+    // TODO:
+    // Cluster cluster = null;
+    //
+    // if (options.getClusterType() != ClusterType.NONE) {
+    //     cluster = this.clusters.calculateClustering(submissions);
+    // }
 
 
     return new JPlagResult(comparisons, durationInMillis);
     return new JPlagResult(comparisons, durationInMillis);
   }
   }