activefacts-metamodel 1.9.20 → 1.9.22

data/lib/activefacts/metamodel/metamodel.rb

@@ -6,6 +6,7 @@ module ActiveFacts
       identified_by   :guid
       one_to_one      :guid, mandatory: true              # Component has Guid, see Guid#component
       maybe           :has_absolute_name                  # Has Absolute Name
+      has_one         :injection_annotation, class: "Annotation"  # Component has injection-Annotation, see Annotation#all_component_as_injection_annotation
       has_one         :name                               # Component projects Name, see Name#all_component
       has_one         :ordinal                            # Component has Ordinal rank, see Ordinal#all_component
       has_one         :parent, class: Component, counterpart: :member  # Member belongs to Parent, see Component#all_member
@@ -13,77 +14,34 @@ module ActiveFacts
 
     class Mapping < Component
       has_one         :object_type, mandatory: true       # Mapping represents Object Type, see ObjectType#all_mapping
+      one_to_one      :full_absorption                    # Mapping creates Full Absorption, see FullAbsorption#mapping
       has_one         :native_type_name, class: "Name"    # Mapping uses native- type Name, see Name#all_mapping_as_native_type_name
+      one_to_one      :reverse_mapping, class: Mapping, counterpart: :forward_mapping  # forward-Mapping is matched by reverse-Mapping, see Mapping#forward_mapping
     end
 
-    class AccessPath
-      identified_by   :guid
-      one_to_one      :guid, mandatory: true              # Access Path has Guid, see Guid#access_path
-      has_one         :composite, mandatory: true         # Access Path is to Composite, see Composite#all_access_path
-      has_one         :name                               # Access Path is called Name, see Name#all_access_path
-    end
-
-    class Name < String
-      value_type      length: 64
+    class NestingMode < String
+      value_type
     end
 
-    class CompositeGroup
-      identified_by   :name
-      one_to_one      :name, mandatory: true              # Composite Group has Name, see Name#composite_group
+    class Description < String
+      value_type
     end
 
     class Guid < ::Guid
       value_type
     end
 
-    class Composition
-      identified_by   :guid
-      one_to_one      :guid, mandatory: true              # Composition has Guid, see Guid#composition
-      has_one         :compositor_name, mandatory: true, class: Name  # Composition is by compositor-Name, see Name#all_composition_as_compositor_name
-      one_to_one      :name, mandatory: true              # Composition is called Name, see Name#composition
-    end
-
-    class Constraint
-      identified_by   :concept
-      one_to_one      :concept, mandatory: true           # Constraint is an instance of Concept, see Concept#constraint
-      has_one         :name                               # Constraint is called Name, see Name#all_constraint
-      has_one         :vocabulary                         # Constraint belongs to Vocabulary, see Vocabulary#all_constraint
-    end
-
-    class Frequency < UnsignedInteger
-      value_type      length: 32
-    end
-
-    class RoleSequence
-      identified_by   :guid
-      one_to_one      :guid, mandatory: true              # Role Sequence has Guid, see Guid#role_sequence
-      maybe           :has_unused_dependency_to_force_table_in_norma  # Has Unused Dependency To Force Table In Norma
-    end
-
-    class PresenceConstraint < Constraint
-      maybe           :is_mandatory                       # Is Mandatory
-      maybe           :is_preferred_identifier            # Is Preferred Identifier
-      has_one         :role_sequence, mandatory: true     # Presence Constraint covers Role Sequence, see RoleSequence#all_presence_constraint
-      has_one         :max_frequency, class: Frequency    # Presence Constraint has max-Frequency, see Frequency#all_presence_constraint_as_max_frequency
-      has_one         :min_frequency, class: Frequency    # Presence Constraint has min-Frequency, see Frequency#all_presence_constraint_as_min_frequency
-    end
-
-    class Index < AccessPath
-      maybe           :is_unique                          # Is Unique
-      has_one         :presence_constraint, mandatory: true  # Index derives from Presence Constraint, see PresenceConstraint#all_index
+    class ImplicationRuleName < String
+      value_type
     end
 
-    class Composite
-      identified_by   :mapping
-      one_to_one      :mapping, mandatory: true           # Composite consists of Mapping, see Mapping#composite
-      has_one         :composition, mandatory: true       # Composite belongs to Composition, see Composition#all_composite
-      has_one         :composite_group                    # Composite belongs to Composite Group, see CompositeGroup#all_composite
-      one_to_one      :natural_index, class: Index        # Composite has natural-Index, see Index#composite_as_natural_index
-      one_to_one      :primary_index, class: Index        # Composite has primary-Index, see Index#composite_as_primary_index
+    class ImplicationRule
+      identified_by   :implication_rule_name
+      one_to_one      :implication_rule_name, mandatory: true  # Implication Rule has Implication Rule Name, see ImplicationRuleName#implication_rule
     end
 
-    class ForeignKey < AccessPath
-      has_one         :source_composite, mandatory: true, class: Composite  # Foreign Key traverses from source-Composite, see Composite#all_foreign_key_as_source_composite
+    class Name < String
+      value_type      length: 64
     end
 
     class Pronoun < String
@@ -105,36 +63,15 @@ module ActiveFacts
       identified_by   :vocabulary, :name
       has_one         :vocabulary, mandatory: true        # Object Type belongs to Vocabulary, see Vocabulary#all_object_type
       has_one         :name, mandatory: true              # Object Type is called Name, see Name#all_object_type
+      one_to_one      :concept, mandatory: true           # Object Type is an instance of Concept, see Concept#object_type
       has_one         :pronoun                            # Object Type uses Pronoun, see Pronoun#all_object_type
     end
 
-    class FullAbsorption
-      identified_by   :composition, :object_type
-      has_one         :composition, mandatory: true       # Full Absorption involves Composition, see Composition#all_full_absorption
-      has_one         :object_type, mandatory: true       # Full Absorption involves Object Type, see ObjectType#all_full_absorption
-    end
-
-    class NestingMode < String
-      value_type
-    end
-
-    class Description < String
-      value_type
-    end
-
-    class ImplicationRuleName < String
-      value_type
-    end
-
-    class ImplicationRule
-      identified_by   :implication_rule_name
-      one_to_one      :implication_rule_name, mandatory: true  # Implication Rule has Implication Rule Name, see ImplicationRuleName#implication_rule
-    end
-
     class Population
       identified_by   :vocabulary, :name
       has_one         :vocabulary                         # Population belongs to Vocabulary, see Vocabulary#all_population
       has_one         :name, mandatory: true              # Population has Name, see Name#all_population
+      one_to_one      :concept, mandatory: true           # Population is an instance of Concept, see Concept#population
     end
 
     class Topic
@@ -165,12 +102,20 @@ module ActiveFacts
     end
 
     class LinkFactType < FactType
+      one_to_one      :implying_role, mandatory: true, class: "Role"  # Link Fact Type has implying-Role, see Role#link_fact_type_as_implying_role
     end
 
     class Ordinal < UnsignedInteger
       value_type      length: 16
     end
 
+    class Constraint
+      identified_by   :concept
+      one_to_one      :concept, mandatory: true           # Constraint is an instance of Concept, see Concept#constraint
+      has_one         :name                               # Constraint is called Name, see Name#all_constraint
+      has_one         :vocabulary                         # Constraint belongs to Vocabulary, see Vocabulary#all_constraint
+    end
+
     class RegularExpression < String
       value_type
     end
@@ -286,6 +231,7 @@ module ActiveFacts
       identified_by   :fact_type, :ordinal
       has_one         :fact_type, mandatory: true         # Role belongs to Fact Type, see FactType#all_role
       has_one         :ordinal, mandatory: true           # Role fills Ordinal, see Ordinal#all_role
+      one_to_one      :concept, mandatory: true           # Role is an instance of Concept, see Concept#role
       has_one         :object_type, mandatory: true       # Role is played by Object Type, see ObjectType#all_role
       one_to_one      :link_fact_type, counterpart: :implying_role  # implying-Role implies Link Fact Type, see LinkFactType#implying_role
       has_one         :role_name, class: Name             # Role has role-Name, see Name#all_role_as_role_name
@@ -297,10 +243,35 @@ module ActiveFacts
       maybe           :flattens                           # Flattens
       has_one         :child_role, mandatory: true, class: Role  # Absorption traverses to child-Role, see Role#all_absorption_as_child_role
       has_one         :parent_role, mandatory: true, class: Role  # Absorption traverses from parent-Role, see Role#all_absorption_as_parent_role
