activefacts-examples 1.7.2 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6adce89f6d0f635d4a04c797a57108d7a9383fd4
-  data.tar.gz: ce83f699090b2224dcbf622ec476d53cf3afe42c
+  metadata.gz: 7f93f35c1d7ac88faac09133a9553a32b9d4703c
+  data.tar.gz: e8dfdc6c577ed8bcb6b32bf66a4a57c0946f7187
 SHA512:
-  metadata.gz: 9fd1c3464285ab449310cf8db1c823a3c239d7b816a6bb8206c455b28db64e1171b6d1c8ea569fb0e073769ae2ae1360a4e62ef3f327093a3f861db263b31340
-  data.tar.gz: a4b06621a15442c8711a03468d5e5ee69e503ddd1542f36282e6610212cbd3b7d3a5da40fb212e216dae7f3b483ffa787a6415e775d50853ee2c8340753169b0
+  metadata.gz: bdfb1294b59b39e9ca14df1d434e117ae1d3880088b3f208f826ce19c7aff46d09031e33c70dac76a3d417f04f3ab339751c2c37b68a54bd52ff7d9b8797766c
+  data.tar.gz: ba58358aa52fceeec9aaf3099c8cc99a6461bd9af6649ea127e927d96a9d5f58117f037f1b980b790fde67874841994c140c1963d77390615bf372c7f55ceecf

data/Gemfile

@@ -2,7 +2,11 @@ source 'https://rubygems.org'
 
 gemspec
 
