github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Code cleanup

pull/2/head
Tatsuhiro Tsujikawa 2011-10-30 00:13:08 +09:00
parent 5749647ae5
commit e23e9a4a65
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/SegList.h
View File

@ -51,7 +51,7 @@ public:
void clear() void clear()
{ {
seg_.clear(); segs_.clear();
index_ = 0; index_ = 0;
val_ = std::numeric_limits<T>::min(); val_ = std::numeric_limits<T>::min();
} }
@ -61,12 +61,12 @@ public:
// are all merged into one. This function resets current position. // are all merged into one. This function resets current position.
void normalize() void normalize()
{ {
if(!seg_.empty()) { if(!segs_.empty()) {
std::sort(seg_.begin(), seg_.end()); std::sort(segs_.begin(), segs_.end());
std::vector<std::pair<T, T> > s; std::vector<std::pair<T, T> > s;
s.push_back(seg_.front()); s.push_back(segs_.front());
for(size_t i = 1, len = seg_.size(); i < len; ++i) { for(size_t i = 1, len = segs_.size(); i < len; ++i) {
const std::pair<T, T>& x = seg_[i]; const std::pair<T, T>& x = segs_[i];
if(x.first <= s.back().second) { if(x.first <= s.back().second) {
if(s.back().second < x.second) { if(s.back().second < x.second) {
s.back().second = x.second; s.back().second = x.second;
@ -75,9 +75,9 @@ public:
s.push_back(x); s.push_back(x);
} }
} }
s.swap(seg_); s.swap(segs_);
index_ = 0; index_ = 0;
val_ = seg_.front().first; val_ = segs_.front().first;
} }
} }
@ -85,17 +85,17 @@ public:
void add(T a, T b) void add(T a, T b)
{ {
if(a < b) { if(a < b) {
if(seg_.empty()) { if(segs_.empty()) {
val_ = std::max(val_, a); val_ = std::max(val_, a);
} }
seg_.push_back(std::make_pair(a, b)); segs_.push_back(std::make_pair(a, b));
} }
} }
// Returns true if next value is available. Otherwise returns false. // Returns true if next value is available. Otherwise returns false.
bool hasNext() const bool hasNext() const
{ {
return index_ < seg_.size() && val_ < seg_[index_].second; return index_ < segs_.size() && val_ < segs_[index_].second;
} }
// Returns next value. Advance current position to the next. If // Returns next value. Advance current position to the next. If
@ -103,11 +103,11 @@ public:
T next() T next()
{ {
T res; T res;
if(index_ < seg_.size()) { if(index_ < segs_.size()) {
res = val_++; res = val_++;
if(val_ == seg_[index_].second) { if(val_ == segs_[index_].second) {
++index_; ++index_;
val_ = seg_[index_].first; val_ = segs_[index_].first;
} }
} else { } else {
res = 0; res = 0;
@ -120,7 +120,7 @@ public:
T peek() const T peek() const
{ {
T res; T res;
if(index_ < seg_.size()) { if(index_ < segs_.size()) {
res = val_; res = val_;
} else { } else {
res = 0; res = 0;
@ -128,7 +128,7 @@ public:
return res; return res;
} }
private: private:
std::vector<std::pair<T, T> > seg_; std::vector<std::pair<T, T> > segs_;
size_t index_; size_t index_;
T val_; T val_;
}; };