kscience/visionforge
8
1
Fork 1
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

v0.2.0-dev-22 #47

Merged
altavir merged 158 commits from dev into master 2021-07-17 11:04:22 +03:00
Conversation 0 Commits 158 Files Changed 518 +3 -5
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e1138be861 - Show all commits

6
visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/markLayers.kt
View File

@ -55,12 +55,12 @@ public fun SolidGroup.markLayers(thresholds: List<Int> = listOf(500, 1000, 20000
val counterTree = VisionCounterTree(Name.EMPTY, this, hashMapOf()) val counterTree = VisionCounterTree(Name.EMPTY, this, hashMapOf())
val totalCount = counterTree.childrenCount val totalCount = counterTree.childrenCount
if (totalCount > thresholds.firstOrNull() ?: 0) { if (totalCount > thresholds.firstOrNull() ?: 0) {
val allNodes = counterTree.topToBottom().filter { it.selfCount > 1 }.distinct().toMutableList() val allNodes = counterTree.topToBottom().distinct().toMutableList()
//println("tree construction finished") //println("tree construction finished")
allNodes.sortWith( allNodes.sortWith(
compareBy<VisionCounterTree>( compareBy<VisionCounterTree>(
{ it.name.length }, { it.name.length },
{ it.childrenCount * it.selfCount } { (it.children.size + 1) * it.selfCount }
).reversed() ).reversed()
) )
@ -76,7 +76,7 @@ public fun SolidGroup.markLayers(thresholds: List<Int> = listOf(500, 1000, 20000
if (layerIndex == 0) break if (layerIndex == 0) break
node.vision.layer = layerIndex node.vision.layer = layerIndex
remaining -= node.selfCount * node.childrenCount remaining -= node.selfCount * (node.children.size + 1)
logger?.apply { logger?.apply {
if (node.selfCount > 1) { if (node.selfCount > 1) {
info { "Prototype with name ${node.name} moved to layer $layerIndex. $remaining nodes remains" } info { "Prototype with name ${node.name} moved to layer $layerIndex. $remaining nodes remains" }

2
visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
View File

@ -37,8 +37,6 @@ public interface Solid : Vision {
override val descriptor: NodeDescriptor get() = Companion.descriptor override val descriptor: NodeDescriptor get() = Companion.descriptor
public companion object { public companion object {
// val SELECTED_KEY = "selected".asName() // val SELECTED_KEY = "selected".asName()
public val DETAIL_KEY: Name = "detail".asName() public val DETAIL_KEY: Name = "detail".asName()