-if ENV['PWD'] =~ %r{\A/Users/cjh/work/activefacts}
+if ENV['PWD'] =~ %r{\A#{ENV['HOME']}/work}
+  $stderr.puts "Using work area gems for #{File.basename(File.dirname(__FILE__))} from activefacts-examples"
+  gem 'activefacts-api', path: '/Users/cjh/work/activefacts/api'
+  gem 'activefacts-metamodel', path: '/Users/cjh/work/activefacts/metamodel'
+  gem 'activefacts-rmap', path: '/Users/cjh/work/activefacts/rmap'
   gem 'activefacts-cql', path: '/Users/cjh/work/activefacts/cql'
   gem 'activefacts-orm', path: '/Users/cjh/work/activefacts/orm'
   gem 'activefacts-generators', path: '/Users/cjh/work/activefacts/generators'

data/activefacts-examples.gemspec

@@ -4,11 +4,11 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "activefacts-examples"
-  spec.version       = "1.7.2"
+  spec.version       = "1.8.0"
   spec.authors       = ["Clifford Heath"]
   spec.email         = ["clifford.heath@gmail.com"]
 
-  spec.summary       = %q{Example models in the Constellation Query Language for use with ActiveFacts}
+  spec.summary       = %q{Example models for use with ActiveFacts}
   spec.description   = %q{Example models in the Constellation Query Language for use with ActiveFacts}
   spec.homepage      = "http://github.com/cjheath/activefacts-examples"
   spec.license       = "MIT"
@@ -16,11 +16,9 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10.a"
+  spec.add_development_dependency "bundler", ">= 1.10", "~> 1.10.6"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3.3"
 
-  spec.add_runtime_dependency "activefacts-cql"
-  spec.add_runtime_dependency "activefacts-orm"
-  spec.add_runtime_dependency "activefacts-generators"
+  spec.add_runtime_dependency "activefacts", ">= 1.8", "~> 1.8.0"
 end

data/cql/Metamodel.cql

@@ -53,6 +53,17 @@ Coefficient is identified by Numerator and Denominator and Coefficient is precis
 	Coefficient has one Denominator,
 	Coefficient is precise;
 
+Component is identified by Guid where
+	Component has one Guid,
+	Guid is of at most one Component;
+Component projects at most one Name;
+
+Composition is identified by Guid where
+	Composition has one Guid,
+	Guid is of at most one Composition;
+Composition is called one Name,
+	Name is of at most one Composition;
+
 Concept is identified by Guid where
 	Concept has one Guid,
 	Guid is of at most one Concept;
@@ -75,6 +86,8 @@ Context Note has one Discussion,
 Context Note applies to at most one relevant-Concept,
 	Concept has Context Note;
 
+Discriminator is a kind of Component;
+
 Enforcement is identified by Constraint where
 	Constraint requires at most one Enforcement,
 	Enforcement applies to one Constraint;
@@ -92,6 +105,8 @@ Fact is of one Fact Type;
 Implication Rule is identified by its Name;
 Concept is implied by at most one Implication Rule;
 
+Indicator is a kind of Component;
+
 Instance is identified by Concept where
 	Instance is an instance of one Concept;
 Instance objectifies at most one Fact,
@@ -103,6 +118,10 @@ Location is identified by X and Y where
 	Location is at one X,
 	Location is at one Y;
 
+Mapping is a kind of Component;
+Mapping (as Parent) contains Component (as Member) [acyclic, stronglyintransitive],
+	Member belongs to at most one Parent;
+
 Presence Constraint is a kind of Constraint;
 Presence Constraint has at most one max-Frequency restricted to {1..};
 Presence Constraint has at most one min-Frequency restricted to {2..};
@@ -128,6 +147,7 @@ Role is identified by Fact Type and Ordinal where
 	Fact Type contains Role,
 	Role fills one Ordinal,
 	Ordinal applies to Role;
+Indicator indicates one Role played;
 Link Fact Type has one implying-Role,
 	implying-Role implies at most one Link Fact Type;
 Ring Constraint has at most one other-Role,
@@ -154,6 +174,8 @@ Role Value is identified by Fact and Role where
 Instance plays Role Value,
 	Role Value is of one Instance;
 
+Scoping is a kind of Mapping;
+
 Set Constraint is a kind of Constraint;
 
 Shape is identified by Guid where
@@ -229,6 +251,12 @@ Vocabulary contains Constraint,
 Vocabulary includes Unit,
 	Unit is in one Vocabulary;
 
+Absorption is a kind of Mapping;
+Absorption traverses to one child-Role;
+Absorption traverses from one parent-Role;
+Absorption is matched by at most one reverse-Absorption;
+Absorption flattens;
+
 Aggregation is where
 	Variable is bound to Aggregate over aggregated-Variable,
 	Aggregate of aggregated-Variable is bound as one Variable;
@@ -244,6 +272,12 @@ Bound is identified by Value and Bound is inclusive where
 	Value is of at least one Bound,
 	Bound is inclusive;
 
+Composite is identified by Mapping where
+	Mapping projects at most one Composite,
+	Composite consists of one Mapping;
+Composition contains Composite,
+	Composite belongs to one Composition;
+
 Constraint Shape is a kind of Shape;
 Constraint Shape is for one Constraint;
 
@@ -266,15 +300,30 @@ Diagram is identified by Vocabulary and Name where
 	Diagram is called one Name,
 	Name is of Diagram;
 
+Discriminated Role is where
+	Discriminator distinguishes Role using one Value,
+	Role is indicated by Value for Discriminator;
+
 Fact Type Shape is a kind of Shape;
 Fact Type Shape has at most one Display Role Names Setting;
 Fact Type Shape is for one Fact Type,
 	Fact Type has Fact Type Shape;
 Fact Type Shape has at most one Rotation Setting;
 
+Injection is a kind of Mapping;
+
+Mirror Role is a kind of Role;
+Mirror Role is for at most one Role (as Base Role),
+	Base Role implies at most one Mirror Role;
+
 Model Note Shape is a kind of Shape;
 Model Note Shape is for one Context Note;
 
+Nesting is where
+	Absorption is nested under index-Role in Ordinal position,
+	Absorption in Ordinal position is nested under one Role,
+	Role keys nesting of Absorption at Ordinal priority;
+
 ORM Diagram is a kind of Diagram;
 Shape is in one ORM Diagram,
 	ORM Diagram includes Shape;
@@ -283,6 +332,7 @@ Object Type is identified by Vocabulary and Name where
 	Object Type belongs to one Vocabulary,
 	Object Type is called one Name;
 Instance is of one Object Type;
+Mapping represents one Object Type;
 Object Type is an instance of one Concept;
 Object Type uses at most one Pronoun;
 Object Type plays Role,
@@ -374,8 +424,8 @@ Allowed Range is where
 Domain Object Type is a kind of Object Type;
 
 Entity Type is a kind of Domain Object Type;
-Entity Type nests at most one Fact Type,
-	Fact Type is nested as at most one Entity Type;
+Entity Type objectifies at most one Fact Type,
+	Fact Type is objectified as at most one Entity Type;
 
 Type Inheritance is a kind of Fact Type identified by Subtype and Supertype where
 	Entity Type (as Subtype) is subtype of super-Entity Type (as Supertype) [acyclic, intransitive],
@@ -408,11 +458,14 @@ Value Type Parameter Restriction is where
 	Value Type Parameter applies to Value Type;
 Value Type Parameter Restriction has one Value;
 
-Implicit Boolean Value Type is a kind of Value Type;
-
 /*
  * Constraints:
  */
+either Component belongs to Mapping(1) or Component is a Mapping(2) that projects Composite but not both;
+for each Component exactly one of these holds:
+	Component is a Mapping,
+	Component is an Indicator,
+	Component is a Discriminator;
 for each Concept exactly one of these holds:
 	Object Type is an instance of Concept,
 	Fact Type is an instance of Concept,
@@ -424,12 +477,18 @@ for each Concept exactly one of these holds:
 	Fact is an instance of Concept,
 	Population is an instance of Concept,
 	Query is an instance of Concept;
+either Constraint Shape is a Ring Constraint Shape or Constraint Shape is a Value Constraint Shape but not both;
 for each Constraint exactly one of these holds:
 	Constraint is a Set Constraint,
 	Constraint is a Presence Constraint,
 	Constraint is a Ring Constraint,
 	Constraint is a Value Constraint;
 either Domain Object Type is a Value Type or Domain Object Type is an Entity Type but not both;
+for each Mapping exactly one of these holds:
+	Mapping is an Absorption,
+	Mapping is an Injection,
+	Mapping is a Scoping,
+	Mapping projects Composite;
 for each Role Sequence exactly one of these holds:
 	Role Sequence is for Reading,
 	Presence Constraint covers Role Sequence,
@@ -451,6 +510,9 @@ either Unit is fundamental or Unit is derived from base-Unit but not both;
 either Value Constraint Shape is for Object Type Shape or Value Constraint Shape is for Role Display but not both;
 either Value Constraint allows Value Range or Value Constraint requires matching Regular Expression but not both;
 either Value Constraint constrains Value Type or Value Constraint applies to Role but not both;
+for each Mapping at most one of these holds:
+	Mapping is an Absorption that flattens,
+	Mapping projects Composite;
 for each Instance at most one of these holds:
 	Instance has Value,
 	Instance objectifies Fact;
@@ -466,19 +528,32 @@ Step specifies Fact Type that contains Role
 Variable is for Object Type that plays Role
 	if and only if
 	Variable is restricted by Role of Step;
+/*
+Absorption traverses from parent Role that is played by Object Type and Mapping(1) is a kind of Component(2) and Mapping(1) is an Absorption
+	only if Member belongs to Mapping(2) that represents Object Type;
+Absorption traverses to child Role that is played by Object Type and Absorption is a kind of Mapping(2)
+	only if Mapping(1) represents Object Type;
+*/
 Presence Constraint is preferred identifier
 	only if Presence Constraint has max Frequency;
 Value Type has Scale
 	only if Value Type has Length;
 Variable matches nesting over Step
 	only if Variable is for Object Type and Step specifies Fact Type;
+each Absorption(1) occurs at most one time in
+	Absorption(2) is matched by reverse Absorption(1);
 either Agreement was reached by Agent or Agreement was on Date;
+// either Component projects Name or Component is some Absorption that flattens;
 each Concept occurs at most one time in
 	Object Type is an instance of Concept;
 each Concept occurs at most one time in
 	Population is an instance of Concept;
 each Concept occurs at most one time in
 	Role is an instance of Concept;
+each Discriminator occurs at least 2 times in
+	Discriminator distinguishes Role using Value;
+each combination Discriminator, Value occurs one time in
+	Discriminator distinguishes Role using Value;
 each combination Entity Type(1), Type Inheritance occurs at most one time in
 	Entity Type(1) is subtype of super Entity Type(2),
 	Type Inheritance provides identification;
@@ -500,68 +575,3 @@ each combination Vocabulary, Name occurs at most one time in
 each combination Vocabulary, Name occurs at most one time in
 	Unit is in Vocabulary,
 	Unit is called Name;
-
-/*
- * Compositions
- */
-Component is identified by Guid where
-	Component has one Guid,
-	Guid is of at most one Component;
-Component projects at most one Name;
-
-Composition is identified by Guid where
-	Composition has one Guid,
-	Guid is of at most one Composition;
-Composition is called one Name,
-	Name is of at most one Composition;
-
-Discriminator is a kind of Component;
-
-Indicator is a kind of Component;
-Indicator indicates one Role played;
-
-Mapping is a kind of Component;
-Mapping contains Component (as Member) [acyclic, stronglyintransitive],
-	Member belongs to at most one parent-Mapping;
-Mapping represents one Object Type;
-
-Nesting is a kind of Mapping;
-
-Absorption is a kind of Mapping;
-Absorption traverses to one child-Role;
-Absorption is nested under at most one index-Role;
-Absorption traverses from one parent-Role;
-Absorption flattens;
-
-Composite is identified by Mapping where
-	Mapping projects at most one Composite,
-	Composite consists of one Mapping;
-Composition contains Composite,
-	Composite belongs to one Composition;
-
-Discriminated Role is where
-	Discriminator distinguishes Role using one Value,
-	Role is indicated by Value for Discriminator;
-
-Injection is a kind of Mapping;
-for each Component exactly one of these holds:
-	that Component is a Mapping,
-	that Component is an Indicator,
-	that Component is a Discriminator;
-either Component is a Mapping(2) that projects some Composite or Component belongs to parent Mapping(1) but not both;
-for each Mapping exactly one of these holds:
-	that Mapping is an Absorption,
-	that Mapping is an Injection,
-	that Mapping is a Nesting,
-	that Mapping projects some Composite;
-for each Mapping at most one of these holds:
-	that Mapping projects some Composite,
-	that Mapping is an Absorption and that Absorption flattens;
-some Mapping represents some Object Type
-	if and only if
-	that Mapping is an Absorption that traverses to some child- Role and that Role is played by that Object Type;
-either Component projects some Name or that Component flattens;
-each Discriminator occurs at least 2 times in
-	Discriminator distinguishes Role using Value;
-each combination Discriminator, Value occurs one time in
-	Discriminator distinguishes Role using Value;

data/cql/SeparateSubtype.cql

@@ -22,7 +22,7 @@ Person is identified by its Name;
 Vehicle Incident is a kind of Incident [separate];
 
 Witness is a kind of Person;
-Witness saw Incident,
+Witness saw at least one Incident,
 	Incident was independently witnessed by at most one Witness;
 
 Driver is a kind of Person;

data/diagrams/json/Metamodel.json

@@ -50,7 +50,6 @@ diagrams: [
     {"uuid":"e6680c4a-00bb-7cf1-52c9-dfb39a","name":"Guid","shapes":[]},
     {"uuid":"8604dec4-1c72-930b-e1bb-8bb865","name":"Implication Rule Name","shapes":[],"supertype":"5b5d04ca-7705-d36c-c15f-241d6e"},
     {"uuid":"6fe06eff-b88e-2459-21e6-39df51","name":"Implication Rule","shapes":[],"ref_mode":".Name"},
-    {"uuid":"c66500bd-38ff-595f-30df-ecc500","name":"Implicit Boolean Value Type","shapes":[],"supertypes":[["56c9cec4-88ef-1e86-9ca6-970913","0039d3ee-54b1-91c9-8e6c-c21232"]]},
     {"uuid":"64b45d52-1c9c-0d5f-75fa-a98e6a","name":"Indicator","shapes":[],"supertypes":[["fd47e94d-1f36-025d-73df-6cb546","ff4c4a9e-da54-ac2b-8b5d-c45854"]]},
     {"uuid":"8774195f-10a4-2fbf-b99e-caeed9","name":"Injection","shapes":[],"supertypes":[["32358c40-0d09-b3bc-7875-8ef402","a017a7b2-8b77-412c-c724-c441b0"]]},
     {"uuid":"bb3ea578-9bed-15bd-db91-59046d","name":"Instance","shapes":[]},
@@ -59,9 +58,10 @@ diagrams: [
     {"uuid":"de09e03e-7bb2-1c53-9d85-d230d6","name":"Literal","shapes":[],"supertype":"5b5d04ca-7705-d36c-c15f-241d6e"},
     {"uuid":"c7a2feb2-46ce-d506-271d-c47da0","name":"Location","shapes":[]},
     {"uuid":"32358c40-0d09-b3bc-7875-8ef402","name":"Mapping","shapes":[],"supertypes":[["fd47e94d-1f36-025d-73df-6cb546","48009576-8002-bd90-9dab-04f062"]]},
+    {"uuid":"5e0598ad-c975-eb1d-7e21-6ecd97","name":"Mirror Role","shapes":[],"supertypes":[["92fe2e9f-6dd4-a626-d621-777493","b523c75d-1aa4-c7df-5ba7-0525b5"]]},
     {"uuid":"ba49770f-0fba-1aa9-f1c1-5a9730","name":"Model Note Shape","shapes":[],"supertypes":[["6ed24bcf-12f0-0369-0af8-fa24eb","6b8a8c1c-2889-10e0-5299-6a2b70"]]},
     {"uuid":"46e08c2e-b6b9-c3e4-ac7b-2bf98b","name":"Name","shapes":[],"supertype":"5b5d04ca-7705-d36c-c15f-241d6e"},
-    {"uuid":"45951ee0-d56a-c690-2a8a-e8a114","name":"Nesting","shapes":[],"supertypes":[["32358c40-0d09-b3bc-7875-8ef402","bb11a2d7-f14e-d7e8-366b-dd920c"]]},
+    {"uuid":"45951ee0-d56a-c690-2a8a-e8a114","name":"Nesting","shapes":[],"objectifies":"e246a361-39ce-5177-93cb-0cbcfe"},
     {"uuid":"8042d033-71e4-ac59-286a-a79a18","name":"Numerator","shapes":[],"supertype":"33545e34-44c4-aed3-f30e-93433b"},
     {"uuid":"deadd195-6677-b612-ebe8-dc8de0","name":"ORM Diagram","shapes":[],"supertypes":[["a6898a8b-e5be-0049-b633-3fa1f7","25496941-e2bb-b787-cb8e-58dfe7"]]},
     {"uuid":"af0275ad-cd84-2a95-1b71-4af0c7","name":"Object Type Shape","shapes":[],"supertypes":[["6ed24bcf-12f0-0369-0af8-fa24eb","f730c683-7409-6f3d-4891-e1f48f"]]},
@@ -82,13 +82,13 @@ diagrams: [
     {"uuid":"2f6e7cda-bd43-216e-e8f9-b82e8d","name":"Ring Type","shapes":[],"supertype":"5b5d04ca-7705-d36c-c15f-241d6e"},
     {"uuid":"a81ebc59-bd22-f66e-b7ad-d123ce","name":"Role Display","shapes":[],"objectifies":"341ce05d-b225-6e99-2cfd-3882c5"},
     {"uuid":"6bd8fca9-e6dd-e3c8-26a7-3e61df","name":"Role Name Shape","shapes":[],"supertypes":[["6ed24bcf-12f0-0369-0af8-fa24eb","2f164350-d200-387a-f1b0-7c31f2"]]},
-    {"uuid":"93eec55b-0bdf-efec-1c65-231051","name":"Role Proxy","shapes":[],"supertypes":[["92fe2e9f-6dd4-a626-d621-777493","b523c75d-1aa4-c7df-5ba7-0525b5"]]},
     {"uuid":"f80e850c-f4cb-25dd-6a6c-e97290","name":"Role Ref","shapes":[],"objectifies":"1c28387a-5103-97e6-e46e-16346f"},
     {"uuid":"af212182-e76c-e1b5-07ec-883f03","name":"Role Sequence","shapes":[],"ref_mode":"Guid"},
     {"uuid":"18d23fe3-f58b-8824-165c-973561","name":"Role Value","shapes":[]},
     {"uuid":"92fe2e9f-6dd4-a626-d621-777493","name":"Role","shapes":[]},
     {"uuid":"376bb1d6-ede0-cc6b-e2b2-80a1d0","name":"Rotation Setting","shapes":[],"supertype":"5b5d04ca-7705-d36c-c15f-241d6e"},
     {"uuid":"93d28ddf-f746-bdb2-5494-b3f23a","name":"Scale","shapes":[],"supertype":"d0b1295f-80c0-cfc2-53c9-f8803c"},
+    {"uuid":"37fe75ff-1c97-8a69-89d1-b95d61","name":"Scoping","shapes":[],"supertypes":[["32358c40-0d09-b3bc-7875-8ef402","bb11a2d7-f14e-d7e8-366b-dd920c"]]},
     {"uuid":"6f67a00a-d62b-5846-f83d-b3d0a2","name":"Set Comparison Constraint","shapes":[],"supertypes":[["9d13ab35-012e-499c-def6-431913","42e4fe2a-1959-2ea2-f75f-cedba9"]]},
     {"uuid":"9c29ecab-9b22-0138-deeb-4fb3b6","name":"Set Comparison Roles","shapes":[],"objectifies":"1f6cf707-9269-75fc-bfb5-54501e"},
     {"uuid":"9d13ab35-012e-499c-def6-431913","name":"Set Constraint","shapes":[],"supertypes":[["0c0b0ef2-8be9-7569-da46-943be0","a0fcdd7c-2c3d-4b24-a6ca-dc66da"]]},
@@ -138,13 +138,14 @@ diagrams: [
     {"uuid":"5568314b-1f47-0995-1153-4cf75e","roles":[{"uuid":"6bb4823f-7c2b-2ff7-d920-989e18","player":"bb3ea578-9bed-15bd-db91-59046d"},{"uuid":"5269f001-275f-25cb-d694-56475f","player":"db16b4f2-5a16-acb5-3976-556bf2"}],"readings":[["01","{0} is an instance of {1}"]],"shapes":[],"constraints":[{"uuid":"edd31516-0a0a-903b-cb3e-303c80","min":0,"max":1,"is_preferred":true,"mandatory":null,"uniqueExcept":"6bb4823f-7c2b-2ff7-d920-989e18"},{"uuid":"967f6d91-c34f-bfc5-ac73-1a3268","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"6bb4823f-7c2b-2ff7-d920-989e18"}]},
     {"uuid":"d2bc1c81-e1b9-5529-9821-071a4b","roles":[{"uuid":"75605efb-167f-6f22-b5ae-b89890","player":"c1f018e7-5506-22b4-83d8-a7fd95"},{"uuid":"06aa4037-fabb-2b71-ce2f-ad576a","player":"f80e850c-f4cb-25dd-6a6c-e97290"}],"readings":[["01","{0} projects {1}"],["10","{0} is projected from {1}"]],"shapes":[],"constraints":[{"uuid":"792b635a-5a67-d1b6-aab0-0df608","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"06aa4037-fabb-2b71-ce2f-ad576a"},{"uuid":"23e20efa-b564-aa18-e037-5fac19","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"75605efb-167f-6f22-b5ae-b89890"}]},
     {"uuid":"b197d1d9-04e7-f866-124c-d7601d","roles":[{"uuid":"8b81ce52-f3d7-4128-107b-b81856","player":"737c9487-58a1-8a78-d92b-1af9c9"},{"uuid":"36199b2e-021a-6a64-83cd-5773a1","player":"1f75e35a-fb0d-5de1-e866-d9cc0e"}],"readings":[["01","{0} has {1}"],["10","{0} is for {1}"]],"shapes":[],"constraints":[{"uuid":"cc21b269-00de-4eda-2a9e-6ca4c6","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"36199b2e-021a-6a64-83cd-5773a1"}]},
+    {"uuid":"248472f5-d632-2280-8710-b23435","roles":[{"uuid":"fff69eb8-53c1-e338-05e8-7c0e5d","player":"b7027c11-048b-f45f-19fa-a561ef"},{"uuid":"239508fe-3e68-9e49-919a-73ca5c","player":"b7027c11-048b-f45f-19fa-a561ef"}],"readings":[["01","{0} is matched by reverse-{1}"]],"shapes":[],"constraints":[{"uuid":"712f1453-1790-5316-8313-3b0fc2","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"239508fe-3e68-9e49-919a-73ca5c"},{"uuid":"9628475a-5c5c-671f-9f9d-5ca3c6","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"fff69eb8-53c1-e338-05e8-7c0e5d"}]},
     {"uuid":"dc8e87f5-0ddd-bf7c-8630-2ca8a3","roles":[{"uuid":"545f00fc-2b18-b7b9-adeb-e4faab","player":"6ed24bcf-12f0-0369-0af8-fa24eb"},{"uuid":"7c710b26-72a8-441e-06c8-6f5836","player":"deadd195-6677-b612-ebe8-dc8de0"}],"readings":[["01","{0} is in {1}"],["10","{0} includes {1}"]],"shapes":[],"constraints":[{"uuid":"b4e65c4c-73b9-0153-ec04-2d080b","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"545f00fc-2b18-b7b9-adeb-e4faab"}]},
     {"uuid":"96ff4650-5580-2a10-4f79-2a7568","roles":[{"uuid":"d629f92a-f43a-3956-19f8-cd4943","player":"88982edc-3f15-3d6d-c1bd-f031d3"},{"uuid":"248224d0-4984-786a-d90f-aead3c","player":"8042d033-71e4-ac59-286a-a79a18"}],"readings":[["01","{0} has {1}"]],"shapes":[],"constraints":[{"uuid":"2a211a01-7d4e-d063-cc7c-a64b60","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"d629f92a-f43a-3956-19f8-cd4943"}]},
     {"uuid":"44f39f00-52a8-1bd9-0bb3-a070fc","objectified_as":"2f1b6363-3a18-23a5-de73-1f61e7","roles":[{"uuid":"5e0a698b-e219-4e94-9910-aa86ae","player":"d6e42408-cc1a-4c0a-8a36-4e7309"},{"uuid":"ea076bd9-a6e3-f112-5dd8-bd8b97","player":"d6e42408-cc1a-4c0a-8a36-4e7309"}],"readings":[["01","{0} is derived from base-{1}"]],"shapes":[],"constraints":[{"uuid":"c2a9805d-a15c-fc36-58ac-90df9b","min":1,"max":1,"is_preferred":true,"mandatory":true,"uniqueExcept":null},{"uuid":"9d6176e2-700e-cc1d-f447-6caa34","shapes":[],"ringKind":"AcyclicIntransitive","roles":["5e0a698b-e219-4e94-9910-aa86ae","ea076bd9-a6e3-f112-5dd8-bd8b97"]}]},
     {"uuid":"86c64ee1-120a-cf76-34c1-166de9","roles":[{"uuid":"fc6e6541-5314-fdb3-2f70-223c46","player":"7f06b39d-3155-b771-8af2-f10607"},{"uuid":"e78b3691-4bea-1338-4654-809305","player":"59fb40da-b1f6-bff6-9e6b-63d1d4"}],"readings":[["01","{0} has maximum-{1}"]],"shapes":[],"constraints":[{"uuid":"ffc4202d-2e06-e529-e2e6-dafd01","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"e78b3691-4bea-1338-4654-809305"}]},
     {"uuid":"ca362777-6aa3-cf11-ccb7-6dd4ef","objectified_as":"561c84ca-8d23-5e14-bb16-b199ac","roles":[{"uuid":"c5e97af6-6248-3056-be06-e40eae","player":"6bb15109-e63b-394b-0bd0-25fc60"},{"uuid":"05658efc-abaf-536b-660c-ab39fd","player":"4a566166-83c2-64f7-31c3-430fa2"},{"uuid":"6817e12f-8887-ba23-0db8-765874","player":"6bb15109-e63b-394b-0bd0-25fc60"}],"readings":[["012","{0} is bound to {1} over aggregated-{2}"],["120","{0} of aggregated-{1} is bound as {2}"]],"shapes":[],"constraints":[{"uuid":"7046b316-07ca-63a2-aa50-28a4de","min":1,"max":1,"is_preferred":true,"mandatory":true,"uniqueExcept":"c5e97af6-6248-3056-be06-e40eae"}]},
-    {"uuid":"eb024dcf-1185-ca9c-8d65-3dee5d","roles":[{"uuid":"e5ee27c2-90c9-9fa7-9662-786f8f","player":"3e320962-99f2-83a8-1612-63ebe0"},{"uuid":"45c8f9da-ebab-c5d9-6562-ed2f6c","player":"737c9487-58a1-8a78-d92b-1af9c9"}],"readings":[["01","{0} nests {1}"],["10","{0} is nested as {1}"]],"shapes":[],"constraints":[{"uuid":"dd816ca8-3792-ec28-00d2-68119d","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"45c8f9da-ebab-c5d9-6562-ed2f6c"},{"uuid":"9a6b93c4-c9b5-53fa-7339-3a647d","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"e5ee27c2-90c9-9fa7-9662-786f8f"}]},
-    {"uuid":"96bc1adf-62c4-fa84-ca74-4a9b7b","roles":[{"uuid":"d1e0a43c-8194-81c6-6d76-3e8941","player":"92fe2e9f-6dd4-a626-d621-777493"},{"uuid":"f15d5c38-574e-15a0-854d-65a5a9","player":"92fe2e9f-6dd4-a626-d621-777493"}],"readings":[["01","{0} is for {1}"],["10","{0} implies {1}"]],"shapes":[],"constraints":[{"uuid":"7331d44d-a40f-e6fd-03d9-9e9f4b","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"f15d5c38-574e-15a0-854d-65a5a9"},{"uuid":"0c839f42-1004-a49c-fb52-24d514","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"d1e0a43c-8194-81c6-6d76-3e8941"}]},
+    {"uuid":"eb024dcf-1185-ca9c-8d65-3dee5d","roles":[{"uuid":"e5ee27c2-90c9-9fa7-9662-786f8f","player":"3e320962-99f2-83a8-1612-63ebe0"},{"uuid":"45c8f9da-ebab-c5d9-6562-ed2f6c","player":"737c9487-58a1-8a78-d92b-1af9c9"}],"readings":[["01","{0} objectifies {1}"],["10","{0} is objectified as {1}"]],"shapes":[],"constraints":[{"uuid":"dd816ca8-3792-ec28-00d2-68119d","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"45c8f9da-ebab-c5d9-6562-ed2f6c"},{"uuid":"9a6b93c4-c9b5-53fa-7339-3a647d","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"e5ee27c2-90c9-9fa7-9662-786f8f"}]},
+    {"uuid":"96bc1adf-62c4-fa84-ca74-4a9b7b","roles":[{"uuid":"d1e0a43c-8194-81c6-6d76-3e8941","player":"5e0598ad-c975-eb1d-7e21-6ecd97"},{"uuid":"f15d5c38-574e-15a0-854d-65a5a9","player":"92fe2e9f-6dd4-a626-d621-777493"}],"readings":[["01","{0} is for {1}"],["10","{0} implies {1}"]],"shapes":[],"constraints":[{"uuid":"7331d44d-a40f-e6fd-03d9-9e9f4b","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"f15d5c38-574e-15a0-854d-65a5a9"},{"uuid":"0c839f42-1004-a49c-fb52-24d514","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"d1e0a43c-8194-81c6-6d76-3e8941"}]},
     {"uuid":"3053c493-1c28-1718-af5a-284d91","roles":[{"uuid":"bbb88a3a-8b77-8be2-815f-c50e3a","player":"463fa50c-acb0-0c46-a16f-71af4e"},{"uuid":"c364bb49-8c2f-9bba-93a6-2d7c4a","player":"1f75e35a-fb0d-5de1-e866-d9cc0e"}],"readings":[["01","{0} is for {1}"],["10","{0} has {1}"]],"shapes":[],"constraints":[{"uuid":"cb802f64-d9be-4597-f56e-0ad80a","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"bbb88a3a-8b77-8be2-815f-c50e3a"},{"uuid":"c6ee9a58-907f-e8e3-a5b4-35a5dd","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"bbb88a3a-8b77-8be2-815f-c50e3a"}]},
     {"uuid":"5f89c8f1-f06c-fc75-886b-65d904","roles":[{"uuid":"b359db59-65ec-993b-7e21-c146d7","player":"a57f16bc-9c4c-f5b2-0b5e-7cb0db"},{"uuid":"ab8aa695-15d3-30e6-735e-d2e9ca","player":"b0d73911-4de8-15b3-32af-858aef"}],"readings":[["10","{0} uses {1}"]],"shapes":[],"constraints":[{"uuid":"a07f03c0-842b-6a55-ca1d-38ef64","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"b359db59-65ec-993b-7e21-c146d7"}]},
     {"uuid":"cc81d560-7aa9-18f1-5eaa-423124","roles":[{"uuid":"5e66fc0a-7d33-f5a1-ec73-af5d52","player":"f80e850c-f4cb-25dd-6a6c-e97290"},{"uuid":"3cd9a38f-ec5a-ca64-26e1-c3e2a1","player":"caab36b4-3b15-a2d9-bfb1-5e0086"}],"readings":[["01","{0} has leading-{1}"]],"shapes":[],"constraints":[{"uuid":"3b659353-62f7-fb2c-54b3-36b631","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"3cd9a38f-ec5a-ca64-26e1-c3e2a1"}]},
@@ -220,7 +221,7 @@ diagrams: [
     {"uuid":"0be6b656-00a8-3641-c5f6-d545e7","roles":[{"uuid":"d55f706c-4f95-fa15-c8aa-b9bc39","player":"92fe2e9f-6dd4-a626-d621-777493"},{"uuid":"1b6f13c9-649b-d6f0-1698-0edf06","player":"737c9487-58a1-8a78-d92b-1af9c9"}],"readings":[["01","{0} belongs to {1}"],["10","{0} contains {1}"]],"shapes":[],"constraints":[{"uuid":"4ba638f7-d458-adf6-eac8-daaafa","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"d55f706c-4f95-fa15-c8aa-b9bc39"}]},
     {"uuid":"e95b4165-cccc-7926-3724-fe5c68","roles":[{"uuid":"d0d6c3a0-ac4a-ff39-5130-1399b3","player":"490ebbb9-8f57-9dab-df0b-b38b5f"},{"uuid":"d7074aa2-9f37-70d3-8f6f-b10099","player":"d6e42408-cc1a-4c0a-8a36-4e7309"}],"readings":[["01","{0} includes {1}"],["10","{0} is in {1}"]],"shapes":[],"constraints":[{"uuid":"415ec2a8-954d-0fb0-58bc-1ad9dc","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"d7074aa2-9f37-70d3-8f6f-b10099"}]},
     {"uuid":"ab8a4003-cd30-3132-692c-8cddc6","roles":[{"uuid":"a3943554-546e-0ab5-d8fe-98d9f6","player":"edb2c4be-ef98-0eae-8842-6bcd65"},{"uuid":"40bb5907-ed03-b882-211c-1f810c","player":"a4da9732-565f-9626-fcae-29a9c5"}],"readings":[["01","{0} has min-{1}"]],"shapes":[],"constraints":[{"uuid":"c0c7c33c-2a61-eb75-8244-318aef","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"40bb5907-ed03-b882-211c-1f810c"}]},
-    {"uuid":"e246a361-39ce-5177-93cb-0cbcfe","roles":[{"uuid":"7f04d38a-2243-9f43-b8c7-83a314","player":"b7027c11-048b-f45f-19fa-a561ef"},{"uuid":"e60b4a21-e5af-8573-e42b-233ab0","player":"92fe2e9f-6dd4-a626-d621-777493"}],"readings":[["01","{0} is nested under index-{1}"]],"shapes":[],"constraints":[{"uuid":"17660010-ba7e-6d6e-c862-7a98ab","min":0,"max":1,"is_preferred":null,"mandatory":null,"uniqueExcept":"e60b4a21-e5af-8573-e42b-233ab0"}]},
+    {"uuid":"e246a361-39ce-5177-93cb-0cbcfe","objectified_as":"45951ee0-d56a-c690-2a8a-e8a114","roles":[{"uuid":"7f04d38a-2243-9f43-b8c7-83a314","player":"b7027c11-048b-f45f-19fa-a561ef"},{"uuid":"e60b4a21-e5af-8573-e42b-233ab0","player":"92fe2e9f-6dd4-a626-d621-777493"},{"uuid":"eacc0016-c705-a860-ef02-55bfb1","player":"63beb402-8ac5-0c64-1313-9cda5a"}],"readings":[["012","{0} is nested under index-{1} in {2} position"],["021","{0} in {1} position is nested under {2}"],["102","{0} keys nesting of {1} at {2} priority"]],"shapes":[],"constraints":[{"uuid":"28b2b85c-496f-6a04-7164-7c5f30","min":1,"max":1,"is_preferred":true,"mandatory":true,"uniqueExcept":"e60b4a21-e5af-8573-e42b-233ab0"}]},
     {"uuid":"16acc2a1-7467-2c53-59c1-1d3d71","objectified_as":"203abdc9-60b9-e2da-80da-01bc26","roles":[{"uuid":"982d233a-43ba-7236-9ee2-2de80d","player":"02b2f76d-2394-741c-f8ad-03fdf2"},{"uuid":"d4a91ec0-5c04-d42d-635b-388042","player":"7f06b39d-3155-b771-8af2-f10607"}],"readings":[["01","{0} allows {1}"]],"shapes":[],"constraints":[{"uuid":"7cd7c366-1253-eb7e-fef0-8d3c8a","min":1,"max":1,"is_preferred":true,"mandatory":true,"uniqueExcept":null}]},
     {"uuid":"a974ed80-1d3f-bce4-70cb-852bda","objectified_as":"3bd0fb48-0f5e-2f7a-c37d-7bb029","roles":[{"uuid":"5ebf5c0a-403f-9ace-89ae-0b3eac","player":"46e08c2e-b6b9-c3e4-ac7b-2bf98b"},{"uuid":"9e3c5915-12a9-57bf-446a-c76846","player":"56c9cec4-88ef-1e86-9ca6-970913"}],"readings":[["01","{0} is a facet of {1}"],["10","{0} has facet called {1}"]],"shapes":[],"constraints":[{"uuid":"fe7eb0b1-1fc6-e2a1-58c0-ab38ff","min":1,"max":1,"is_preferred":true,"mandatory":true,"uniqueExcept":null}]},
     {"uuid":"4ffc19af-45c9-11a6-ef08-e5198e","roles":[{"uuid":"5bcae2a4-b612-30aa-9a49-f7efb3","player":"92fe2e9f-6dd4-a626-d621-777493"},{"uuid":"27974f89-9bb2-74e6-0bf7-6f009b","player":"63beb402-8ac5-0c64-1313-9cda5a"}],"readings":[["01","{0} fills {1}"],["10","{0} applies to {1}"]],"shapes":[],"constraints":[{"uuid":"a9f4ec65-73e3-8196-17da-e671c4","min":1,"max":1,"is_preferred":null,"mandatory":true,"role":"5bcae2a4-b612-30aa-9a49-f7efb3"}]},
@@ -291,6 +292,7 @@ diagrams: [
   ],
   constraints: [
     {"uuid":"1ca9a8f2-f1dd-d8fa-080c-cd39e8","type":"SetExclusionConstraint","shapes":[],"is_mandatory":true,"role_sequences":[["5c33c08c-ebec-93ef-3a05-b4dfc0"],["31ffb1f0-da35-5caa-1974-747450"]]},
+    {"uuid":"ded0530c-5815-950d-910d-3d15c3","type":"SubsetConstraint","shapes":[],"role_sequences":[["d3238d10-9740-14aa-a79a-cec656","4fcd0e4e-def0-c86e-c4a0-58b1e0"],["3599b0bb-82aa-91f8-d2c5-39cb59","50238e51-4650-4c0d-9a26-fbfa2a"]]},
     {"uuid":"ce755310-2b8d-35b3-a3bd-733a44","type":"SetExclusionConstraint","shapes":[],"is_mandatory":true,"role_sequences":[["34c89c4c-9110-6d8f-3abf-9521f8"],["c7d2736d-3c19-72a2-0af4-d5ed94"]]},
     {"uuid":"67759b07-657b-189a-4b2d-5d30ff","type":"PresenceConstraint","shapes":[],"min_frequency":0,"max_frequency":1,"is_mandatory":null,"is_preferred_identifier":true,"role_sequences":[["248224d0-4984-786a-d90f-aead3c","3b16d9bd-11e2-823e-988e-980572","56f1e6b1-d4c8-9c91-057d-016774"]]},
     {"uuid":"90db5044-afc1-bee7-2621-15297c","type":"PresenceConstraint","shapes":[],"min_frequency":0,"max_frequency":1,"is_mandatory":null,"is_preferred_identifier":null,"role_sequences":[["7c710b26-72a8-441e-06c8-6f5836","02608e50-a385-dc39-805c-d36ea6"]]},
@@ -320,13 +322,13 @@ diagrams: [
     {"uuid":"122ec7ef-792e-a0f0-e135-b9e34c","type":"SetExclusionConstraint","shapes":[],"is_mandatory":null,"role_sequences":[["461ee7f4-1a68-c8bc-5161-1a1bc6"],["35912c3c-4c86-99c5-0ae6-62f70f"]]},
     {"uuid":"e85cd970-d1be-fcb7-3063-946bbb","type":"PresenceConstraint","shapes":[],"min_frequency":1,"max_frequency":null,"is_mandatory":true,"is_preferred_identifier":false,"role_sequences":[["e2150d8b-02c1-86e1-717f-03594d","fc6e6541-5314-fdb3-2f70-223c46"]]},
     {"uuid":"8c925616-a393-0177-5536-cc7d05","type":"PresenceConstraint","shapes":[],"min_frequency":1,"max_frequency":null,"is_mandatory":true,"is_preferred_identifier":false,"role_sequences":[["a3943554-546e-0ab5-d8fe-98d9f6","4a84136a-40ef-2e4c-aadc-3d5100","f30933f6-afb8-f139-f8ee-e5ed79"]]},
-    {"uuid":"9b4ec9fa-c3a8-0a36-0301-675beb","type":"SetEqualityConstraint","shapes":[],"role_sequences":[["3599b0bb-82aa-91f8-d2c5-39cb59","50238e51-4650-4c0d-9a26-fbfa2a"],["d3238d10-9740-14aa-a79a-cec656","4fcd0e4e-def0-c86e-c4a0-58b1e0"]]},
     {"uuid":"59eeb2cf-8f4d-2b73-8c14-cfd93a","type":"SetExclusionConstraint","shapes":[],"is_mandatory":true,"role_sequences":[["36cc99c3-6cfb-e1a5-0de6-3d9d37"],["2d892cff-e9f2-0eff-8edb-fd66ef"],["c0b7cce4-b7a9-1a3f-8119-6c08e6"],["64fe9174-c381-e74a-c4c4-449980"],["66763657-128a-760f-f29d-d87961"],["06938c72-f876-9d59-73e1-3935db"],["5269f001-275f-25cb-d694-56475f"],["0ef687a2-b0f5-1736-4069-3b50a6"],["c3aa8291-45fb-e19c-dbcd-3ef475"],["57fe3c40-9e0b-3d8e-a686-5f7e04"]]},
     {"uuid":"628b2e80-f96d-aad5-dd57-f46810","type":"PresenceConstraint","shapes":[],"min_frequency":0,"max_frequency":1,"is_mandatory":null,"is_preferred_identifier":null,"role_sequences":[["6730ee91-ef6f-b933-256f-8848ce","5a2b3955-1718-292a-893b-93e6df"]]},
     {"uuid":"2a6864e2-a2cd-e3bb-0696-5f1de8","type":"SetExclusionConstraint","shapes":[],"is_mandatory":true,"role_sequences":[["e6c3bf64-89ea-09f1-ca9f-dd5400"],["e3dd5eb3-1929-5dd3-2576-9b61d7"]]},
     {"uuid":"101ab982-cfdc-c110-6301-8f7542","type":"SetExclusionConstraint","shapes":[],"is_mandatory":true,"role_sequences":[["a0fcdd7c-2c3d-4b24-a6ca-dc66da"],["55696af9-9d80-51f6-cb75-418b60"],["edde05ca-634b-aad4-f1f9-58ad24"],["076b5284-b7b3-0be8-b552-50c2d7"]]},
     {"uuid":"c83e7bf5-b678-bfe1-9b28-a1c133","type":"PresenceConstraint","shapes":[],"min_frequency":0,"max_frequency":1,"is_mandatory":null,"is_preferred_identifier":true,"role_sequences":[["35bf5616-886d-40b2-3e50-fad733","663fdf1d-186c-eee9-0c43-b15d2d"]]},
     {"uuid":"f90d0d45-9dcb-2f12-2f33-4a78a3","type":"PresenceConstraint","shapes":[],"min_frequency":0,"max_frequency":1,"is_mandatory":null,"is_preferred_identifier":true,"role_sequences":[["e88974b6-b9db-c7bf-23a8-048fbd","5bd76555-2ea3-fb91-f0a8-8eb260"]]},
+    {"uuid":"498e8226-dcc0-f075-cc5d-e8740f","type":"SubsetConstraint","shapes":[],"role_sequences":[["88cc5478-86ce-8f4b-b95f-4ccbc7","4fcd0e4e-def0-c86e-c4a0-58b1e0"],["4f4e8a76-8cd7-7bf3-7d1e-556446","50238e51-4650-4c0d-9a26-fbfa2a"]]},
     {"uuid":"df180e7f-60e6-d7f3-fd09-76cec5","type":"SetExclusionConstraint","shapes":[],"is_mandatory":null,"role_sequences":[["2eca8649-1cbe-b527-abf1-71b81e"],["64aee8ea-6693-9dd9-5ee5-2db6b6"]]},
     {"uuid":"da1392c9-c50d-2998-5eed-377664","type":"PresenceConstraint","shapes":[],"min_frequency":0,"max_frequency":1,"is_mandatory":null,"is_preferred_identifier":null,"role_sequences":[["6e21df09-1a88-ee34-8fbc-1b5ffe","2da75c9b-a8c0-1e93-921b-aed6c7"]]},
     {"uuid":"6ef3d5c5-adec-2808-bfe0-dc3fc4","type":"SetExclusionConstraint","shapes":[],"is_mandatory":true,"role_sequences":[["fb453a48-2e27-2811-e222-7d660f"],["1bc1b389-889b-cd56-c388-19524d"]]},