diff --git a/src/main/java/se/su/dsv/scipro/match/GreedyMatchingAlgorithm.java b/src/main/java/se/su/dsv/scipro/match/GreedyMatchingAlgorithm.java index 8aa6930b03..e0e08fc488 100644 --- a/src/main/java/se/su/dsv/scipro/match/GreedyMatchingAlgorithm.java +++ b/src/main/java/se/su/dsv/scipro/match/GreedyMatchingAlgorithm.java @@ -39,8 +39,8 @@ public class GreedyMatchingAlgorithm implements MatchingAlgorithm { matchProjectIdeas(unmatchedProjectIdeas, supervisorAvailability, pairList); if(!pairList.isEmpty()) { - Collections.sort(pairList); calculateTotalAvailability(pairList); + Collections.sort(pairList); Pair foundPair = pairList.get(0); for(Availability availability : supervisorAvailability) { if(availability.getSupervisor().equals(foundPair.getMatch().getSupervisor()) && diff --git a/src/test/java/se/su/dsv/scipro/match/TestGreedyMatchingAlgorithm.java b/src/test/java/se/su/dsv/scipro/match/TestGreedyMatchingAlgorithm.java index 9e66082e26..d76d881c70 100644 --- a/src/test/java/se/su/dsv/scipro/match/TestGreedyMatchingAlgorithm.java +++ b/src/test/java/se/su/dsv/scipro/match/TestGreedyMatchingAlgorithm.java @@ -636,7 +636,7 @@ public class TestGreedyMatchingAlgorithm { @Test @Transactional @Rollback - /* three supervisors which are matched against three project ideas */ + /* three supervisors are matched against three project ideas */ public void testIncreaseSlotForMasterSupervisor_v3() { List<ProjectIdea> projectIdeaList = new ArrayList<ProjectIdea>(); List<Employee> supervisorList = new ArrayList<Employee>();