NeoFlock/NeoComputers
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.codersquack.nl/NeoFlock/NeoComputers

Browse Source
This commit is contained in:
mewhenthe
2026-05-03 17:21:34 +02:00
parent 4d37483057 4d84ec2ed4
commit b78cc44d89
3 changed files with 5 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/org/neoflock/neocomputers/network/DeviceNode.kt
View File

@@ -40,10 +40,6 @@ open class DeviceNode(_address: UUID? = null) {
return maximum
}
val boundNetworks = HashSet<LocalNetwork>()
// meaningless except visibility is NETWORK, where there can only be one
fun getPrimaryNetwork() = boundNetworks.firstOrNull()
fun getChargerNodes(): Set<DeviceNode> = getReachable().filter { it.powerRole != PowerRole.CONSUMER }.toSet()
fun totalEnergyInConnections(): Long = getChargerNodes().fold(0) { acc, node -> acc + node.energy }
fun maxEnergyInConnections(): Long = getChargerNodes().fold(0) { acc, node -> acc + node.energyCapacity }

70
src/main/kotlin/org/neoflock/neocomputers/network/LocalNetwork.kt
View File

@@ -1,70 +0,0 @@
package org.neoflock.neocomputers.network
class LocalNetwork(val sourceOfTruth: DeviceNode) {
val devices = HashSet<DeviceNode>()
fun getReachableByTruth() = sourceOfTruth.computeReachable()
fun performMerge(other: LocalNetwork) {
for(dev in other.devices) {
if(other in dev.boundNetworks) {
dev.boundNetworks.remove(other)
dev.boundNetworks.add(this)
}
devices.add(dev)
}
other.devices.clear()
}
fun addToNetwork(dev: DeviceNode) {
if(dev in devices) return
if(dev.reachability == Networking.Visibility.NETWORK) {
val primNet = dev.getPrimaryNetwork()
if(primNet != null) {
// Merge the networks!
// merge smallest into largest for perf
if(primNet.devices.size > devices.size) {
primNet.performMerge(this)
} else {
performMerge(primNet)
}
return
}
}
devices.add(dev)
dev.boundNetworks.add(this)
when(dev.reachability) {
Networking.Visibility.NONE -> return
Networking.Visibility.SOME -> {
dev.getPreferredFew().forEach { addToNetwork(it) }
}
Networking.Visibility.NETWORK -> {
dev.connections.forEach { addToNetwork(it) }
}
}
}
fun checkIfStillConnected(dev: DeviceNode) {
if(dev !in devices) return
if(dev in getReachableByTruth()) return
removeFromNetwork(dev)
}
fun removeFromNetwork(dev: DeviceNode) {
// TODO: this is wrong, rewrite it. We need it to make a sub-network.
if(dev == sourceOfTruth) {
throw UnsupportedOperationException("removing the source of truth is not supported")
}
if(dev !in devices) return
devices.remove(dev)
dev.boundNetworks.remove(this)
when(dev.reachability) {
Networking.Visibility.NONE -> {}
Networking.Visibility.SOME -> dev.getPreferredFew().forEach { removeFromNetwork(it) }
Networking.Visibility.NETWORK -> dev.connections.forEach { removeFromNetwork(it) }
}
}
}