X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcore%2Futil%2FMultiMap.hpp;h=5fbd80e102d5b2244a9d4427191e2e087758920b;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=c52a634f92c2670e4d805abccbf4fdf88859b807;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git diff --git a/include/anna/core/util/MultiMap.hpp b/include/anna/core/util/MultiMap.hpp index c52a634..5fbd80e 100644 --- a/include/anna/core/util/MultiMap.hpp +++ b/include/anna/core/util/MultiMap.hpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not Nothingness Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// http://redmine.teslayout.com/projects/anna-suite -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of the copyright holder nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: eduardo.ramos.testillano@gmail.com -// cisco.tierra@gmail.com +// ANNA - Anna is Not Nothingness Anymore // +// // +// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo // +// // +// See project site at http://redmine.teslayout.com/projects/anna-suite // +// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE // #ifndef anna_core_util_MultiMap_hpp @@ -60,14 +32,14 @@ namespace anna { */ template < typename T, typename SortBy, typename TKey = int > class MultiMap : public std::vector { struct LessT : public std::binary_function { - bool operator()(const T* first, const T* second) const throw() { + bool operator()(const T* first, const T* second) const { return SortBy::value(first) < SortBy::value(second); } }; // El orden de los operandos está impuesto por cómo se invoca al operator() desde stl_algo.h (2685). struct LessKey : public std::binary_function { - bool operator()(const T* _vv, const TKey& searched) const throw() { + bool operator()(const T* _vv, const TKey& searched) const { return SortBy::value(_vv) < searched; } }; @@ -100,7 +72,7 @@ public: \return \em true si ha registrado la nueva instancia o \em false en otro caso. */ bool add(T* _vv) - throw(RuntimeException) { + noexcept(false) { if(_vv == NULL) return false; @@ -122,12 +94,12 @@ public: \return \em true si la instancia recibida como parametro esta contenido en el map o \em en otro caso. */ - bool contains(const T* _vv) const throw() { return (_vv == NULL) ? false : (find(SortBy::value(_vv)) != NULL); } + bool contains(const T* _vv) const { return (_vv == NULL) ? false : (find(SortBy::value(_vv)) != NULL); } /** * Borra las entradas contenidas en el vector ordenado y libera la memoria asociada a las mismas. */ - void clearAndDestroy() throw() { + void clearAndDestroy() { for(iterator ii = this->begin(), maxii = this->end(); ii != maxii; ii ++) delete data(ii); @@ -140,7 +112,7 @@ public: \return La instancia correspondiente a la entrada borrada o NULL si no se encontró ninguna entrada válida. */ T* erase(const T* _vv) - throw(RuntimeException) { + noexcept(false) { if(_vv == NULL) return NULL; @@ -165,7 +137,7 @@ public: * \return La nueva posición a la que debería pasar el iterador una vez borrada la entrada. * */ - iterator erase_iterator(iterator ii) throw() { return container::erase(ii); } + iterator erase_iterator(iterator ii) { return container::erase(ii); } /** Devuelve la instancia asociada a la clave recibida como parametro o NULL si no existe. @@ -173,7 +145,7 @@ public: \return la instancia asociada a la clave recibida como parametro o NULL si no existe. */ T* find(const TKey& key) - throw() { + { iterator maxii = this->end(); iterator ii = lower_bound(this->begin(), maxii, key, a_lessKey); @@ -189,7 +161,7 @@ public: * \return el iterador a la instancia asociada a la clave recibida. */ iterator find_iterator(const TKey& key) - throw() { + { return lower_bound(this->begin(), this->end(), key, a_lessKey); } @@ -198,7 +170,7 @@ public: \param key Clave a buscar en el map. \return la instancia asociada a la clave recibida como parametro o NULL si no existe. */ - const T* find(const TKey& key) const throw() { + const T* find(const TKey& key) const { return const_cast *>(this)->find(key); } @@ -206,13 +178,13 @@ public: Devuelve el objeto referenciado por el iterador. \return El objeto referenciado por el iterador. */ - static T* data(iterator ii) throw() { return *ii; } + static T* data(iterator ii) { return *ii; } /** Devuelve el objeto referenciado por el iterador. \return El objeto referenciado por el iterador. */ - static const T* data(const_iterator ii) throw() { return *ii; } + static const T* data(const_iterator ii) { return *ii; } private: LessT a_lessT;