activefacts 0.8.9 → 0.8.10

data/examples/CQL/Genealogy.cql

@@ -55,6 +55,7 @@ Occupation is of Person,
 Person is of at most one Gender;
 Person is called at most one family-Name,
 	family-Name is of Person;
+given-Name is name of Person;  // Avoid ambiguity; this is a new fact type
 given-Name is name of Person,
 	Person is called at most one given-Name;
 preferred-Picture is of Person,
@@ -87,8 +88,8 @@ Participation is where
  * Constraints:
  */
 each Event Date occurs at least one time in
-	Event Date wasnt before min Year,
-	Event Date wasnt after max Year,
+	Event Date wasnt before min Year(2),
+	Event Date wasnt after max Year(1),
 	Event Date occurred in Month,
 	Event Date occurred on Day;
 each Event occurs at least one time in

data/examples/CQL/Insurance.cql

@@ -70,7 +70,7 @@ Cover Type is identified by its Code;
 Cover Type has one Cover Type Name,
 	Cover Type Name is of at most one Cover Type;
 
-Demerit Kind is identified by its Name [independent];
+Demerit Kind is independent identified by its Name;
 
 Incident is identified by Claim where
 	Claim concerns at most one Incident,
@@ -101,8 +101,11 @@ Person is a kind of Party;
 Person has at most one Occupation;
 Person has one Title;
 Person has at most one birth-Date;
-Person has one family-Name;
-Person has one given-Name;
+Person has one family-Name,
+	family-Name is of Person;
+Person has given-Name;  // Avoid ambiguity; this is a new fact type
+Person has one given-Name,
+	given-Name is of Person;
 
 Phone is identified by its Nr;
 
@@ -125,7 +128,7 @@ Prod Description is of at most one Product,
 
 Registration is identified by its Nr;
 
-State is identified by its Code [independent];
+State is independent identified by its Code;
 State Name is of at most one State,
 	State has at most one State Name;
 
@@ -301,9 +304,9 @@ Party is a Company that has contact Person
 	if and only if
 	Party is a company;
 each Contact Methods occurs at least one time in
-	Contact Methods includes mobile Phone,
-	Contact Methods includes home Phone,
-	Contact Methods includes business Phone,
+	Contact Methods includes mobile Phone(3),
+	Contact Methods includes home Phone(2),
+	Contact Methods includes business Phone(1),
 	Contact Methods includes Email;
 each combination Policy, Claim Sequence occurs at most one time in
 	Claim is on Policy,

data/examples/CQL/JoinEquality.cql

@@ -14,10 +14,10 @@ Venue Id is written as Auto Counter;
  */
 Event is identified by its Id;
 
-Venue is identified by its Id [independent];
+Venue is independent identified by its Id;
 Event is held at one Venue;
 
-Seat is identified by Venue and Reserve and Row and Number [independent] where
+Seat is independent identified by Venue and Reserve and Row and Number where
 	Seat is at one Venue,
 	Seat is in one Reserve,
 	Seat is in one Row,

data/examples/CQL/Marriage.cql

@@ -8,7 +8,7 @@ Name is written as String;
 /*
  * Entity Types
  */
-Person is identified by given-Name and family-Name [independent] where
+Person is independent identified by given-Name and family-Name where
 	Person has one given-Name,
 	Person has one family-Name;
 

data/examples/CQL/Metamodel.cql

@@ -12,6 +12,7 @@ Context Note Kind is written as String restricted to {'as_opposed_to', 'because'
 Date is written as Date;
 Denominator is written as Unsigned Integer(32);
 Discussion is written as String;
+Disjunction Id is written as Auto Counter;
 Display Role Names Setting is written as String restricted to {'false', 'true'};
 Enforcement Code is written as String(16);
 Ephemera URL is written as String;
@@ -35,6 +36,7 @@ Scale is written as Unsigned Integer(32);
 Shape Id is written as Auto Counter;
 Subscript is written as Unsigned Integer(16);
 Text is written as String(256);
+Transaction Timing is written as String restricted to {'assert', 'commit'};
 Unit Id is written as Auto Counter;
 X is written as Signed Integer(32);
 Y is written as Signed Integer(32);
@@ -61,6 +63,8 @@ Context Note has one Context Note Kind,
 Context Note has one Discussion,
 	Discussion is for Context Note;
 
+Disjunction is identified by its Id;
+
 Enforcement is identified by Constraint where
 	Constraint requires at most one Enforcement,
 	Enforcement applies to one Constraint;
@@ -89,6 +93,8 @@ Join Node is identified by Join and Ordinal where
 	Join Node has one Ordinal position;
 Join Node has at most one Subscript,
 	Subscript is of Join Node;
+Join Node has at most one role-Name,
+	Name is of Join Node;
 
 Position is identified by X and Y where
 	Position is at one X,
@@ -112,11 +118,11 @@ Ring Constraint is of one Ring Type;
 
 Role is where
 	Fact Type has at least one Ordinal role;
-Implicit Fact Type is implied by one Role,
-	Role implies at most one Implicit Fact Type;
-Ring Constraint has at most one other-Role;
-Ring Constraint has other-Role,
+Implicit Fact Type is implied by one Role (as Implying Role),
+	Implying Role implies at most one Implicit Fact Type;
+Ring Constraint has at most one other-Role,
 	other-Role is of Ring Constraint;
+Role is of Ring Constraint;  // Avoid ambiguity; this is a new fact type
 Role is of Ring Constraint,
 	Ring Constraint has at most one Role;
 Role has at most one role-Name,
@@ -186,20 +192,6 @@ Bound is identified by Value and Bound is inclusive where
 	Value is of at least one Bound,
 	Bound is inclusive;
 
-Concept is identified by Vocabulary and Name where
-	Concept belongs to one Vocabulary,
-	Vocabulary contains Concept,
-	Concept is called one Name;
-Concept has Context Note,
-	Context Note applies to at most one Concept;
-Concept uses at most one Pronoun;
-Concept plays Role,
-	Role is played by one Concept;
-Concept is independent;
-Instance is of one Concept;
-Join Node is for one Concept,
-	Concept is referenced in Join Node;
-
 Constraint Shape is a kind of Shape;
 Constraint Shape is for one Constraint;
 
@@ -224,35 +216,48 @@ Diagram is identified by Vocabulary and Name where
 Shape is in one Diagram,
 	Diagram includes Shape;
 
-Entity Type is a kind of Concept;
-Entity Type nests at most one Fact Type,
-	Fact Type is nested as at most one Entity Type;
-
 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;
 
-Join Role is where
+Join Role is independent where
 	Join Node includes at least one Role,
 	Role connects to Join Node;
 
 Join Step is identified by input-Join Role and output-Join Role where
 	Join Step has one input-Join Role,
 	Join Step has one output-Join Role;
+Join Step falls under at most one Disjunction,
+	Disjunction covers at least one Join Step;
 Join Step traverses one Fact Type,
 	Fact Type directs Join Step;
-Join Step involves incidental-Join Role;
+Join Step involves incidental-Join Role,
+	Join Role is incidentally involved in at most one Join Step;
 is anti Join Step;
 Join Step is outer;
 
 Model Note Shape is a kind of Shape;
 Model Note Shape is for one Context Note;
 
+Object Type is identified by Vocabulary and Name where
+	Object Type belongs to one Vocabulary,
+	Vocabulary contains Object Type,
+	Object Type is called one Name;
+Instance is of one Object Type;
+Join Node is for one Object Type,
+	Object Type is referenced in Join Node;
+Object Type has Context Note,
+	Context Note applies to at most one Object Type;
+Object Type uses at most one Pronoun;
+Object Type plays Role,
+	Role is played by one Object Type;
+Object Type is independent;
+
 Object Type Shape is a kind of Shape;
-Object Type Shape is for one Concept,
-	Concept has Object Type Shape;
+Object Type Shape is for one Object Type,
+	Object Type has Object Type Shape;
 Object Type Shape has expanded reference mode;
 
 Objectified Fact Type Name Shape is a kind of Shape identified by Fact Type Shape where
@@ -310,13 +315,6 @@ Set Equality Constraint is a kind of Set Comparison Constraint;
 Set Exclusion Constraint is a kind of Set Comparison Constraint;
 Set Exclusion Constraint is mandatory;
 
-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],
-	Supertype is supertype of Subtype;
-Assimilation applies to Type Inheritance,
-	Type Inheritance uses at most one Assimilation;
-Type Inheritance provides identification;
-
 Value Constraint Shape is a kind of Constraint Shape;
 Role Display has at most one Value Constraint Shape,
 	Value Constraint Shape is for at most one Role Display;
@@ -327,7 +325,7 @@ Value Range is identified by minimum-Bound and maximum-Bound where
 	Value Range has at most one minimum-Bound,
 	Value Range has at most one maximum-Bound;
 
-Value Type is a kind of Concept;
+Value Type is a kind of Object Type;
 Value Type has at most one Length,
 	Length is of Value Type;
 Value Type has at most one Scale,
@@ -335,34 +333,52 @@ Value Type has at most one Scale,
 Value Type is of at most one Unit;
 Value Type has at most one Value Constraint,
 	Value Constraint constrains at most one Value Type;
+Value Type has at most one auto- assigned Transaction Timing;
 Value Type is subtype of at most one super-Value Type (as Supertype) [acyclic],
 	Supertype is supertype of Value Type;
-Value Type is auto-assigned;
 
 Allowed Range is where
 	Value Constraint allows at least one Value Range;
 
-ImplicitBooleanValueType is a kind of Value Type;
+Entity Type is a kind of Object Type;
+Entity Type nests at most one Fact Type,
+	Fact Type is nested as at most one Entity Type;
+
+Facet is where
+	Value Type has facet called Name,
+	Name is a facet of Value Type;
+
+Facet Value is where
+	Value Type defines Facet as having one Value,
+	Value for Facet applies to Value Type;
 
-Parameter is where
-	Name is a parameter of Value Type,
-	Value Type has parameter called Name;
+Implicit Boolean Value Type is a kind of Value Type;
 
-Param Value is where
-	Value for Parameter applies to one Value 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],
+	Supertype is supertype of Subtype;
+Assimilation applies to Type Inheritance,
+	Type Inheritance uses at most one Assimilation;
+Type Inheritance provides identification;
 
 /*
  * Constraints:
  */
-either Concept is an Entity Type or Concept is a Value Type but not both;
 for each Constraint exactly one of these holds:
 	Constraint is a Presence Constraint,
 	Constraint is a Set Constraint,
 	Constraint is a Ring Constraint;
 for each Context Note exactly one of these holds:
-	Context Note applies to Concept,
+	Context Note applies to Object Type,
 	Context Note applies to Fact Type,
 	Context Note applies to Constraint;
+either Object Type is an Entity Type or Object Type is a Value Type but not both;
+for each Role Sequence exactly one of these holds:
+	Role Sequence is for Reading,
+	Presence Constraint covers Role Sequence,
+	Subset Constraint(1) covers subset-Role Sequence,
+	Subset Constraint(2) covers superset-Role Sequence,
+	Role Sequence is Ordinal in Set Comparison Constraint;
 either Set Comparison Constraint is a Set Exclusion Constraint or Set Comparison Constraint is a Set Equality Constraint but not both;
 either Set Constraint is a Set Comparison Constraint or Set Constraint is a Subset Constraint but not both;
 either Unit uses coefficient from Ephemera URL or Unit has Coefficient but not both;
@@ -372,12 +388,18 @@ either Value Constraint constrains Value Type or Value Constraint applies to Rol
 for each Instance at most one of these holds:
 	Instance has Value,
 	Instance objectifies Fact;
-Join Node is for Concept that plays Role
+for each Join Role at most one of these holds:
+	Join Step(1) has input-Join Role,
+	Join Role is incidentally involved in Join Step;
+for each Join Role at most one of these holds:
+	Join Step(1) has output-Join Role,
+	Join Role is incidentally involved in Join Step;
+Join Node is for Object Type that plays Role
 	if and only if
 	Join Node includes Role;
-Role Value is of Instance that is of Concept
+Role Value is of Instance that is of Object Type
 	if and only if
-	Role Value is of Role that is played by Concept;
+	Role Value is of Role that is played by Object Type;
 Role Value fulfils Fact that is of Fact Type
 	if and only if
 	Role Value is of Role (where Fact Type has Ordinal role);
@@ -389,14 +411,12 @@ either Agreement was reached by Agent or Agreement was on Date;
 each combination Diagram, Position occurs at most one time in
 	Shape is in Diagram,
 	Shape is at Position;
-each combination Entity Type, Type Inheritance occurs at most one time in
-	Entity Type is subtype of super Entity Type,
+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;
-each Join Role occurs at most one time in
-	Join Step involves incidental Join Role;
 each Presence Constraint occurs at least one time in
-	Presence Constraint has min Frequency,
-	Presence Constraint has max Frequency,
+	Presence Constraint has min Frequency(2),
+	Presence Constraint has max Frequency(1),
 	Presence Constraint is mandatory;
 each Role Ref occurs at most one time in
 	Join Role projects Role Ref;
@@ -404,7 +424,7 @@ each Role Sequence occurs at least one time in
 	Role Sequence in Ordinal position includes Role;
 each Set Comparison Constraint occurs at least 2 times in
 	Set Comparison Constraint has in Ordinal position Role Sequence;
