Commits

Joseph Bane  committed 02f0a80

Fixed merge messup.

  • Participants
  • Parent commits cbffdb1

Comments (0)

Files changed (1)

File Simulation.cpp

 {
     Time = 0;
     majority = 2;  // based on knowing there are 3 total nodes
-    highestRequest = 1;
     const float FailureProbability = 0.2f;
     const int Delta = 20;
     for(size_t i = 0; i < ProcessCount; ++i)
 }
 
 
-string Simulation::status()
+string Simulation::status() const
 {
   if (majorityPresent()) {
     return string("MAJORITY");
 }
 
 
-bool Simulation::majorityPresent()
+bool Simulation::majorityPresent() const
 {
   int upNodes = 0;
   for(size_t i = 0; i < Processes.size(); ++i) {