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

Comparing trunk/src/utils/PropertyMap.cpp (file contents):
Revision 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
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.
# Line 37 | Line 28
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 "utils/PropertyMap.hpp"
43   #include <cassert>
44   #include <utility>
45  
46 < namespace oopse {
46 > namespace OpenMD {
47  
48 < PropertyMap::~PropertyMap(){
49 <  clearProperties();
50 < }
48 >  PropertyMap::~PropertyMap(){
49 >    clearProperties();
50 >  }
51  
52  
53 < void PropertyMap::addProperty(GenericData* genData){
53 >  void PropertyMap::addProperty(GenericData* genData){
54      std::map<std::string, GenericData*>::iterator iter;
55  
56      iter = propMap_.find(genData->getID());
57  
58      if (iter == propMap_.end()){
59 <        propMap_.insert(std::make_pair(genData->getID(), genData));
59 >      propMap_.insert(std::make_pair(genData->getID(), genData));
60      } else {
61 <        delete iter->second;
62 <        iter->second = genData;
61 >      delete iter->second;
62 >      iter->second = genData;
63      }
64 < }
64 >  }
65  
66 < bool PropertyMap::removeProperty(const 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);
70  
71      if (iter != propMap_.end()){
72 <        delete iter->second;
73 <        propMap_.erase(iter);    
74 <        return true;
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;
76 >      //logger.warn("Can not find property with name: " + propName);
77 >      return false;
78      }
79 < }
79 >  }
80  
81 < void PropertyMap::clearProperties(){
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;
85 >      delete iter->second;
86  
87      propMap_.clear();
88 < }
88 >  }
89  
90 < std::vector<std::string> PropertyMap::getPropertyNames(){
90 >  std::vector<std::string> PropertyMap::getPropertyNames(){
91      std::vector<std::string> propNames;
92      std::map<std::string, GenericData*>::iterator iter;
93  
94      for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
95 <        propNames.push_back(iter->first);
95 >      propNames.push_back(iter->first);
96  
97      return propNames;
98 < }
98 >  }
99  
100 < std::vector<GenericData*> PropertyMap::getProperties(){
100 >  std::vector<GenericData*> PropertyMap::getProperties(){
101      std::vector<GenericData*> properties;
102      std::map<std::string, GenericData*>::iterator iter;
103  
104      for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
105 <        properties.push_back(iter->second);
105 >      properties.push_back(iter->second);
106  
107      return properties;
108 < }
108 >  }
109  
110 < GenericData* PropertyMap::getPropertyByName(const std::string& propName){
110 >  GenericData* PropertyMap::getPropertyByName(const std::string& propName){
111      std::map<std::string, GenericData*>::iterator iter;
112  
113      iter = propMap_.find(propName);
114  
115      if (iter != propMap_.end())
116 <        return iter->second;
116 >      return iter->second;
117      else
118 <        return NULL;
119 < }
118 >      return NULL;
119 >  }
120  
121 < }//end namepace oopse
121 > }//end namespace OpenMD

Diff Legend

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