-either Value Range has minimum Bound or Value Range has maximum Bound;
+either Value Range has minimum Bound(2) or Value Range has maximum Bound(1);
 each combination Vocabulary, Name occurs at most one time in
 	Constraint belongs to Vocabulary,
 	Constraint is called Name;

data/examples/CQL/MetamodelNext.cql

@@ -6,7 +6,6 @@ vocabulary Metamodel;
 Adjective is written as String(64);
 Agent Name is written as String;
 Assimilation is written as String restricted to {'partitioned', 'separate'};
-Context Note Id is written as Auto Counter;
 Context Note Kind is written as String restricted to {'as_opposed_to', 'because', 'so_that', 'to_avoid'};
 Date is written as Date;
 Denominator is written as Unsigned Integer(32);
@@ -15,11 +14,9 @@ Display Role Names Setting is written as String restricted to {'false', 'true'};
 Enforcement Code is written as String(16);
 Ephemera URL is written as String;
 Exponent is written as Signed Integer(16);
-Fact Id is written as Auto Counter;
 Frequency is written as Unsigned Integer(32);
 GUID is written as String;
-Instance Id is written as Auto Counter;
-Join Id is written as Auto Counter;
+Language Code is written as Char(3);
 Length is written as Unsigned Integer(32);
 Literal is written as String;
 Name is written as String(64);
@@ -28,13 +25,12 @@ Offset is written as Decimal;
 Ordinal is written as Unsigned Integer(16);
 Pronoun is written as String(20) restricted to {'feminine', 'masculine', 'neuter', 'personal'};
 Ring Type is written as String;
-Role Sequence Id is written as Auto Counter;
 Rotation Setting is written as String restricted to {'left', 'right'};
 Scale is written as Unsigned Integer(32);
-Shape Id is written as Auto Counter;
-Subscript is written as String;
+Subscript is written as Unsigned Integer(16);
 Text is written as String(256);
-Unit Id is written as Auto Counter;
+Transaction Timing is written as String restricted to {'assert', 'commit'};
+Unit Code is written as Char;
 X is written as Signed Integer(32);
 Y is written as Signed Integer(32);
 
@@ -52,11 +48,13 @@ Concept is identified by GUID where
 	Concept has one GUID,
 	GUID is of at most one Concept;
 
-Constraint is a kind of Concept [partitioned];
+Constraint is a kind of Concept;
 Name is of Constraint,
 	Constraint is called at most one Name;
 
-Context Note is identified by its Id;
+Context Note is identified by GUID where
+	Context Note has one GUID,
+	GUID is of at most one Context Note;
 Concept has Context Note,
 	Context Note applies to at most one Concept;
 Context Note has one Context Note Kind,
@@ -71,18 +69,24 @@ Enforcement notifies at most one Agent;
 Enforcement has one Enforcement Code,
 	Enforcement Code is of Enforcement;
 
-Fact is identified by its Id;
+Fact is identified by GUID where
+	Fact has one GUID,
+	GUID is of at most one Fact;
 
-Fact Type is a kind of Concept [partitioned];
+Fact Type is a kind of Concept;
 Fact is of one Fact Type;
 
 Implicit Fact Type is a kind of Fact Type;
 
-Instance is identified by its Id;
+Instance is identified by GUID where
+	Instance has one GUID,
+	GUID is of at most one Instance;
 Instance objectifies at most one Fact,
 	Fact is objectified as at most one Instance;
 
-Join is identified by its Id;
+Join is identified by GUID where
+	Join has one GUID,
+	GUID is of at most one Join;
 
 Join Node is identified by Join and Ordinal where
 	Join includes Join Node,
@@ -90,8 +94,12 @@ Join Node is identified by Join and Ordinal where
 	Join Node has one Ordinal position;
 Join Node has at most one Subscript,
 	Subscript is of Join Node;
+Join Node has at most one role-Name,
+	Name is of Join Node;
 
-Object Type is a kind of Concept [partitioned];
+Language is identified by its Code;
+
+Object Type is a kind of Concept;
 Instance is of one Object Type;
 Join Node is for one Object Type,
 	Object Type is referenced in Join Node;
@@ -118,19 +126,21 @@ Reading has one Text;
 Ring Constraint is a kind of Constraint;
 Ring Constraint is of one Ring Type;
 
-Role is a kind of Concept [partitioned] where
+Role is a kind of Concept where
 	Fact Type has at least one Ordinal role;
