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

@@ -21,35 +21,26 @@ 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) {
+            changeValue(newValue)
+
             send(
                 FeedbackEpidemicPacket(
                     address,
-                receiverAddress,
+                    packet.senderAddress,
-                nodeValue,
+                    newValue,
                     if (infectStrategy == InfectStrategy.PUSH)
                         EpidemicPacket.Type.PUSH else EpidemicPacket.Type.REPLY,
                     true
                 )
             )
-    }
 
-    private fun spreadNewValue() {
             when (infectStrategy) {
-            InfectStrategy.PUSH -> sendPushToRandom()
+                InfectStrategy.PUSH -> sendPush()
-            InfectStrategy.PULL -> sendPullToRandom()
+                InfectStrategy.PULL -> sendPull()
-            InfectStrategy.PUSHPULL -> sendPushPullToRandom()
+                InfectStrategy.PUSHPULL -> sendPushPull()
+            }
         }
     }
 

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

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

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

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

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

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

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

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

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

@@ -11,7 +11,6 @@ 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
@@ -33,25 +32,26 @@ class QueryNode<T>(
     }
 
     override fun receivePushOrReply(packet: FeedbackEpidemicPacket<T>) {
-        when (nodeState) {
+        //println(packet)
-            State.REMOVED -> return
+        if (nodeState == State.REMOVED)
-            State.INFECTED -> whenInfected(packet)
+            return
-            State.SUSCEPTIBLE -> whenSusceptible(packet)
-        }
-    }
 
-    private fun whenSusceptible(packet: FeedbackEpidemicPacket<T>) {
+        if (nodeState == State.SUSCEPTIBLE) {
+           // println("susceptible")
             nodeState = State.INFECTED
-        queryValue = packet.payload
 
-        sendPushToRandom(2)
+            queryValue = packet.payload
+            sendPush(1)
 
             if (packet.payload == nodeValue)
-            println("find ${packet.payload} on node $address")
+                println("find on node $address")
+        } else {
+            if (packet.isFeedback && random.nextBoolean()) {
+                nodeState = State.REMOVED
+                println("removed")
+
             }
 
-    private fun whenInfected(packet: FeedbackEpidemicPacket<T>) {
-        if (!packet.isFeedback)
             send(
                 FeedbackEpidemicPacket(
                     address,
@@ -61,9 +61,7 @@ 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,10 +5,11 @@ import util.network.epidemic.packet.FeedbackEpidemicPacket
 import util.network.simulator.Address
 import util.network.simulator.Network
 
+
 fun main() {
     val network = Network()
 
-    repeat(20) {
+    repeat(10) {
         QueryNode(Address(it), network, it*2)
     }
 
@@ -18,7 +19,7 @@ fun main() {
     val packet = FeedbackEpidemicPacket(
         alpha.address,
         beta.address,
-        24,
+        14,
         EpidemicPacket.Type.PUSH,
         false
     )
@@ -27,3 +28,4 @@ fun main() {
 
     network.start()
 }
+

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

@@ -41,21 +41,21 @@ abstract class EpidemicNode<T, P : EpidemicPacket<T>>(
         type: EpidemicPacket.Type
     ): EpidemicPacket<T>
 
-    protected fun sendPushToRandom(numberOfReceiver: Int = 1) {
+    protected fun sendPush(numberOfReceiver: Int = 1) {
         sendToRandom(
             EpidemicPacket.Type.PUSH,
             numberOfReceiver
         )
     }
 
-    protected fun sendPullToRandom(numberOfReceiver: Int = 1) {
+    protected fun sendPull(numberOfReceiver: Int = 1) {
         sendToRandom(
             EpidemicPacket.Type.PULL,
             numberOfReceiver
         )
     }
 
-    protected fun sendPushPullToRandom(numberOfReceiver: Int = 1) {
+    protected fun sendPushPull(numberOfReceiver: Int = 1) {
         sendToRandom(
             EpidemicPacket.Type.PUSHPULL,
             numberOfReceiver
@@ -69,6 +69,8 @@ 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)
@@ -123,4 +125,5 @@ abstract class EpidemicNode<T, P : EpidemicPacket<T>>(
             return EpidemicSender(threadGroup)
         }
     }
+
 }

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

@@ -8,4 +8,6 @@ interface EpidemicPacket<T> : PayloadPacket<T> {
     enum class Type {
         PUSH, PULL, PUSHPULL, REPLY
     }
+
 }
+

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

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

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

@@ -39,8 +39,7 @@ class TestNode(address: Address, network: Network) : Node(address, network) {
         }
     }
 
-    private inner class TestCommunicatorFactory(threadGroup: ThreadGroup) :
+    private inner class TestCommunicatorFactory(threadGroup: ThreadGroup): CommunicatorFactory(threadGroup) {
-        CommunicatorFactory(threadGroup) {
         override fun createReceiver(): Receiver {
             return TestReceiver(threadGroup)
         }

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

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