Skip to content

Sectioned element updates are included in changeset stage 4. #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 22, 2018
Merged

Sectioned element updates are included in changeset stage 4. #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a4d0e9
Include element updates in changet stage 4
ra1028 Aug 22, 2018
e9bfc2f
Update comments
ra1028 Aug 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 46 additions & 24 deletions Sources/Algorithm.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,10 @@ public extension StagedChangeset where Collection: RangeReplaceableCollection, C

var changesets = ContiguousArray<Changeset<Collection>>()

// The 1st stage changeset includes only the element deletions and updates and the collection
// that its changes applied to source collection.
// The 1st stage changeset.
// - Includes:
// - element deletes
// - element updates
if !result.deleted.isEmpty || !result.updated.isEmpty {
changesets.append(
Changeset(
Expand All @@ -82,8 +84,10 @@ public extension StagedChangeset where Collection: RangeReplaceableCollection, C
)
}

// The 2nd stage changeset includes only the element insertions and moves and the collection
// that its changes applied to 1st stage collection.
// The 2st stage changeset.
// - Includes:
// - element inserts
// - element moves
if !result.inserted.isEmpty || !result.moved.isEmpty {
changesets.append(
Changeset(
Expand All @@ -100,6 +104,8 @@ public extension StagedChangeset where Collection: RangeReplaceableCollection, C
changesets[index].data = target
}

// The data and changes each contains are represents the middle of whole the changes.
// Each changes are from the previous stage.
self.init(changesets)
}
}
Expand Down Expand Up @@ -253,8 +259,8 @@ public extension StagedChangeset where Collection: RangeReplaceableCollection, C
// If the element target section is recorded as insertion, record its element path as deletion.
if let targetElementPath = sourceElementTraces[sourceElementPath].reference,
case .some = sectionResult.metadata.targetReferences[targetElementPath.section] {
let targetElement = contiguousTargetSections[targetElementPath]
firstStageElements.append(targetElement)
let sourceElement = contiguousSourceSections[sourceElementPath]
firstStageElements.append(sourceElement)
continue
}

Expand All @@ -263,8 +269,8 @@ public extension StagedChangeset where Collection: RangeReplaceableCollection, C
offsetByDelete += 1
}

let section = Section(source: sourceSections[sourceSectionIndex], elements: firstStageElements)
firstStageSections.append(section)
let firstStageSection = Section(source: sourceSections[sourceSectionIndex], elements: firstStageElements)
firstStageSections.append(firstStageSection)
}

// Record the element updates/moves/insertions.
Expand All @@ -284,30 +290,32 @@ public extension StagedChangeset where Collection: RangeReplaceableCollection, C
let secondStageSection = firstStageSections[sourceSectionIndex - sectionDeleteOffset]
secondStageSections.append(secondStageSection)

let thirdStageSection = Section(source: secondStageSection, elements: targetElements)
thirdStageSections.append(thirdStageSection)
var thirdStageElements = ContiguousArray<Element>()
thirdStageElements.reserveCapacity(targetElements.count)

for targetElementIndex in targetElements.indices {
untrackedSourceIndex = untrackedSourceIndex.flatMap { index in
sourceElementTraces[sourceSectionIndex].suffix(from: index).index { !$0.isTracked }
}

let targetElementPath = ElementPath(element: targetElementIndex, section: targetSectionIndex)
let targetElement = contiguousTargetSections[targetElementPath]

// If the element source section is recorded as deletion, record its element path as insertion.
guard let sourceElementPath = targetElementReferences[targetElementPath],
let movedSourceSectionIndex = sectionResult.metadata.sourceTraces[sourceElementPath.section].reference else {
thirdStageElements.append(targetElement)
elementInserted.append(targetElementPath)
continue
}

sourceElementTraces[sourceElementPath].isTracked = true

let sourceElement = contiguousSourceSections[sourceElementPath]
let targetElement = contiguousTargetSections[targetElementPath]
thirdStageElements.append(sourceElement)

if !targetElement.isContentEqual(to: sourceElement) {
elementUpdated.append(sourceElementPath)
elementUpdated.append(targetElementPath)
}

if sourceElementPath.section != sourceSectionIndex || sourceElementPath.element != untrackedSourceIndex {
Expand All @@ -316,25 +324,31 @@ public extension StagedChangeset where Collection: RangeReplaceableCollection, C
elementMoved.append((source: moveSourceElementPath, target: targetElementPath))
}
}

let thirdStageSection = Section(source: secondStageSection, elements: thirdStageElements)
thirdStageSections.append(thirdStageSection)
}

var changesets = ContiguousArray<Changeset<Collection>>()

// The 1st stage changeset includes only the section deletions and element deletions, element updates
// and the collection that its changes applied to source collection.
if !sectionResult.deleted.isEmpty || !elementDeleted.isEmpty || !elementUpdated.isEmpty {
// The 1st stage changeset.
// - Includes:
// - section deletes
// - element deletes
if !sectionResult.deleted.isEmpty || !elementDeleted.isEmpty {
changesets.append(
Changeset(
data: Collection(firstStageSections),
sectionDeleted: sectionResult.deleted,
elementDeleted: elementDeleted,
elementUpdated: elementUpdated
elementDeleted: elementDeleted
)
)
}

// The 2nd stage changeset includes only the section insertions and moves and the collection
// that its changes applied to 1st stage collection.
// The 2st stage changeset.
// - Includes:
// - section inserts
// - section moves
if !sectionResult.inserted.isEmpty || !sectionResult.moved.isEmpty {
changesets.append(
Changeset(
Expand All @@ -345,8 +359,10 @@ public extension StagedChangeset where Collection: RangeReplaceableCollection, C
)
}

// The 3rd stage changeset includes only the element insertions and moves and the collection
// that its changes applied to 2nd stage collection.
// The 3st stage changeset.
// - Includes:
// - element inserts
// - element moves
if !elementInserted.isEmpty || !elementMoved.isEmpty {
changesets.append(
Changeset(
Expand All @@ -357,12 +373,16 @@ public extension StagedChangeset where Collection: RangeReplaceableCollection, C
)
}

// The 4th stage changeset includes only the section updates and the collection that its changes applied to 3rd stage collection.
if !sectionResult.updated.isEmpty {
// The 3st stage changeset.
// - Includes:
// - section updates
// - element updates
if !sectionResult.updated.isEmpty || !elementUpdated.isEmpty {
changesets.append(
Changeset(
data: target,
sectionUpdated: sectionResult.updated
sectionUpdated: sectionResult.updated,
elementUpdated: elementUpdated
)
)
}
Expand All @@ -373,6 +393,8 @@ public extension StagedChangeset where Collection: RangeReplaceableCollection, C
changesets[index].data = target
}

// The data and changes each contains are represents the middle of whole the changes.
// Each changes are from the previous stage.
self.init(changesets)
}
}
Expand Down