use unique predicates

1 files changed, 20 insertions, 11 deletions

diff --git a/rdf/waste.sdm b/rdf/waste.sdm
index 2b28fa5..b89a6bb 100644
--- a/rdf/waste.sdm
+++ b/rdf/waste.sdm
@@ -4,7 +4,7 @@ module waste action <https://thoughtroam.abcdefghijklmnopqrstuvxyzæøå.dk/rdf/
   import [ waste_view ]
 
   entity Resident is
-    identity personId -> unknown
+    identity citizenId -> unknown
 
     viewsWasteAs -> {unique 0..6} waste_view:Grossness
   end
@@ -12,34 +12,43 @@ module waste action <https://thoughtroam.abcdefghijklmnopqrstuvxyzæøå.dk/rdf/
   entity Household is
     identity apartmentId -> unknown
 
-    contains -> {1..9} Bin
+    furnishedWith -> {1..9} Bin
     inhabitedBy -> {1..4} Resident
   end
 
-;  entity Host is
-;    provides -> Container
-;  end
+  entity Host is
+    identity HostingId -> unknown
+
+    providesContainer -> Container
+  end
 
   entity WasteCollector
 
   entity Bin is
     identity binId -> unknown
 
-    capacity -> BinCapacity
-    spareCapacity -> BinSpareCapacity
+    binCapacity -> BinCapacity
+    binSpareCapacity -> BinSpareCapacity
   end
 
   event BinEmptied source Bin is
-    of -> Bin
-    by -> Resident
-    to -> Container
-    resets -> BinSpareCapacity
+    binEmptied -> Bin
+    binEmptiedBy -> Resident
+    binEmptiedTo -> Container
+    binResets -> BinSpareCapacity
   end
 
   event BinFilled source Bin is
     by -> Resident
   end
 
+  event ContainerEmptied source Container is
+    containerEmptied -> Container
+    containerEmptiedBy -> WasteCollector
+    containerEmptiedTo -> RecyclingPlant
+    containerResets -> ContainerSpareCapacity
+  end
+
   structure Container
 
   structure Incinerator