Skip to content
Snippets Groups Projects
Commit 1cb9d571 authored by Alex's avatar Alex
Browse files

fixed error in transition receiverAllOfferReceived->Uncommitted

parent fc98e979
No related branches found
No related tags found
No related merge requests found
...@@ -39,6 +39,10 @@ digraph finite_state_machine { ...@@ -39,6 +39,10 @@ digraph finite_state_machine {
stash stash
"]; "];
WaitingRoleAssignment -> WaitingRoleAssignment [label = "neighbour : MakeOffer(o) =>
stash
"];
WaitingRoleAssignment -> OffererWaitingValues [ label = "self : DetermineSubset(true) => WaitingRoleAssignment -> OffererWaitingValues [ label = "self : DetermineSubset(true) =>
unstashall unstashall
"]; "];
......
doc/report/figures/fsm/agent_beginning.png

191 KiB | W: | H:

doc/report/figures/fsm/agent_beginning.png

195 KiB | W: | H:

doc/report/figures/fsm/agent_beginning.png
doc/report/figures/fsm/agent_beginning.png
doc/report/figures/fsm/agent_beginning.png
doc/report/figures/fsm/agent_beginning.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -84,7 +84,9 @@ digraph finite_state_machine { ...@@ -84,7 +84,9 @@ digraph finite_state_machine {
self ! Act(shouldAct, self.currBestOffer.move) self ! Act(shouldAct, self.currBestOffer.move)
"]; "];
Committed -> Committed [label = "neighbour : Reject(someOffer) =>
Nothing
"];
GivingPartnerGoNoGo -> GivingPartnerGoNoGo [label = "self.partner : GiveGo => GivingPartnerGoNoGo -> GivingPartnerGoNoGo [label = "self.partner : GiveGo =>
......
doc/report/figures/fsm/committed.png

281 KiB | W: | H:

doc/report/figures/fsm/committed.png

294 KiB | W: | H:

doc/report/figures/fsm/committed.png
doc/report/figures/fsm/committed.png
doc/report/figures/fsm/committed.png
doc/report/figures/fsm/committed.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -41,6 +41,10 @@ digraph finite_state_machine { ...@@ -41,6 +41,10 @@ digraph finite_state_machine {
WaitingRoleAssignment -> OffererWaitingValues [ label = "self : DetermineSubset(true) => WaitingRoleAssignment -> OffererWaitingValues [ label = "self : DetermineSubset(true) =>
unstashall unstashall
"];
WaitingRoleAssignment -> WaitingRoleAssignment [label = "neighbour : MakeOffer(o) =>
stash
"]; "];
WaitingRoleAssignment -> ReceiverWaitingValues [ label = "self : DetermineSubset(false) => WaitingRoleAssignment -> ReceiverWaitingValues [ label = "self : DetermineSubset(false) =>
...@@ -109,6 +113,10 @@ digraph finite_state_machine { ...@@ -109,6 +113,10 @@ digraph finite_state_machine {
ReceiverWaitingValues -> ReceiverWaitingValues [label = "neighbour : MakeOffer(someOffer/None) => ReceiverWaitingValues -> ReceiverWaitingValues [label = "neighbour : MakeOffer(someOffer/None) =>
stash stash
"];
ReceiverWaitingValues -> ReceiverWaitingValues [label = "neighbour : Reject(someOffer) =>
Nothing
"]; "];
/*Receives a neighbour's delta*/ /*Receives a neighbour's delta*/
...@@ -152,6 +160,10 @@ digraph finite_state_machine { ...@@ -152,6 +160,10 @@ digraph finite_state_machine {
stash stash
"]; "];
ReceiverAllOffersReceived -> ReceiverAllOffersReceived [label = "neighbour : Reject(someOffer) =>
Nothing
"];
/*Receive a void offer from itself: there are no viable offers*/ /*Receive a void offer from itself: there are no viable offers*/
ReceiverAllOffersReceived -> Uncommitted [label = "self : BestOffer(None, _) => ReceiverAllOffersReceived -> Uncommitted [label = "self : BestOffer(None, _) =>
unstashall unstashall
...@@ -175,6 +187,10 @@ digraph finite_state_machine { ...@@ -175,6 +187,10 @@ digraph finite_state_machine {
/*THE END?*/ /*THE END?*/
Committed -> Committed [label = "neighbour : Reject(someOffer) =>
Nothing
"];
/*committed*/ /*committed*/
Committed -> Committed [label = "neighbour : InformDelta(delta) && (#self.neighbourDeltas < #self.neighbours-1) => Committed -> Committed [label = "neighbour : InformDelta(delta) && (#self.neighbourDeltas < #self.neighbours-1) =>
self.neighbourDeltas.put(neighbour, delta) self.neighbourDeltas.put(neighbour, delta)
...@@ -187,6 +203,10 @@ digraph finite_state_machine { ...@@ -187,6 +203,10 @@ digraph finite_state_machine {
self ! Act(shouldAct, self.currBestOffer.move) self ! Act(shouldAct, self.currBestOffer.move)
"]; "];
Uncommitted -> Uncommitted [label = "neighbour : Reject(someOffer) =>
Nothing
"];
/*uncommitted*/ /*uncommitted*/
Uncommitted -> Uncommitted [label = "neighbour : InformDelta(delta) && (#self.neighbourDeltas < #self.neighbours-1) => Uncommitted -> Uncommitted [label = "neighbour : InformDelta(delta) && (#self.neighbourDeltas < #self.neighbours-1) =>
self.neighbourDeltas.put(neighbour, delta) self.neighbourDeltas.put(neighbour, delta)
......
doc/report/figures/fsm/full_mgm2_agent.png

738 KiB | W: | H:

doc/report/figures/fsm/full_mgm2_agent.png

762 KiB | W: | H:

doc/report/figures/fsm/full_mgm2_agent.png
doc/report/figures/fsm/full_mgm2_agent.png
doc/report/figures/fsm/full_mgm2_agent.png
doc/report/figures/fsm/full_mgm2_agent.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -71,6 +71,10 @@ digraph finite_state_machine { ...@@ -71,6 +71,10 @@ digraph finite_state_machine {
stash stash
"]; "];
ReceiverWaitingValues -> ReceiverWaitingValues [label = "neighbour : Reject(someOffer) =>
Nothing
"];
/*RECEIVER ALL OFFERS RECEIVED*/ /*RECEIVER ALL OFFERS RECEIVED*/
...@@ -79,6 +83,10 @@ digraph finite_state_machine { ...@@ -79,6 +83,10 @@ digraph finite_state_machine {
stash stash
"]; "];
ReceiverAllOffersReceived -> ReceiverAllOffersReceived [label = "neighbour : Reject(someOffer) =>
Nothing
"];
/*Receive a void offer from itself: there are no viable offers*/ /*Receive a void offer from itself: there are no viable offers*/
ReceiverAllOffersReceived -> Uncommitted [label = "self : BestOffer(None, _) => ReceiverAllOffersReceived -> Uncommitted [label = "self : BestOffer(None, _) =>
unstashall unstashall
......
doc/report/figures/fsm/receiver.png

287 KiB | W: | H:

doc/report/figures/fsm/receiver.png

300 KiB | W: | H:

doc/report/figures/fsm/receiver.png
doc/report/figures/fsm/receiver.png
doc/report/figures/fsm/receiver.png
doc/report/figures/fsm/receiver.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -80,6 +80,10 @@ digraph finite_state_machine { ...@@ -80,6 +80,10 @@ digraph finite_state_machine {
Nothing Nothing
"]; "];
Uncommitted -> Uncommitted [label = "neighbour : Reject(someOffer) =>
Nothing
"];
/*uncommitted*/ /*uncommitted*/
Uncommitted -> ActSolo [label = "neighbour : InformDelta(delta) && (#self.neighbourDeltas == #self.neighbours-1) => Uncommitted -> ActSolo [label = "neighbour : InformDelta(delta) && (#self.neighbourDeltas == #self.neighbours-1) =>
self.neighbourDeltas.put(neighbour, delta) self.neighbourDeltas.put(neighbour, delta)
......
doc/report/figures/fsm/uncommitted.png

232 KiB | W: | H:

doc/report/figures/fsm/uncommitted.png

243 KiB | W: | H:

doc/report/figures/fsm/uncommitted.png
doc/report/figures/fsm/uncommitted.png
doc/report/figures/fsm/uncommitted.png
doc/report/figures/fsm/uncommitted.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -318,7 +318,7 @@ class AgentBehaviour(variable: Variable, ...@@ -318,7 +318,7 @@ class AgentBehaviour(variable: Variable,
rejectOffers(updatedMind.receivedOffers) //decline all offers rejectOffers(updatedMind.receivedOffers) //decline all offers
broadcast(InformDelta(updatedMind.deltas(variable))) //inform all neighbours broadcast(InformDelta(updatedMind.deltas(variable))) //inform all neighbours
unstashAll unstashAll
goto(Committed) using updatedMind goto(Uncommitted) using updatedMind
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment