--- trunk/OOPSE-3.0/src/math/Vector.hpp	2004/10/14 23:28:09	1569
+++ trunk/OOPSE-3.0/src/math/Vector.hpp	2004/10/19 21:28:55	1603
@@ -55,6 +55,7 @@ namespace oopse {
     inline bool equal(double e1, double e2) {
         return fabs(e1 - e2) < epsilon;
     }
+
     
     /**
      * @class Vector Vector.hpp "math/Vector.hpp"
@@ -85,11 +86,17 @@ namespace oopse {
                 
                 return *this;
             }
+
+            template<typename T>
+            inline Vector(const T& s){
+                for (unsigned int i = 0; i < Dim; i++)
+                    data_[i] = s;
+            }
             
             /** Constructs and initializes a Vector from an array */            
-            inline Vector( double* v) {
-		for (unsigned int i = 0; i < Dim; i++)
-		    data_[i] = v[i];
+            inline Vector( Real* v) {
+                for (unsigned int i = 0; i < Dim; i++)
+                    data_[i] = v[i];
             }
 
             /** 
@@ -97,7 +104,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];
             }
@@ -107,7 +114,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];
             }
@@ -117,7 +124,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];
             }
@@ -127,7 +134,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];
             }
@@ -159,9 +166,8 @@ namespace oopse {
              
             /** Negates the value of this vector in place. */           
             inline void negate() {
-                data_[0] = -data_[0];
-                data_[1] = -data_[1];
-                data_[2] = -data_[2];
+                for (unsigned int i = 0; i < Dim; i++)
+                    data_[i] = -data_[i];
             }
 
             /**
@@ -179,9 +185,9 @@ namespace oopse {
             * @param v1 the other vector
             */
             inline void add( const Vector<Real, Dim>& 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).
@@ -189,8 +195,8 @@ namespace oopse {
             * @param v2 the second vector
             */
             inline void add( const Vector<Real, Dim>& v1, const Vector<Real, Dim>& v2 ) {
-            	for (unsigned int i = 0; i < Dim; i++)
-		    data_[i] = v1.data_[i] + v2.data_[i];
+                for (unsigned int i = 0; i < Dim; i++)
+                    data_[i] = v1.data_[i] + v2.data_[i];
             }
 
             /**
@@ -216,19 +222,19 @@ 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 ) {
-            	for (unsigned int i = 0; i < Dim; i++)
+            inline void mul( Real s ) {
+                for (unsigned int i = 0; i < Dim; i++)
                    data_[i] *= s;
             }
 
             /**
             * Sets the value of this vector to the scalar multiplication of vector v1  
             * (*this = s * v1).
+            * @param v1 the vector            
             * @param s the scalar value
-            * @param v1 the vector
             */
-            inline void mul( double s, const Vector<Real, Dim>& v1 ) {
-            	for (unsigned int i = 0; i < Dim; i++)
+            inline void mul( const Vector<Real, Dim>& v1, Real s) {
+                for (unsigned int i = 0; i < Dim; i++)
                     data_[i] = s * v1.data_[i];
             }
 
@@ -236,8 +242,8 @@ 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) {
-            	for (unsigned int i = 0; i < Dim; i++)            
+            inline void div( Real s) {
+                for (unsigned int i = 0; i < Dim; i++)            
                     data_[i] /= s;
             }
 
@@ -246,8 +252,8 @@ namespace oopse {
             * @param v1 the source vector
             * @param s the scalar value
             */                         
-            inline void div( const Vector<Real, Dim>& v1, double s ) {
-            	for (unsigned int i = 0; i < Dim; i++)
+            inline void div( const Vector<Real, Dim>& v1, Real s ) {
+                for (unsigned int i = 0; i < Dim; i++)
                     data_[i] = v1.data_[i] / s;
             }
 
@@ -264,13 +270,13 @@ namespace oopse {
             }
 
             /** @see #mul */
-            inline Vector<Real, Dim>& operator *=( double s) {
+            inline Vector<Real, Dim>& operator *=( Real s) {
                 mul(s);
                 return *this;
             }
 
             /** @see #div */
-            inline Vector<Real, Dim>& operator /=( double s ) {
+            inline Vector<Real, Dim>& operator /=( Real s ) {
                 div(s);
                 return *this;
             }
@@ -279,36 +285,49 @@ 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 lengthSquared() {
+             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;
             }
+
+            /**
+             * Tests if this vector is normalized
+             * @return true if this vector is normalized, otherwise return false
+             */
+            inline bool isNormalized() {
+                return equal(lengthSquare(), 1.0);
+            }           
             
         protected:
-            double data_[3];
+            Real data_[Dim];
         
     };
 
     /** unary minus*/
     template<typename Real, unsigned int Dim>    
     inline Vector<Real, Dim> operator -(const Vector<Real, Dim>& v1){
-        Vector tmp(v1);
-        return tmp.negate();
+        Vector<Real, Dim> tmp(v1);
+        tmp.negate();
+        return tmp;
     }
 
     /**
@@ -345,9 +364,9 @@ namespace oopse {
      * @param s the scalar value
      */ 
     template<typename Real, unsigned int Dim>                 
-    Vector<Real, Dim> operator * ( const Vector<Real, Dim>& v1, double s) {       
+    Vector<Real, Dim> operator * ( const Vector<Real, Dim>& v1, Real s) {       
         Vector<Real, Dim> result;
-        result.mul(s, v1);
+        result.mul(v1,s);
         return result;           
     }
     
@@ -358,9 +377,9 @@ namespace oopse {
      * @param v1 the source vector
      */  
     template<typename Real, unsigned int Dim>
-    Vector<Real, Dim> operator * ( double s, const Vector<Real, Dim>& v1 ) {
+    Vector<Real, Dim> operator * ( Real s, const Vector<Real, Dim>& v1 ) {
         Vector<Real, Dim> result;
-        result.mul(s, v1);
+        result.mul(v1, s);
         return result;           
     }
 
@@ -371,33 +390,13 @@ namespace oopse {
      * @param s the scalar value
      */
     template<typename Real, unsigned int Dim>    
-    Vector<Real, Dim> operator / ( const Vector<Real, Dim>& v1, double s) {       
+    Vector<Real, Dim> operator / ( const Vector<Real, Dim>& v1, Real s) {       
         Vector<Real, Dim> result;
         result.div( v1,s);
         return result;           
     }
     
     /**
-     * Returns the  value of division of a vector by a scalar. 
-     * @return  the vaule of scalar division of this vector
-     * @param s the scalar value
-     * @param v1 the source vector
-     */
-    template<typename Real, unsigned int Dim>        
-    inline Vector<Real, Dim> operator /( double s, const Vector<Real, Dim>& v1 ) {
-        Vector<Real, Dim> result;
-        result.div( v1,s);
-        return result;           
-    }
-
-    /** fuzzy comparson */
-    template<typename Real, unsigned int Dim>        
-    inline bool epsilonEqual( const Vector<Real, Dim>& v1, const Vector<Real, Dim>& v2 ) {
-
-    }
-
-    
-    /**
      * Returns the dot product of two Vectors
      * @param v1 first vector
      * @param v2 second vector
@@ -405,13 +404,13 @@ namespace oopse {
      */
     template<typename Real, unsigned int Dim>    
     inline Real dot( const Vector<Real, Dim>& v1, const Vector<Real, Dim>& v2 ) {
-		Real tmp;
-		tmp = 0;
+        Real tmp;
+        tmp = 0;
 
-		for (unsigned int i = 0; i < Dim; i++)
-			tmp += v1[i] + v2[i];
-		
-		return tmp;
+        for (unsigned int i = 0; i < Dim; i++)
+            tmp += v1[i] * v2[i];
+
+        return tmp;
     }
 
     /**
@@ -442,8 +441,19 @@ namespace oopse {
      * Write to an output stream
      */
     template<typename Real, unsigned int Dim>
-    std::ostream &operator<< ( std::ostream& o, const Vector<Real, Dim>& v1 ) {
+    std::ostream &operator<< ( std::ostream& o, const Vector<Real, Dim>& v) {
+
+        o << "[ ";
         
+        for (unsigned int i = 0 ; i< Dim; i++) {
+            o << v[i];
+
+            if (i  != Dim -1) {
+                o<< ", ";
+            }
+        }
+
+        o << " ]";
         return o;        
     }