ENHANCED: Support multiple free days for teachers, closing #2.

Reported by Thure Dührsen. Many thanks!
triska · Sep 3, 2019 · c702321 · c702321
1 parent 1a2bde9
commit c702321
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/simsttab.pl b/simsttab.pl
@@ -152,12 +152,9 @@
         include(teacher_req(Teacher), Rs, Sub),
         pairs_slots(Sub, Vs),
         all_different(Vs),
-        (   teacher_freeday(Teacher,F) ->
-            maplist(slot_quotient, Vs, Qs),
-            all_diff_from(Qs, F)
-        ;   true
-        ).
-
+        findall(F, teacher_freeday(Teacher, F), Fs),
+        maplist(slot_quotient, Vs, Qs),
+        maplist(all_diff_from(Qs), Fs).
 
 sameroom_var(Reqs, r(Class,Subject,Lesson), Var) :-
         memberchk(req(Class,Subject,_Teacher,_Num)-Slots, Reqs),