fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-11 20:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Cleaned up rak::priority_queue.

Browse Source 
* Added download time left display, need to tweak it.

* Removed libtorrent/src/download/download_setup.cc.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@607 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2005-12-09 05:22:36 +00:00
parent 12ef47da3c
commit 7cc377b550
11 changed files with 102 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rak/priority_queue.h
+46 -10
View File
@@ -46,7 +46,7 @@
namespace rak {
template <typename Value, typename Compare, typename Equal, typename Remove>
template <typename Value, typename Compare, typename Equal>
class priority_queue : public std::vector<Value> {
public:
typedef std::vector<Value> base_type;
@@ -59,8 +59,8 @@ public:
using base_type::size;
using base_type::empty;
priority_queue(Compare l = Compare(), Equal e = Equal(), Remove r = Remove())
: m_compare(l), m_equal(e), m_remove(r) {}
priority_queue(Compare l = Compare(), Equal e = Equal())
: m_compare(l), m_equal(e) {}
const_reference top() const {
return base_type::front();
@@ -76,16 +76,23 @@ public:
std::push_heap(base_type::begin(), base_type::end(), m_compare);
}
// Removes 'value' from the queue. The Remove functor must change the
// priority of the value such that it comes before any other in the
// queue.
void erase(value_type value) {
iterator itr = std::find_if(base_type::begin(), base_type::end(), std::bind2nd(m_equal, value));
template <typename Key>
iterator find(const Key& key) {
return std::find_if(base_type::begin(), base_type::end(), std::bind2nd(m_equal, key));
}
template <typename Key>
void erase(const Key& key) {
erase(find(key));
}
// Removes 'itr' from the queue. This assumes 'itr' has been
// modified such that it has a higher priority than any other
// element in the queue.
void erase(iterator itr) {
if (itr == base_type::end())
return;
m_remove(*itr);
std::push_heap(base_type::begin(), ++itr, m_compare);
pop();
}
@@ -93,9 +100,38 @@ public:
private:
Compare m_compare;
Equal m_equal;
Remove m_remove;
};
// Iterate while the top node has higher priority, as 'Compare'
// returns false.
template <typename Queue, typename Compare>
class queue_pop_iterator
: public std::iterator<std::forward_iterator_tag, void, void, void, void> {
public:
typedef Queue container_type;
queue_pop_iterator() : m_queue(NULL) {}
queue_pop_iterator(Queue* q, Compare c) : m_queue(q), m_compare(c) {}
queue_pop_iterator& operator ++ () { m_queue->pop(); return *this; }
queue_pop_iterator& operator ++ (int) { m_queue->pop(); return *this; }
typename container_type::const_reference operator * () { return m_queue->top(); }
bool operator != (const queue_pop_iterator& itr) { return !m_queue->empty() && !m_compare(m_queue->top()); }
bool operator == (const queue_pop_iterator& itr) { return m_queue->empty() || m_compare(m_queue->top()); }
private:
Queue* m_queue;
Compare m_compare;
};
template <typename Queue, typename Compare>
inline queue_pop_iterator<Queue, Compare>
queue_popper(Queue& queue, Compare comp) {
return queue_pop_iterator<Queue, Compare>(&queue, comp);
}
}
#endif