Do not allow two same roles in a row

MilkBiscuit · Apr 18, 2021 · 52967fa · 52967fa
1 parent 76e91bf
commit 52967fa
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/src/com/cheng/rostergenerator/RosterProducer.java b/src/com/cheng/rostergenerator/RosterProducer.java
@@ -5,6 +5,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import com.cheng.rostergenerator.helper.FileHelper;
@@ -177,9 +178,27 @@ public static Map<String, String> generateOneMeeting(List<Member> speakers, List
 
         var meetingRoles = MeetingRoleHelper.getMeetingRoleForAnyOne();
         for (String role : meetingRoles) {
-            var optAnyOne = totalMembers.stream().filter(
-                m -> (namesOfMeeting.indexOf(m.name) == -1)
-            ).findFirst();
+            List<String> namesForRole = roleToNames.get(role);
+            Optional<Member> optAnyOne;
+            if (MeetingRoleHelper.isTTEvaluator(role)) {
+                var ttEvaluatorNames = new ArrayList<String>();
+                var ttEvaluator1 = roleToNames.get(TextConstants.TT_EVALUATOR_1);
+                if (!ttEvaluator1.isEmpty()) {
+                    ttEvaluatorNames.add(ttEvaluator1.get(ttEvaluator1.size() - 1));
+                }
+                var ttEvaluator2 = roleToNames.get(TextConstants.TT_EVALUATOR_2);
+                if (!ttEvaluator2.isEmpty()) {
+                    ttEvaluatorNames.add(ttEvaluator2.get(ttEvaluator2.size() - 1));
+                }
+                optAnyOne = totalMembers.stream().filter(
+                    m -> (namesOfMeeting.indexOf(m.name) == -1) && (ttEvaluatorNames.indexOf(m.name) == -1)
+                ).findFirst();
+            } else {
+                var excludeNameForRole = namesForRole.isEmpty() ? "" : namesForRole.get(namesForRole.size() - 1);
+                optAnyOne = totalMembers.stream().filter(
+                    m -> (namesOfMeeting.indexOf(m.name) == -1) && (m.name != excludeNameForRole)
+                ).findFirst();
+            }
             if (optAnyOne.isPresent()) {
                 var anyone = optAnyOne.get();
                 map.put(role, anyone.name);
@@ -205,8 +224,6 @@ public static String[][] generateRosterTableData() throws RosterException {
 
         // Randomise the order
         Collections.shuffle(allSpeakers);
-        Collections.shuffle(allMembers);
-
         String[][] data = new String[sNumOfRolesPerMeeting][sNumOfMeetings+1];
         // Fill the row head, name of various meeting roles
         for (int i = 0; i < sNumOfRolesPerMeeting; i++) {
@@ -219,6 +236,9 @@ public static String[][] generateRosterTableData() throws RosterException {
             roleToNames.put(role, new ArrayList<String>());
         }
         for (int j = 1; j <= sNumOfMeetings; j++) {
+            // Randomise the order
+            Collections.shuffle(allMembers);
+
             var reserveForNewMember = PreferenceHelper.reserveForNewMember();
             var fourSpeeches = PreferenceHelper.hasFourSpeeches();
             var usualSpeeches = fourSpeeches ? 4 : 5;

diff --git a/src/com/cheng/rostergenerator/helper/MeetingRoleHelper.java b/src/com/cheng/rostergenerator/helper/MeetingRoleHelper.java
@@ -65,4 +65,8 @@ public static List<String> getMeetingRoleForAnyOne() {
         return rolesPerMeeting;
     }
 
+    public static boolean isTTEvaluator(String role) {
+        return TextConstants.TT_EVALUATOR_1 == role || TextConstants.TT_EVALUATOR_2 == role;
+    }
+
 }