--- trunk/OOPSE-4/src/utils/PropertyMap.cpp 2004/10/13 22:28:51 1566 +++ trunk/OOPSE-4/src/utils/PropertyMap.cpp 2005/01/12 22:41:40 1930 @@ -1,100 +1,121 @@ -/* - * Copyright (C) 2000-2004 Object Oriented Parallel Simulation Engine (OOPSE) project - * - * Contact: oopse@oopse.org - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. - * All we ask is that proper credit is given for our work, which includes - * - but is not limited to - adding the above copyright notice to the beginning - * of your source code files, and to any copyright notice that you may distribute - * with programs based on this work. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + /* + * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. * + * The University of Notre Dame grants you ("Licensee") a + * non-exclusive, royalty free, license to use, modify and + * redistribute this software in source and binary code form, provided + * that the following conditions are met: + * + * 1. Acknowledgement of the program authors must be made in any + * publication of scientific results based in part on use of the + * program. An acceptable form of acknowledgement is citation of + * the article in which the program was described (Matthew + * A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher + * J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented + * Parallel Simulation Engine for Molecular Dynamics," + * J. Comput. Chem. 26, pp. 252-271 (2005)) + * + * 2. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 3. 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. + * + * This software is provided "AS IS," without a warranty of any + * kind. All express or implied conditions, representations and + * warranties, including any implied warranty of merchantability, + * fitness for a particular purpose or non-infringement, are hereby + * excluded. The University of Notre Dame and its licensors shall not + * be liable for any damages suffered by licensee as a result of + * using, modifying or distributing the software or its + * derivatives. In no event will the University of Notre Dame or its + * licensors be liable for any lost revenue, profit or data, or for + * direct, indirect, special, consequential, incidental or punitive + * damages, however caused and regardless of the theory of liability, + * arising out of the use of or inability to use software, even if the + * University of Notre Dame has been advised of the possibility of + * such damages. */ -#include "PropertyMap.hpp" +#include "utils/PropertyMap.hpp" #include +#include +namespace oopse { + PropertyMap::~PropertyMap(){ clearProperties(); } -PropertyMap::addProperty(GenericData* genData){ - std::map::iterator iter; +void PropertyMap::addProperty(GenericData* genData){ + std::map::iterator iter; - assert( genData != NULL); + iter = propMap_.find(genData->getID()); - iter = propMap_.find(genData->getID()); - - if (iter == propMap_.end()){ - propMap_.insert(make_pair(genData->getID(), genData)); - } - else - logger.warn(""); - + if (iter == propMap_.end()){ + propMap_.insert(std::make_pair(genData->getID(), genData)); + } else { + delete iter->second; + iter->second = genData; + } } -void PropertyMap::removeProperty(std::string& propName){ +bool PropertyMap::removeProperty(const std::string& propName){ std::map::iterator iter; - iter = propMap_.find(propName); + iter = propMap_.find(propName); - if (iter != propMap.end()){ - delete iter->second; - propMap_.erase(iter); - } - else - logger.warn("Can not find property with name: " + propName); + if (iter != propMap_.end()){ + delete iter->second; + propMap_.erase(iter); + return true; + } else { + //logger.warn("Can not find property with name: " + propName); + return false; + } } void PropertyMap::clearProperties(){ - std::map::iterator iter; + std::map::iterator iter; - for (iter = propMap_.begin(); iter != propMap_.end(); ++iter) - delete iter->second; - - propMap_.clear(); + for (iter = propMap_.begin(); iter != propMap_.end(); ++iter) + delete iter->second; + + propMap_.clear(); } std::vector PropertyMap::getPropertyNames(){ - vector propNames; - std::map::iterator iter; + std::vector propNames; + std::map::iterator iter; - for (iter = propMap_.begin(); iter != propMap_.end(); ++iter) - propNames.push_back(iter->first); + for (iter = propMap_.begin(); iter != propMap_.end(); ++iter) + propNames.push_back(iter->first); - return propNames; + return propNames; } std::vector PropertyMap::getProperties(){ - vector properties; - std::map::iterator iter; + std::vector properties; + std::map::iterator iter; - for (iter = propMap_.begin(); iter != propMap_.end(); ++iter) - properties.push_back(iter->second); + for (iter = propMap_.begin(); iter != propMap_.end(); ++iter) + properties.push_back(iter->second); - return properties; + return properties; } -GenericData* PropertyMap::getPropertyByName(std:string& propName){ - std::map::iterator iter; +GenericData* PropertyMap::getPropertyByName(const std::string& propName){ + std::map::iterator iter; - iter = propMap_.find(propName); + iter = propMap_.find(propName); - if (iter != propMap_.end()) - return iter->second; - else - return NULL; -} + if (iter != propMap_.end()) + return iter->second; + else + return NULL; +} + +}//end namepace oopse