Advertisement
Guest User

Untitled

a guest
Jun 4th, 2018
200
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 4.03 KB | None | 0 0
  1. diff --git a/src/veins/modules/utility/TimerManager.cc b/src/veins/modules/utility/TimerManager.cc
  2. index f6897d76..af285521 100644
  3. --- a/src/veins/modules/utility/TimerManager.cc
  4. +++ b/src/veins/modules/utility/TimerManager.cc
  5. @@ -30,7 +30,7 @@ struct Veins::TimerMessage : public omnetpp::cMessage {
  6.  };
  7.  
  8.  TimerSpecification::TimerSpecification(std::function<void()> callback)
  9. -    : start_mode_(StartMode::IMMEDIATE), end_mode_(EndMode::OPEN), period_(-1), callback_(callback) {}
  10. +    : start_mode_(StartMode::immediate), end_mode_(EndMode::open), period_(-1), callback_(callback) {}
  11.  
  12.  TimerSpecification &TimerSpecification::interval(simtime_t interval) {
  13.    ASSERT(interval > 0);
  14. @@ -39,37 +39,37 @@ TimerSpecification &TimerSpecification::interval(simtime_t interval) {
  15.  }
  16.  
  17.  TimerSpecification &TimerSpecification::relativeStart(simtime_t start) {
  18. -  start_mode_ = StartMode::RELATIVE;
  19. +  start_mode_ = StartMode::relative;
  20.    start_ = start;
  21.    return *this;
  22.  }
  23.  
  24.  TimerSpecification &TimerSpecification::absoluteStart(simtime_t start) {
  25. -  start_mode_ = StartMode::ABSOLUTE;
  26. +  start_mode_ = StartMode::absolute;
  27.    start_ = start;
  28.    return *this;
  29.  }
  30.  
  31.  TimerSpecification &TimerSpecification::relativeEnd(simtime_t end) {
  32. -  end_mode_ = EndMode::RELATIVE;
  33. +  end_mode_ = EndMode::relative;
  34.    end_time_ = end;
  35.    return *this;
  36.  }
  37.  
  38.  TimerSpecification &TimerSpecification::absoluteEnd(simtime_t end) {
  39. -  end_mode_ = EndMode::ABSOLUTE;
  40. +  end_mode_ = EndMode::absolute;
  41.    end_time_ = end;
  42.    return *this;
  43.  }
  44.  
  45.  TimerSpecification &TimerSpecification::repititions(size_t n) {
  46. -  end_mode_ = EndMode::REPITITION;
  47. +  end_mode_ = EndMode::repetition;
  48.    end_count_ = n;
  49.    return *this;
  50.  }
  51.  
  52.  TimerSpecification &TimerSpecification::openEnd() {
  53. -  end_mode_ = EndMode::OPEN;
  54. +  end_mode_ = EndMode::open;
  55.    return *this;
  56.  }
  57.  
  58. @@ -83,28 +83,28 @@ TimerSpecification &TimerSpecification::oneshotAt(omnetpp::simtime_t at) {
  59.  
  60.  void TimerSpecification::finalize() {
  61.    switch (start_mode_) {
  62. -  case StartMode::RELATIVE:
  63. +  case StartMode::relative:
  64.      start_ += simTime();
  65. -    start_mode_ = StartMode::ABSOLUTE;
  66. +    start_mode_ = StartMode::absolute;
  67.      break;
  68. -  case StartMode::ABSOLUTE:
  69. +  case StartMode::absolute:
  70.      break;
  71. -  case StartMode::IMMEDIATE:
  72. +  case StartMode::immediate:
  73.      start_ = simTime() + period_;
  74.      break;
  75.    }
  76.  
  77.    switch (end_mode_) {
  78. -  case EndMode::RELATIVE:
  79. +  case EndMode::relative:
  80.      end_time_ += simTime();
  81. -    end_mode_ = EndMode::ABSOLUTE;
  82. +    end_mode_ = EndMode::absolute;
  83.      break;
  84. -  case EndMode::ABSOLUTE:
  85. +  case EndMode::absolute:
  86.      break;
  87. -  case EndMode::REPITITION:
  88. +  case EndMode::repetition:
  89.      end_time_ = start_ + ((end_count_ - 1) * period_);
  90. -    end_mode_ = EndMode::ABSOLUTE;
  91. -  case EndMode::OPEN:
  92. +    end_mode_ = EndMode::absolute;
  93. +  case EndMode::open:
  94.      break;
  95.    }
  96.  }
  97. @@ -113,7 +113,7 @@ bool TimerSpecification::validOccurence(simtime_t time) const {
  98.    const bool afterStart = time >= start_;
  99.    const bool beforeEnd = time <= end_time_;
  100.    const bool atPeriod = omnetpp::fmod(time - start_, period_) == 0;
  101. -  return afterStart && (beforeEnd || end_mode_ == EndMode::OPEN) && atPeriod;
  102. +  return afterStart && (beforeEnd || end_mode_ == EndMode::open) && atPeriod;
  103.  }
  104.  
  105.  TimerManager::TimerManager(omnetpp::cSimpleModule *parent) : parent_(parent) { ASSERT(parent_); }
  106. diff --git a/src/veins/modules/utility/TimerManager.h b/src/veins/modules/utility/TimerManager.h
  107. index 0f0b5ebf..45f97134 100644
  108. --- a/src/veins/modules/utility/TimerManager.h
  109. +++ b/src/veins/modules/utility/TimerManager.h
  110. @@ -134,8 +134,8 @@ public:
  111.  private:
  112.    friend TimerManager;
  113.  
  114. -  enum class StartMode { RELATIVE, ABSOLUTE, IMMEDIATE };
  115. -  enum class EndMode { RELATIVE, ABSOLUTE, REPITITION, OPEN };
  116. +  enum class StartMode { relative, absolute, immediate };
  117. +  enum class EndMode { relative, absolute, repetition, open };
  118.  
  119.    /**
  120.     * Finalizes this instance such that its values are independent of current simulation time.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement