fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: don't store order of unrestrictedOccurrences

Browse Source
This commit is contained in:
Wolfgang Witt 2021-03-16 13:37:15 +01:00 committed by Gregor Kleen
parent 2be9d76af2
commit ff5d27cdf3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Handler/Utils/Exam.hs
View File

@ -278,9 +278,9 @@ examAutoOccurrence (hash -> seed) rule ExamAutoOccurrenceConfig{..} occurrences
shuffledUsers :: [UserId] shuffledUsers :: [UserId]
shuffledUsers = shuffle' (Map.keys unassignedUsers) (length unassignedUsers) (mkStdGen seed) shuffledUsers = shuffle' (Map.keys unassignedUsers) (length unassignedUsers) (mkStdGen seed)
restrictedOccurrences :: Map ExamOccurrenceId Natural restrictedOccurrences :: Map ExamOccurrenceId Natural
unrestrictedOccurrences :: [ExamOccurrenceId] unrestrictedOccurrences :: Set ExamOccurrenceId
(unrestrictedOccurrences, restrictedOccurrences) (unrestrictedOccurrences, restrictedOccurrences)
= second Map.fromList $ partitionRestricted ([], []) occurrences'' = bimap Set.fromList Map.fromList $ partitionRestricted ([], []) occurrences''
-- reduce available space until to excess space is left while keeping the filling ratio as equal as possible -- reduce available space until to excess space is left while keeping the filling ratio as equal as possible
decreaseBiggestOutlier :: Natural -> Map ExamOccurrenceId Natural -> Map ExamOccurrenceId Natural decreaseBiggestOutlier :: Natural -> Map ExamOccurrenceId Natural -> Map ExamOccurrenceId Natural
decreaseBiggestOutlier 0 currentOccurrences = currentOccurrences decreaseBiggestOutlier 0 currentOccurrences = currentOccurrences
@ -311,7 +311,7 @@ examAutoOccurrence (hash -> seed) rule ExamAutoOccurrenceConfig{..} occurrences
finalOccurrences = Map.toList $ decreaseBiggestOutlier extraCapacity restrictedOccurrences finalOccurrences = Map.toList $ decreaseBiggestOutlier extraCapacity restrictedOccurrences
-- fill in users in a random order -- fill in users in a random order
randomlyAssignedUsers :: Map UserId (Maybe ExamOccurrenceId) randomlyAssignedUsers :: Map UserId (Maybe ExamOccurrenceId)
randomlyAssignedUsers = Map.fromList $ fillUnrestricted (List.cycle unrestrictedOccurrences) randomlyAssignedUsers = Map.fromList $ fillUnrestricted (List.cycle $ Set.toList unrestrictedOccurrences)
$ foldl' addUsers ([], shuffledUsers) finalOccurrences $ foldl' addUsers ([], shuffledUsers) finalOccurrences
addUsers :: ([(UserId, Maybe ExamOccurrenceId)], [UserId]) addUsers :: ([(UserId, Maybe ExamOccurrenceId)], [UserId])
-> (ExamOccurrenceId, Natural) -> (ExamOccurrenceId, Natural)