ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/branches/development/src/utils/PropertyMap.cpp

Comparing:
trunk/src/utils/PropertyMap.cpp (file contents), Revision 73 by tim, Wed Oct 13 22:28:51 2004 UTC vs.
branches/development/src/utils/PropertyMap.cpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 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]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40	+	* [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41		*/
42
43	<	#include "PropertyMap.hpp"
43	>	#include "utils/PropertyMap.hpp"
44		#include <cassert>
45	+	#include <utility>
46
47	<	PropertyMap::~PropertyMap(){
30	<	clearProperties();
31	<	}
47	>	namespace OpenMD {
48
49	+	PropertyMap::~PropertyMap(){
50	+	clearProperties();
51	+	}
52
34	–	PropertyMap::addProperty(GenericData* genData){
35	–	std::map<std::string, GenericData*>::iterator iter;
53
54	<	assert( genData != NULL);
54	>	void PropertyMap::addProperty(GenericData* genData){
55	>	std::map<std::string, GenericData*>::iterator iter;
56
57	<	iter = propMap_.find(genData->getID());
57	>	iter = propMap_.find(genData->getID());
58
59	<	if (iter == propMap_.end()){
60	<	propMap_.insert(make_pair(genData->getID(), genData));
59	>	if (iter == propMap_.end()){
60	>	propMap_.insert(std::make_pair(genData->getID(), genData));
61	>	} else {
62	>	delete iter->second;
63	>	iter->second = genData;
64	>	}
65		}
44	–	else
45	–	logger.warn("");
46	–
47	–	}
66
67	<	void PropertyMap::removeProperty(std::string& propName){
68	<	std::map<std::string, GenericData*>::iterator iter;
67	>	bool PropertyMap::removeProperty(const std::string& propName){
68	>	std::map<std::string, GenericData*>::iterator iter;
69
70	<	iter = propMap_.find(propName);
70	>	iter = propMap_.find(propName);
71
72	<	if (iter != propMap.end()){
73	<	delete iter->second;
74	<	propMap_.erase(iter);
72	>	if (iter != propMap_.end()){
73	>	delete iter->second;
74	>	propMap_.erase(iter);
75	>	return true;
76	>	} else {
77	>	//logger.warn("Can not find property with name: " + propName);
78	>	return false;
79	>	}
80		}
58	–	else
59	–	logger.warn("Can not find property with name: " + propName);
60	–	}
81
82	<	void PropertyMap::clearProperties(){
83	<	std::map<std::string, GenericData*>::iterator iter;
82	>	void PropertyMap::clearProperties(){
83	>	std::map<std::string, GenericData*>::iterator iter;
84
85	<	for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
86	<	delete iter->second;
67	<
68	<	propMap_.clear();
69	<	}
85	>	for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
86	>	delete iter->second;
87
88	<	std::vector<std::string> PropertyMap::getPropertyNames(){
89	<	vector<string> propNames;
73	<	std::map<std::string, GenericData*>::iterator iter;
88	>	propMap_.clear();
89	>	}
90
91	<	for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
92	<	propNames.push_back(iter->first);
91	>	std::vector<std::string> PropertyMap::getPropertyNames(){
92	>	std::vector<std::string> propNames;
93	>	std::map<std::string, GenericData*>::iterator iter;
94
95	<	return propNames;
96	<	}
95	>	for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
96	>	propNames.push_back(iter->first);
97
98	<	std::vector<GenericData*> PropertyMap::getProperties(){
99	<	vector<GenericData*> properties;
83	<	std::map<std::string, GenericData*>::iterator iter;
98	>	return propNames;
99	>	}
100
101	<	for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
102	<	properties.push_back(iter->second);
101	>	std::vector<GenericData*> PropertyMap::getProperties(){
102	>	std::vector<GenericData*> properties;
103	>	std::map<std::string, GenericData*>::iterator iter;
104
105	<	return properties;
106	<	}
105	>	for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
106	>	properties.push_back(iter->second);
107
108	<	GenericData* PropertyMap::getPropertyByName(std:string& propName){
109	<	std::map<std::string, GenericData*>::iterator iter;
108	>	return properties;
109	>	}
110
111	<	iter = propMap_.find(propName);
111	>	GenericData* PropertyMap::getPropertyByName(const std::string& propName){
112	>	std::map<std::string, GenericData*>::iterator iter;
113
114	<	if (iter != propMap_.end())
115	<	return iter->second;
116	<	else
117	<	return NULL;
118	<	}
114	>	iter = propMap_.find(propName);
115	>
116	>	if (iter != propMap_.end())
117	>	return iter->second;
118	>	else
119	>	return NULL;
120	>	}
121	>
122	>	}//end namespace OpenMD

Comparing:
trunk/src/utils/PropertyMap.cpp (property svn:keywords), Revision 73 by tim, Wed Oct 13 22:28:51 2004 UTC vs.
branches/development/src/utils/PropertyMap.cpp (property svn:keywords), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

#	Line 0 | Line 1
1	+	Author Id Revision Date

Diff Legend

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