From c5a62b5490c45995eb2192d0ca8d7acdb9ee35fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gl=C3=B6ckner?= Date: Tue, 29 Mar 2016 17:00:48 +0200 Subject: Reformatted minor headers --- src/rangemap.h | 90 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 42 deletions(-) (limited to 'src/rangemap.h') diff --git a/src/rangemap.h b/src/rangemap.h index 34a50b1..4c427e7 100644 --- a/src/rangemap.h +++ b/src/rangemap.h @@ -24,68 +24,74 @@ * along with DrumGizmo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#ifndef __DRUMGIZMO_RANGEMAP_H__ -#define __DRUMGIZMO_RANGEMAP_H__ +#pragma once #include #include -template -class RangeMap { +template class RangeMap +{ public: - void insert(T1 from, T1 to, T2 value); - std::vector get(T1 from, T1 to); - std::vector get(T1 at); + void insert(T1 from, T1 to, T2 value); + std::vector get(T1 from, T1 to); + std::vector get(T1 at); private: - std::multimap, T2> values; + std::multimap, T2> values; }; -template +template void RangeMap::insert(T1 from, T1 to, T2 value) { - if(from < to) values.insert(std::make_pair(std::make_pair(from, to), value)); - else values.insert(std::make_pair(std::make_pair(to, from), value)); + if(from < to) + { + values.insert(std::make_pair(std::make_pair(from, to), value)); + } + else + { + values.insert(std::make_pair(std::make_pair(to, from), value)); + } } -template +template std::vector RangeMap::get(T1 from, T1 to) { - std::vector res; + std::vector res; - typename std::multimap, T2>::iterator i = values.begin(); - while(i != values.end()) { - T1 a = i->first.first; - T1 b = i->first.second; - if( - (from >= a && to <= b) || // inside - (from <= a && to >= b) || // containing - (from <= a && to >= a && to <= b) || // overlapping lower - (from >= a && from <= b && to >= b) // overlapping upper - ) - res.push_back(i->second); - i++; - } + typename std::multimap, T2>::iterator i = values.begin(); + while(i != values.end()) + { + T1 a = i->first.first; + T1 b = i->first.second; + if((from >= a && to <= b) || // inside + (from <= a && to >= b) || // containing + (from <= a && to >= a && to <= b) || // overlapping lower + (from >= a && from <= b && to >= b) // overlapping upper + ) + { + res.push_back(i->second); + } + i++; + } - return res; + return res; } -template -std::vector RangeMap::get(T1 at) +template std::vector RangeMap::get(T1 at) { - std::vector res; + std::vector res; - typename std::multimap, T2>::iterator i = values.begin(); - while(i != values.end()) { - T1 a = i->first.first; - T1 b = i->first.second; - if(at >= a && at <= b) - res.push_back(i->second); - i++; - } + typename std::multimap, T2>::iterator i = values.begin(); + while(i != values.end()) + { + T1 a = i->first.first; + T1 b = i->first.second; + if(at >= a && at <= b) + { + res.push_back(i->second); + } + i++; + } - return res; + return res; } - - -#endif/*__DRUMGIZMO_RANGEMAP_H__*/ -- cgit v1.2.3