Browse Source

Next review.

Dominik Fuchß 4 years ago
parent
commit
f004db289f
1 changed files with 11 additions and 12 deletions
  1. 11 12
      jplag/src/main/java/de/jplag/options/JPlagOptions.java

+ 11 - 12
jplag/src/main/java/de/jplag/options/JPlagOptions.java

@@ -46,7 +46,7 @@ import de.jplag.strategy.ComparisonMode;
  */
  */
 public record JPlagOptions(Language language, Integer minimumTokenMatch, List<String> submissionDirectories, List<String> oldSubmissionDirectories,
 public record JPlagOptions(Language language, Integer minimumTokenMatch, List<String> submissionDirectories, List<String> oldSubmissionDirectories,
         String baseCodeSubmissionName, String subdirectoryName, List<String> fileSuffixes, String exclusionFileName,
         String baseCodeSubmissionName, String subdirectoryName, List<String> fileSuffixes, String exclusionFileName,
-        SimilarityMetric similarityMetric, float similarityThreshold, Integer maximumNumberOfComparisons, ClusteringOptions clusteringOptions,
+        SimilarityMetric similarityMetric, float similarityThreshold, int maximumNumberOfComparisons, ClusteringOptions clusteringOptions,
         ComparisonMode comparisonMode, Verbosity verbosity, boolean debugParser) {
         ComparisonMode comparisonMode, Verbosity verbosity, boolean debugParser) {
 
 
     public static final ComparisonMode DEFAULT_COMPARISON_MODE = NORMAL;
     public static final ComparisonMode DEFAULT_COMPARISON_MODE = NORMAL;
@@ -66,7 +66,7 @@ public record JPlagOptions(Language language, Integer minimumTokenMatch, List<St
 
 
     public JPlagOptions(Language language, Integer minimumTokenMatch, List<String> submissionDirectories, List<String> oldSubmissionDirectories,
     public JPlagOptions(Language language, Integer minimumTokenMatch, List<String> submissionDirectories, List<String> oldSubmissionDirectories,
             String baseCodeSubmissionName, String subdirectoryName, List<String> fileSuffixes, String exclusionFileName,
             String baseCodeSubmissionName, String subdirectoryName, List<String> fileSuffixes, String exclusionFileName,
-            SimilarityMetric similarityMetric, float similarityThreshold, Integer maximumNumberOfComparisons, ClusteringOptions clusteringOptions,
+            SimilarityMetric similarityMetric, float similarityThreshold, int maximumNumberOfComparisons, ClusteringOptions clusteringOptions,
             ComparisonMode comparisonMode, Verbosity verbosity, boolean debugParser) {
             ComparisonMode comparisonMode, Verbosity verbosity, boolean debugParser) {
         this.language = language;
         this.language = language;
         this.comparisonMode = comparisonMode;
         this.comparisonMode = comparisonMode;
@@ -111,14 +111,14 @@ public record JPlagOptions(Language language, Integer minimumTokenMatch, List<St
 
 
     public JPlagOptions withSimilarityThreshold(float similarityThreshold) {
     public JPlagOptions withSimilarityThreshold(float similarityThreshold) {
         return new JPlagOptions(language, minimumTokenMatch, submissionDirectories, oldSubmissionDirectories, baseCodeSubmissionName,
         return new JPlagOptions(language, minimumTokenMatch, submissionDirectories, oldSubmissionDirectories, baseCodeSubmissionName,
-                subdirectoryName, fileSuffixes, exclusionFileName, similarityMetric, normalizeSimilarityThreshold(similarityThreshold),
-                maximumNumberOfComparisons, clusteringOptions, comparisonMode, verbosity, debugParser);
+                subdirectoryName, fileSuffixes, exclusionFileName, similarityMetric, similarityThreshold, maximumNumberOfComparisons,
+                clusteringOptions, comparisonMode, verbosity, debugParser);
     }
     }
 
 
-    public JPlagOptions withMaximumNumberOfComparisons(Integer maximumNumberOfComparisons) {
+    public JPlagOptions withMaximumNumberOfComparisons(int maximumNumberOfComparisons) {
         return new JPlagOptions(language, minimumTokenMatch, submissionDirectories, oldSubmissionDirectories, baseCodeSubmissionName,
         return new JPlagOptions(language, minimumTokenMatch, submissionDirectories, oldSubmissionDirectories, baseCodeSubmissionName,
-                subdirectoryName, fileSuffixes, exclusionFileName, similarityMetric, similarityThreshold,
-                normalizeMaximumNumberOfComparisons(maximumNumberOfComparisons), clusteringOptions, comparisonMode, verbosity, debugParser);
+                subdirectoryName, fileSuffixes, exclusionFileName, similarityMetric, similarityThreshold, maximumNumberOfComparisons,
+                clusteringOptions, comparisonMode, verbosity, debugParser);
     }
     }
 
 
     public JPlagOptions withSimilarityMetric(SimilarityMetric similarityMetric) {
     public JPlagOptions withSimilarityMetric(SimilarityMetric similarityMetric) {
@@ -152,10 +152,9 @@ public record JPlagOptions(Language language, Integer minimumTokenMatch, List<St
     }
     }
 
 
     public JPlagOptions withBaseCodeSubmissionName(String baseCodeSubmissionName) {
     public JPlagOptions withBaseCodeSubmissionName(String baseCodeSubmissionName) {
-        return new JPlagOptions(language, minimumTokenMatch, submissionDirectories, oldSubmissionDirectories,
-                (baseCodeSubmissionName == null || baseCodeSubmissionName.isBlank()) ? null : baseCodeSubmissionName, subdirectoryName, fileSuffixes,
-                exclusionFileName, similarityMetric, similarityThreshold, maximumNumberOfComparisons, clusteringOptions, comparisonMode, verbosity,
-                debugParser);
+        return new JPlagOptions(language, minimumTokenMatch, submissionDirectories, oldSubmissionDirectories, baseCodeSubmissionName,
+                subdirectoryName, fileSuffixes, exclusionFileName, similarityMetric, similarityThreshold, maximumNumberOfComparisons,
+                clusteringOptions, comparisonMode, verbosity, debugParser);
     }
     }
 
 
     public JPlagOptions withSubdirectoryName(String subdirectoryName) {
     public JPlagOptions withSubdirectoryName(String subdirectoryName) {
@@ -243,7 +242,7 @@ public record JPlagOptions(Language language, Integer minimumTokenMatch, List<St
     }
     }
 
 
     private Integer normalizeMaximumNumberOfComparisons(Integer maximumNumberOfComparisons) {
     private Integer normalizeMaximumNumberOfComparisons(Integer maximumNumberOfComparisons) {
-        return maximumNumberOfComparisons == null ? null : Math.max(maximumNumberOfComparisons, SHOW_ALL_COMPARISONS);
+        return Math.max(maximumNumberOfComparisons, SHOW_ALL_COMPARISONS);
     }
     }
 
 
     private Integer normalizeMinimumTokenMatch(Integer minimumTokenMatch) {
     private Integer normalizeMinimumTokenMatch(Integer minimumTokenMatch) {