Changeset 6981 for main/waeup.sirp/trunk/src/waeup/sirp/hostels

Timestamp:

1 Nov 2011, 08:50:26 (13 years ago)

Author:

Henrik Bettermann

Message:

Simplify invariant bedsOverlap.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/hostels/interfaces.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/hostels/interfaces.py

@@ -123 +123 @@
     @invariant
     def bedsOverlap(hostel):
-        bfr = hostel.beds_for_fresh
-        bre = hostel.beds_for_returning
-        bfi = hostel.beds_for_final
-        if (set(bfr).intersection(set(bre)) or
-            set(bfr).intersection(set(bfi)) or
-            set(bre).intersection(set(bfi))):
+        beds = (hostel.beds_for_fresh +
+                hostel.beds_for_returning +
+                hostel.beds_for_final +
+                hostel.beds_for_all)
+        if len(beds) != len(set(beds)):
             raise Invalid('Bed categories overlap.')