-Implicit Fact Type is implied by one Role,
-	Role implies at most one Implicit Fact Type;
+Implicit Fact Type is implied by one Role (as Implying Role),
+	Implying Role implies at most one Implicit Fact Type;
 Object Type plays Role,
 	Role is played by one Object Type;
-Ring Constraint has at most one other-Role;
 Ring Constraint has at most one other-Role,
 	other-Role is of Ring Constraint;
+Role is of Ring Constraint;  // Avoid ambiguity; this is a new fact type
 Role is of Ring Constraint,
 	Ring Constraint has at most one Role;
 
-Role Sequence is identified by its Id;
+Role Sequence is identified by GUID where
+	Role Sequence has one GUID,
+	GUID is of at most one Role Sequence;
 Presence Constraint covers one Role Sequence;
 Reading is in one Role Sequence,
 	Role Sequence is for Reading;
@@ -145,7 +155,9 @@ Role Value is of one Role;
 
 Set Constraint is a kind of Constraint;
 
-Shape is identified by its Id;
+Shape is identified by GUID where
+	Shape has one GUID,
+	GUID is of at most one Shape;
 Shape is at at most one Position;
 Shape is expanded;
 
@@ -153,7 +165,11 @@ Subset Constraint is a kind of Set Constraint;
 Subset Constraint covers one subset-Role Sequence;
 Subset Constraint covers one superset-Role Sequence;
 
-Unit is identified by its Id;
+Topic is identified by Name where
+	Topic has one Name,
+	Name is of at most one Topic;
+
+Unit is identified by its Code;
 Ephemera URL provides Unit coefficient,
 	Unit uses coefficient from at most one Ephemera URL;
 Name is of Unit,
@@ -169,7 +185,8 @@ Value is identified by Literal and Value is a string and Unit where
 	Value is a string,
 	Value is in at most one Unit,
 	Unit is of Value;
-Instance has at most one Value;
+Instance has at most one Value,
+	Value is of Instance;
 Join Node has at most one Value;
 
 Value Constraint is a kind of Constraint;
@@ -184,11 +201,15 @@ Value Type has at most one Scale,
 Value Type is of at most one Unit;
 Value Type has at most one Value Constraint,
 	Value Constraint constrains at most one Value Type;
+Value Type has at most one auto- assigned Transaction Timing;
 Value Type is subtype of at most one super-Value Type (as Supertype) [acyclic],
 	Supertype is supertype of Value Type;
 
-Vocabulary is identified by Name where
-	Vocabulary is called one Name;
+Vocabulary is where
+	Topic is described in Language,
+	Language describes Topic;
+Reading is for at most one Vocabulary,
+	Vocabulary contains Reading;
 Vocabulary contains Constraint,
 	Constraint belongs to at most one Vocabulary;
 Vocabulary includes Unit,
@@ -230,8 +251,17 @@ Shape is in one Diagram,
 	Diagram includes Shape;
 
 Entity Type is a kind of 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;
+
+Facet is where
+	Value Type has facet called Name,
+	Name is a facet of Value Type;
+Facet has values of at most one Value Type;
+
+Facet Value is where
+	Value Type defines Facet as having one Value,
+	Value for Facet applies to Value Type;
 
 Fact Type Shape is a kind of Shape;
 Fact Type Shape has at most one Display Role Names Setting;
@@ -239,10 +269,10 @@ Fact Type Shape is for one Fact Type,
 	Fact Type has Fact Type Shape;
 Fact Type Shape has at most one Rotation Setting;
 
-ImplicitBooleanValueType is a kind of Value Type;
+Implicit Boolean Value Type is a kind of Value Type;
 
-Join Role is where
-	Join Node includes Role,
+Join Role is independent where
+	Join Node includes at least one Role,
 	Role connects to Join Node;
 
 Join Step is identified by input-Join Role and output-Join Role where
@@ -250,6 +280,8 @@ Join Step is identified by input-Join Role and output-Join Role where
 	Join Step has one output-Join Role;
 Join Step traverses one Fact Type,
 	Fact Type directs Join Step;
+Join Step involves incidental-Join Role,
+	Join Role is incidentally involved in at most one Join Step;
 is anti Join Step;
 Join Step is outer;
 
@@ -265,13 +297,9 @@ Objectified Fact Type Name Shape is a kind of Shape identified by Fact Type Shap
 	Objectified Fact Type Name Shape is for one Fact Type Shape,
 	Fact Type Shape has at most one Objectified Fact Type Name Shape;
 
