mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/model_tree_traversal' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/required_behaviors

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2021-03-29 17:00:00 -04:00
commit a043cb5eb5
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MVMCoreUI/Atomic/Protocols/ModelProtocols/MoleculeModelProtocol.swift
View File

@ -57,9 +57,9 @@ public extension Array where Element == MoleculeModelProtocol {
}
}
func depthFirstTraverse(options: TreeTraversalOptions, depth: Int, callback: (Int, MoleculeModelProtocol)->Void) {
func depthFirstTraverse(options: TreeTraversalOptions, depth: Int, onVisit: (Int, MoleculeModelProtocol)->Void) {
forEach { (molecule) in
molecule.depthFirstTraverse(options: options, depth: depth, onVisit: callback)
molecule.depthFirstTraverse(options: options, depth: depth, onVisit: onVisit)
}
}
}

10
MVMCoreUI/Atomic/Protocols/ModelProtocols/TemplateModelProtocol.swift
View File

@ -9,7 +9,7 @@
import Foundation
public protocol TemplateModelProtocol: PageModelProtocol, ModelProtocol {
public protocol TemplateModelProtocol: PageModelProtocol, ModelProtocol, MoleculeTreeTraversalProtocol {
var template: String { get }
var rootMolecules: [MoleculeModelProtocol] { get }
}
@ -27,4 +27,12 @@ public extension TemplateModelProtocol {
static var categoryName: String {
return "\(TemplateModelProtocol.self)"
}
func reduceDepthFirstTraverse<Result>(options: TreeTraversalOptions, depth: Int, initialResult: Result, nextPartialResult: (Result, MoleculeModelProtocol, Int) -> Result) -> Result {
return rootMolecules.reduceDepthFirstTraverse(options: options, depth: depth, initialResult: initialResult, nextPartialResult: nextPartialResult)
}
func depthFirstTraverse(options: TreeTraversalOptions, depth: Int, onVisit: (Int, MoleculeModelProtocol) -> Void) {
return rootMolecules.depthFirstTraverse(options: options, depth: depth, onVisit: onVisit)
}
}

6
MVMCoreUI/BaseControllers/ViewController.swift
View File

@ -337,12 +337,12 @@ import UIKit
initialLoadFinished = true
initialLoad()
}
print("total molecules in tree: \(model?.rootMolecules.countMolecules() ?? 0)")
print("total molecules in tree: \(model?.countMolecules() ?? 0)")
model?.rootMolecules.printMolecules()
let allVideoMolecules:[BGVideoImageMoleculeModel] = model?.rootMolecules.allMoleculesOfType() ?? []
let allVideoMolecules:[BGVideoImageMoleculeModel] = model?.allMoleculesOfType() ?? []
print("video molecules: \(allVideoMolecules.count)")
handleNewDataAndUpdateUI()