Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/main/java/election_structure/Ballot.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ protected void setup() {
Arrays.asList(searchAgentByType("Mediator")));

sendMessage(foundAgent.get(0).getName().getLocalName(), ACLMessage.INFORM, "CHECK");

}

@Override
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/election_structure/BaseAgent.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ public abstract class BaseAgent extends Agent {
public static final String QUORUM = "QUORUM";
public static final String CANDIDATURE = "CANDIDATURE";
public static final String PROPOSAL = "PROPOSAL";
public static final String CHECK = "CHECK";
public static final String FAILURE = "FAILURE";
public static final String READY = "READY";
public static final String RESULTS = "RESULTS";
public static final String ELECTIONLOG = "ELECTIONLOG";
public static final String CANDIDCODE = "CANDIDCODE";
public static final String CANDIDATE = "CANDIDATE";

public static final String ANSI_RESET = "\u001B[0m";
public static final String ANSI_BLUE = "\u001B[34m";
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/election_structure/Mediator.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,19 @@ public void action () {
case REGISTERED:
verifyElectionStatus(msg, splittedMsg);
break;
case "CHECK":
case CHECK:
setupBallot(msg);
break;
case "FAILURE":
case FAILURE:
resetElection(myAgent);
break;
case "READY":
case READY:
startElection(splittedMsg);
break;
case "RESULTS":
case RESULTS:
processElectionResults(msg, splittedMsg);
break;
case "ELECTIONLOG":
case ELECTIONLOG:
logger.log(Level.INFO, String.format("%s %s %s", ANSI_PURPLE, msg.getContent(), ANSI_RESET));
resetElection(myAgent);
break;
Expand Down Expand Up @@ -161,7 +161,7 @@ private void verifyElectionStatus(ACLMessage msg, String[] splittedMsg) {
if( splittedMsg[2].startsWith(Integer.toString(votingCode)) )
registeredQuorum++;

if ( msg.getContent().endsWith("CANDIDATURE") ) {
if ( msg.getContent().endsWith(CANDIDATURE) ) {
preCandidates.add(msg.getSender());
}

Expand Down
7 changes: 3 additions & 4 deletions src/main/java/election_structure/Voter.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,17 @@ public void action () {
case INVITE:
registerForElection(this.myAgent, msg, splittedMsg);
break;
case "CANDIDCODE":
case CANDIDCODE:
myCandidatureCode = Integer.parseInt(splittedMsg[1]);
registerCandidature(myAgent, myCandidatureCode, msg);
break;
case "CANDIDATE":
case CANDIDATE:
String prop = msg.getContent().substring(msg.getContent().indexOf(PROPOSAL) + PROPOSAL.length() + 1);

recvProposals.put(splittedMsg[1], prop);
candidatesCount++;
break;
case "RESULT":
case RESULTS:
logger.log(Level.INFO, getLogContent(splittedMsg));
break;
default:
Expand Down Expand Up @@ -217,7 +217,6 @@ protected void onWake() {
private void informVotingRegistration() {
ACLMessage informMsg = new ACLMessage(ACLMessage.INFORM);


String sendMsg = String.format("%s IN %d", REGISTERED, votingCode);

if ( candidate )
Expand Down