(eq (%association-role-player a) (%association-role-player b))))
(defun normalize-roles (association)
- ;; TMDM 5.8/6.7: the compared Roles share this parent; other props are empty/null.
- (loop for pair = (equal-pair (%association-roles association) #'same-role-signature-p)
+ ;; TMDM 5.8/6.7: shared parent; identifiers are metadata, not equality keys.
+ (loop for parent = (canonical-association association)
+ for pair = (equal-pair (%association-roles parent) #'same-role-signature-p)
while pair do
(let* ((a (first pair)) (b (second pair))
- (c (%make-association-role association (%association-role-type a) (%association-role-player a))))
- (setf (%association-roles association) (replace-pair (%association-roles association) a b c)
- (%association-role-forward a) c (%association-role-forward b) c))))
+ (c (%make-association-role parent (%association-role-type a) (%association-role-player a))))
+ (setf (%association-role-item-identifiers c)
+ (set-union (%association-role-item-identifiers a) (%association-role-item-identifiers b) #'string=)
+ (%association-roles parent) (replace-pair (%association-roles parent) a b c)
+ (%association-role-forward a) c (%association-role-forward b) c)
+ (merge-item-reifiers c a b))))
(defun equal-associations-p (a b)
;; TMDM 5.7: compare role sets structurally, independent of role ordering.
;; Role parents are the associations being compared (the equality cycle).
- ;; Scope sets are significant; reifier/II are absent in this subset.
+ ;; Scope sets are significant; identifiers do not participate in equality.
(and (eq (%association-type a) (%association-type b))
(same-scope-p (%association-scope a) (%association-scope b))
(= (length (%association-roles a)) (length (%association-roles b)))
(%association-roles a))))
(defun merge-two-associations (map a b)
- ;; TMDM 6.6: C receives A's equal role set. Retarget parent and discarded
- ;; equivalent B-role handles, so clients cannot observe stale live references.
+ ;; TMDM 6.6/6.7: retarget both equal role sets to C, then merge corresponding
+ ;; Roles. This preserves their identifiers AND every retained role handle.
(let ((c (%make-association map (%association-type a))))
(setf (%association-scope c) (copy-list (%association-scope a))
- (%association-roles c) (copy-list (%association-roles a))
+ (%association-item-identifiers c)
+ (set-union (%association-item-identifiers a) (%association-item-identifiers b) #'string=)
+ (%association-roles c) (set-union (%association-roles a) (%association-roles b) #'eq)
(%topic-map-associations map) (replace-pair (%topic-map-associations map) a b c)
(%association-forward a) c (%association-forward b) c)
(dolist (role (%association-roles c)) (setf (%association-role-parent role) c))
- (dolist (role (%association-roles b))
- (setf (%association-role-forward role)
- (find role (%association-roles c) :test #'same-role-signature-p)))
- c))
+ (normalize-roles c)
+ (merge-item-reifiers c a b)))
+
+(defun scan-next-association-merge (map)
+ "The pair of Associations to merge next, found by comparing Associations pairwise: the first Association with a
+later equal one, and the first such later one, in map order; NIL if none. This is the search that defines the
+choice; NEXT-ASSOCIATION-MERGE returns the same pair."
+ (equal-pair (%topic-map-associations map) #'equal-associations-p))
+
+(defun next-association-merge (map)
+ "The pair SCAN-NEXT-ASSOCIATION-MERGE returns, found through an index built for this one search and dropped with it.
+When no Association holds two Roles of one signature and no Scope repeats a theme, EQUAL-ASSOCIATIONS-P holds exactly
+when the two Associations have the EQ type, the same Scope set and the same set of Role signatures: equal Role counts
+and inclusion of duplicate-free sets make the sets equal. Those three are the key, built from the stored references
+as EQUAL-ASSOCIATIONS-P compares them (EQ, never resolved to a representative). The relation is then an equivalence and
+has no side effect, so the first Association with a later key-sharer, and its first such sharer, are what the pairwise
+search finds. With a repeated Role signature the relation is not symmetric; then, and with a repeated theme, the
+pairwise search itself runs. The index is never kept: a merge, a Role merge or a Reifier cascade can change any
+type, player, theme and the list itself before the next search."
+ (let ((associations (%topic-map-associations map)))
+ (unless (every (lambda (a)
+ (and (null (equal-pair (%association-roles a) #'same-role-signature-p))
+ (let ((scope (%association-scope a)))
+ (= (length scope) (length (remove-duplicates scope :test #'eq))))))
+ associations)
+ (return-from next-association-merge (scan-next-association-merge map)))
+ (let ((ids (make-hash-table :test #'eq)) (next 0) (sharers (make-hash-table :test #'equal)))
+ (flet ((id (object) (or (gethash object ids) (setf (gethash object ids) (incf next))))
+ (signature< (x y) (or (< (car x) (car y)) (and (= (car x) (car y)) (< (cdr x) (cdr y))))))
+ (let ((keys (mapcar (lambda (a)
+ (list (id (%association-type a))
+ (sort (mapcar #'id (%association-scope a)) #'<)
+ (sort (mapcar (lambda (role) (cons (id (%association-role-type role))
+ (id (%association-role-player role))))
+ (%association-roles a))
+ #'signature<)))
+ associations)))
+ ;; Each key lists its Associations in map order.
+ (loop for a in (reverse associations) for key in (reverse keys) do (push a (gethash key sharers)))
+ (loop for a in associations for key in keys
+ for later = (second (member a (gethash key sharers) :test #'eq))
+ when later return (list a later)))))))
(defun normalize-associations (map)
(dolist (association (%topic-map-associations map)) (normalize-roles association))
- (loop for pair = (equal-pair (%topic-map-associations map) #'equal-associations-p)
+ (loop for pair = (next-association-merge map)
while pair do (merge-two-associations map (first pair) (second pair)))
map)