SPC/snark
5
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tree merging

Browse Source
This commit is contained in:
Alexander Nozik 2024-02-29 16:41:38 +03:00
parent 395fea432e
commit 8245031896
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
snark-core/src/commonMain/kotlin/space/kscience/snark/DataTreeWithDefault.kt
View File

@ -13,5 +13,22 @@ public class DataTreeWithDefault<T>(public val tree: DataTree<T>, public val def
override val self: DataTreeWithDefault<T> get() = this
override val data: Data<T>? get() = tree.data ?: default.data
override val items: Map<NameToken, GenericDataTree<T, *>> get() = default.items + tree.items
private fun mergeItems(
treeItems: Map<NameToken, DataTree<T>>,
defaultItems: Map<NameToken, DataTree<T>>,
): Map<NameToken, DataTree<T>> {
val mergedKeys = treeItems.keys + defaultItems.keys
return mergedKeys.associateWith {
val treeItem = treeItems[it]
val defaultItem = defaultItems[it]
when {
treeItem == null -> defaultItem!!
defaultItem == null -> treeItem
else -> DataTreeWithDefault(treeItem, defaultItem)
}
}
}
override val items: Map<NameToken, GenericDataTree<T, *>> get() = mergeItems(tree.items, default.items)
}