-      one_to_one      :foreign_key                        # Absorption gives rise to Foreign Key, see ForeignKey#absorption
-      one_to_one      :full_absorption                    # Absorption creates Full Absorption, see FullAbsorption#absorption
       has_one         :nesting_mode                       # Absorption uses Nesting Mode, see NestingMode#all_absorption
-      one_to_one      :reverse_absorption, class: Absorption, counterpart: :forward_absorption  # forward-Absorption is matched by reverse-Absorption, see Absorption#forward_absorption
+    end
+
+    class CompositeGroup
+      identified_by   :name
+      one_to_one      :name, mandatory: true              # Composite Group has Name, see Name#composite_group
+    end
+
+    class Composition
+      identified_by   :guid
+      one_to_one      :guid, mandatory: true              # Composition has Guid, see Guid#composition
+      has_one         :compositor_name, mandatory: true, class: Name  # Composition is by compositor-Name, see Name#all_composition_as_compositor_name
+      one_to_one      :name, mandatory: true              # Composition is called Name, see Name#composition
+    end
+
+    class Composite
+      identified_by   :mapping
+      one_to_one      :mapping, mandatory: true           # Composite consists of Mapping, see Mapping#composite
+      has_one         :composition, mandatory: true       # Composite belongs to Composition, see Composition#all_composite
+      has_one         :composite_group                    # Composite belongs to Composite Group, see CompositeGroup#all_composite
+      one_to_one      :natural_index, class: "Index"      # Composite has natural-Index, see Index#composite_as_natural_index
+      one_to_one      :primary_index, class: "Index"      # Composite has primary-Index, see Index#composite_as_primary_index
+    end
+
+    class AccessPath
+      identified_by   :guid
+      one_to_one      :guid, mandatory: true              # Access Path has Guid, see Guid#access_path
+      has_one         :composite, mandatory: true         # Access Path is to Composite, see Composite#all_access_path
+      has_one         :name                               # Access Path is called Name, see Name#all_access_path
     end
 
     class Adjective < String
@@ -380,6 +351,21 @@ module ActiveFacts
       value_type
     end
 
+    class Injection < Component
+    end
+
+    class ComputedValue < Injection
+    end
+
+    class HashValue < ComputedValue
+    end
+
+    class ComponentHash
+      identified_by   :hash_value, :component
+      has_one         :hash_value, mandatory: true        # Component Hash involves Hash Value, see HashValue#all_component_hash
+      has_one         :component, mandatory: true         # Component Hash involves Component, see Component#all_component_hash
+    end
+
     class Shape
       identified_by   :guid
       one_to_one      :guid, mandatory: true              # Shape has Guid, see Guid#shape
@@ -528,6 +514,13 @@ module ActiveFacts
     end
 
     class ObjectifiedFactTypeNameShape < Shape
+      one_to_one      :fact_type_shape, mandatory: true   # Objectified Fact Type Name Shape is for Fact Type Shape, see FactTypeShape#objectified_fact_type_name_shape
+    end
+
+    class RoleSequence
+      identified_by   :guid
+      one_to_one      :guid, mandatory: true              # Role Sequence has Guid, see Guid#role_sequence
+      maybe           :has_unused_dependency_to_force_table_in_norma  # Has Unused Dependency To Force Table In Norma
     end
 
     class Text < String
@@ -544,6 +537,7 @@ module ActiveFacts
     end
 
     class ReadingShape < Shape
+      one_to_one      :fact_type_shape, mandatory: true   # Reading Shape is for Fact Type Shape, see FactTypeShape#reading_shape
       has_one         :reading, mandatory: true           # Reading Shape is for Reading, see Reading#all_reading_shape
     end
 
@@ -559,6 +553,11 @@ module ActiveFacts
       has_one         :rotation_setting                   # Fact Type Shape has Rotation Setting, see RotationSetting#all_fact_type_shape
     end
 
+    class ForeignKey < AccessPath
+      has_one         :source_composite, mandatory: true, class: Composite  # Foreign Key traverses from source-Composite, see Composite#all_foreign_key_as_source_composite
+      one_to_one      :mapping                            # Foreign Key derives from Mapping, see Mapping#foreign_key
+    end
+
     class ForeignKeyField
       identified_by   :foreign_key, :ordinal
       has_one         :foreign_key, mandatory: true       # Foreign Key Field involves Foreign Key, see ForeignKey#all_foreign_key_field
