activefacts 0.7.3 → 0.8.5

data/examples/CQL/Address.cql

@@ -4,11 +4,11 @@ vocabulary Address;
  * Value Types
  */
 City is written as VariableLengthText(64);
-CompanyName is written as VariableLengthText();
+CompanyName is written as VariableLengthText;
 FamilyName is written as VariableLengthText(20);
 GivenNames is written as VariableLengthText(20);
 Number is written as VariableLengthText(12);
-Postcode is written as VariableLengthText();
+Postcode is written as VariableLengthText;
 StreetLine is written as VariableLengthText(64);
 
 /*
@@ -32,7 +32,7 @@ Address is identified by street-Number and Street and City and Postcode where
 	Address is at at most one street-Number,
 	Address is at one Street,
 	Address is in one City,
-	Address is in at most one Postcode,
+	Address is in at most one Postcode restricted to {1000..9999},
 	Postcode is of Address;
 Company has head office at at most one Address;
 Person lives at at most one Address;

data/examples/CQL/Blog.cql

@@ -3,14 +3,14 @@ vocabulary Blog;
 /*
  * Value Types
  */
-AuthorId is written as AutoCounter();
-CommentId is written as AutoCounter();
+AuthorId is written as AutoCounter;
+CommentId is written as AutoCounter;
 Name is written as VariableLengthText(64);
 Ordinal is written as UnsignedInteger(32);
-PostId is written as AutoCounter();
+PostId is written as AutoCounter;
 Style is written as VariableLengthText(20);
-Text is written as LargeLengthText();
-TopicId is written as AutoCounter();
+Text is written as LargeLengthText;
+TopicId is written as AutoCounter;
 
 /*
  * Entity Types
@@ -32,12 +32,6 @@ Content provides text of Comment,
 
 Post is identified by its Id;
 Post was written by one Author;
-Paragraph is where
-	Post includes Ordinal paragraph;
-Content is of Paragraph,
-	Paragraph contains one Content;
-Paragraph has Comment,
-	Comment is on one Paragraph;
 
 Topic is identified by its Id;
 Post belongs to one Topic,
@@ -46,9 +40,14 @@ Topic belongs to at most one parent-Topic [acyclic];
 Topic is called one topic-Name,
 	Name is of at most one Topic;
 
+Paragraph is where
+	Post includes Ordinal paragraph;
+Content is of Paragraph,
+	Paragraph contains one Content;
+Paragraph has Comment,
+	Comment is on one Paragraph;
+
 /*
  * Constraints:
  */
-for each Content exactly one of these holds:
-	Content provides text of Comment,
-	Content is of Paragraph;
+either Content provides text of Comment or Content is of Paragraph but not both;

data/examples/CQL/CompanyDirectorEmployee.cql

@@ -25,10 +25,12 @@ Person is identified by given-Name and family-Name where
 	given-Name is of Person,
 	family-Name is of Person,
 	Person is called at most one family-Name;
-Person was born on at most one birth-Date;
+Person was born on at most one birth-Date restricted to {'1900/01/01'..};
+
 Attendance is where
 	Person (as Attendee) attended Meeting,
 	Meeting was attended by Attendee;
+
 Directorship is where
 	Person (as Director) directs Company,
 	Company is directed by at least one Director;
@@ -46,6 +48,4 @@ Manager is ceo;
 /*
  * Constraints:
  */
-for each Employee exactly one of these holds:
-	that Employee is ceo,
-	that Employee is supervised by some Manager;
+either that Employee is ceo or that Employee is supervised by some Manager but not both;

data/examples/CQL/Death.cql

@@ -3,13 +3,14 @@ vocabulary Death;
 /*
  * Value Types
  */
-CauseOfDeath is written as VariableLengthText();
+CauseOfDeath is written as VariableLengthText;
 PersonName is written as VariableLengthText(40);
 
 /*
  * Entity Types
  */
-Person is identified by its Name;
+Person is identified by its Name [independent];
+
 Death is where
 	Person is dead;
 Death was due to at most one CauseOfDeath;

data/examples/CQL/Genealogy.cql

@@ -7,22 +7,22 @@ Address is written as VariableLengthText(128);
 Certificate is written as VariableLengthText(64);
 Day is written as UnsignedInteger(32) restricted to {1..31};
 Email is written as VariableLengthText(64);
-EventID is written as AutoCounter();
+EventID is written as AutoCounter;
 EventLocation is written as VariableLengthText(128);
-EventRoleName is written as VariableLengthText() restricted to {'Celebrant', 'Father', 'Husband', 'Mother', 'Subject', 'Wife'};
-EventTypeID is written as AutoCounter();
+EventRoleName is written as VariableLengthText restricted to {'Celebrant', 'Father', 'Husband', 'Mother', 'Subject', 'Wife'};
+EventTypeID is written as AutoCounter;
 EventTypeName is written as VariableLengthText(16) restricted to {'Birth', 'Burial', 'Christening', 'Death', 'Divorce', 'Marriage'};
 Gender is written as FixedLengthText(1) restricted to {'F', 'M'};
 Month is written as UnsignedInteger(32) restricted to {1..12};
 Name is written as VariableLengthText(128);
 Occupation is written as VariableLengthText(128);
 Official is written as VariableLengthText(64);
-PersonID is written as AutoCounter();
+PersonID is written as AutoCounter;
 Picture is written as PictureRawData(20);
-RoleID is written as AutoCounter();
-SourceID is written as AutoCounter();
+RoleID is written as AutoCounter;
+SourceID is written as AutoCounter;
 SourceName is written as VariableLengthText(128);
-UserID is written as AutoCounter();
+UserID is written as AutoCounter;
 Year is written as UnsignedInteger(32);
 
 /*
@@ -67,20 +67,22 @@ Role is called one EventRoleName,
 Source is identified by its ID;
 Source has one SourceName,
 	SourceName is of at most one Source;
-Participation is where
-	Person played Role in Event according to Source,
-	Person was involved in Event according to Source in Role,
-	Source claims Person played Role in Event;
 
 User is identified by its ID;
 Email is of User,
 	User has at most one Email;
 User provided Source,
 	Source was provided by one User;
+
 Friend is where
 	User is friend of other-User [symmetric];
 Friend is confirmed;
 
+Participation is where
+	Person played Role in Event according to Source,
+	Person was involved in Event according to Source in Role,
+	Source claims Person played Role in Event;
+
 /*
  * Constraints:
  */

data/examples/CQL/Marriage.cql

@@ -3,12 +3,12 @@ vocabulary Marriage;
 /*
  * Value Types
  */
-Name is written as VariableLengthText();
+Name is written as VariableLengthText;
 
 /*
  * Entity Types
  */
-Person is identified by given-Name and family-Name where
+Person is identified by given-Name and family-Name [independent] where
 	Person has one given-Name,
 	Person has one family-Name;
 

data/examples/CQL/Metamodel.cql

@@ -4,36 +4,36 @@ vocabulary Metamodel;
  * Value Types
  */
 Adjective is written as VariableLengthText(64);
-ConstraintId is written as AutoCounter();
+Assimilation is written as VariableLengthText restricted to {'partitioned', 'separate'};
+ConstraintId is written as AutoCounter;
+ContextNoteId is written as AutoCounter;
+ContextNoteKind is written as VariableLengthText restricted to {'as_opposed_to', 'because', 'so_that', 'to_avoid'};
 Denominator is written as UnsignedInteger(32);
+Discussion is written as VariableLengthText;
 Enforcement is written as VariableLengthText(16);
 Exponent is written as SignedSmallInteger(32);
-FactId is written as AutoCounter();
-FactTypeId is written as AutoCounter();
+FactId is written as AutoCounter;
+FactTypeId is written as AutoCounter;
 Frequency is written as UnsignedInteger(32);
-InstanceId is written as AutoCounter();
+InstanceId is written as AutoCounter;
 Length is written as UnsignedInteger(32);
+Literal is written as VariableLengthText;
 Name is written as VariableLengthText(64);
-Numerator is written as Decimal();
-Offset is written as Decimal();
+Numerator is written as Decimal;
+Offset is written as Decimal;
 Ordinal is written as UnsignedSmallInteger(32);
-Pronoun is written as VariableLengthText(20) restricted to {'feminine', 'masculine', 'personal'};
-RingType is written as VariableLengthText();
-RoleSequenceId is written as AutoCounter();
+PersonName is written as VariableLengthText;
+Pronoun is written as VariableLengthText(20) restricted to {'feminine', 'masculine', 'neuter', 'personal'};
+RingType is written as VariableLengthText;
+RoleSequenceId is written as AutoCounter;
 Scale is written as UnsignedInteger(32);
 Text is written as VariableLengthText(256);
-UnitId is written as AutoCounter();
-Value is written as VariableLengthText(256);
-ValueRestrictionId is written as AutoCounter();
+UnitId is written as AutoCounter;
+ValueRestrictionId is written as AutoCounter;
 
 /*
  * Entity Types
  */
-Bound is identified by Value and Bound is inclusive where
-	Bound has one Value,
-	Value is of at least one Bound,
-	Bound is inclusive;
-
 Coefficient is identified by Numerator and Denominator and Coefficient is precise where
 	Coefficient has one Numerator,
 	Coefficient has one Denominator,
@@ -45,17 +45,29 @@ Constraint requires at most one Enforcement,
 Name is of Constraint,
 	Constraint is called at most one Name;
 
+ContextNote is identified by its Id;
+Constraint has ContextNote,
+	ContextNote applies to at most one Constraint;
+ContextNote has one ContextNoteKind,
+	ContextNoteKind is of ContextNote;
+ContextNote has one Discussion,
+	Discussion is for ContextNote;
+
 Fact is identified by its Id;
 
 FactType is identified by its Id;
 Fact is of one FactType;
+FactType has ContextNote,
+	ContextNote applies to at most one FactType;
 
 Instance is identified by its Id;
-Instance has at most one Value;
+Instance objectifies at most one Fact;
+
+Person is identified by its Name;
 
 PresenceConstraint is a kind of Constraint;
-PresenceConstraint has at most one max-Frequency;
-PresenceConstraint has at most one min-Frequency;
+PresenceConstraint has at most one max-Frequency restricted to {1..};
+PresenceConstraint has at most one min-Frequency restricted to {2..};
 PresenceConstraint is mandatory;
 PresenceConstraint is preferred identifier;
 
@@ -69,6 +81,15 @@ Reading has one Text;
 RingConstraint is a kind of Constraint;
 RingConstraint is of one RingType;
 
+Role is where
+	FactType has at least one Ordinal role;
+Role is of RingConstraint,
+	RingConstraint has at most one Role;
+Role has at most one role-Name,
+	role-Name is name of at least one Role;
+other-Role is of RingConstraint,
+	RingConstraint has at most one other-Role;
+
 RoleSequence is identified by its Id;
 PresenceConstraint covers one RoleSequence;
 Reading is in one RoleSequence,
@@ -79,6 +100,7 @@ RoleValue is identified by Instance and Fact where
 	RoleValue is of one Instance,
 	RoleValue fulfils one Fact,
 	Fact includes at least one RoleValue;
+RoleValue is of one Role;
 
 SetConstraint is a kind of Constraint;
 
@@ -91,18 +113,20 @@ Name is of Unit,
 	Unit is called one Name;
 Unit has at most one Coefficient;
 Unit has at most one Offset;
+Unit is ephemeral;
 Unit is fundamental;
-Derivation is where
-	Unit (as DerivedUnit) is derived from base-Unit (as BaseUnit) [acyclic, intransitive];
-Derivation has at most one Exponent;
 
-ValueRange is identified by minimum-Bound and maximum-Bound where
-	ValueRange has at most one minimum-Bound,
-	ValueRange has at most one maximum-Bound;
+Value is identified by Literal and Value is a string and Unit where
+	Value is represented by one Literal,
+	Literal represents Value,
+	Value is a string,
+	Value is in at most one Unit,
+	Unit is of Value;
+Instance has at most one Value;
 
 ValueRestriction is identified by its Id;
-AllowedRange is where
-	ValueRestriction allows at least one ValueRange;
+Role has at most one role-ValueRestriction,
+	ValueRestriction applies to Role;
 
 Vocabulary is identified by Name where
 	Vocabulary is called one Name;
@@ -111,10 +135,43 @@ Vocabulary contains Constraint,
 Vocabulary includes Unit,
 	Unit is in one Vocabulary;
 
-Feature is identified by Vocabulary and Name where
-	Feature belongs to at most one Vocabulary,
-	Vocabulary contains Feature,
-	Feature is called one Name;
+Agreement is identified by ContextNote where
+	ContextNote was added by at most one Agreement,
+	Agreement covers one ContextNote;
+Agreement was on at most one Date;
+
+Bound is identified by Value and Bound is inclusive where
+	Bound has one Value,
+	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 ContextNote,
+	ContextNote 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;
+
+ContextAccordingTo is where
+	ContextNote is according to Person,
+	Person claims ContextNote;
+
+ContextAgreedBy is where
+	Agreement was reached by Person,
+	Person agreed on Agreement;
+
+Derivation is where
+	Unit (as DerivedUnit) is derived from base-Unit (as BaseUnit) [acyclic, intransitive];
+Derivation has at most one Exponent;
+
+EntityType is a kind of Concept;
+EntityType nests at most one FactType,
+	FactType is nested as at most one EntityType;
 
 Population is identified by Vocabulary and Name where
 	Vocabulary includes Population,
@@ -128,7 +185,16 @@ Population includes Instance,
 Population includes RoleValue,
 	RoleValue belongs to one Population;
 
+RoleRef is where
+	RoleSequence in Ordinal position includes at most one Role,
+	Role is in RoleSequence in at most one Ordinal place,
+	RoleSequence includes Role in Ordinal place,
+	Role has Ordinal place in RoleSequence;
+RoleRef has at most one leading-Adjective;
+RoleRef has at most one trailing-Adjective;
+
 SetComparisonConstraint is a kind of SetConstraint;
+
 SetComparisonRoles is where
 	SetComparisonConstraint has in Ordinal position at most one RoleSequence,
 	RoleSequence is Ordinal in SetComparisonConstraint,
@@ -140,45 +206,17 @@ SetEqualityConstraint is a kind of SetComparisonConstraint;
 SetExclusionConstraint is a kind of SetComparisonConstraint;
 SetExclusionConstraint is mandatory;
 
-Concept is a kind of Feature;
-Concept uses at most one Pronoun;
-Concept is independent;
-Instance is of one Concept;
-Role is where
-	FactType has Ordinal role played by Concept,
-	Concept plays role in FactType in Ordinal place,
-	Concept plays Ordinal role in FactType;
-Role is of RingConstraint,
-	RingConstraint has at most one Role;
-Role has at most one role-Name,
-	role-Name is name of at least one Role;
-Role has at most one role-ValueRestriction,
-	ValueRestriction applies to Role;
-RoleValue is of one Role;
-other-Role is of RingConstraint,
-	RingConstraint has at most one other-Role;
-RoleRef is where
-	RoleSequence in Ordinal position includes at most one Role,
-	Role is in RoleSequence in at most one Ordinal place,
-	RoleSequence includes Role in Ordinal place,
-	Role has Ordinal place in RoleSequence;
-RoleRef has at most one leading-Adjective;
-RoleRef has at most one trailing-Adjective;
-Join is where
-	RoleRef has Ordinal (as JoinStep) join;
-Join traverses at most one Concept,
-	Concept is traversed by Join;
-Join has at most one input-Role;
-Join has at most one output-Role;
-
-EntityType is a kind of Concept;
-EntityType nests at most one FactType,
-	FactType is nested as at most one EntityType;
 TypeInheritance is a kind of FactType identified by Subtype and Supertype where
 	EntityType (as Subtype) is subtype of super-EntityType (as Supertype) [acyclic],
 	Supertype is supertype of Subtype;
+Assimilation applies to TypeInheritance,
+	TypeInheritance uses at most one Assimilation;
 TypeInheritance provides identification;
 
+ValueRange is identified by minimum-Bound and maximum-Bound where
+	ValueRange has at most one minimum-Bound,
+	ValueRange has at most one maximum-Bound;
+
 ValueType is a kind of Concept;
 ValueType has at most one Length,
 	Length is of ValueType;
