--- trunk/src/utils/Algorithm.hpp 2005/02/13 19:14:43 325 +++ trunk/src/utils/Algorithm.hpp 2012/10/03 14:07:28 1802 @@ -6,19 +6,10 @@ * 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 + * 1. 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 + * 2. 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. @@ -37,34 +28,50 @@ * 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. + * + * SUPPORT OPEN SCIENCE! If you use OpenMD or its source code in your + * research, please cite the appropriate papers when you publish your + * work. Good starting points are: + * + * [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). + * [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). + * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008). + * [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). + * [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). */ #include +#include "config.h" +namespace OpenMD { -namespace oopse { - -/** - * copy_if is one of the missing functions in STL. - * copy_if copies elements from the range [first, last) to the range [result, result + (last-first)), - * except that any element for which pred is false is not copied. - */ -template -OutputIterator copy_if(InputIterator first, InputIterator last, OutputIterator result, Predicate p) { + /** + * copy_if is one of the missing functions in STL. + * copy_if copies elements from the range [first, last) to the range [result, result + (last-first)), + * except that any element for which pred is false is not copied. + */ + template + OutputIterator copy_if(InputIterator first, InputIterator last, OutputIterator result, Predicate p) { while (first != last) { - if (p(*first)) { - *result++ = *first; - } - ++first; + if (p(*first)) { + *result++ = *first; + } + ++first; } return result; + } + + template + struct logical_xor : public std::binary_function { + T operator()(const T& x, const T& y) { return x ^ y; } + }; + + template + struct to_bool : public std::unary_function { + bool operator()(const T& x) const { + return x != 0; + } + }; } - -template -struct logical_xor :public std::binary_function { - double operator()(T x, T y) { return x ^ y; } -}; - -}