ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/utils/PropertyMap.cpp
(Generate patch)

Comparing trunk/src/utils/PropertyMap.cpp (file contents):
Revision 73 by tim, Wed Oct 13 22:28:51 2004 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC

# Line 1 | Line 1
1   /*
2 < * Copyright (C) 2000-2004  Object Oriented Parallel Simulation Engine (OOPSE) project
3 < *
4 < * Contact: oopse@oopse.org
5 < *
6 < * This program is free software; you can redistribute it and/or
7 < * modify it under the terms of the GNU Lesser General Public License
8 < * as published by the Free Software Foundation; either version 2.1
9 < * of the License, or (at your option) any later version.
10 < * All we ask is that proper credit is given for our work, which includes
11 < * - but is not limited to - adding the above copyright notice to the beginning
12 < * of your source code files, and to any copyright notice that you may distribute
13 < * with programs based on this work.
14 < *
15 < * This program is distributed in the hope that it will be useful,
16 < * but WITHOUT ANY WARRANTY; without even the implied warranty of
17 < * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18 < * GNU Lesser General Public License for more details.
19 < *
20 < * You should have received a copy of the GNU Lesser General Public License
21 < * along with this program; if not, write to the Free Software
22 < * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
2 > * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4 + * The University of Notre Dame grants you ("Licensee") a
5 + * non-exclusive, royalty free, license to use, modify and
6 + * redistribute this software in source and binary code form, provided
7 + * that the following conditions are met:
8 + *
9 + * 1. Redistributions of source code must retain the above copyright
10 + *    notice, this list of conditions and the following disclaimer.
11 + *
12 + * 2. Redistributions in binary form must reproduce the above copyright
13 + *    notice, this list of conditions and the following disclaimer in the
14 + *    documentation and/or other materials provided with the
15 + *    distribution.
16 + *
17 + * This software is provided "AS IS," without a warranty of any
18 + * kind. All express or implied conditions, representations and
19 + * warranties, including any implied warranty of merchantability,
20 + * fitness for a particular purpose or non-infringement, are hereby
21 + * excluded.  The University of Notre Dame and its licensors shall not
22 + * be liable for any damages suffered by licensee as a result of
23 + * using, modifying or distributing the software or its
24 + * derivatives. In no event will the University of Notre Dame or its
25 + * licensors be liable for any lost revenue, profit or data, or for
26 + * direct, indirect, special, consequential, incidental or punitive
27 + * damages, however caused and regardless of the theory of liability,
28 + * arising out of the use of or inability to use software, even if the
29 + * University of Notre Dame has been advised of the possibility of
30 + * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
35 + *                                                                      
36 + * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37 + * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 + * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 + * [4]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42 < #include "PropertyMap.hpp"
42 > #include "utils/PropertyMap.hpp"
43   #include <cassert>
44 + #include <utility>
45  
46 < PropertyMap::~PropertyMap(){
30 <  clearProperties();
31 < }
46 > namespace OpenMD {
47  
48 +  PropertyMap::~PropertyMap(){
49 +    clearProperties();
50 +  }
51  
34 – PropertyMap::addProperty(GenericData* genData){
35 –  std::map<std::string, GenericData*>::iterator iter;
52  
53 <  assert( genData != NULL);
53 >  void PropertyMap::addProperty(GenericData* genData){
54 >    std::map<std::string, GenericData*>::iterator iter;
55  
56 <  iter = propMap_.find(genData->getID());
56 >    iter = propMap_.find(genData->getID());
57  
58 <  if (iter == propMap_.end()){
59 <    propMap_.insert(make_pair(genData->getID(), genData));
58 >    if (iter == propMap_.end()){
59 >      propMap_.insert(std::make_pair(genData->getID(), genData));
60 >    } else {
61 >      delete iter->second;
62 >      iter->second = genData;
63 >    }
64    }
44 –  else
45 –    logger.warn("");
46 –  
47 – }
65  
66 < void PropertyMap::removeProperty(std::string& propName){
67 <  std::map<std::string, GenericData*>::iterator iter;
66 >  bool PropertyMap::removeProperty(const std::string& propName){
67 >    std::map<std::string, GenericData*>::iterator iter;
68  
69 <  iter = propMap_.find(propName);
69 >    iter = propMap_.find(propName);
70  
71 <  if (iter != propMap.end()){
72 <    delete iter->second;
73 <    propMap_.erase(iter);    
71 >    if (iter != propMap_.end()){
72 >      delete iter->second;
73 >      propMap_.erase(iter);    
74 >      return true;
75 >    } else {
76 >      //logger.warn("Can not find property with name: " + propName);
77 >      return false;
78 >    }
79    }
58 –  else
59 –    logger.warn("Can not find property with name: " + propName);
60 – }
80  
81 < void PropertyMap::clearProperties(){
82 <  std::map<std::string, GenericData*>::iterator iter;
81 >  void PropertyMap::clearProperties(){
82 >    std::map<std::string, GenericData*>::iterator iter;
83  
84 <  for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
85 <    delete iter->second;
67 <  
68 <  propMap_.clear();
69 < }
84 >    for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
85 >      delete iter->second;
86  
87 < std::vector<std::string> PropertyMap::getPropertyNames(){
88 <  vector<string> propNames;
73 <  std::map<std::string, GenericData*>::iterator iter;
87 >    propMap_.clear();
88 >  }
89  
90 <  for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
91 <    propNames.push_back(iter->first);
90 >  std::vector<std::string> PropertyMap::getPropertyNames(){
91 >    std::vector<std::string> propNames;
92 >    std::map<std::string, GenericData*>::iterator iter;
93  
94 <  return propNames;
95 < }
94 >    for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
95 >      propNames.push_back(iter->first);
96  
97 < std::vector<GenericData*> PropertyMap::getProperties(){
98 <  vector<GenericData*> properties;
83 <  std::map<std::string, GenericData*>::iterator iter;
97 >    return propNames;
98 >  }
99  
100 <  for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
101 <    properties.push_back(iter->second);
100 >  std::vector<GenericData*> PropertyMap::getProperties(){
101 >    std::vector<GenericData*> properties;
102 >    std::map<std::string, GenericData*>::iterator iter;
103  
104 <  return properties;
105 < }
104 >    for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
105 >      properties.push_back(iter->second);
106  
107 < GenericData* PropertyMap::getPropertyByName(std:string& propName){
108 <  std::map<std::string, GenericData*>::iterator iter;
107 >    return properties;
108 >  }
109  
110 <  iter = propMap_.find(propName);
110 >  GenericData* PropertyMap::getPropertyByName(const std::string& propName){
111 >    std::map<std::string, GenericData*>::iterator iter;
112  
113 <  if (iter != propMap_.end())
114 <    return iter->second;
115 <  else
116 <    return NULL;
117 < }        
113 >    iter = propMap_.find(propName);
114 >
115 >    if (iter != propMap_.end())
116 >      return iter->second;
117 >    else
118 >      return NULL;
119 >  }
120 >
121 > }//end namespace OpenMD

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines