From 12a89783ef087052d73ddcbf065fe08901333f34 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 8 Oct 2007 02:57:21 +0000 Subject: Eliminate redundant object collections (ObjectModel having a separate collection of its children). Fix renaming/creation of children (fix ticket 97). git-svn-id: http://svn.drobilla.net/lad/raul@844 a436a847-0d15-0410-975c-d299462d15a1 --- raul/Table.hpp | 3 +++ raul/TableImpl.hpp | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'raul') diff --git a/raul/Table.hpp b/raul/Table.hpp index 1d20a9c..fa3848c 100644 --- a/raul/Table.hpp +++ b/raul/Table.hpp @@ -86,7 +86,10 @@ public: std::pair cram(const Table& range); + const_iterator find(const_iterator start, const_iterator end, const K& key) const; const_iterator find(const K& key) const; + + iterator find(iterator start, iterator end, const K& key); iterator find(const K& key); const_iterator find_range_end(const_iterator left, bool (*comp)(const K&,const K&)) const; diff --git a/raul/TableImpl.hpp b/raul/TableImpl.hpp index 1bb4699..d01c0ca 100644 --- a/raul/TableImpl.hpp +++ b/raul/TableImpl.hpp @@ -65,12 +65,21 @@ Table::find(const K& key) const template typename Table::iterator Table::find(const K& key) +{ + return find(begin(), end(), key); +} + + +/** Binary search (O(log(end - start))) */ +template +typename Table::iterator +Table::find(iterator start, iterator finish, const K& key) { if (size() == 0) return end(); - size_t lower = 0; - size_t upper = size() - 1; + size_t lower = start._index; + size_t upper = finish._index - 1; size_t i; while (upper >= lower) { -- cgit v1.2.1