activefacts-examples 1.9.8 → 1.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd9942ddefa02df74287c7f357bf12167672a63c
-  data.tar.gz: 7780c6d000672c1523506e13b0d9bb0e5fd503c0
+  metadata.gz: a5d47946d95a7144d2631ad2d596e8ed663364cf
+  data.tar.gz: d14d17f2afac6a0d18f50bf838000b0404559e2b
 SHA512:
-  metadata.gz: c4c143e99ec0f8e3599832f80bdb0c11eaf0e4d1f70909792c4b33e946654fea5b2b8eb2b7ef109969c153ace36eaefa642afdea73b2bdc7f0bdcdd5dc3bea57
-  data.tar.gz: 40d23c15f2eda12c42649a89a3384eb05ea87c2d9a22056c53c4a6b5239d4bcb0956340d4290efe46e101c84498cd8a0290a0657c1fbf1a17a89ff3b38b9ff92
+  metadata.gz: 2b23adb4f446c711392a2e0e86fd853e81f9d21ad4007fc048d422a81a48c3469bc1a4f62f3c0464146e17d340d6832157c65d113ff4eef4393a04cffab49da6
+  data.tar.gz: c4c4e92e3e1baf5130d898494d96a67abaf6d6e6d4a8241187122ce00799e4240821613c22f6aba07accd05f5675607015d3bd17f550ad6329cc7d3a0edde218

data/Gemfile

@@ -11,5 +11,6 @@ if this_file =~ %r{\A#{ENV['HOME']}}i
   gem 'activefacts-rmap', path: dir+'/rmap'
   gem 'activefacts-cql', path: dir+'/cql'
   gem 'activefacts-orm', path: dir+'/orm'
+  gem 'activefacts-compositions', path: dir+'/compositions'
   gem 'activefacts-generators', path: dir+'/generators'
 end

data/activefacts-examples.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "activefacts-examples"
-  spec.version       = "1.9.8"
+  spec.version       = "1.9.9"
   spec.authors       = ["Clifford Heath"]
   spec.email         = ["clifford.heath@gmail.com"]
 
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", ">= 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "> 10"
   spec.add_development_dependency "rspec", "~> 3", ">= 3.3"
 
   spec.add_runtime_dependency "activefacts", ">= 1.8", "~> 1"

data/cql/CinemaBookings.cql

@@ -1,4 +1,4 @@
-vocabulary CinemaBookings;
+schema Cinema Bookings;
 
 /*
  * Value Types
@@ -62,3 +62,9 @@ Seat Allocation is where
  */
 Booking (in which Person booked Session (in which Cinema shows Film on DateTime) for Number of seats) has allocated Seat
 	only if Cinema contains Row that contains Seat;
+
+/*
+Booking has allocated Seat
+    only if that Booking is for some Session that is at some Cinema that contains some Row that contains that Seat;
+*/
+

data/cql/CinemaTickets.cql

@@ -10,7 +10,6 @@ Collection Code is written as Signed Integer(32);
 Day is written as Signed Integer(32) restricted to {1..31};
 Encrypted Password is written as String;
 Film ID is written as Auto Counter;
-High Demand is written as Boolean;
 Hour is written as Signed Integer(32) restricted to {0..23};
 Minute is written as Signed Integer(32) restricted to {0..59};
 Month Nr is written as Signed Integer(32) restricted to {1..12};
@@ -75,8 +74,12 @@ Session Time is identified by Year and Month and Day and Hour and Minute where
 	Session Time is at one Hour,
 	Session Time is at one Minute;
 
-Ticket Pricing is where
-	tickets on Session Time at Cinema in Section for High Demand have one Price;
+Ticket Category is identified by Cinema and Session Time and Section and Ticket Category has high demand where
+	Ticket Category is for one Cinema,
+	Ticket Category is for one Session Time,
+	Ticket Category is for one Section,
+	Ticket Category has high demand;
+Ticket Category has at most one Price;
 
 Session is where
 	Cinema shows Film on Session Time,

data/cql/CompanyDirectorEmployee.cql

@@ -53,4 +53,4 @@ Employment is where
 /*
  * Constraints:
  */
-either Employee is supervised by Manager(1) or Employee is a Manager(2) that is ceo but not both;
+either Employee is supervised by Manager or Employee is a Manager(2) that is ceo but not both;

data/cql/Diplomacy.cql

@@ -39,9 +39,9 @@ for each Diplomat, Country at most one of these holds:
 	Diplomat serves in Country,
 	Diplomat represents Country;
 Diplomat is an Ambassador that is from Country(1) to Country(2)
-	only if Diplomat represents Country(1);
+	only if Diplomat represents Country;
 Diplomat is an Ambassador that is from Country(2) to Country(1)
-	only if Diplomat serves in Country(1);
+	only if Diplomat serves in Country;
 Diplomat serves in Country
 	only if Diplomat speaks Language that is spoken in Country;
 each Ambassador occurs at least one time in

data/cql/OilSupply.cql

@@ -10,7 +10,7 @@ Quantity is written as Unsigned Integer(32);
 Refinery Name is written as String(80);
 Region Name is written as String;
 Season is written as String(6) restricted to {'Autumn', 'Spring', 'Summer', 'Winter'};
-Transport Method is written as String restricted to {'Rail', 'Road', 'Sea'};
+Transport Mode is written as String restricted to {'Rail', 'Road', 'Sea'};
 Year Nr is written as Signed Integer(32);
 
 /*
@@ -26,8 +26,8 @@ Refinery is independent identified by its Name;
 Region is independent identified by its Name;
 
 Transport Route is where
-	Transport Method transportation is available from Refinery to Region,
-	Transport Method transportation is available to Region from Refinery;
+	Transport Mode transportation is available from Refinery to Region,
+	Transport Mode transportation is available to Region from Refinery;
 Transport Route incurs at most one Cost per kl;
 
 Year is identified by its Nr;

data/cql/OneRoleNesting.cql

@@ -26,7 +26,7 @@ Party Moniker has one Accuracy;
 Person is a kind of Party;
 
 Birth is where
-	Person was born on one Event Date;
+	Person was born on one Event Date of -birth;
 
 Death is where
 	Person died;

data/cql/SeparateSubtype.cql

@@ -28,3 +28,9 @@ Witness saw at least one Incident,
 Driver is a kind of Person;
 Vehicle Incident occurred while at most one Driver was in charge;
 
+/*
+ * Constraints:
+ */
+for each Incident, Person at most one of these holds:
+	Incident is a Vehicle Incident that occurred while Driver was in charge and Driver is a kind of Person,
+	Incident was independently witnessed by Witness;

data/cql/ServiceDirector.cql

@@ -53,7 +53,7 @@ Credential has one User Name;
 Data Store is identified by its Name;
 Data Store requires at least one Credential;
 Data Store has one Friendly-Name;
-Data Store has at most one HeartBeat-Truck PCID;
+Data Store has at most one Heart- Beat Truck PCID;
 Data Store has one Internal-Credential;
 Data Store is one Major-Version;
 Data Store is one Minor-Version;
@@ -81,8 +81,8 @@ Monitor is owned by one Monitoring Application;
 
 Network is identified by its Nr;
 Company has at least one Origin-Network;
-Data Store has TcpProxy-Network,
-	TcpProxy-Network is in at most one Data Store;
+Data Store has Tcp- Proxy Network,
+	Tcp- Proxy Network is in at most one Data Store;
 Host System uses at least one Network,
 	Network is used by at most one Host System;
 Network uses at most one Domain-Name;
@@ -94,7 +94,7 @@ Network is ip_single;
 Network is ip_subnet;
 
 Notification Level is identified by its Nr;
-Notification Level has one InitialDelay-Duration;
+Notification Level has one Initial- Delay Duration;
 Notification Level has one Repeat-Duration;
 
 Notification Type is independent identified by its Name;
@@ -102,11 +102,11 @@ Notification Type is independent identified by its Name;
 Provider Type is identified by its Id;
 
 Recurring Schedule is identified by its Id;
-Monitor has AllExclusion-Recurring Schedule,
-	AllExclusion-Recurring Schedule applies to at most one Monitor;
-Monitor (as IntegratingMonitor) has IntegrationExclusion-Recurring Schedule;  // Avoid ambiguity; this is a new fact type
-Monitor (as IntegratingMonitor) has IntegrationExclusion-Recurring Schedule,
-	IntegrationExclusion-Recurring Schedule applies to at most one IntegratingMonitor;
+Monitor has All- Exclusion Recurring Schedule,
+	All- Exclusion Recurring Schedule applies to at most one Monitor;
+Monitor (as IntegratingMonitor) has Integration- Exclusion Recurring Schedule;  // Avoid ambiguity; this is a new fact type
+Monitor (as IntegratingMonitor) has Integration- Exclusion Recurring Schedule,
+	Integration- Exclusion Recurring Schedule applies to at most one IntegratingMonitor;
 Recurring Schedule has one Duration;
 Recurring Schedule has one Start-Time;
 Recurring Schedule friday;
@@ -126,7 +126,7 @@ Satellite Message has one Serial Number;
 Satellite Message has one insertion-Date Time;
 
 Subscription is identified by its Nr;
-Company has one DriverTech-Subscription;
+Company has one Driver- Tech Subscription;
 Subscription has one Beginning-Date;
 Subscription has at most one Ending-Date;
 Subscription is enabled;
@@ -206,7 +206,7 @@ for each Credential exactly one of these holds:
 for each Network exactly one of these holds:
 	Network is used by Host System,
 	Company has Origin-Network,
-	TcpProxy-Network is in Data Store;
+	Tcp- Proxy Network is in Data Store;
 for each Network exactly one of these holds:
 	Network is ip_single,
 	Network is ip_subnet,
@@ -229,7 +229,7 @@ Switch is on private Network
 	Data Store has Legacy Switch;
 Client has default Data Store
 	only if Client uses Data Store;
-TcpProxy Network is in Data Store
+Tcp Proxy Network is in Data Store
 	only if Network is ip_single;
 Network uses Domain Name
 	only if Network is ip_single;
@@ -264,7 +264,7 @@ each Recurring Schedule occurs at least one time in
 each Service occurs one time in
 	Vendor provides Service;
 each Subscription occurs at most one time in
-	Company has DriverTech Subscription;
+	Company has Driver Tech Subscription;
 each Subscription occurs at most one time in
 	Data Store Service has Subscription;
 each Switch occurs at most one time in

data/cql/Supervision.cql

@@ -31,7 +31,6 @@ CEO Shareholding is where
 /*
  * Constraints:
  */
-either Employee reports to Manager(1) or Employee is a Manager(2) that is a CEO that runs Company but not both;
+either Employee reports to Manager or Employee is a Manager(2) that is a CEO that runs Company but not both;
 Employee is a Manager that is a CEO that runs Company
-	if and only if
-	Employee works for Company;
+	only if Employee works for Company;

data/cql/Warehousing.cql

@@ -26,8 +26,8 @@ Bin contains one Quantity,
 Dispatch is identified by its ID;
 
 Dispatch Item is identified by its ID;
-Dispatch is of at least one Dispatch Item,
-	Dispatch Item is for at most one Dispatch;
+Dispatch is of Dispatch Item,
+	Dispatch Item is for one Dispatch;
 Dispatch Item is in one Quantity;
 
 Party is identified by its ID;
@@ -49,8 +49,8 @@ Purchase Order Item is in one Quantity;
 Receipt is identified by its ID;
 
 Received Item is identified by its ID;
-Receipt is of at least one Received Item,
-	Received Item has at most one Receipt;
+Receipt is of Received Item,
+	Received Item has one Receipt;
 Received Item is one Product;
 Received Item is for at most one Purchase Order Item;
 Received Item is in one Quantity;

data/diagrams/json/CinemaTickets.json

@@ -9,7 +9,6 @@ diagrams: [
     {"uuid":"2259a950-5fb5-213b-6aa8-a279ad","name":"Auto Counter","shapes":[]},
     {"uuid":"0a9fd309-1413-b920-5f52-56282b","name":"Booking Nr","shapes":[],"supertype":"316a37a0-ef76-de29-6b59-a3a11b"},
     {"uuid":"24fadb6f-64f4-7e94-92b3-daf28a","name":"Booking","shapes":[],"ref_mode":".Nr","objectifies":"232a2b92-9b25-1ed8-6259-3e9ad6"},
-    {"uuid":"598fda34-eb6e-a165-0e5b-3bb5ce","name":"Boolean","shapes":[]},
     {"uuid":"f441a0e2-5e6c-c17a-ca22-fb8492","name":"Char","shapes":[]},
     {"uuid":"dc6de150-c50b-f2e2-7037-4a3e71","name":"Cinema ID","shapes":[],"supertype":"2259a950-5fb5-213b-6aa8-a279ad"},
     {"uuid":"5e169015-a2b2-7245-bf65-d2c903","name":"Cinema","shapes":[],"ref_mode":".ID"},
@@ -18,7 +17,6 @@ diagrams: [
     {"uuid":"a1cda619-2474-8438-2e14-e347fb","name":"Encrypted Password","shapes":[],"supertype":"8e1d41d9-1a29-89c7-e0dd-34f003"},
     {"uuid":"6f1fdd5b-8e7a-72ee-286e-0348b8","name":"Film ID","shapes":[],"supertype":"2259a950-5fb5-213b-6aa8-a279ad"},
     {"uuid":"fa44d042-0159-59b9-f4f9-c483cf","name":"Film","shapes":[],"ref_mode":".ID"},
-    {"uuid":"e323ff6f-7ac5-89fe-0a79-7e190a","name":"High Demand","shapes":[],"supertype":"598fda34-eb6e-a165-0e5b-3bb5ce"},
     {"uuid":"6397821b-524d-aae7-c50e-0d2078","name":"Hour","shapes":[],"supertype":"316a37a0-ef76-de29-6b59-a3a11b"},
     {"uuid":"8d5b6ddb-3fb6-bd0b-081f-a63cd1","name":"Minute","shapes":[],"supertype":"316a37a0-ef76-de29-6b59-a3a11b"},
     {"uuid":"77d666d4-7464-6a28-a764-5f7809","name":"Money","shapes":[]},
@@ -44,7 +42,7 @@ diagrams: [
     {"uuid":"316a37a0-ef76-de29-6b59-a3a11b","name":"Signed Integer","shapes":[]},
     {"uuid":"8e1d41d9-1a29-89c7-e0dd-34f003","name":"String","shapes":[]},
     {"uuid":"fbd080fb-8874-ec14-bded-891183","name":"Text","shapes":[]},
-    {"uuid":"a1a520c3-744a-683b-eb2f-15fdbd","name":"Ticket Pricing","shapes":[],"objectifies":"5970f7e0-6ae1-abd1-adfc-d70bc7"},
+    {"uuid":"5e3ed334-c41f-6430-da33-310f14","name":"Ticket Category","shapes":[]},
     {"uuid":"20f86d25-220a-d165-6191-e9a966","name":"Unsigned Integer","shapes":[]},
     {"uuid":"07ccd8d3-33f3-fde6-5e61-2cc918","name":"Year Nr","shapes":[],"supertype":"316a37a0-ef76-de29-6b59-a3a11b"},
     {"uuid":"da692323-013c-7d92-8464-7dc03b","name":"Year","shapes":[],"ref_mode":".Nr"}
@@ -54,25 +52,29 @@ diagrams: [
     {"uuid":"2e78368d-4bf9-7db6-b6d9-914c79","roles":[{"uuid":"0f3b4de4-004d-0135-c013-197bcb","player":"7cb85473-d35c-65d1-e499-00fa37"},{"uuid":"58bf4383-3d4a-5b03-55bb-251b54","player":"de01abf3-a73d-d33a-ea2e-fb16ca"}],"readings":[["01","{0} has {1}"],["10","{0} is of {1}"]],"shapes":[],"constraints":[{"uuid":"789b8516-d131-5fe4-7ce3-b125ff","min":0,"max":1,"is_preferred":true,"mandatory":null,"uniqueExcept":"0f3b4de4-004d-0135-c013-197bcb"},{"uuid":"71270c07-3ead-6b97-de5e-8b417b","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"0f3b4de4-004d-0135-c013-197bcb"}]},
     {"uuid":"300e8e55-fb01-8e73-5c50-ae8421","roles":[{"uuid":"31ebc788-66e3-9a31-cb81-b956ea","player":"6c5fe7a2-44bf-09f9-f30e-d3298d"},{"uuid":"8ef21cb4-c3d1-94fc-a577-cc6450","player":"da692323-013c-7d92-8464-7dc03b"}],"readings":[["01","{0} is in {1}"]],"shapes":[],"constraints":[{"uuid":"344c05a4-5896-508e-a2ad-644603","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"31ebc788-66e3-9a31-cb81-b956ea"}]},
     {"uuid":"20dad6ce-19c4-44a0-bd25-36ea1b","roles":[{"uuid":"7e812cce-ed2a-0ec0-9708-276633","player":"2f6cd681-ca37-1a32-c8a5-39af5d"}],"readings":[["0","{0} uses allocated seating"]],"shapes":[],"constraints":[{"uuid":"30954166-52d2-b361-0e18-c89e21","min":0,"max":1,"is_preferred":true,"mandatory":null,"uniqueExcept":null}]},
+    {"uuid":"71bdbf6a-8745-adf7-e46d-6958f1","roles":[{"uuid":"fc537d9e-5905-a3d4-300b-aecad7","player":"5e3ed334-c41f-6430-da33-310f14"},{"uuid":"bc172526-54f7-51da-dfec-8c3468","player":"28f66ff5-586b-ad53-fbe6-edde21"}],"readings":[["01","{0} has {1}"]],"shapes":[],"constraints":[{"uuid":"a979215b-e23e-1842-cb97-865802","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"bc172526-54f7-51da-dfec-8c3468"}]},
     {"uuid":"5262c079-59fb-1640-04e9-b4dc78","roles":[{"uuid":"76085e77-d21a-260b-e023-2a1bda","player":"8ff75bfd-7208-dedc-994a-c24ab5"},{"uuid":"cec6f6f6-fa5a-3575-b6d8-78fe56","player":"d59d8e16-a488-f61a-d3a2-8d04ca"}],"readings":[["01","{0} has {1}"],["10","{0} is of {1}"]],"shapes":[],"constraints":[{"uuid":"d2124480-fc3f-51e0-1145-50d279","min":0,"max":1,"is_preferred":true,"mandatory":null,"uniqueExcept":"76085e77-d21a-260b-e023-2a1bda"},{"uuid":"66b1f488-bbe8-881a-8052-9c0ad9","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"76085e77-d21a-260b-e023-2a1bda"}]},
     {"uuid":"4de8ec9f-864d-a745-9a17-32caf1","roles":[{"uuid":"55928c31-aec4-1d8a-b02a-d26153","player":"f188e48e-f857-6c1f-387e-898d24"},{"uuid":"3bb6bdbf-2e74-c0bc-2cf2-144838","player":"5e169015-a2b2-7245-bf65-d2c903"}],"readings":[["01","{0} is in {1}"],["10","{0} contains {1}"]],"shapes":[],"constraints":[{"uuid":"0c8f0296-90fd-a24c-8dae-105621","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"55928c31-aec4-1d8a-b02a-d26153"}]},
+    {"uuid":"e8ad7b6a-539c-f1df-030d-23c205","roles":[{"uuid":"74c8f872-e232-bf27-d6e4-2c984a","player":"5e3ed334-c41f-6430-da33-310f14"}],"readings":[["0","{0} has high demand"]],"shapes":[],"constraints":[{"uuid":"6d30e786-f1f0-2f6e-e70d-39aaa4","min":0,"max":1,"is_preferred":true,"mandatory":null,"uniqueExcept":null}]},
     {"uuid":"232a2b92-9b25-1ed8-6259-3e9ad6","objectified_as":"24fadb6f-64f4-7e94-92b3-daf28a","roles":[{"uuid":"4056e201-8482-e6b6-cda7-bc9cb4","player":"8ff75bfd-7208-dedc-994a-c24ab5"},{"uuid":"e17aff30-9059-7954-4519-80ea77","player":"2f6cd681-ca37-1a32-c8a5-39af5d"},{"uuid":"f85f52e7-44f4-f03a-b518-37f9e1","player":"9d10e652-5145-745c-944a-06ef98"}],"readings":[["012","{0} booked {1} for {2} of places"],["021","{0} booked {1} of places for {2}"]],"shapes":[],"constraints":[{"uuid":"93f82ad8-409b-9758-e345-336c3f","min":1,"max":1,"is_preferred":null,"mandatory":true,"uniqueExcept":"f85f52e7-44f4-f03a-b518-37f9e1"}]},
     {"uuid":"dbd2ea04-e57f-c49b-3493-cd2243","roles":[{"uuid":"9cac4c6b-735e-b02b-6b5f-7a8b3b","player":"2f6cd681-ca37-1a32-c8a5-39af5d"}],"readings":[["0","{0} is high-demand"]],"shapes":[],"constraints":[{"uuid":"24857a51-8bae-9611-b753-342653","min":0,"max":1,"is_preferred":true,"mandatory":null,"uniqueExcept":null}]},
+    {"uuid":"eb191aca-d594-2ff8-d9a1-485a3b","roles":[{"uuid":"c1654074-85c9-b585-8a34-88266b","player":"5e3ed334-c41f-6430-da33-310f14"},{"uuid":"00868b3f-aa96-9c17-adb4-cbebdc","player":"ed0db176-1a97-7160-9307-8739be"}],"readings":[["01","{0} is for {1}"]],"shapes":[],"constraints":[{"uuid":"d58a0613-90df-86e6-7df1-887fc9","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"c1654074-85c9-b585-8a34-88266b"}]},
     {"uuid":"8ceef059-4112-7ec3-120a-d111e6","roles":[{"uuid":"99da2751-a693-b9e7-da4d-cbab97","player":"6c5fe7a2-44bf-09f9-f30e-d3298d"},{"uuid":"21fa60ae-6d7d-d1de-e9b7-bb2c21","player":"8621134f-147e-e604-d33a-a5fafd"}],"readings":[["01","{0} is on {1}"]],"shapes":[],"constraints":[{"uuid":"be396e9b-f7e1-fc9e-5b87-372e41","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"99da2751-a693-b9e7-da4d-cbab97"}]},
     {"uuid":"97701076-6e22-8f40-8f8a-d43763","roles":[{"uuid":"42f82ea7-174d-28ff-c36a-515727","player":"24fadb6f-64f4-7e94-92b3-daf28a"},{"uuid":"64c31a1a-d336-0cef-f828-94761c","player":"d829edb1-8225-1085-8167-6fc33c"}],"readings":[["01","{0} has {1}"]],"shapes":[],"constraints":[{"uuid":"1aaf48c4-7a97-2b9c-f0a2-1dab94","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"64c31a1a-d336-0cef-f828-94761c"}]},
     {"uuid":"f3bbf906-6ae8-0c67-339f-46b2d3","objectified_as":"1d51271a-4130-0367-f706-3c712a","roles":[{"uuid":"295ac212-a287-6dfd-5a8c-a9dd79","player":"24fadb6f-64f4-7e94-92b3-daf28a"},{"uuid":"e0748688-5c61-d6f1-3b1a-7e70da","player":"59e789dd-c97e-f0f6-95ca-216ab0"}],"readings":[["01","{0} has allocated-{1}"],["10","{0} is allocated to {1}"]],"shapes":[],"constraints":[{"uuid":"dcaf2ca2-4bc6-cc00-ae7e-bae74f","min":1,"max":1,"is_preferred":true,"mandatory":true,"uniqueExcept":null}]},
     {"uuid":"c8d298f4-4c98-e8a6-7a8b-3f3695","roles":[{"uuid":"3ece2ca8-e26e-b55f-12fc-0cf566","player":"6cab2061-f0d2-2a91-c882-1fc8d6"},{"uuid":"6bac197c-627e-aa3e-7a04-282b9d","player":"7f731425-b10e-f359-b3da-d9388c"}],"readings":[["01","{0} has {1}"],["10","{0} is of {1}"]],"shapes":[],"constraints":[{"uuid":"5feda09e-2ffb-d790-1586-31fe02","min":0,"max":1,"is_preferred":true,"mandatory":null,"uniqueExcept":"3ece2ca8-e26e-b55f-12fc-0cf566"},{"uuid":"f66a792d-a33c-2618-a086-5505d7","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"3ece2ca8-e26e-b55f-12fc-0cf566"}]},
     {"uuid":"25604355-689d-2429-5bae-0ac48d","objectified_as":"09f6bc4f-e656-00b4-3826-fae086","roles":[{"uuid":"bb0476d5-68f6-7617-53d9-f60651","player":"24fadb6f-64f4-7e94-92b3-daf28a"},{"uuid":"7cd89d87-4e2b-0102-f8a7-5a719e","player":"7cb85473-d35c-65d1-e499-00fa37"},{"uuid":"99222b5d-22df-88f8-5676-d2ae70","player":"9d10e652-5145-745c-944a-06ef98"}],"readings":[["012","{0} applied {1} for {2} of places"],["201","{0} of places for {1} have been paid for by {2}"]],"shapes":[],"constraints":[{"uuid":"06265819-a271-40dc-1089-f0c1b5","min":1,"max":1,"is_preferred":true,"mandatory":true,"uniqueExcept":"99222b5d-22df-88f8-5676-d2ae70"}]},
-    {"uuid":"5970f7e0-6ae1-abd1-adfc-d70bc7","objectified_as":"a1a520c3-744a-683b-eb2f-15fdbd","roles":[{"uuid":"3723750b-9df8-5bb8-d20f-a0f356","player":"5e169015-a2b2-7245-bf65-d2c903"},{"uuid":"e201d588-07ee-f74b-69b6-c023ee","player":"6c5fe7a2-44bf-09f9-f30e-d3298d"},{"uuid":"0411c476-9510-9581-e1f5-d5534a","player":"ed0db176-1a97-7160-9307-8739be"},{"uuid":"81a65099-928c-74b9-630a-497299","player":"e323ff6f-7ac5-89fe-0a79-7e190a"},{"uuid":"19ad0d7b-59e5-8c68-6e33-264990","player":"28f66ff5-586b-ad53-fbe6-edde21"}],"readings":[["10234","tickets on {0} at {1} in {2} for {3} have {4}"]],"shapes":[],"constraints":[{"uuid":"dff00d7a-f859-d7fd-38f1-6da715","min":1,"max":1,"is_preferred":true,"mandatory":true,"uniqueExcept":"19ad0d7b-59e5-8c68-6e33-264990"}]},
     {"uuid":"c0922945-13f0-3ed4-8594-459407","objectified_as":"2f6cd681-ca37-1a32-c8a5-39af5d","roles":[{"uuid":"bce25f15-994d-37d6-88a0-091cc0","player":"5e169015-a2b2-7245-bf65-d2c903"},{"uuid":"fc267466-2b65-16ea-8aba-40b681","player":"fa44d042-0159-59b9-f4f9-c483cf"},{"uuid":"349406c4-4b63-9dca-e74f-2db285","player":"6c5fe7a2-44bf-09f9-f30e-d3298d"}],"readings":[["012","{0} shows {1} on {2}"],["021","{0} at {1} is showing {2}"],["120","{0} is showing on {1} at {2}"]],"shapes":[],"constraints":[{"uuid":"1368f9cd-1dac-8ff7-9b8d-2d0e13","min":1,"max":1,"is_preferred":true,"mandatory":true,"uniqueExcept":"fc267466-2b65-16ea-8aba-40b681"}]},
     {"uuid":"9e16d052-706f-e21c-b5a1-123d60","roles":[{"uuid":"17570458-bd19-26e1-f713-a871f0","player":"fa44d042-0159-59b9-f4f9-c483cf"},{"uuid":"0bd0966a-b10c-fd1e-1444-cce827","player":"da692323-013c-7d92-8464-7dc03b"}],"readings":[["01","{0} was made in {1}"]],"shapes":[],"constraints":[{"uuid":"0242479d-45f2-62d7-67fa-7b3f74","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"0bd0966a-b10c-fd1e-1444-cce827"}]},
     {"uuid":"688a373f-6316-748e-f5de-0d7cd5","roles":[{"uuid":"f3dda3b3-342d-3d86-7f72-eb15b1","player":"6c5fe7a2-44bf-09f9-f30e-d3298d"},{"uuid":"660b2289-7fe7-757c-716f-c9405a","player":"6397821b-524d-aae7-c50e-0d2078"}],"readings":[["01","{0} is at {1}"]],"shapes":[],"constraints":[{"uuid":"f405d2c5-7e22-eb8e-694a-b4c374","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"f3dda3b3-342d-3d86-7f72-eb15b1"}]},
+    {"uuid":"be78c15e-3888-7f82-dfe0-55a56c","roles":[{"uuid":"c6c414f4-e5d3-8862-553c-b8ba19","player":"5e3ed334-c41f-6430-da33-310f14"},{"uuid":"78a6deec-7199-22ce-d0b4-66eef8","player":"5e169015-a2b2-7245-bf65-d2c903"}],"readings":[["01","{0} is for {1}"]],"shapes":[],"constraints":[{"uuid":"569b921e-a3f4-6f6d-ca45-dc68f9","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"c6c414f4-e5d3-8862-553c-b8ba19"}]},
     {"uuid":"e03256f8-ac1c-d1a9-0835-0b7faf","roles":[{"uuid":"b888753e-0c5b-0cf4-fc9a-c2275c","player":"24fadb6f-64f4-7e94-92b3-daf28a"},{"uuid":"403163c7-d6f1-ce34-fc33-ba7bfd","player":"cd132160-ed6d-0e5d-a730-37f936"}],"readings":[["01","tickets for {0} are being mailed to {1}"]],"shapes":[],"constraints":[{"uuid":"64553e77-5579-2c6e-114b-f7c2df","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"403163c7-d6f1-ce34-fc33-ba7bfd"}]},
     {"uuid":"c7b37e97-e552-7855-0224-92daa3","objectified_as":"04021ccb-9406-f70f-6c1d-4ebfc3","roles":[{"uuid":"4f7ec1e9-35ba-1b25-8c0d-63863d","player":"ed0db176-1a97-7160-9307-8739be"},{"uuid":"1efd5997-29a1-9f43-a6bc-97e07f","player":"5e169015-a2b2-7245-bf65-d2c903"}],"readings":[["01","{0} of {1} uses allocated seating"],["10","{0} provides allocated seating in {1}"]],"shapes":[],"constraints":[{"uuid":"fea553ce-4f9e-f07c-17ad-cd430c","min":1,"max":1,"is_preferred":true,"mandatory":true,"uniqueExcept":null}]},
     {"uuid":"4eaca304-91d6-8206-dea8-03941e","roles":[{"uuid":"265d14e7-4290-682d-d356-a8a7ce","player":"2f6cd681-ca37-1a32-c8a5-39af5d"},{"uuid":"09f63f5b-a4be-4624-2bf8-6dec8e","player":"59e789dd-c97e-f0f6-95ca-216ab0"}],"readings":[["01","{0} has {1}"]],"shapes":[]},
     {"uuid":"8be65352-26e8-8077-bf6b-8e1b70","roles":[{"uuid":"4112d54d-e5f9-f58f-5ae1-55f9a1","player":"fa44d042-0159-59b9-f4f9-c483cf"},{"uuid":"8254b0a2-30b2-c568-a94b-2cbb08","player":"ae35ec1b-d529-1b5b-8aa6-8e3378"}],"readings":[["01","{0} has {1}"]],"shapes":[],"constraints":[{"uuid":"7fc2bd6f-f470-469d-ad23-ab008e","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"4112d54d-e5f9-f58f-5ae1-55f9a1"}]},
     {"uuid":"bafa2892-15df-dc6e-0bc1-47e357","roles":[{"uuid":"c3856969-f31c-dd51-c89b-94bbcd","player":"6c5fe7a2-44bf-09f9-f30e-d3298d"},{"uuid":"f28249d4-20cd-bbe3-d4db-e7a81d","player":"6cab2061-f0d2-2a91-c882-1fc8d6"}],"readings":[["01","{0} is in {1}"]],"shapes":[],"constraints":[{"uuid":"4f37edc3-ef80-7207-b1f2-0faaa1","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"c3856969-f31c-dd51-c89b-94bbcd"}]},
     {"uuid":"a970fb87-7333-f272-90bb-d9203a","roles":[{"uuid":"fc851bb2-f774-d1e7-dd70-6c3a96","player":"cd132160-ed6d-0e5d-a730-37f936"},{"uuid":"2d879c3b-8e67-6622-cdbf-b81491","player":"5708e21b-83d7-6f1e-4888-cfa4de"}],"readings":[["01","{0} has {1}"],["10","{0} is of {1}"]],"shapes":[],"constraints":[{"uuid":"f1d96504-3980-37b4-cf1a-f3fede","min":0,"max":1,"is_preferred":true,"mandatory":null,"uniqueExcept":"fc851bb2-f774-d1e7-dd70-6c3a96"},{"uuid":"5ca2b5e1-70af-37a6-a448-b66178","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"fc851bb2-f774-d1e7-dd70-6c3a96"}]},
+    {"uuid":"40257eef-0afa-68ae-123f-070e98","roles":[{"uuid":"4318b500-d410-1e55-8c1c-3b7fe2","player":"5e3ed334-c41f-6430-da33-310f14"},{"uuid":"407ffdce-02b3-ae2b-a712-069372","player":"6c5fe7a2-44bf-09f9-f30e-d3298d"}],"readings":[["01","{0} is for {1}"]],"shapes":[],"constraints":[{"uuid":"f7579b29-660c-0f0e-f93d-a758e0","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"4318b500-d410-1e55-8c1c-3b7fe2"}]},
     {"uuid":"3c7709cc-e904-a728-4b49-af201c","roles":[{"uuid":"e520e31f-e4c8-b7e2-508d-4fae46","player":"8ff75bfd-7208-dedc-994a-c24ab5"},{"uuid":"f9457b40-f87b-75bc-26a5-53c4e2","player":"ae35ec1b-d529-1b5b-8aa6-8e3378"}],"readings":[["01","{0} has login-{1}"],["10","{0} is of {1}"]],"shapes":[],"constraints":[{"uuid":"509f7eec-9a88-7973-5b4b-6db446","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"f9457b40-f87b-75bc-26a5-53c4e2"},{"uuid":"7439e200-bd0d-b416-d1f2-451c93","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"e520e31f-e4c8-b7e2-508d-4fae46"}]},
     {"uuid":"875a2ae5-04d0-8ede-35fb-19f1cd","roles":[{"uuid":"a1231f80-69d0-8595-855a-6553b1","player":"24fadb6f-64f4-7e94-92b3-daf28a"}],"readings":[["0","tickets for {0} have been issued"]],"shapes":[],"constraints":[{"uuid":"376830be-9782-2cc2-46ea-de1c78","min":0,"max":1,"is_preferred":true,"mandatory":null,"uniqueExcept":null}]},
     {"uuid":"bc1c3ede-3790-4df7-1d3c-8b9a45","roles":[{"uuid":"6f7588c6-0ff1-ed50-7890-24e58c","player":"59e789dd-c97e-f0f6-95ca-216ab0"},{"uuid":"c500e2f4-85fb-5b55-53ba-b9108c","player":"ed0db176-1a97-7160-9307-8739be"}],"readings":[["01","{0} is in {1}"],["10","{0} contains {1}"]],"shapes":[],"constraints":[{"uuid":"f45bbbdd-1277-bd49-3ea6-0ac300","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"c500e2f4-85fb-5b55-53ba-b9108c"}]},
@@ -95,6 +97,7 @@ diagrams: [
     {"uuid":"17d8a5cb-b2cf-d95d-2abd-669111","type":"PresenceConstraint","shapes":[],"min_frequency":0,"max_frequency":1,"is_mandatory":null,"is_preferred_identifier":null,"role_sequences":[["8254b0a2-30b2-c568-a94b-2cbb08","0bd0966a-b10c-fd1e-1444-cce827"]]},
     {"uuid":"bb3bea21-0c16-4226-b64b-9d594b","type":"SetExclusionConstraint","shapes":[],"is_mandatory":null,"role_sequences":[["42f82ea7-174d-28ff-c36a-515727"],["b888753e-0c5b-0cf4-fc9a-c2275c"]]},
     {"uuid":"c8bb8d4d-35fe-713e-ae7c-48b484","type":"PresenceConstraint","shapes":[],"min_frequency":0,"max_frequency":1,"is_mandatory":null,"is_preferred_identifier":true,"role_sequences":[["27e8479e-7cff-1bef-3bc5-f1cdda","39f86eb6-01ca-cd28-cf92-6e770c"]]},
+    {"uuid":"dd289cba-6d55-6e35-7c48-5c34e1","type":"PresenceConstraint","shapes":[],"min_frequency":0,"max_frequency":1,"is_mandatory":null,"is_preferred_identifier":true,"role_sequences":[["78a6deec-7199-22ce-d0b4-66eef8","407ffdce-02b3-ae2b-a712-069372","00868b3f-aa96-9c17-adb4-cbebdc","74c8f872-e232-bf27-d6e4-2c984a"]]},
     {"uuid":"61f2ba65-a8d8-a760-0c1d-3fc9fb","type":"SubsetConstraint","shapes":[],"role_sequences":[["b888753e-0c5b-0cf4-fc9a-c2275c"],["a1231f80-69d0-8595-855a-6553b1"]]},
     {"uuid":"85e6d48a-b6e7-c281-4c8f-093d45","type":"PresenceConstraint","shapes":[],"min_frequency":0,"max_frequency":1,"is_mandatory":null,"is_preferred_identifier":true,"role_sequences":[["3bb6bdbf-2e74-c0bc-2cf2-144838","46655f5b-fd64-cd0a-696c-ea56c7"]]}
   ]

data/diagrams/json/OilSupply.json

@@ -3,7 +3,7 @@ diagrams: [
 
   ],
   object_types: [
-    {"uuid":"a75160b3-3156-4c04-9e6f-a18ec1","name":"Acceptable Substitution","shapes":[],"objectifies":"c9646a32-609e-13df-86d8-dff782"},
+    {"uuid":"a75160b3-3156-4c04-9e6f-a18ec1","name":"Acceptable Substitution","shapes":[],"objectifies":"c9646a32-609e-13df-86d8-dff782","implicit":true},
     {"uuid":"84e00afd-a346-95a2-b669-31993c","name":"Cost","shapes":[],"supertype":"c0021d9c-f630-07fd-9852-eb9919"},
     {"uuid":"c0021d9c-f630-07fd-9852-eb9919","name":"Money","shapes":[]},
     {"uuid":"d6de60a8-8969-7ffd-ea24-bd2595","name":"Month Nr","shapes":[],"supertype":"00be9eaf-0db1-13de-0a81-8c40b1"},
@@ -16,12 +16,12 @@ diagrams: [
     {"uuid":"4bf6b690-aa77-e9d6-6b0d-866fc0","name":"Refinery","shapes":[],"ref_mode":".Name","independent":true},
     {"uuid":"2f25c81c-2230-814a-dc7d-c498a9","name":"Region Name","shapes":[],"supertype":"df548ed0-3b10-d1c1-93fc-29d431"},
     {"uuid":"9d3a9977-3456-4f58-c7c9-57ba28","name":"Region","shapes":[],"ref_mode":".Name","independent":true},
-    {"uuid":"f22bc159-fa0e-b4ca-6e08-b24a14","name":"Regional Demand","shapes":[],"objectifies":"85b9800e-dcc5-22b5-a319-592cc6"},
+    {"uuid":"f22bc159-fa0e-b4ca-6e08-b24a14","name":"Regional Demand","shapes":[],"objectifies":"85b9800e-dcc5-22b5-a319-592cc6","implicit":true},
     {"uuid":"5fdfc3a7-b0e2-3c80-b3fc-2e22ce","name":"Season","shapes":[],"supertype":"df548ed0-3b10-d1c1-93fc-29d431"},
     {"uuid":"00be9eaf-0db1-13de-0a81-8c40b1","name":"Signed Integer","shapes":[]},
     {"uuid":"df548ed0-3b10-d1c1-93fc-29d431","name":"String","shapes":[]},
     {"uuid":"e4c022eb-d99c-6f1b-7a14-21b26a","name":"Supply Period","shapes":[]},
-    {"uuid":"23e4e645-ed6e-3a5a-81ad-6074dd","name":"Transport Method","shapes":[],"supertype":"df548ed0-3b10-d1c1-93fc-29d431"},
+    {"uuid":"ea456b07-bde4-e846-1272-06001d","name":"Transport Mode","shapes":[],"supertype":"df548ed0-3b10-d1c1-93fc-29d431"},
     {"uuid":"ae450e7f-b5e7-124d-f28b-a704a6","name":"Transport Route","shapes":[],"objectifies":"0d15cf74-d8cd-44f0-d223-5eb0a2"},
     {"uuid":"f8a0f0a9-0387-a6bd-9d23-57e797","name":"Unsigned Integer","shapes":[]},
     {"uuid":"010c9d61-669b-72ef-45b9-25adc4","name":"Year Nr","shapes":[],"supertype":"00be9eaf-0db1-13de-0a81-8c40b1"},
@@ -36,7 +36,7 @@ diagrams: [
     {"uuid":"c9646a32-609e-13df-86d8-dff782","objectified_as":"a75160b3-3156-4c04-9e6f-a18ec1","roles":[{"uuid":"c069f1cd-2fd0-fa98-69da-abc27a","player":"cc2d0ec3-589a-4b6e-83cf-7f1690"},{"uuid":"2df9a3bd-b2a0-b2e5-28a2-1567db","player":"cc2d0ec3-589a-4b6e-83cf-7f1690"},{"uuid":"4413db19-b21d-2d0a-a948-551380","player":"5fdfc3a7-b0e2-3c80-b3fc-2e22ce"}],"readings":[["012","alternate-{0} is an acceptable substitute for {1} in {2}"],["102","{0} may be substituted by alternate-{1} in {2}"]],"shapes":[],"constraints":[{"uuid":"416c3bef-23cf-a3ed-d114-e1071b","min":1,"max":1,"is_preferred":true,"mandatory":true,"uniqueExcept":null},{"uuid":"8b4f5586-eae7-5f46-0cd7-304948","shapes":[],"ringKind":"AcyclicIntransitive","roles":["2df9a3bd-b2a0-b2e5-28a2-1567db","c069f1cd-2fd0-fa98-69da-abc27a"]}]},
     {"uuid":"43e35ffa-c7e7-0f93-8902-3b36e4","roles":[{"uuid":"15c4a01c-2fbc-5e8b-6a10-d572b4","player":"cc2d0ec3-589a-4b6e-83cf-7f1690"},{"uuid":"b3961d20-e5f1-f8c5-bc14-579bfe","player":"fb37f913-9e5c-e17f-4c1d-22ad40"}],"readings":[["01","{0} has {1}"],["10","{0} is of {1}"]],"shapes":[],"constraints":[{"uuid":"b3e597be-a3f1-8ee2-55f1-aff504","min":0,"max":1,"is_preferred":true,"mandatory":null,"uniqueExcept":"15c4a01c-2fbc-5e8b-6a10-d572b4"},{"uuid":"b07d5fbc-f2b0-16ac-6945-a4c577","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"15c4a01c-2fbc-5e8b-6a10-d572b4"}]},
     {"uuid":"cadb824d-875f-6179-bb7f-33bc6c","roles":[{"uuid":"67515e90-b5ad-bf37-8a5b-1a7ff4","player":"e4c022eb-d99c-6f1b-7a14-21b26a"},{"uuid":"9488eb7f-6ae9-01e5-e3f8-d33c01","player":"ce562544-c702-9e02-ebee-1419b4"}],"readings":[["01","{0} is in {1}"]],"shapes":[],"constraints":[{"uuid":"2ce27a5b-b7ec-e580-4f17-d9d67d","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"67515e90-b5ad-bf37-8a5b-1a7ff4"}]},
-    {"uuid":"0d15cf74-d8cd-44f0-d223-5eb0a2","objectified_as":"ae450e7f-b5e7-124d-f28b-a704a6","roles":[{"uuid":"8bb6b238-00ad-9069-8ccf-af07eb","player":"23e4e645-ed6e-3a5a-81ad-6074dd"},{"uuid":"caed3d87-9f0e-d247-7270-feb641","player":"4bf6b690-aa77-e9d6-6b0d-866fc0"},{"uuid":"e8537f91-27c0-5c2e-4e89-65a8fd","player":"9d3a9977-3456-4f58-c7c9-57ba28"}],"readings":[["012","{0} transportation is available from {1} to {2}"],["021","{0} transportation is available to {1} from {2}"]],"shapes":[],"constraints":[{"uuid":"b40e1d82-45d6-7334-04f8-24bbb1","min":1,"max":1,"is_preferred":true,"mandatory":true,"uniqueExcept":null}]},
+    {"uuid":"0d15cf74-d8cd-44f0-d223-5eb0a2","objectified_as":"ae450e7f-b5e7-124d-f28b-a704a6","roles":[{"uuid":"8bb6b238-00ad-9069-8ccf-af07eb","player":"ea456b07-bde4-e846-1272-06001d"},{"uuid":"caed3d87-9f0e-d247-7270-feb641","player":"4bf6b690-aa77-e9d6-6b0d-866fc0"},{"uuid":"e8537f91-27c0-5c2e-4e89-65a8fd","player":"9d3a9977-3456-4f58-c7c9-57ba28"}],"readings":[["012","{0} transportation is available from {1} to {2}"],["021","{0} transportation is available to {1} from {2}"]],"shapes":[],"constraints":[{"uuid":"b40e1d82-45d6-7334-04f8-24bbb1","min":1,"max":1,"is_preferred":true,"mandatory":true,"uniqueExcept":null}]},
     {"uuid":"bce18066-a1f3-3343-be32-1b9aa7","roles":[{"uuid":"5c248b99-ecda-d3a6-e5fd-354f96","player":"e4c022eb-d99c-6f1b-7a14-21b26a"},{"uuid":"632deada-3bf9-b93c-8ff9-c86c31","player":"677778ab-55ec-0a8a-959e-03a3df"}],"readings":[["01","{0} is in {1}"]],"shapes":[],"constraints":[{"uuid":"90107798-eadb-5582-7f15-9f13fa","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"5c248b99-ecda-d3a6-e5fd-354f96"}]},
     {"uuid":"de57cb74-3fb0-5178-6742-df6640","roles":[{"uuid":"dd004195-4982-8aa3-8043-1a6fd1","player":"677778ab-55ec-0a8a-959e-03a3df"},{"uuid":"fa573542-498a-0434-98a1-2fd33e","player":"010c9d61-669b-72ef-45b9-25adc4"}],"readings":[["01","{0} has {1}"],["10","{0} is of {1}"]],"shapes":[],"constraints":[{"uuid":"ba28a87f-176b-9622-c6be-ae88a6","min":0,"max":1,"is_preferred":true,"mandatory":null,"uniqueExcept":"dd004195-4982-8aa3-8043-1a6fd1"},{"uuid":"afe26754-8969-2702-4e37-fde257","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"dd004195-4982-8aa3-8043-1a6fd1"}]},
     {"uuid":"e15a2889-d833-7a1b-ab82-18c312","objectified_as":"2bc280ad-b184-d27e-3b6f-3612c2","roles":[{"uuid":"4555fb42-1a51-3e34-9451-5db159","player":"e4c022eb-d99c-6f1b-7a14-21b26a"},{"uuid":"430cec10-ba3b-53cd-fb7b-31823b","player":"4bf6b690-aa77-e9d6-6b0d-866fc0"},{"uuid":"6d78e66b-5ed4-0cb4-60e6-9db705","player":"16b411a9-406d-f2fe-da28-256c9e"},{"uuid":"7e12c83b-1a26-be9a-b6bf-95d17c","player":"cc2d0ec3-589a-4b6e-83cf-7f1690"}],"readings":[["1032","{0} in {1} will make {2} in {3}"],["1230","{0} will make {1} of {2} in {3}"],["1302","{0} will make {1} in {2} in {3}"]],"shapes":[],"constraints":[{"uuid":"804fd9db-795b-622c-a3bc-b64c5a","min":1,"max":1,"is_preferred":true,"mandatory":true,"uniqueExcept":"6d78e66b-5ed4-0cb4-60e6-9db705"}]},

data/diagrams/json/OneRoleNesting.json

@@ -22,7 +22,7 @@ diagrams: [
   ],
   fact_types: [
     {"uuid":"f892f1cc-4ed9-7941-27d8-ac19d2","objectified_as":"e4954a31-a5f0-daa0-33d7-183ce6","roles":[{"uuid":"88d86327-0fc6-8088-5ca3-a3f4f9","player":"166a8f92-3858-5a29-200f-5831a8"}],"readings":[["0","{0} died"]],"shapes":[],"constraints":[{"uuid":"f358e06d-8fc8-7c7d-2c41-c60aec","min":1,"max":1,"is_preferred":true,"mandatory":true,"role":"88d86327-0fc6-8088-5ca3-a3f4f9"}]},
-    {"uuid":"1635510b-a1be-c26a-7a81-e42f29","objectified_as":"8da84344-ce69-2164-7825-aebc65","roles":[{"uuid":"2a6f99a7-6cc4-d548-3145-9e99c0","player":"166a8f92-3858-5a29-200f-5831a8"},{"uuid":"18ad2610-392b-135a-682b-c016cd","player":"1cb528ae-86a8-9c6e-e407-bbb750"}],"readings":[["01","{0} was born on {1}"]],"shapes":[],"constraints":[{"uuid":"474b3119-cb8c-ed3a-0d5e-662306","min":1,"max":1,"is_preferred":true,"mandatory":true,"role":"2a6f99a7-6cc4-d548-3145-9e99c0"}]},
+    {"uuid":"1635510b-a1be-c26a-7a81-e42f29","objectified_as":"8da84344-ce69-2164-7825-aebc65","roles":[{"uuid":"2a6f99a7-6cc4-d548-3145-9e99c0","player":"166a8f92-3858-5a29-200f-5831a8"},{"uuid":"18ad2610-392b-135a-682b-c016cd","player":"1cb528ae-86a8-9c6e-e407-bbb750"}],"readings":[["01","{0} was born on {1} -of birth"]],"shapes":[],"constraints":[{"uuid":"474b3119-cb8c-ed3a-0d5e-662306","min":1,"max":1,"is_preferred":true,"mandatory":true,"role":"2a6f99a7-6cc4-d548-3145-9e99c0"}]},
     {"uuid":"b604fb38-ddcf-694a-885b-027af8","objectified_as":"532f3e60-cacd-b681-5e8f-89c04c","roles":[{"uuid":"3fd1ecff-e506-5ea6-c81f-2ab5ed","player":"34077a14-e590-e4dd-99ad-6b0115"},{"uuid":"ef630d7e-8598-2cb1-cdbc-662694","player":"b79f8450-608f-adab-dbae-ab69dc"}],"readings":[["01","{0} is called {1}"]],"shapes":[],"constraints":[{"uuid":"cab6132a-07e8-20d8-b737-eaadc9","min":1,"max":1,"is_preferred":true,"mandatory":true,"role":"3fd1ecff-e506-5ea6-c81f-2ab5ed"}]},
     {"uuid":"046a39b6-53c6-9e28-e7a5-954d6b","roles":[{"uuid":"cc96722c-5193-015e-3ba7-ba8c6b","player":"e4954a31-a5f0-daa0-33d7-183ce6"},{"uuid":"90fd0abd-311a-2ac7-1446-6b7f8c","player":"1cb528ae-86a8-9c6e-e407-bbb750"}],"readings":[["01","{0} occurred on death-{1}"]],"shapes":[],"constraints":[{"uuid":"d8db5eb3-5ce6-e7ac-5df3-2e2d37","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"90fd0abd-311a-2ac7-1446-6b7f8c"}]},
     {"uuid":"ecad77ad-c928-55eb-b2a3-2a270e","roles":[{"uuid":"0982ac43-5eb7-bc8b-d43e-ce3826","player":"8da84344-ce69-2164-7825-aebc65"},{"uuid":"46fdd5e4-e95c-28a4-97bc-cc0ca7","player":"f767d08c-0138-854f-9e19-43bcac"}],"readings":[["01","{0} was assisted by attending-{1}"],["10","{0} attended {1}"]],"shapes":[],"constraints":[{"uuid":"0a1646d4-4368-0342-0bfa-a41368","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"46fdd5e4-e95c-28a4-97bc-cc0ca7"}]},

data/metadata/json/CinemaTickets.json

@@ -2,38 +2,38 @@
   "types": {
     "Address": {
       "is_main": false,
-      "id": "79bed20a-dcc0-4220-ac8c-1ccaee2df3f9",
+      "id": "854fe142-6be0-4271-abd4-97514c086a34",
       "functions": [
         {
           "title": "Address Text",
           "type": "Address Text",
           "where": "this Address has one Address Text",
-          "role_id": "88002aff-2cdc-4c31-9de8-a35c2d6e2171"
+          "role_id": "fd0a53e8-b7b0-4680-8f76-b5f4c128fcdd"
         },
         {
           "title": "all Booking",
           "type": "Booking",
           "where": "tickets for some Booking are being mailed to this Address",
-          "role_id": "880fc697-835a-4032-b30b-a1615c564a8e",
+          "role_id": "82a437aa-5189-4a5c-9407-51c83c792b6f",
           "is_list": true
         }
       ]
     },
     "Address Text": {
       "is_main": false,
-      "id": "0dfbe1ce-30f4-46ef-8400-59aba954569f",
+      "id": "9ac1a7a4-3d77-42ee-b17b-eed7b092c8f4",
       "functions": [
         {
           "title": "Address",
           "type": "Address",
           "where": "this Address Text is of one Address",
-          "role_id": "9329045a-b0b9-4e37-8069-3c3c35d59d11"
+          "role_id": "b4e7f10e-49e1-44fb-8d5b-1cfca3f97682"
         }
       ]
     },
     "Booking": {
       "is_main": true,
-      "id": "805cf066-2ccf-40d1-80c8-0444871cd88b",
+      "id": "d267872f-a94e-4b2f-a6a4-57890a81c5bd",
       "functions": [
         {
           "title": "involving Person",
@@ -54,392 +54,379 @@
           "title": "Booking Nr",
           "type": "Booking Nr",
           "where": "this Booking has one Booking Nr",
-          "role_id": "bcd7f14b-aeed-4325-96b8-29d619948efc"
+          "role_id": "210c8de8-2a28-48e9-b64e-f157a757bcb4"
         },
         {
           "title": "Collection Code",
           "type": "Collection Code",
           "where": "this Booking has one Collection Code",
-          "role_id": "161bf2a5-99c3-49c8-803b-fd0532a4e559"
+          "role_id": "c76e921d-e0b8-4c39-9e07-bbdb8a2b179c"
         },
         {
           "title": "all Allocated Seat",
           "type": "Seat",
           "where": "this Booking has some allocated-Seat",
-          "role_id": "dfc48463-c64c-42c2-8d74-ae625f190e20",
+          "role_id": "5e41eea4-05a7-45e6-b42d-f8606d2b9026",
           "is_list": true
         },
         {
           "title": "Section",
           "type": "Section",
           "where": "this Booking is for seats in one Section",
-          "role_id": "42bed52f-ac02-4f56-b54d-63d9e0e0c3b3"
+          "role_id": "102d3a95-2852-47c8-8e7d-fcd45d3b22b8"
         },
         {
           "title": "all Places Paid",
           "type": "Places Paid",
           "where": "this Booking applied some Payment Method for some Number of places",
-          "role_id": "51be9fb3-22d5-4a7b-8fd5-6c2728f67136",
+          "role_id": "44c59b62-9cb1-49c7-9db9-b363277f026e",
           "is_list": true
         },
         {
           "title": "Address",
           "type": "Address",
           "where": "tickets for this Booking are being mailed to one Address",
-          "role_id": "3f800b8f-991d-45c9-ada7-22ef43be02c3"
+          "role_id": "b2edcab6-a728-4852-8496-fa5b1beaabcb"
         },
         {
           "title": "tickets for Booking have been issued",
           "type": "boolean",
           "where": "tickets for this Booking have been issued",
-          "role_id": "4cecc192-8ea3-4e04-a2f8-5ed3f08842bc"
+          "role_id": "5d7a10dd-99a3-4649-bdb6-721a1be8bd2d"
         }
       ]
     },
     "Booking Nr": {
       "is_main": false,
-      "id": "152f2dfc-7204-45c2-a201-4f823c26abe1",
+      "id": "052c62c0-99a9-44d5-924a-74cbac824050",
       "functions": [
         {
           "title": "Booking",
           "type": "Booking",
           "where": "this Booking Nr is of one Booking",
-          "role_id": "4828d13a-2603-4b87-8e60-8e7267c245a7"
+          "role_id": "84286052-a262-4844-ba39-0aed0eeb0c37"
         }
       ]
     },
     "Cinema": {
       "is_main": true,
-      "id": "c789eb0b-ba55-47c7-8a6b-fba0d89f7384",
+      "id": "d402dcd0-25a6-4701-97ad-13c4e0db60a1",
       "functions": [
         {
           "title": "Cinema ID",
           "type": "Cinema ID",
           "where": "this Cinema has one Cinema ID",
-          "role_id": "13db8f97-bbab-4c58-bd53-30754568c2c1"
+          "role_id": "cf42f7d2-2f58-4bd6-8c27-a7857a03fe0c"
         },
         {
           "title": "Name",
           "type": "Name",
           "where": "this Cinema has one Name",
-          "role_id": "12488143-780a-4a4a-abb6-2acdfb724e51"
+          "role_id": "dbcbc2bb-e678-44fb-9672-fafff458baca"
         },
         {
           "title": "all Section",
           "type": "Section",
           "where": "this Cinema provides allocated seating in some Section",
-          "role_id": "f56353df-7863-4015-a811-43e984d88688",
+          "role_id": "ee589be5-cd03-42f4-9954-adbe30d06594",
           "is_list": true
         },
         {
           "title": "all Session",
           "type": "Session",
           "where": "this Cinema shows some Film on some Session Time",
-          "role_id": "ace48257-965a-4c83-8c85-bef912add9d1",
+          "role_id": "00b07212-8a54-43ae-8e8d-20d722260a5f",
           "is_list": true
         },
         {
           "title": "all Row",
           "type": "Row",
           "where": "this Cinema contains some Row",
-          "role_id": "511523c8-fcee-4380-a3dd-8fdec5f81f7b",
+          "role_id": "550b45d2-4440-44b1-9b83-4b7c72529657",
           "is_list": true
         },
         {
-          "title": "all Ticket Pricing",
-          "type": "Ticket Pricing",
-          "where": "tickets on some Session Time at this Cinema in some Section for some High Demand have some Price",
-          "role_id": "ca280f7e-f459-4ff9-86c2-62802995f762",
+          "title": "all Ticket Category",
+          "type": "Ticket Category",
+          "where": "some Ticket Category is for this Cinema",
+          "role_id": "898bf1cb-d8a8-4334-ae8b-bdb1e211e197",
           "is_list": true
         }
       ]
     },
     "Cinema ID": {
       "is_main": false,
-      "id": "46bfae4b-be0f-4178-b129-705723c0bd37",
+      "id": "81083d80-957a-464f-907c-6fa1d7eb329d",
       "functions": [
         {
           "title": "Cinema",
           "type": "Cinema",
           "where": "this Cinema ID is of one Cinema",
-          "role_id": "39a51260-c9d6-4d9d-86f7-6de0614e9311"
+          "role_id": "cc8e7167-53ca-4a0f-a9ae-b141ced9500b"
         }
       ]
     },
     "Collection Code": {
       "is_main": false,
-      "id": "2afd5405-738d-4833-b5a5-4594aef2f787",
+      "id": "ec0818d3-8168-4723-9cb3-22a23e73256c",
       "functions": [
         {
           "title": "all Booking",
           "type": "Booking",
           "where": "some Booking has this Collection Code",
-          "role_id": "cb6a393c-f2d4-4dc2-8f70-122171648d5d",
+          "role_id": "2dd95d6a-533d-420b-9092-6ecaf9a35402",
           "is_list": true
         }
       ]
     },
     "Day": {
       "is_main": false,
-      "id": "3a708535-4407-4c7d-b3c0-61b7bed9f6b0",
+      "id": "39c34715-19a1-461f-8a34-871c92363f32",
       "functions": [
         {
           "title": "all Session Time",
           "type": "Session Time",
           "where": "some Session Time is on this Day",
-          "role_id": "2319cc45-752a-42d7-ba40-4fb06f2d9b5e",
+          "role_id": "35f1064b-36dd-4d42-9b50-a7cb4aa1ad96",
           "is_list": true
         }
       ]
     },
     "Encrypted Password": {
       "is_main": false,
-      "id": "ff46e828-4d6b-4cf8-be60-ba6269c3c7aa",
+      "id": "1b498e35-0b8c-46bf-a3a0-1ce5c1a3b724",
       "functions": [
         {
           "title": "all Person",
           "type": "Person",
           "where": "some Person has this Encrypted Password",
-          "role_id": "f65505b6-5d0c-4bda-a956-980311e8d213",
+          "role_id": "9257e659-9487-49a3-8c05-5bf4e7fcc659",
           "is_list": true
         }
       ]
     },
     "Film": {
       "is_main": true,
-      "id": "d380bb16-c460-4830-8bd5-40b9269d2277",
+      "id": "d386222a-b7f5-48d9-9423-b82e1bfc7709",
       "functions": [
         {
           "title": "all Session",
           "type": "Session",
           "where": "this Film is showing on some Session Time at some Cinema",
-          "role_id": "5c7e1283-dd16-498b-8d85-03263bfa8954",
+          "role_id": "d47a2f65-3953-4d02-a9bc-145af1db2913",
           "is_list": true
         },
         {
           "title": "Film ID",
           "type": "Film ID",
           "where": "this Film has one Film ID",
-          "role_id": "da8024a2-9007-4b10-82d9-519798ab67b5"
+          "role_id": "ced69081-a757-482f-bf19-a37456ce1f50"
         },
         {
           "title": "Name",
           "type": "Name",
           "where": "this Film has one Name",
-          "role_id": "aae0ed12-89c7-43cd-9707-52488e030552"
+          "role_id": "2c1a9570-7d6a-4ada-b932-0ce3419aa78a"
         },
         {
           "title": "Year",
           "type": "Year",
           "where": "this Film was made in one Year",
-          "role_id": "07cff9e8-8ed8-4db5-bb2a-545e3c6e8145"
+          "role_id": "4b5fa330-3541-48c6-861c-f0b69f102e09"
         }
       ]
     },
     "Film ID": {
       "is_main": false,
-      "id": "64833cb2-11c3-4f17-8c77-851bea49afe7",
+      "id": "7be8dcf4-a397-4b03-b6ec-b3153cdc2b04",
       "functions": [
         {
           "title": "Film",
           "type": "Film",
           "where": "this Film ID is of one Film",
-          "role_id": "70b56042-6a6b-4c36-b242-8f795207925b"
-        }
-      ]
-    },
-    "High Demand": {
-      "is_main": false,
-      "id": "90cb9dbe-d4a5-41ce-bff0-37a6cc15321a",
-      "functions": [
-        {
-          "title": "all Ticket Pricing",
-          "type": "Ticket Pricing",
-          "where": "tickets on some Session Time at some Cinema in some Section for this High Demand have some Price",
-          "role_id": "04d8962a-2f11-48dc-a362-4a358254b672",
-          "is_list": true
+          "role_id": "8b955aae-6d54-4644-9cac-625ae13e6574"
         }
       ]
     },
     "Hour": {
       "is_main": false,
-      "id": "179e9694-0b4b-4b01-a507-a99aaab1f837",
+      "id": "b883ca80-7ab9-4572-9695-09a190ac5a53",
       "functions": [
         {
           "title": "all Session Time",
           "type": "Session Time",
           "where": "some Session Time is at this Hour",
-          "role_id": "7db969e4-7ee5-49d8-96da-d83fe1956d99",
+          "role_id": "614d1647-caf1-4654-ba61-dd2c5d0e8cce",
           "is_list": true
         }
       ]
     },
     "Minute": {
       "is_main": false,
-      "id": "4d11c849-e48c-4ae1-837a-8293b0d900cf",
+      "id": "10658f22-00db-461f-9c48-f44b118a0a78",
       "functions": [
         {
           "title": "all Session Time",
           "type": "Session Time",
           "where": "some Session Time is at this Minute",
-          "role_id": "d880838d-04ab-470b-9d7c-16da10d7178f",
+          "role_id": "670b02dd-c301-431b-ab68-b9a12eed98c7",
           "is_list": true
         }
       ]
     },
     "Month": {
       "is_main": false,
-      "id": "b12f5702-1fee-49e2-803b-189f9e4e39e4",
+      "id": "08b9d865-e3d9-460f-b7c6-05b947f5cb62",
       "functions": [
         {
           "title": "Month Nr",
           "type": "Month Nr",
           "where": "this Month has one Month Nr",
-          "role_id": "9c1f49c2-480c-4833-b537-57a6243484c9"
+          "role_id": "f9c473ef-2bd1-40b6-8dd9-47e1cb34bc70"
         },
         {
           "title": "all Session Time",
           "type": "Session Time",
           "where": "some Session Time is in this Month",
-          "role_id": "b304af3b-48f2-4d26-a5fe-c817a4d80f61",
+          "role_id": "e08af845-395b-4d4a-bd56-1a2da360e082",
           "is_list": true
         }
       ]
     },
     "Month Nr": {
       "is_main": false,
-      "id": "93849031-c190-4873-aa2b-26eabe0c5753",
+      "id": "0eaa6eb3-ff71-40a3-8704-d1a1ad077cfe",
       "functions": [
         {
           "title": "Month",
           "type": "Month",
           "where": "this Month Nr is of one Month",
-          "role_id": "a2411673-6646-4ccb-b839-ec25f34e051f"
+          "role_id": "6d8dfb61-6858-4449-8adb-b4039f03e452"
         }
       ]
     },
     "Name": {
       "is_main": false,
-      "id": "b93d67f4-1456-45fc-b0a3-119801fd33c6",
+      "id": "13664dcf-6d5c-4d24-aa32-ce84655227de",
       "functions": [
         {
           "title": "Cinema",
           "type": "Cinema",
           "where": "this Name is of one Cinema",
-          "role_id": "728f6929-95eb-4209-8b67-4bd7011673b9"
+          "role_id": "9a11bb1c-2974-494d-871a-a40a6e1f09d6"
         },
         {
           "title": "all Film",
           "type": "Film",
           "where": "some Film has this Name",
-          "role_id": "b5dadae8-131d-4879-9dc6-b49f10e565fc",
+          "role_id": "5a2bf649-aaff-4033-bec5-2aab9568eb29",
           "is_list": true
         },
         {
           "title": "Person",
           "type": "Person",
           "where": "this Name is of one Person",
-          "role_id": "718386a3-2188-4eb1-821e-2f68da978eba"
+          "role_id": "c744d52c-afad-4415-8ec8-f6dd697abbd0"
         }
       ]
     },
     "Number": {
       "is_main": false,
-      "id": "b6f4a4cf-008e-4701-88f0-607d9a67e827",
+      "id": "302eaeee-7b93-4217-a870-078ea000eddf",
       "functions": [
         {
           "title": "all Places Paid",
           "type": "Places Paid",
           "where": "this Number of places for some Booking have been paid for by some Payment Method",
-          "role_id": "7290ceef-c1bf-4c62-82e8-44b791e1fce9",
+          "role_id": "9bba37e1-29d6-4de3-affe-347ce8240a8d",
           "is_list": true
         },
         {
           "title": "all Booking",
           "type": "Booking",
           "where": "some Person booked some Session for this Number of places",
-          "role_id": "ff573479-1d89-43b9-bf2f-8d216a2f2427",
+          "role_id": "7fcb15a1-87c2-4fcc-b8bf-fc180d047ad8",
           "is_list": true
         }
       ]
     },
     "Payment Method": {
       "is_main": false,
-      "id": "4b47d949-d8ee-4a52-b90e-c7d874dc3607",
+      "id": "00d6b400-479b-47c5-a588-66d9123e7e50",
       "functions": [
         {
           "title": "all Places Paid",
           "type": "Places Paid",
           "where": "some Number of places for some Booking have been paid for by this Payment Method",
-          "role_id": "b1e46b2c-a009-44ee-9878-0e50e7ff3b00",
+          "role_id": "87b4c729-e8af-4800-9bf8-cc7066e103c8",
           "is_list": true
         },
         {
           "title": "Payment Method Code",
           "type": "Payment Method Code",
           "where": "this Payment Method has one Payment Method Code",
-          "role_id": "6a90d5c3-a558-431e-841b-9c0f8e3f90cd"
+          "role_id": "0ae7cd80-dcdb-442c-9e3e-f708b31958b9"
         }
       ]
     },
     "Payment Method Code": {
       "is_main": false,
-      "id": "e603fcce-15c1-417b-abb8-83fc2ee7b9b8",
+      "id": "166cd6da-8efe-408b-aa6c-1ab9b7fdc689",
       "functions": [
         {
           "title": "Payment Method",
           "type": "Payment Method",
           "where": "this Payment Method Code is of one Payment Method",
-          "role_id": "7a325060-edd1-4d79-a340-9445f3a0b371"
+          "role_id": "78422d76-24ce-47eb-aab9-2c4f63157673"
         }
       ]
     },
     "Person": {
       "is_main": true,
-      "id": "671c68c6-37ed-4b68-a13f-185c707d2723",
+      "id": "e4a6df95-769f-4e96-9ec2-558de6c922c7",
       "functions": [
         {
           "title": "all Booking",
           "type": "Booking",
           "where": "this Person booked some Session for some Number of places",
-          "role_id": "b667dc7a-c502-4daa-880b-cc478cf7889e",
+          "role_id": "d1ad9c6f-ebee-4ce3-958e-20716e6d5380",
           "is_list": true
         },
         {
           "title": "Encrypted Password",
           "type": "Encrypted Password",
           "where": "this Person has one Encrypted Password",
-          "role_id": "76130fdb-b155-4395-bbbc-25b8e88f97bd"
+          "role_id": "8e604ba3-0adc-4be8-ab0f-50a07cb89c28"
         },
         {
           "title": "Person ID",
           "type": "Person ID",
           "where": "this Person has one Person ID",
-          "role_id": "22f57f64-bdbd-4ec0-a6e1-ee530e97420f"
+          "role_id": "c7c3a1ef-a9a3-44cd-b78c-df138b418d06"
         },
         {
           "title": "Login Name",
           "type": "Name",
           "where": "this Person has one login-Name",
-          "role_id": "4fd2d692-f7d9-46c6-8591-70a8ff04be48"
+          "role_id": "32be8278-7b0d-4f16-b377-be8b6b3beb2c"
         }
       ]
     },
     "Person ID": {
       "is_main": false,
-      "id": "f3948d0a-e28b-4bc7-ab76-3cbea11fc691",
+      "id": "4e88462f-5d1a-407d-b108-e1e7fbdf1306",
       "functions": [
         {
           "title": "Person",
           "type": "Person",
           "where": "this Person ID is of one Person",
-          "role_id": "2d53d562-c21c-46fc-9f92-b952660f7276"
+          "role_id": "cf8b5c04-4033-4e6b-8e69-fa303a3d81ce"
         }
       ]
     },
     "Places Paid": {
       "is_main": true,
-      "id": "a01df44f-a2f3-47de-b30e-efab4b0f2329",
+      "id": "321bcf9a-2536-4867-8e1f-0ce7e481bbad",
       "functions": [
         {
           "title": "involving Number",
@@ -460,154 +447,154 @@
     },
     "Price": {
       "is_main": false,
-      "id": "28a2475c-abb5-49f5-acfa-d2e1139402db",
+      "id": "64eaee16-5f87-4d31-9ce6-ea3815cc01bf",
       "functions": [
         {
-          "title": "all Ticket Pricing",
-          "type": "Ticket Pricing",
-          "where": "tickets on some Session Time at some Cinema in some Section for some High Demand have this Price",
-          "role_id": "583317d7-efe2-47e7-b4b4-e88c28c27cae",
+          "title": "all Ticket Category",
+          "type": "Ticket Category",
+          "where": "some Ticket Category has this Price",
+          "role_id": "c49b3d4f-81df-444c-a1df-71336d8ab66a",
           "is_list": true
         }
       ]
     },
     "Row": {
       "is_main": false,
-      "id": "c9ed4a1f-7f0c-48ae-84ba-4965996f44ab",
+      "id": "3bb4cd73-ef9a-46f5-915a-ad48dae97268",
       "functions": [
         {
           "title": "Row Nr",
           "type": "Row Nr",
           "where": "this Row has one Row Nr",
-          "role_id": "dcb84d91-c3b4-43b8-b7c4-835e8c436fb6"
+          "role_id": "41e05659-f7d7-48ca-b44a-2706b6c0d930"
         },
         {
           "title": "Cinema",
           "type": "Cinema",
           "where": "this Row is in one Cinema",
-          "role_id": "55adc89d-4e60-4985-ac7b-2472edbd19ee"
+          "role_id": "dde5b2cb-1d17-47aa-b9c0-6330be4b53a5"
         },
         {
           "title": "all Seat",
           "type": "Seat",
           "where": "this Row contains some Seat",
-          "role_id": "25b88796-5efc-4e13-bab0-7e054b5e99c7",
+          "role_id": "12152d10-20a9-4807-bb38-87f4b3696a16",
           "is_list": true
         }
       ]
     },
     "Row Nr": {
       "is_main": false,
-      "id": "3ba0e6b1-9bd9-4036-be56-8adf8847b9ed",
+      "id": "feccb84e-e2c1-41e4-bf55-9f9c7127bfd5",
       "functions": [
         {
           "title": "all Row",
           "type": "Row",
           "where": "this Row Nr is of some Row",
-          "role_id": "c6a899b0-9555-48fe-b612-2d43b333b89b",
+          "role_id": "4a44990a-4b34-48b2-ab26-18a70c981ed3",
           "is_list": true
         }
       ]
     },
     "Seat": {
       "is_main": true,
-      "id": "931fd695-2b08-4443-b884-c2d7c7f77a7b",
+      "id": "cff131c6-471d-4e32-a5d9-aadf241c536e",
       "functions": [
         {
           "title": "all Booking",
           "type": "Booking",
           "where": "this Seat is allocated to some Booking",
-          "role_id": "e91fe05a-fe74-4ac3-8419-e981dddd4e01",
+          "role_id": "5756c6af-89f4-4d26-b05c-65130f430735",
           "is_list": true
         },
         {
           "title": "Seat Number",
           "type": "Seat Number",
           "where": "this Seat has one Seat Number",
-          "role_id": "34d4691a-5939-46a8-a3dd-4935e86ca61b"
+          "role_id": "6a08fa15-4e2a-45ba-aa81-60e84d484f37"
         },
         {
           "title": "Row",
           "type": "Row",
           "where": "this Seat is in one Row",
-          "role_id": "e91d3765-3200-440a-a669-126cffc91a5d"
+          "role_id": "0bfb3ecc-44ea-467b-84ba-af7fe4adcdd6"
         },
         {
           "title": "Section",
           "type": "Section",
           "where": "this Seat is in one Section",
-          "role_id": "c4ea54d2-228a-40b1-89b9-dace498e246c"
+          "role_id": "798413c3-ba32-4160-9717-179c405cbfc2"
         }
       ]
     },
     "Seat Number": {
       "is_main": false,
-      "id": "033e04da-febb-4bc1-b311-a4901d5fce8d",
+      "id": "6cc01fba-7b82-403c-89be-b39ae4b09049",
       "functions": [
         {
           "title": "all Seat",
           "type": "Seat",
           "where": "this Seat Number is of some Seat",
-          "role_id": "5f98a46d-b4f1-4f35-b601-3cea5b4157c5",
+          "role_id": "4be451de-2e44-4077-8320-e7be5d25f44c",
           "is_list": true
         }
       ]
     },
     "Section": {
       "is_main": false,
-      "id": "726a012a-baad-496d-8745-6cd081b9fcec",
+      "id": "fce26f5c-79e1-4824-8b23-4f92e525a40b",
       "functions": [
         {
           "title": "all Booking",
           "type": "Booking",
           "where": "some Booking is for seats in this Section",
-          "role_id": "5862426d-e222-43c5-a5e7-3c11db5fe03e",
+          "role_id": "eb29882b-7b2d-43f4-8f74-f73b9d282810",
           "is_list": true
         },
         {
           "title": "all Cinema",
           "type": "Cinema",
           "where": "this Section of some Cinema uses allocated seating",
-          "role_id": "b6b973d0-29a4-41da-b0f1-27a408d4c8a2",
+          "role_id": "868d52fb-ba7c-447e-afb5-d5812f1d1d5a",
           "is_list": true
         },
         {
           "title": "all Seat",
           "type": "Seat",
           "where": "this Section contains some Seat",
-          "role_id": "96199371-ffc2-45fc-b7ee-33e797983d70",
+          "role_id": "0f760043-baa6-42d0-90c4-13679ac128fd",
           "is_list": true
         },
         {
           "title": "Section Name",
           "type": "Section Name",
           "where": "this Section has one Section Name",
-          "role_id": "3199f1a2-6618-4861-9b9e-5cb6e5e20921"
+          "role_id": "b70fd0e9-2f73-45d6-a62a-c54a99127235"
         },
         {
-          "title": "all Ticket Pricing",
-          "type": "Ticket Pricing",
-          "where": "tickets on some Session Time at some Cinema in this Section for some High Demand have some Price",
-          "role_id": "c64a5122-d929-4428-bd86-e8423cb3643d",
+          "title": "all Ticket Category",
+          "type": "Ticket Category",
+          "where": "some Ticket Category is for this Section",
+          "role_id": "63d1b61d-edb5-4fb6-a417-f806d138e626",
           "is_list": true
         }
       ]
     },
     "Section Name": {
       "is_main": false,
-      "id": "fd4e9f78-2368-4241-bb3b-da1d022ef3d8",
+      "id": "379722bb-3c92-4a91-9815-4f4388f7dfeb",
       "functions": [
         {
           "title": "Section",
           "type": "Section",
           "where": "this Section Name is of one Section",
-          "role_id": "456fb742-109c-4a66-92e4-b49c8aac8f0d"
+          "role_id": "48f208bb-0214-460a-89ef-e07e1b3b1599"
         }
       ]
     },
     "Session": {
       "is_main": true,
-      "id": "c2011033-2587-4008-ab3a-58b6a64ba437",
+      "id": "420a2128-87da-4cd3-8c10-5e9b45cfb9f7",
       "functions": [
         {
           "title": "involving Cinema",
@@ -628,139 +615,144 @@
           "title": "all Booking",
           "type": "Booking",
           "where": "some Person booked this Session for some Number of places",
-          "role_id": "2c0b410a-4267-4d87-be3f-7419463d4e73",
+          "role_id": "9f16d5bc-6d17-4aed-9801-ffe9b8d11f65",
           "is_list": true
         },
         {
           "title": "Session is high-demand",
           "type": "boolean",
           "where": "this Session is high-demand",
-          "role_id": "f70a1899-fe35-43c8-b63f-dd78ec5cf276"
+          "role_id": "65c02bd1-6752-46ac-adcc-209ba31333ad"
         },
         {
           "title": "Session uses allocated seating",
           "type": "boolean",
           "where": "this Session uses allocated seating",
-          "role_id": "1be3e1fb-b4f9-4759-9416-03a7f23558b2"
+          "role_id": "9115463b-0de1-494e-a5dd-132fd3bee96f"
         }
       ]
     },
     "Session Time": {
       "is_main": false,
-      "id": "9ffd4176-df3d-42c8-a575-21a29d542fec",
+      "id": "53946231-e597-4065-bdd8-8ba4f0bf7902",
       "functions": [
         {
           "title": "all Session",
           "type": "Session",
           "where": "some Cinema shows some Film on this Session Time",
-          "role_id": "a9e36c81-49fb-40df-ae29-711b4bada13c",
+          "role_id": "6a7143a7-39bf-41cf-9dd4-4e405cfc0c47",
           "is_list": true
         },
         {
           "title": "Hour",
           "type": "Hour",
           "where": "this Session Time is at one Hour",
-          "role_id": "fecb3350-0d22-44f2-960f-8bcb1ee07d93"
+          "role_id": "fffaca03-6224-4067-b56b-a10e21501997"
         },
         {
           "title": "Minute",
           "type": "Minute",
           "where": "this Session Time is at one Minute",
-          "role_id": "521d25ed-8382-4ab9-bb8f-b0017e08892d"
+          "role_id": "c989dc90-95f9-407a-80de-c8c41a1e86ee"
         },
         {
           "title": "Month",
           "type": "Month",
           "where": "this Session Time is in one Month",
-          "role_id": "b9307922-9864-45ea-b569-28d4ebef6b25"
+          "role_id": "7bf90194-3e0f-403c-afde-ff0e9b73c703"
         },
         {
           "title": "Year",
           "type": "Year",
           "where": "this Session Time is in one Year",
-          "role_id": "72e517bb-8920-43f9-8923-e1aab8b57549"
+          "role_id": "9e53bef6-7464-45ae-b200-ecfcb9c03a5a"
         },
         {
           "title": "Day",
           "type": "Day",
           "where": "this Session Time is on one Day",
-          "role_id": "f707dafb-46fd-4b57-a043-4ccfd1e38fca"
+          "role_id": "7d164a0e-21c0-42e2-8782-da1b0bcc3b85"
         },
         {
-          "title": "all Ticket Pricing",
-          "type": "Ticket Pricing",
-          "where": "tickets on this Session Time at some Cinema in some Section for some High Demand have some Price",
-          "role_id": "00e984a1-2712-48aa-8d54-e6a5529cfb91",
+          "title": "all Ticket Category",
+          "type": "Ticket Category",
+          "where": "some Ticket Category is for this Session Time",
+          "role_id": "fabeb8cd-9177-41fb-87cf-3caa89bce78c",
           "is_list": true
         }
       ]
     },
-    "Ticket Pricing": {
+    "Ticket Category": {
       "is_main": true,
-      "id": "2d29e9f8-8c2d-4c68-8aa5-341eb7afaa9a",
+      "id": "dd052c40-8c29-4453-8cb0-79cec4ac8c45",
       "functions": [
         {
-          "title": "involving Session Time",
-          "type": "Session Time",
-          "where": "tickets on this Session Time at some Cinema in some Section for some High Demand have some Price"
+          "title": "Price",
+          "type": "Price",
+          "where": "this Ticket Category has one Price",
+          "role_id": "0bfffe0a-9cd5-4a88-8353-d3c3359a2c2e"
         },
         {
-          "title": "involving Cinema",
-          "type": "Cinema",
-          "where": "tickets on some Session Time at this Cinema in some Section for some High Demand have some Price"
+          "title": "Ticket Category has high demand",
+          "type": "boolean",
+          "where": "this Ticket Category has high demand",
+          "role_id": "1ee1f84c-0b45-47a5-ac50-c49aba588d1f"
         },
         {
-          "title": "involving Section",
-          "type": "Section",
-          "where": "tickets on some Session Time at some Cinema in this Section for some High Demand have some Price"
+          "title": "Cinema",
+          "type": "Cinema",
+          "where": "this Ticket Category is for one Cinema",
+          "role_id": "62c20527-0797-42dc-9bdb-8da307ceaa05"
         },
         {
-          "title": "involving High Demand",
-          "type": "High Demand",
-          "where": "tickets on some Session Time at some Cinema in some Section for this High Demand have some Price"
+          "title": "Section",
+          "type": "Section",
+          "where": "this Ticket Category is for one Section",
+          "role_id": "7271eaa0-5e43-44c7-ae88-5ac45d4b3ebf"
         },
         {
-          "title": "involving Price",
-          "type": "Price",
-          "where": "tickets on some Session Time at some Cinema in some Section for some High Demand have this Price"
+          "title": "Session Time",
+          "type": "Session Time",
+          "where": "this Ticket Category is for one Session Time",
+          "role_id": "140b2003-a239-454d-8699-b057c9e680d7"
         }
       ]
     },
     "Year": {
       "is_main": false,
-      "id": "58f5e53f-85ad-49ae-9793-b4788badae10",
+      "id": "5a4665e7-e61e-4973-aace-b10bd342afcc",
       "functions": [
         {
           "title": "all Film",
           "type": "Film",
           "where": "some Film was made in this Year",
-          "role_id": "fab3ccbd-99d5-4b40-ac80-3688cda9c16d",
+          "role_id": "4015d21f-7d34-42ef-bd57-9e4048c3319e",
           "is_list": true
         },
         {
           "title": "all Session Time",
           "type": "Session Time",
           "where": "some Session Time is in this Year",
-          "role_id": "291e361c-1f5a-436e-a495-363dd1b5210f",
+          "role_id": "58bb5829-2ad2-4ee1-9f09-5fb26d4063cb",
           "is_list": true
         },
         {
           "title": "Year Nr",
           "type": "Year Nr",
           "where": "this Year has one Year Nr",
-          "role_id": "a1ed2457-b659-4cc5-9860-ae850474ee3b"
+          "role_id": "6f451b7b-904d-4fe7-b7f9-302f62888174"
         }
       ]
     },
     "Year Nr": {
       "is_main": false,
-      "id": "cbad7e71-989e-4226-8ce2-606cb197288b",
+      "id": "84235858-7805-4189-bafa-93a7ce519821",
       "functions": [
         {
           "title": "Year",
           "type": "Year",
           "where": "this Year Nr is of one Year",
-          "role_id": "91faff78-c224-456e-87f5-1f5f7d74bfdc"
+          "role_id": "4cbf12df-a27d-4938-9265-b593570b4061"
         }
       ]
     }