-Parameter is where
-	Name is a parameter of Value Type,
-	Value Type has parameter called Name;
-
-Population is identified by Vocabulary and Name where
-	Vocabulary includes Population,
-	Population belongs to at most one Vocabulary,
+Population is identified by Topic and Name where
+	Topic includes Population,
+	Population belongs to at most one Topic,
 	Population has one Name,
 	Name is of Population;
 Population includes Fact,
@@ -321,19 +349,20 @@ Set Exclusion Constraint is a kind of Set Comparison Constraint;
 Set Exclusion Constraint is mandatory;
 
 Term is where
-	Vocabulary contains Name;
-Term designates at most one Object Type,
-	Object Type uses one Term;
-Term is secondary for at most one Object Type (as Secondary),
-	Secondary has secondary-Term;
-Term (as Role Name) is name of Role Ref,
-	Role Ref has at most one Role Name;
-
-Type Inheritance is a kind of Fact Type identified by Subtype and Supertype where
+	Vocabulary uses Name for one Object Type,
+	Vocabulary refers to Object Type as Name,
+	Name applies to Object Type in Vocabulary;
+Term (as Role Name) is name of Role,
+	Role has at most one Role Name;
+Term is preferred;
+
+Type Inheritance is where
 	Entity Type (as Subtype) is subtype of super-Entity Type (as Supertype) [acyclic, intransitive],
 	Supertype is supertype of Subtype;
 Assimilation applies to Type Inheritance,
 	Type Inheritance uses at most one Assimilation;
+Type Inheritance implies one Fact Type,
+	Fact Type is implied by at most one Type Inheritance;
 Type Inheritance provides identification;
 
 Value Constraint Shape is a kind of Constraint Shape;
@@ -349,9 +378,6 @@ Value Range is identified by minimum-Bound and maximum-Bound where
 Allowed Range is where
 	Value Constraint allows at least one Value Range;
 
-Param Value is where
-	Value for Parameter applies to one Value Type;
-
 /*
  * Constraints:
  */
@@ -380,15 +406,12 @@ either Value Constraint constrains Value Type or Value Constraint applies to Rol
 for each Instance at most one of these holds:
 	Instance has Value,
 	Instance objectifies Fact;
-for each Term at most one of these holds:
-	Term designates Object Type,
-	Term is name of Role Ref;
-for each Term at most one of these holds:
-	Term designates Object Type(1),
-	Term is secondary for Object Type(2);
-for each Term at most one of these holds:
-	Term is secondary for Object Type,
-	Term is name of Role Ref;
+for each Join Role at most one of these holds:
+	Join Step(1) has input-Join Role,
+	Join Role is incidentally involved in Join Step;
+for each Join Role at most one of these holds:
+	Join Step(1) has output-Join Role,
+	Join Role is incidentally involved in Join Step;
 Join Node is for Object Type that plays Role
 	if and only if
 	Join Node includes Role;
@@ -406,12 +429,12 @@ either Agreement was reached by Agent or Agreement was on Date;
 each combination Diagram, Position occurs at most one time in
 	Shape is in Diagram,
 	Shape is at Position;
-each combination Entity Type, Type Inheritance occurs at most one time in
-	Entity Type is subtype of super Entity Type,
+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;
 each Presence Constraint occurs at least one time in
-	Presence Constraint has min Frequency,
-	Presence Constraint has max Frequency,
+	Presence Constraint has min Frequency(2),
+	Presence Constraint has max Frequency(1),
 	Presence Constraint is mandatory;
 each Role Ref occurs at most one time in
 	Join Role projects Role Ref;
@@ -419,14 +442,13 @@ each Role Sequence occurs at least one time in
 	Role Sequence in Ordinal position includes Role;
 each Set Comparison Constraint occurs at least 2 times in
 	Set Comparison Constraint has in Ordinal position Role Sequence;
-each Term occurs at least one time in
-	Term designates Object Type,
-	Term is secondary for Object Type,
-	Term is name of Role Ref;
-either Value Range has minimum Bound or Value Range has maximum Bound;
+either Value Range has minimum Bound(2) or Value Range has maximum Bound(1);
 each combination Vocabulary, Name occurs at most one time in
 	Constraint belongs to Vocabulary,
 	Constraint is called Name;
 each combination Vocabulary, Name occurs at most one time in
 	Unit is in Vocabulary,
 	Unit is called Name;
+each combination Vocabulary, Object Type, Term occurs at most one time in
+	Vocabulary uses Name for Object Type,
+	Term is preferred;