@@ -188,39 +226,48 @@ ValueType is of at most one Unit;
 ValueType has at most one ValueRestriction;
 ValueType is subtype of at most one super-ValueType (as Supertype) [acyclic],
 	Supertype is supertype of ValueType;
+
+AllowedRange is where
+	ValueRestriction allows at least one ValueRange;
+
+Join is where
+	RoleRef has Ordinal (as JoinStep) join;
+Join traverses at most one Concept,
+	Concept is traversed by Join;
+Join has at most one input-Role;
+Join has at most one output-Role;
+
 Parameter is where
 	Name is a parameter of ValueType,
 	ValueType has parameter called Name;
+
 ParamValue is where
 	Value for Parameter applies to at most one ValueType;
 
 /*
  * Constraints:
  */
-for each Concept exactly one of these holds:
-	EntityType is a subtype of Concept,
-	ValueType is a subtype of Concept;
+either Concept is an EntityType or Concept is a ValueType but not both;
 for each Constraint exactly one of these holds:
-	PresenceConstraint is a subtype of Constraint,
-	SetConstraint is a subtype of Constraint,
-	RingConstraint is a subtype of Constraint;
-for each Feature exactly one of these holds:
-	Concept is a subtype of Feature;
+	PresenceConstraint is a kind of Constraint,
+	SetConstraint is a kind of Constraint,
+	RingConstraint is a kind of Constraint;
+for each ContextNote exactly one of these holds:
+	Concept has ContextNote,
+	FactType has ContextNote,
+	Constraint has ContextNote;
+for each Instance at most one of these holds:
+	Instance has Value,
+	Instance objectifies Fact;
 Instance plays RoleValue and Instance is of Concept
 	if and only if
-	RoleValue is of Role and FactType has Ordinal role played by Concept;
+	RoleValue is of Role and Concept plays Role;
 RoleValue fulfils Fact and Fact is of FactType
 	if and only if
-	RoleValue is of Role and FactType has Ordinal role played by Concept;
-for each SetComparisonConstraint exactly one of these holds:
-	SetExclusionConstraint is a subtype of SetComparisonConstraint,
-	SetEqualityConstraint is a subtype of SetComparisonConstraint;
-for each SetConstraint exactly one of these holds:
-	SetComparisonConstraint is a subtype of SetConstraint,
-	SubsetConstraint is a subtype of SetConstraint;
-for each Unit exactly one of these holds:
-	Unit is fundamental,
-	that Unit is derived from some base-Unit;
+	RoleValue is of Role and FactType has Ordinal role;
+either SetComparisonConstraint is a SetExclusionConstraint or SetComparisonConstraint is a SetEqualityConstraint but not both;
+either SetConstraint is a SetComparisonConstraint or SetConstraint is a SubsetConstraint but not both;
+either Unit is fundamental or that Unit is derived from some base-Unit but not both;
 PresenceConstraint is preferred identifier
 	only if PresenceConstraint has max-Frequency;
 ValueType has Scale
@@ -228,20 +275,16 @@ ValueType has Scale
 each combination EntityType, TypeInheritance occurs at most one time in
 	EntityType is subtype of super-EntityType,
 	TypeInheritance provides identification;
-each FactType occurs at least one time in
-	FactType has Ordinal role played by Concept;
-each Join occurs at least one time in
-	Join has input-Role,
-	Join has output-Role;
+each Fact occurs at most one time in
+	Instance objectifies Fact;
+either Join has input-Role or Join has output-Role;
 each PresenceConstraint occurs at least one time in
 	PresenceConstraint has min-Frequency,
 	PresenceConstraint has max-Frequency,
 	PresenceConstraint is mandatory;
 each RoleSequence occurs at least one time in
 	RoleSequence in Ordinal position includes Role;
-each ValueRange occurs at least one time in
-	ValueRange has minimum-Bound,
-	ValueRange has maximum-Bound;
+either ValueRange has minimum-Bound or ValueRange has maximum-Bound;
 each combination Vocabulary, Name occurs at most one time in
 	Vocabulary contains Constraint,
 	Name is of Constraint;