@@ -567,6 +566,17 @@ module ActiveFacts
       has_one         :value                              # Foreign Key Field is discriminated by Value, see Value#all_foreign_key_field
     end
 
+    class Frequency < UnsignedInteger
+      value_type      length: 32
+    end
+
+    class FullAbsorption
+      identified_by   :composition, :object_type
+      has_one         :composition, mandatory: true       # Full Absorption involves Composition, see Composition#all_full_absorption
+      has_one         :object_type, mandatory: true       # Full Absorption involves Object Type, see ObjectType#all_full_absorption
+      one_to_one      :mapping, mandatory: true           # Full Absorption applies to Mapping, see Mapping#full_absorption
+    end
+
     class VersionPattern < String
       value_type      length: 64
     end
@@ -580,6 +590,19 @@ module ActiveFacts
       has_one         :version_pattern                    # Import has Version Pattern, see VersionPattern#all_import
     end
 
+    class PresenceConstraint < Constraint
+      maybe           :is_mandatory                       # Is Mandatory
+      maybe           :is_preferred_identifier            # Is Preferred Identifier
+      has_one         :role_sequence, mandatory: true     # Presence Constraint covers Role Sequence, see RoleSequence#all_presence_constraint
+      has_one         :max_frequency, class: Frequency    # Presence Constraint has max-Frequency, see Frequency#all_presence_constraint_as_max_frequency
+      has_one         :min_frequency, class: Frequency    # Presence Constraint has min-Frequency, see Frequency#all_presence_constraint_as_min_frequency
+    end
+
+    class Index < AccessPath
+      maybe           :is_unique                          # Is Unique
+      has_one         :presence_constraint                # Index derives from Presence Constraint, see PresenceConstraint#all_index
+    end
+
     class IndexField
       identified_by   :access_path, :ordinal
       has_one         :access_path, mandatory: true       # Index Field involves Access Path, see AccessPath#all_index_field
@@ -594,9 +617,6 @@ module ActiveFacts
       has_one         :true_value, class: Value           # Indicator uses true-Value, see Value#all_indicator_as_true_value
     end
 
-    class Injection < Mapping
-    end
-
     class LeafConstraint
       identified_by   :component, :leaf_constraint
       has_one         :component, mandatory: true         # Leaf Constraint involves Component, see Component#all_leaf_constraint
@@ -665,6 +685,10 @@ module ActiveFacts
       one_to_one      :role_ref                           # Play projects Role Ref, see RoleRef#play
     end
 
+    class RestrictionStyle < String
+      value_type
+    end
+
     class RingType < String
       value_type
     end
@@ -680,6 +704,7 @@ module ActiveFacts
     end
 
     class RoleNameShape < Shape
+      one_to_one      :role_display, mandatory: true      # Role Name Shape is for Role Display, see RoleDisplay#role_name_shape
     end
 
     class ValueConstraintShape < ConstraintShape
@@ -744,10 +769,6 @@ module ActiveFacts
     class SurrogateKey < Injection
     end
 
-    class TemporalMapping < Mapping
-      has_one         :value_type, mandatory: true        # Temporal Mapping records time using Value Type, see ValueType#all_temporal_mapping
-    end
-
     class TransformTargetRef
       identified_by   :transform_matching, :ordinal
       has_one         :transform_matching, mandatory: true  # Transform Target Ref involves Transform Matching, see TransformMatching#all_transform_target_ref
@@ -765,10 +786,10 @@ module ActiveFacts
       has_one         :assimilation                       # Type Inheritance uses Assimilation, see Assimilation#all_type_inheritance
     end
 
-    class ValidFrom < Injection
+    class ValidFrom < Mapping
     end
 
-    class ValueField < Injection
+    class ValueField < Mapping
     end
 
     class ValueTypeParameter
@@ -776,13 +797,14 @@ module ActiveFacts
       has_one         :value_type, mandatory: true        # Value Type Parameter involves Value Type, see ValueType#all_value_type_parameter
       has_one         :name, mandatory: true              # Value Type Parameter involves Name, see Name#all_value_type_parameter
       has_one         :parameter_value_type, mandatory: true, class: ValueType  # Value Type Parameter requires value of parameter-Value Type, see ValueType#all_value_type_parameter_as_parameter_value_type
+      has_one         :restriction_style                  # Value Type Parameter has Restriction Style, see RestrictionStyle#all_value_type_parameter
     end
 
     class ValueTypeParameterRestriction
-      identified_by   :value_type, :value_type_parameter
+      identified_by   :value_type, :value_type_parameter, :value_range
       has_one         :value_type, mandatory: true        # Value Type Parameter Restriction involves Value Type, see ValueType#all_value_type_parameter_restriction
       has_one         :value_type_parameter, mandatory: true  # Value Type Parameter Restriction involves Value Type Parameter, see ValueTypeParameter#all_value_type_parameter_restriction
-      has_one         :value, mandatory: true             # Value Type Parameter Restriction has Value, see Value#all_value_type_parameter_restriction
+      has_one         :value_range, mandatory: true       # Value Type Parameter Restriction involves Value Range, see ValueRange#all_value_type_parameter_restriction
     end
   end
 end

data/lib/activefacts/metamodel/validate/composition.rb

@@ -45,8 +45,11 @@ module ActiveFacts
         all_access_path.each do |access_path|
           report.call(access_path, "Must contain at least one IndexField") unless access_path.all_index_field.size > 0
           access_path.all_index_field.each do |index_field|
-            report.call(access_path, "#{index_field.inspect} must be an Indicator or played by a ValueType") unless index_field.component.is_a?(Indicator) || index_field.component.object_type.is_a?(ValueType)
-            report.call(access_path, "#{index_field.inspect} must be within its composite") unless index_field.component.root == self
+            report.call(access_path, "#{index_field.inspect} must be an Indicator or played by a ValueType") unless !index_field.component.is_a?(Mapping) || index_field.component.object_type.is_a?(ValueType)
+            report.call(access_path, "#{index_field.inspect} must have a component") unless index_field.component
+            if index_field.component
+              report.call(access_path, "#{index_field.inspect} must be within its composite") unless index_field.component.root == self
+            end
           end
           if ForeignKey === access_path
             if access_path.all_index_field.size == access_path.all_foreign_key_field.size
@@ -88,7 +91,6 @@ module ActiveFacts
               report.call(member, "Object type #{member.object_type.name} should play the child role #{c.name}") unless member.object_type == c.object_type
               report.call(member, "Parent mapping object type #{object_type.name} should play the parent role #{p.name}") unless object_type == p.object_type
 
-              member.validate_reverse &report
               member.validate_nesting &report if member.all_nesting.size > 0
               member.validate_members &report
 
@@ -104,11 +106,8 @@ module ActiveFacts
             when ValidFrom
               # Nothing to check here
 
-            when Injection
-              report.call(member, "REVISIT: Unexpected and unchecked Injection")
-
             when Mapping
-              report.call(member, "A child Component should not be a bare Mapping")
+              member.validate_reverse &report
 
             when Indicator
               report.call(member, "Indicator requires a Role") unless member.role
@@ -123,16 +122,16 @@ module ActiveFacts
           end
         end
       end
-    end
 
-    class Absorption
       def validate_reverse &report
-        reverse = forward_absorption || reverse_absorption
+        reverse = forward_mapping || reverse_mapping
         return unless reverse
         report.call(self, "Opposite absorption's child role #{reverse.child_role.name} should match parent role #{parent_role.name}") unless reverse.child_role == parent_role
         report.call(self, "Opposite absorption's parent role #{reverse.parent_role.name} should match child role #{child_role.name}") unless reverse.parent_role == child_role
       end
+    end
 
+    class Absorption
       def validate_nesting &report
         report.call(self, "REVISIT: Unexpected and unchecked Nesting")
         report.call(self, "Nesting Mode must be specified") unless self.nesting_mode

data/lib/activefacts/metamodel/version.rb

@@ -1,5 +1,5 @@
 module ActiveFacts
   module Metamodel
-    VERSION = "1.9.20"
+    VERSION = "1.9.22"
   end
 end

data/lib/activefacts/support.rb

@@ -125,7 +125,7 @@ class String
     end
 
     def +(words)
-      Words.new(self + Array(words))
+      Words.new(super)
     end
   end
 
@@ -146,5 +146,10 @@ class String
       map{|w| w =~ /^[^_[:alpha:]]/ ? '_'+w : w}
     )
   end
+
+  def unindent
+    indent = self.split("\n").select {|line| !line.strip.empty? }.map {|line| line.index(/[^\s]/) }.compact.min || 0
+    self.gsub(/^[[:blank:]]{#{indent}}/, '')
+  end
 end
 

data/orm/Metamodel.cql.diffs

@@ -1,5 +1,5 @@
-*** Metamodel.orm.cql.orig	2017-10-27 11:34:20.000000000 +1100
---- Metamodel.orm.cql	2017-10-27 11:42:31.000000000 +1100
+*** Metamodel.orm.cql.orig	2017-12-20 10:07:22.000000000 +1100
+--- Metamodel.orm.cql	2017-12-20 10:08:11.000000000 +1100
 ***************
 *** 20,22 ****
   Frequency is written as Unsigned Integer(32);
@@ -10,50 +10,50 @@
 ! Guid is written as Guid auto-assigned at assert;
   Implication Rule Name is written as String;
 ***************
-*** 544,547 ****
+*** 551,554 ****
   
 - Data Type is a kind of Object Type;
 - 
   Domain Object Type is a kind of Object Type;
---- 544,545 ----
+--- 551,552 ----
 ***************
-*** 601,603 ****
-  either Access Path is an Index or Access Path is a Foreign Key but not both;
-! either Component(1) belongs to Component(2) or Component(1) is a Mapping that projects Composite but not both;
+*** 608,610 ****
   for each Component exactly one of these holds:
---- 599,601 ----
-  either Access Path is an Index or Access Path is a Foreign Key but not both;
-! either Component belongs to Component or Component(1) is a Mapping that projects Composite but not both;
+! 	Component is a Mapping that projects Composite,
+  	Component is an Indicator,
+--- 606,608 ----
   for each Component exactly one of these holds:
+! 	Component is a Mapping,
+  	Component is an Indicator,
 ***************
-*** 651,655 ****
+*** 653,657 ****
   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(1) is an Absorption(2) and Absorption(1) flattens,
 - 	Mapping projects Composite;
   for each Instance at most one of these holds:
---- 649,650 ----
+--- 651,652 ----
 ***************
-*** 657,658 ****
---- 652,656 ----
+*** 659,660 ****
+--- 654,658 ----
   	Instance objectifies Fact;
 + for each Mapping at most one of these holds:
 + 	Mapping is an Absorption that flattens,
 + 	Mapping projects Composite;
   Absorption is nested under index Role in Ordinal position
 ***************
-*** 660,667 ****
+*** 662,669 ****
   	Absorption uses Nesting Mode;
-- Object Type is involved in Full Absorption that applies to Absorption that is a kind of Mapping(2)
+- Object Type is involved in Full Absorption that applies to Mapping
 - 	if and only if
-- 	Mapping(1) represents Object Type;
+- 	Mapping represents Object Type;
 - Query projects derived Fact Type that contains Role
 - 	if and only if
 - 	Query includes Variable that projects Role;
   Role Value is of Instance that is of Object Type
---- 658,659 ----
+--- 660,661 ----
 ***************
-*** 678,689 ****
+*** 680,691 ****
   	Variable is restricted by Role of Step;
   Composite has primary Index
 ! 	only if Composite is reached through Access Path;
@@ -66,7 +66,7 @@
 - Absorption is a kind of Mapping(2) and Absorption traverses to child Role that is played by Object Type
 - 	only if Mapping(1) represents Object Type;
   Presence Constraint is preferred identifier
---- 670,679 ----
+--- 672,681 ----
   	Variable is restricted by Role of Step;
 + Absorption traverses from parent Parent Role(1) that is played by Object Type
 + 	only if Absorption is a kind of Component(2) and Component(3) belongs to Component(2) that is a Mapping that represents Object Type;
@@ -78,8 +78,8 @@
   	only if Index is unique;
   Presence Constraint is preferred identifier
 ***************
-*** 697,699 ****
+*** 699,701 ****
   either Agreement was reached by Agent or Agreement was on Date;
 - either Component projects Name or Absorption flattens;
   each Concept occurs at most one time in
---- 687,688 ----
+--- 689,690 ----