Joseph Bane avatar Joseph Bane committed 8f519c8 Merge

Merged with Graham.

Comments (0)

Files changed (1)

 
   if (timeSince > delta) {
     // This represents rejection of the original request.
-    cout << "REJECT: Request " << r.getID() << " (" << timeSince << ", " << delta << ") " << " [" << simulation->status() << "]\n";
+    cout << "REJECT: Request " << r.getID() << " (" << timeSince << ", " << delta << ")\n";
   }
   else {
     // Create new message objects to ask for votes
   else {
     const int timeSince = simulation->getTime() - m.getRequestTime();
     
-    if ( (int(m.getVote()) == int(Message::vote::accept))
-	 && (timeSince < delta*2) ) {
+    //if ( (int(m.getVote()) == int(Message::vote::accept))
+    // && (timeSince < delta*2) ) {
+    if (int(m.getVote()) == int(Message::vote::accept)) {
       
       // Accept Request
       cout << "PID: " << id << "  ACCEPT: Request " << m.getRequestID() << " (" << timeSince << ", " << delta*2 << ")\n";
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.