--- trunk/src/math/Vector.hpp 2004/10/18 23:13:23 101 +++ trunk/src/math/Vector.hpp 2005/01/13 19:40:37 253 @@ -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 Vector.hpp * @author Teng Lin @@ -36,10 +52,10 @@ #include #include #include - +#include namespace oopse { - const double epsilon = 0.000001; + static const double epsilon = 0.000001; template inline bool equal(T e1, T e2) { @@ -55,6 +71,7 @@ namespace oopse { inline bool equal(double e1, double e2) { return fabs(e1 - e2) < epsilon; } + /** * @class Vector Vector.hpp "math/Vector.hpp" @@ -64,10 +81,13 @@ namespace oopse { class Vector{ public: + typedef Real ElemType; + typedef Real* ElemPoinerType; + /** default constructor */ inline Vector(){ for (unsigned int i = 0; i < Dim; i++) - data_[i] = 0.0; + data_[i] = 0; } /** Constructs and initializes a Vector from a vector */ @@ -93,7 +113,7 @@ namespace oopse { } /** Constructs and initializes a Vector from an array */ - inline Vector( double* v) { + inline Vector( Real* v) { for (unsigned int i = 0; i < Dim; i++) data_[i] = v[i]; } @@ -103,7 +123,7 @@ namespace oopse { * @return reference of ith element * @param i index */ - inline double& operator[](unsigned int i) { + inline Real& operator[](unsigned int i) { assert( i < Dim); return data_[i]; } @@ -113,7 +133,7 @@ namespace oopse { * @return reference of ith element * @param i index */ - inline double& operator()(unsigned int i) { + inline Real& operator()(unsigned int i) { assert( i < Dim); return data_[i]; } @@ -123,7 +143,7 @@ namespace oopse { * @return reference of ith element * @param i index */ - inline const double& operator[](unsigned int i) const { + inline const Real& operator[](unsigned int i) const { assert( i < Dim); return data_[i]; } @@ -133,11 +153,23 @@ namespace oopse { * @return reference of ith element * @param i index */ - inline const double& operator()(unsigned int i) const { + inline const Real& operator()(unsigned int i) const { assert( i < Dim); return data_[i]; } + /** Copy the internal data to an array*/ + void getArray(Real* array) { + for (unsigned int i = 0; i < Dim; i ++) { + array[i] = data_[i]; + } + } + + /** Returns the pointer of internal array */ + Real* getArrayPointer() { + return data_; + } + /** * Tests if this vetor is equal to other vector * @return true if equal, otherwise return false @@ -184,9 +216,9 @@ namespace oopse { * @param v1 the other vector */ inline void add( const Vector& v1 ) { - for (unsigned int i = 0; i < Dim; i++) - data_[i] += v1.data_[i]; - } + for (unsigned int i = 0; i < Dim; i++) + data_[i] += v1.data_[i]; + } /** * Sets the value of this vector to the sum of v1 and v2 (*this = v1 + v2). @@ -221,7 +253,7 @@ namespace oopse { * Sets the value of this vector to the scalar multiplication of itself (*this *= s). * @param s the scalar value */ - inline void mul( double s ) { + inline void mul( Real s ) { for (unsigned int i = 0; i < Dim; i++) data_[i] *= s; } @@ -232,7 +264,7 @@ namespace oopse { * @param v1 the vector * @param s the scalar value */ - inline void mul( const Vector& v1, double s) { + inline void mul( const Vector& v1, Real s) { for (unsigned int i = 0; i < Dim; i++) data_[i] = s * v1.data_[i]; } @@ -241,7 +273,7 @@ namespace oopse { * Sets the value of this vector to the scalar division of itself (*this /= s ). * @param s the scalar value */ - inline void div( double s) { + inline void div( Real s) { for (unsigned int i = 0; i < Dim; i++) data_[i] /= s; } @@ -251,7 +283,7 @@ namespace oopse { * @param v1 the source vector * @param s the scalar value */ - inline void div( const Vector& v1, double s ) { + inline void div( const Vector& v1, Real s ) { for (unsigned int i = 0; i < Dim; i++) data_[i] = v1.data_[i] / s; } @@ -269,13 +301,13 @@ namespace oopse { } /** @see #mul */ - inline Vector& operator *=( double s) { + inline Vector& operator *=( Real s) { mul(s); return *this; } /** @see #div */ - inline Vector& operator /=( double s ) { + inline Vector& operator /=( Real s ) { div(s); return *this; } @@ -284,23 +316,27 @@ namespace oopse { * Returns the length of this vector. * @return the length of this vector */ - inline double length() { - return sqrt(lengthSquared()); + inline Real length() { + return sqrt(lengthSquare()); } /** * Returns the squared length of this vector. * @return the squared length of this vector */ - inline double lengthSquare() { + inline Real lengthSquare() { return dot(*this, *this); } /** Normalizes this vector in place */ inline void normalize() { - double len; + Real len; len = length(); + + //if (len < oopse:epsilon) + // throw(); + *this /= len; } @@ -308,13 +344,12 @@ namespace oopse { * Tests if this vector is normalized * @return true if this vector is normalized, otherwise return false */ - inline bool isNormalized() const - { - return lengthSquare() == 1.0; + inline bool isNormalized() { + return equal(lengthSquare(), 1.0); } protected: - double data_[Dim]; + Real data_[Dim]; }; @@ -360,7 +395,7 @@ namespace oopse { * @param s the scalar value */ template - Vector operator * ( const Vector& v1, double s) { + Vector operator * ( const Vector& v1, Real s) { Vector result; result.mul(v1,s); return result; @@ -373,7 +408,7 @@ namespace oopse { * @param v1 the source vector */ template - Vector operator * ( double s, const Vector& v1 ) { + Vector operator * ( Real s, const Vector& v1 ) { Vector result; result.mul(v1, s); return result; @@ -386,19 +421,12 @@ namespace oopse { * @param s the scalar value */ template - Vector operator / ( const Vector& v1, double s) { + Vector operator / ( const Vector& v1, Real s) { Vector result; result.div( v1,s); return result; } - /** fuzzy comparson */ - template - inline bool epsilonEqual( const Vector& v1, const Vector& v2 ) { - - } - - /** * Returns the dot product of two Vectors * @param v1 first vector @@ -411,7 +439,7 @@ namespace oopse { tmp = 0; for (unsigned int i = 0; i < Dim; i++) - tmp += v1[i] + v2[i]; + tmp += v1[i] * v2[i]; return tmp; } @@ -446,7 +474,17 @@ namespace oopse { template std::ostream &operator<< ( std::ostream& o, const Vector& v) { - o << "[" << v[0] << ", " << v[1] << ", " << v[2] << "]" << endl; + o << "[ "; + + for (unsigned int i = 0 ; i< Dim; i++) { + o << v[i]; + + if (i != Dim -1) { + o<< ", "; + } + } + + o << " ]"; return o; }