--- trunk/OOPSE-2.0/src/utils/GenericData.hpp 2004/10/21 16:22:01 1625 +++ trunk/OOPSE-2.0/src/utils/GenericData.hpp 2005/01/12 22:41:40 1930 @@ -1,28 +1,44 @@ -/* - * Copyright (C) 2000-2004 Object Oriented Parallel Simulation Engine (OOPSE) project - * - * Contact: oopse@oopse.org - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. - * All we ask is that proper credit is given for our work, which includes - * - but is not limited to - adding the above copyright notice to the beginning - * of your source code files, and to any copyright notice that you may distribute - * with programs based on this work. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + /* + * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. + * + * The University of Notre Dame grants you ("Licensee") a + * non-exclusive, royalty free, license to use, modify and + * redistribute this software in source and binary code form, provided + * that the following conditions are met: + * + * 1. Acknowledgement of the program authors must be made in any + * publication of scientific results based in part on use of the + * program. An acceptable form of acknowledgement is citation of + * the article in which the program was described (Matthew + * A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher + * J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented + * Parallel Simulation Engine for Molecular Dynamics," + * J. Comput. Chem. 26, pp. 252-271 (2005)) + * + * 2. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * + * 3. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * + * This software is provided "AS IS," without a warranty of any + * kind. All express or implied conditions, representations and + * warranties, including any implied warranty of merchantability, + * fitness for a particular purpose or non-infringement, are hereby + * excluded. The University of Notre Dame and its licensors shall not + * be liable for any damages suffered by licensee as a result of + * using, modifying or distributing the software or its + * derivatives. In no event will the University of Notre Dame or its + * licensors be liable for any lost revenue, profit or data, or for + * direct, indirect, special, consequential, incidental or punitive + * damages, however caused and regardless of the theory of liability, + * arising out of the use of or inability to use software, even if the + * University of Notre Dame has been advised of the possibility of + * such damages. */ - + /** * @file GenericData.hpp * @brief @@ -90,7 +106,7 @@ namespace oopse{ public: SimpleTypeData() : GenericData(), data_(ElemDataType()) {} SimpleTypeData(const std::string& id) : GenericData(id), data_(ElemDataType()) {} - + SimpleTypeData(const std::string&id , const ElemDataType& data) : GenericData(id), data_(data) {} template SimpleTypeData(const SimpleTypeData& s) { data_ = s.getData(); @@ -137,7 +153,7 @@ namespace oopse{ /** * @typedef StringGenericData - * A generic data type contains a string variable + * A generic data type contains a std::string variable * * @code * StringGenericData* s = new StringGenericData("MyStringGenericData"); @@ -147,7 +163,7 @@ namespace oopse{ * s->setData("OOPSE"); * propMap->addProperty(s); * - * gdata = propMap->getProperty("MyStringGenericData"); + * gdata = propMap->getPropertyByName("MyStringGenericData"); * if (gdata != NULL){ * s = dynamic_cast(gdata); * if (s != NULL) @@ -188,25 +204,25 @@ namespace oopse{ /** * @typedef IntVectorGenericData - * A generic data type contains a vector variable. + * A generic data type contains a std::vector variable. */ typedef STLContainerTypeData IntVectorGenericData; /** * @typedef IntVectorGenericData - * A generic data type contains a vector variable. + * A generic data type contains a std::vector variable. */ typedef STLContainerTypeData FloatVectorGenericData; /** * @typedef IntVectorGenericData - * A generic data type contains a vector variable. + * A generic data type contains a std::vector variable. */ typedef STLContainerTypeData DoubleVectorGenericData; /** * @typedef StringVectorGenericData - * A generic data type contains a vector variable. + * A generic data type contains a std::vector variable. * * @code * StringVectorGenericData* sv = new StringVectorGenericData("MyStringVector"); @@ -219,7 +235,7 @@ namespace oopse{ * * propMap.addProperty(sv); * - * gdata = propMap.getProperty("MyStringVector"); + * gdata = propMap.getPropertyByName("MyStringVector"); * * if (gdata != NULL){ * @@ -236,7 +252,7 @@ namespace oopse{ /** * @typedef IntVectorGenericData - * A generic data type contains a list > variable. + * A generic data type contains a std::list > variable. */ typedef STLContainerTypeData > IntVectorListGenericData;