From 530571b3013c755800ea83d47d1cb049e985b202 Mon Sep 17 00:00:00 2001
From: Alex <alexandravigneron1@gmail.com>
Date: Thu, 2 Jul 2020 15:53:43 +0200
Subject: [PATCH] potential context fix
---
.../scadcop/solver/decentralized/mgm2/AgentBehaviour.scala | 4 ----
.../org/scadcop/solver/decentralized/mgm2/MGM2Mind.scala | 5 +----
.../scadcop/solver/decentralized/supervisor/Supervisor.scala | 2 +-
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/main/scala/org/scadcop/solver/decentralized/mgm2/AgentBehaviour.scala b/src/main/scala/org/scadcop/solver/decentralized/mgm2/AgentBehaviour.scala
index 3ec17e6..1f2c255 100644
--- a/src/main/scala/org/scadcop/solver/decentralized/mgm2/AgentBehaviour.scala
+++ b/src/main/scala/org/scadcop/solver/decentralized/mgm2/AgentBehaviour.scala
@@ -200,10 +200,6 @@ class AgentBehaviour(variable: Variable,
updatedMind = updatedMind.updateDeltas(variable: Variable, offer.moves.head.payoff)
updatedMind = updatedMind.setCurrBestOffer(Some(offer))
broadcast(InformDelta(updatedMind.deltas(variable)))
- // MM: Should be replaced by
- // broadcast(InformDelta(offer.moves.head.payoff))
- // updatedMind = updatedMind.setCurrBestOffer(Some(offer))
- // No ?
unstashAll
goto(Committed) using updatedMind
diff --git a/src/main/scala/org/scadcop/solver/decentralized/mgm2/MGM2Mind.scala b/src/main/scala/org/scadcop/solver/decentralized/mgm2/MGM2Mind.scala
index 49f44b5..0d4bab9 100644
--- a/src/main/scala/org/scadcop/solver/decentralized/mgm2/MGM2Mind.scala
+++ b/src/main/scala/org/scadcop/solver/decentralized/mgm2/MGM2Mind.scala
@@ -108,7 +108,7 @@ class MGM2Mind(val context : Context = new Context(),
val potentialContext: Context = context.fix(variable, myValue).fix(neighbour, neighbourValue)
val potentialCost: Double = potentialContext.cost(constraints)
val gain = currentCost - potentialCost
- val move = new BilateralMove(context, gain)
+ val move = new BilateralMove(potentialContext, gain)
moves ::= move
}
}
@@ -206,9 +206,6 @@ class MGM2Mind(val context : Context = new Context(),
currBestOffer)
}
- /**
- * Resets number of offers received
- */
def resetNbOffersReceived(): MGM2Mind =
new MGM2Mind(context,
isCommitted,
diff --git a/src/main/scala/org/scadcop/solver/decentralized/supervisor/Supervisor.scala b/src/main/scala/org/scadcop/solver/decentralized/supervisor/Supervisor.scala
index 2593c58..e0e4e5c 100644
--- a/src/main/scala/org/scadcop/solver/decentralized/supervisor/Supervisor.scala
+++ b/src/main/scala/org/scadcop/solver/decentralized/supervisor/Supervisor.scala
@@ -249,7 +249,7 @@ class Supervisor(val pb : DCOP, val algorithm: Algorithm) extends Actor with Sta
object Supervisor {
var counter = 0
- val NB_ROUNDS = 10
+ val NB_ROUNDS = 2
def incrementCounter() : Int = {
counter = counter + 1
--
GitLab