diff --git a/src/main/java/edu/hanover/schedulevisualizer/core/TimeSlotHandler.java b/src/main/java/edu/hanover/schedulevisualizer/core/TimeSlotHandler.java index 52949dd..68c16b4 100644 --- a/src/main/java/edu/hanover/schedulevisualizer/core/TimeSlotHandler.java +++ b/src/main/java/edu/hanover/schedulevisualizer/core/TimeSlotHandler.java @@ -19,11 +19,15 @@ protected TimeSlot combineWithFirstAssignedSecondUnassigned(List wkd1, @Override protected TimeSlot combineWithBothAssigned(List wkd1, Integer sn1, List wkd2, Integer sn2) { - if (wkd2.get(0).isTR() && wkd1.get(0).isTR()) { - return ef.makeHCTimeSlot(wkd1, sn2); + if (wkd2.get(0).isTR()) { + if (wkd1.get(0).isTR()) { + return ef.makeHCTimeSlot(wkd1, sn2); + } } - if (!wkd2.get(0).isTR() && !wkd1.get(0).isTR()) { - return ef.makeHCTimeSlot(wkd1, sn2); + if (!wkd2.get(0).isTR()) { + if (!wkd1.get(0).isTR()) { + return ef.makeHCTimeSlot(wkd1, sn2); + } } return ef.makeHCTimeSlot(wkd2, sn2); }