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

Comparing trunk/OOPSE-4/src/utils/PropertyMap.cpp (file contents):
Revision 1566 by tim, Wed Oct 13 22:28:51 2004 UTC vs.
Revision 1930 by gezelter, Wed Jan 12 22:41:40 2005 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.
1 > /*
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. 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
19 + *    notice, this list of conditions and the following disclaimer.
20 + *
21 + * 3. Redistributions in binary form must reproduce the above copyright
22 + *    notice, this list of conditions and the following disclaimer in the
23 + *    documentation and/or other materials provided with the
24 + *    distribution.
25 + *
26 + * This software is provided "AS IS," without a warranty of any
27 + * kind. All express or implied conditions, representations and
28 + * warranties, including any implied warranty of merchantability,
29 + * fitness for a particular purpose or non-infringement, are hereby
30 + * excluded.  The University of Notre Dame and its licensors shall not
31 + * be liable for any damages suffered by licensee as a result of
32 + * using, modifying or distributing the software or its
33 + * derivatives. In no event will the University of Notre Dame or its
34 + * licensors be liable for any lost revenue, profit or data, or for
35 + * direct, indirect, special, consequential, incidental or punitive
36 + * damages, however caused and regardless of the theory of liability,
37 + * arising out of the use of or inability to use software, even if the
38 + * University of Notre Dame has been advised of the possibility of
39 + * such damages.
40   */
41  
42 < #include "PropertyMap.hpp"
42 > #include "utils/PropertyMap.hpp"
43   #include <cassert>
44 + #include <utility>
45  
46 + namespace oopse {
47 +
48   PropertyMap::~PropertyMap(){
49    clearProperties();
50   }
51  
52  
53 < PropertyMap::addProperty(GenericData* genData){
54 <  std::map<std::string, GenericData*>::iterator iter;
53 > void PropertyMap::addProperty(GenericData* genData){
54 >    std::map<std::string, GenericData*>::iterator iter;
55  
56 <  assert( genData != NULL);
56 >    iter = propMap_.find(genData->getID());
57  
58 <  iter = propMap_.find(genData->getID());
59 <
60 <  if (iter == propMap_.end()){
61 <    propMap_.insert(make_pair(genData->getID(), genData));
62 <  }
63 <  else
45 <    logger.warn("");
46 <  
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   }
65  
66 < void PropertyMap::removeProperty(std::string& propName){
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);    
74 <  }
75 <  else
76 <    logger.warn("Can not find property with name: " + propName);
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   }
80  
81   void PropertyMap::clearProperties(){
82 <  std::map<std::string, GenericData*>::iterator iter;
82 >    std::map<std::string, GenericData*>::iterator iter;
83  
84 <  for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
85 <    delete iter->second;
86 <  
87 <  propMap_.clear();
84 >    for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
85 >        delete iter->second;
86 >
87 >    propMap_.clear();
88   }
89  
90   std::vector<std::string> PropertyMap::getPropertyNames(){
91 <  vector<string> propNames;
92 <  std::map<std::string, GenericData*>::iterator iter;
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);
94 >    for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
95 >        propNames.push_back(iter->first);
96  
97 <  return propNames;
97 >    return propNames;
98   }
99  
100   std::vector<GenericData*> PropertyMap::getProperties(){
101 <  vector<GenericData*> properties;
102 <  std::map<std::string, GenericData*>::iterator iter;
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);
104 >    for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
105 >        properties.push_back(iter->second);
106  
107 <  return properties;
107 >    return properties;
108   }
109  
110 < GenericData* PropertyMap::getPropertyByName(std:string& propName){
111 <  std::map<std::string, GenericData*>::iterator iter;
110 > GenericData* PropertyMap::getPropertyByName(const std::string& propName){
111 >    std::map<std::string, GenericData*>::iterator iter;
112  
113 <  iter = propMap_.find(propName);
113 >    iter = propMap_.find(propName);
114  
115 <  if (iter != propMap_.end())
116 <    return iter->second;
117 <  else
118 <    return NULL;
119 < }        
115 >    if (iter != propMap_.end())
116 >        return iter->second;
117 >    else
118 >        return NULL;
119 > }
120 >
121 > }//end namepace oopse

Diff Legend

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