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

Comparing:
trunk/src/utils/PropertyMap.hpp (file contents), Revision 73 by tim, Wed Oct 13 22:28:51 2004 UTC vs.
branches/development/src/utils/PropertyMap.hpp (file contents), Revision 1710 by gezelter, Fri May 18 21:44:02 2012 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   /**
# Line 38 | Line 55
55   #include <string>
56   #include <vector>
57  
58 < #include <GenericData.hpp>
58 > #include <utils/GenericData.hpp>
59  
60 < namespace oopse{
60 > namespace OpenMD{
61  
62    /**
63     * @class PropertyMap
64     * PropertyMap class maintains a list of GenericData. Type of Property is actually GenericData.
65     */
66    class PropertyMap{
67 <    public:
51 <      
52 <      /** trivial constructor */
53 <      PropertyMap();
67 >  public:
68  
69 <      /**
70 <       * Virtual Destructor responsible for deleting all of the generc data in PropertyMap
57 <       */
58 <      virtual ~PropertyMap();
69 >    /** trivial constructor */
70 >    PropertyMap() {}
71  
72 <      /**
73 <       * Adds property into property map
74 <       *
75 <       * @param genData GenericData to be added into PropertyMap
64 <       *
65 <       * @see #removeProperty
66 <       * @see #clearProperties
67 <       */
68 <      void addProperty(GenericData* genData);
72 >    /**
73 >     * Virtual Destructor responsible for deleting all of the generc data in PropertyMap
74 >     */
75 >    virtual ~PropertyMap();
76  
77 <      /**
78 <       * Removes property from PropertyMap by name
79 <       *
80 <       * @param propName the name of property to be removed
81 <       *
82 <       * @see #addProperty
83 <       * @see #clearProperties
84 <       */
85 <      void removeProperty(std::string& propName);
77 >    /**
78 >     * Adds property into property map
79 >     *
80 >     * @param genData GenericData to be added into PropertyMap
81 >     *
82 >     * @see #removeProperty
83 >     * @see #clearProperties
84 >     */
85 >    void addProperty(GenericData* genData);
86  
87 <      /**
88 <       * clear all of the properties
89 <       *
90 <       * @see #addProperty
91 <       * @see #removeProperty
92 <       */
93 <      void clearProperties();
87 >    /**
88 >     * Removes property from PropertyMap by name
89 >     *
90 >     * @param propName the name of property to be removed
91 >     *
92 >     * @see #addProperty
93 >     * @see #clearProperties
94 >     */
95 >    bool removeProperty(const std::string& propName);
96  
97 <      /**
98 <       * Returns all names of properties
99 <       *
100 <       * @return all names of properties
101 <       */
102 <      std::vector<std::string> getPropertyNames();
97 >    /**
98 >     * clear all of the properties
99 >     *
100 >     * @see #addProperty
101 >     * @see #removeProperty
102 >     */
103 >    void clearProperties();
104  
105 <      /**
106 <       * Returns all of the properties in PropertyMap
107 <       *
108 <       * @return all of the properties in PropertyMap
109 <       *
110 <       * @see #getPropertyByName
101 <       */      
102 <      std::vector<GenericData*> getProperties();
105 >    /**
106 >     * Returns all names of properties
107 >     *
108 >     * @return all names of properties
109 >     */
110 >    std::vector<std::string> getPropertyNames();
111  
112 <      /**
113 <       * Returns property
114 <       *
115 <       * @param propName name of property
116 <       *
117 <       * @return a pointer point to property with propName. If no property named propName
118 <       * exists, return NULL
119 <       *
112 <       * @see #getProperties
113 <       */      
114 <      GenericData* getPropertyByName(std:string& propName);
115 <      template<typename T = GenericData*> T getPropertyByName(std:string& propName);
116 <      
117 <    protected:
118 <      std::map<std::string, GenericData*> propMap_;
112 >    /**
113 >     * Returns all of the properties in PropertyMap
114 >     *
115 >     * @return all of the properties in PropertyMap
116 >     *
117 >     * @see #getPropertyByName
118 >     */      
119 >    std::vector<GenericData*> getProperties();
120  
121 <    private:
121 >    /**
122 >     * Checks if property is in this PropertyMap
123 >     *
124 >     * @param propName name of property
125 >     *
126 >     * @return boolean
127 >     *
128 >     * @see #getProperties, #getPropertyByName
129 >     */      
130 >    bool hasProperty(const std::string& propName);
131  
132 <      /** prevent copy constructing */
133 <      PropertyMap(const PropertyMap&);
132 >    /**
133 >     * Returns property
134 >     *
135 >     * @param propName name of property
136 >     *
137 >     * @return a pointer point to property with propName. If no property named propName
138 >     * exists, return NULL
139 >     *
140 >     * @see #getProperties
141 >     */      
142 >    GenericData* getPropertyByName(const std::string& propName);
143 >    //template<typename T = GenericData*> T getPropertyByName(std:std::string& propName);
144  
145 <      /** prevent copy assignment */
146 <      PropertyMap& operator=(const PropertyMap&);
145 >  protected:
146 >    std::map<std::string, GenericData*> propMap_;
147 >
148 >  private:
149 >
150 >    /** prevent copy constructing */
151 >    PropertyMap(const PropertyMap&);
152 >
153 >    /** prevent copy assignment */
154 >    PropertyMap& operator=(const PropertyMap&);
155    };
156  
157 < }// namespace oopse
158 < #endif //UTIL_PROPERTYMAP_HPP
157 > }// namespace OpenMD
158 >
159 > #endif //UTIL_PROPERTYMAP_HPP

Comparing:
trunk/src/utils/PropertyMap.hpp (property svn:keywords), Revision 73 by tim, Wed Oct 13 22:28:51 2004 UTC vs.
branches/development/src/utils/PropertyMap.hpp (property svn:keywords), Revision 1710 by gezelter, Fri May 18 21:44:02 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines