refactoring

src/main/kotlin/drills/drill09/average/AverageNode.kt

@@ -21,26 +21,35 @@ class AverageNode(
         if (packet.isFeedback)
             changeValue(payload)
         else {
+            computeAverage(payload)
+            sendFeedback(packet.senderAddress)
+            spreadNewValue()
+        }
+    }
+
+    private fun computeAverage(payload: Double) {
         val newValue = (nodeValue + payload) / 2
-
         changeValue(newValue)
+    }
 
+    private fun sendFeedback(receiverAddress: Address) {
         send(
             FeedbackEpidemicPacket(
                 address,
-                    packet.senderAddress,
+                receiverAddress,
-                    newValue,
+                nodeValue,
                 if (infectStrategy == InfectStrategy.PUSH)
                     EpidemicPacket.Type.PUSH else EpidemicPacket.Type.REPLY,
                 true
             )
         )
-
-            when (infectStrategy) {
-                InfectStrategy.PUSH -> sendPush()
-                InfectStrategy.PULL -> sendPull()
-                InfectStrategy.PUSHPULL -> sendPushPull()
     }
+
+    private fun spreadNewValue() {
+        when (infectStrategy) {
+            InfectStrategy.PUSH -> sendPushToRandom()
+            InfectStrategy.PULL -> sendPullToRandom()
+            InfectStrategy.PUSHPULL -> sendPushPullToRandom()
         }
     }
 

src/main/kotlin/drills/drill09/dbreplica/DbNode.kt

@@ -37,9 +37,9 @@ class DbNode<T>(
 
     override fun infect() {
         when (infectStrategy) {
-            InfectStrategy.PUSH -> sendPush()
+            InfectStrategy.PUSH -> sendPushToRandom()
-            InfectStrategy.PULL -> sendPull()
+            InfectStrategy.PULL -> sendPullToRandom()
-            InfectStrategy.PUSHPULL -> sendPushPull()
+            InfectStrategy.PUSHPULL -> sendPushPullToRandom()
         }
 
         Thread.sleep(DELTA)

src/main/kotlin/drills/drill09/dbreplica/TestPull.kt

@@ -4,7 +4,6 @@ import util.network.epidemic.TimedPayload
 import util.network.simulator.Address
 import util.network.simulator.Network
 
-
 fun main() {
     val network = Network()
 
@@ -29,4 +28,3 @@ fun main() {
         println((it as DbNode<Int>).nodeValue)
     }
 }
-

src/main/kotlin/drills/drill09/dbreplica/TestPush.kt

@@ -4,7 +4,6 @@ import util.network.epidemic.TimedPayload
 import util.network.simulator.Address
 import util.network.simulator.Network
 
-
 fun main() {
     val network = Network()
 
@@ -29,4 +28,3 @@ fun main() {
         println((it as DbNode<Int>).nodeValue)
     }
 }
-

src/main/kotlin/drills/drill09/dbreplica/TestPushPull.kt

@@ -4,7 +4,6 @@ import util.network.epidemic.TimedPayload
 import util.network.simulator.Address
 import util.network.simulator.Network
 
-
 fun main() {
     val network = Network()
 
@@ -29,4 +28,3 @@ fun main() {
         println((it as DbNode<Int>).nodeValue)
     }
 }
-

src/main/kotlin/drills/drill09/gossip/QueryNode.kt

@@ -11,6 +11,7 @@ class QueryNode<T>(
     address: Address,
     network: Network,
     initialValue: T,
+    private val demotivatingFactor: Int = 10,
     bufferSize: Int = 1
 ) : EpidemicNode<T, FeedbackEpidemicPacket<T>>(
     address, network, initialValue, bufferSize
@@ -32,26 +33,25 @@ class QueryNode<T>(
     }
 
     override fun receivePushOrReply(packet: FeedbackEpidemicPacket<T>) {
-        //println(packet)
+        when (nodeState) {
-        if (nodeState == State.REMOVED)
+            State.REMOVED -> return
-            return
+            State.INFECTED -> whenInfected(packet)
-
+            State.SUSCEPTIBLE -> whenSusceptible(packet)
-        if (nodeState == State.SUSCEPTIBLE) {
+        }
-           // println("susceptible")
-            nodeState = State.INFECTED
-
-            queryValue = packet.payload
-            sendPush(1)
-
-            if (packet.payload == nodeValue)
-                println("find on node $address")
-        } else {
-            if (packet.isFeedback && random.nextBoolean()) {
-                nodeState = State.REMOVED
-                println("removed")
-
     }
 
+    private fun whenSusceptible(packet: FeedbackEpidemicPacket<T>) {
+        nodeState = State.INFECTED
+        queryValue = packet.payload
+
+        sendPushToRandom(2)
+
+        if (packet.payload == nodeValue)
+            println("find ${packet.payload} on node $address")
+    }
+
+    private fun whenInfected(packet: FeedbackEpidemicPacket<T>) {
+        if (!packet.isFeedback)
             send(
                 FeedbackEpidemicPacket(
                     address,
@@ -61,7 +61,9 @@ class QueryNode<T>(
                     true
                 )
             )
-        }
+
+        if (packet.isFeedback && random.nextDouble(1.0) < 1 / demotivatingFactor)
+            nodeState = State.REMOVED
     }
 
     override fun receivePull(packet: FeedbackEpidemicPacket<T>) {

src/main/kotlin/drills/drill09/gossip/TestPush.kt

@@ -5,12 +5,11 @@ import util.network.epidemic.packet.FeedbackEpidemicPacket
 import util.network.simulator.Address
 import util.network.simulator.Network
 
-
 fun main() {
     val network = Network()
 
-    repeat(10) {
+    repeat(20) {
-        QueryNode(Address(it), network, it*2)
+        QueryNode(Address(it), network, it * 2)
     }
 
     val alpha = network.getRandomNode() as QueryNode<Int>
@@ -19,7 +18,7 @@ fun main() {
     val packet = FeedbackEpidemicPacket(
         alpha.address,
         beta.address,
-        14,
+        24,
         EpidemicPacket.Type.PUSH,
         false
     )
@@ -28,4 +27,3 @@ fun main() {
 
     network.start()
 }
-

src/main/kotlin/util/network/epidemic/EpidemicNode.kt

@@ -5,7 +5,7 @@ import util.network.simulator.Address
 import util.network.simulator.Network
 import util.network.simulator.Node
 
-abstract class EpidemicNode<T, P: EpidemicPacket<T>>(
+abstract class EpidemicNode<T, P : EpidemicPacket<T>>(
     address: Address,
     network: Network,
     initialValue: T,
@@ -41,21 +41,21 @@ abstract class EpidemicNode<T, P: EpidemicPacket<T>>(
         type: EpidemicPacket.Type
     ): EpidemicPacket<T>
 
-    protected fun sendPush(numberOfReceiver: Int = 1) {
+    protected fun sendPushToRandom(numberOfReceiver: Int = 1) {
         sendToRandom(
             EpidemicPacket.Type.PUSH,
             numberOfReceiver
         )
     }
 
-    protected fun sendPull(numberOfReceiver: Int = 1) {
+    protected fun sendPullToRandom(numberOfReceiver: Int = 1) {
         sendToRandom(
             EpidemicPacket.Type.PULL,
             numberOfReceiver
         )
     }
 
-    protected fun sendPushPull(numberOfReceiver: Int = 1) {
+    protected fun sendPushPullToRandom(numberOfReceiver: Int = 1) {
         sendToRandom(
             EpidemicPacket.Type.PUSHPULL,
             numberOfReceiver
@@ -69,8 +69,6 @@ abstract class EpidemicNode<T, P: EpidemicPacket<T>>(
     protected abstract fun infect()
 
     protected fun onReceive(packet: P) {
-        //println(packet.type)
-
         when (packet.type) {
             EpidemicPacket.Type.PUSH -> receivePushOrReply(packet)
             EpidemicPacket.Type.PULL -> receivePull(packet)
@@ -125,5 +123,4 @@ abstract class EpidemicNode<T, P: EpidemicPacket<T>>(
             return EpidemicSender(threadGroup)
         }
     }
-
 }

src/main/kotlin/util/network/epidemic/packet/EpidemicPacket.kt

@@ -2,12 +2,10 @@ package util.network.epidemic.packet
 
 import util.network.simulator.packet.PayloadPacket
 
-interface EpidemicPacket<T>: PayloadPacket<T> {
+interface EpidemicPacket<T> : PayloadPacket<T> {
     val type: Type
 
     enum class Type {
         PUSH, PULL, PUSHPULL, REPLY
     }
-
 }
-

src/main/kotlin/util/network/epidemic/packet/FeedbackEpidemicPacket.kt

@@ -10,4 +10,3 @@ data class FeedbackEpidemicPacket<T>(
     override val type: EpidemicPacket.Type,
     override val isFeedback: Boolean
 ) : EpidemicPacket<T>, FeedbackPacket
-

src/main/kotlin/util/network/epidemic/packet/TimedEpidemicPacket.kt

@@ -8,4 +8,4 @@ data class TimedEpidemicPacket<T>(
     override val receiverAddress: Address,
     override val payload: TimedPayload<T>,
     override val type: EpidemicPacket.Type
-): EpidemicPacket<TimedPayload<T>>
+) : EpidemicPacket<TimedPayload<T>>

src/main/kotlin/util/network/simulator/Network.kt

@@ -17,7 +17,7 @@ class Network(threadGrupName: String = "network") {
         addresses.add(node.address)
     }
 
-    fun getRandomAddress() : Address {
+    fun getRandomAddress(): Address {
         val index = random.nextInt(addresses.size)
 
         return addresses[index]

src/main/kotlin/util/network/simulator/Test.kt

@@ -12,12 +12,12 @@ fun main() {
     network.start()
 }
 
-class TestNode(address: Address, network: Network): Node(address, network) {
+class TestNode(address: Address, network: Network) : Node(address, network) {
     override fun communicatorFactory(threadGroup: ThreadGroup): CommunicatorFactory {
         return TestCommunicatorFactory(threadGroup)
     }
 
-    private inner class TestReceiver(threadGroup: ThreadGroup): Receiver(threadGroup) {
+    private inner class TestReceiver(threadGroup: ThreadGroup) : Receiver(threadGroup) {
         override fun run() {
             if (address != Address(0))
                 return
@@ -28,7 +28,7 @@ class TestNode(address: Address, network: Network): Node(address, network) {
         }
     }
 
-    private inner class TestSender(threadGroup: ThreadGroup): Sender(threadGroup) {
+    private inner class TestSender(threadGroup: ThreadGroup) : Sender(threadGroup) {
         override fun run() {
             if (address != Address(1))
                 return
@@ -39,7 +39,8 @@ class TestNode(address: Address, network: Network): Node(address, network) {
         }
     }
 
-    private inner class TestCommunicatorFactory(threadGroup: ThreadGroup): CommunicatorFactory(threadGroup) {
+    private inner class TestCommunicatorFactory(threadGroup: ThreadGroup) :
+        CommunicatorFactory(threadGroup) {
         override fun createReceiver(): Receiver {
             return TestReceiver(threadGroup)
         }

src/main/kotlin/util/network/simulator/packet/FeedbackPacket.kt

@@ -1,5 +1,5 @@
 package util.network.simulator.packet
 
-interface FeedbackPacket: Packet {
+interface FeedbackPacket : Packet {
     val isFeedback: Boolean
 }

src/main/kotlin/util/network/simulator/packet/NetworkPacket.kt

@@ -6,4 +6,3 @@ data class NetworkPacket(
     override val senderAddress: Address,
     override val receiverAddress: Address
 ) : Packet
-

src/main/kotlin/util/network/simulator/packet/PayloadPacket.kt

@@ -1,5 +1,5 @@
 package util.network.simulator.packet
 
-interface PayloadPacket<T>: Packet {
+interface PayloadPacket<T> : Packet {
     val payload: T
 }