fix: consider only non-filtered commits for the max number of commits by project

Author: leonardoAnjos16

src/main/app/MiningWorker.groovy

@@ -1,5 +1,7 @@
 package app
 
+import java.util.Collections
+import java.util.Random
 import java.text.SimpleDateFormat
 
 import static app.MiningFramework.arguments
@@ -39,19 +41,23 @@ class MiningWorker implements Runnable {
                     checkForUnstagedChanges(project);
                 }
 
-                def (mergeCommits, skipped) = project.getMergeCommits(
-                    arguments.getSinceDate(),
-                    arguments.getUntilDate(),
-                    arguments.getMaxCommitsPerProject(),
-                    arguments.getRandomSeed()
-                )
+                def (mergeCommits, skipped) = project.getMergeCommits(arguments.getSinceDate(), arguments.getUntilDate())
 
+                Random random = new Random(arguments.getRandomSeed())
+                Collections.shuffle(mergeCommits, random)
+
+                int collectedMergeCommits = 0
                 for (mergeCommit in mergeCommits) {
+                    if (collectedMergeCommits >= arguments.getMaxCommitsPerProject()) {
+                        break
+                    }
+
                     try {
                         if (commitFilter.applyFilter(project, mergeCommit)) {
                             println "${project.getName()} - Merge commit: ${mergeCommit.getSHA()}"
 
                             runDataCollectors(project, mergeCommit)
+                            collectedMergeCommits++
                         }
                     } catch (Exception e) {
                         println "${project.getName()} - ${mergeCommit.getSHA()} - ERROR"

src/main/project/Project.groovy

@@ -42,7 +42,7 @@ class Project {
         return matcher.find()
     }
 
-    List getMergeCommits(String sinceDate, String untilDate, int maxCommitsPerProject, int randomSeed) {
+    List getMergeCommits(String sinceDate, String untilDate) {
         ArrayList<String> skipped = new ArrayList<String>()
         ArrayList<MergeCommit> mergeCommits = new ArrayList<MergeCommit>()
 
@@ -74,10 +74,6 @@ class Project {
         if(mergeCommits.isEmpty())
             println "No merge commits."
 
-        Random random = new Random(randomSeed)
-        Collections.shuffle(mergeCommits, random)
-        mergeCommits = mergeCommits.take(maxCommitsPerProject)
-
         return [mergeCommits, skipped]
     }