[oMetah-devel] ometah/common geometry.hpp itsPoint.hpp itsSet....

[Johann]

CVSROOT:        /cvsroot/ometah
Module name:    ometah
Branch:         
Changes by:     Johann <address@hidden> 05/02/28 14:30:05

Modified files:
        common         : geometry.hpp itsPoint.hpp itsSet.hpp matrix.hpp 
                         string.hpp 

Log message:
        * more common stuff

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/common/geometry.hpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/common/itsPoint.hpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/common/itsSet.hpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/common/matrix.hpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/common/string.hpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: ometah/common/geometry.hpp
diff -u ometah/common/geometry.hpp:1.1 ometah/common/geometry.hpp:1.2
--- ometah/common/geometry.hpp:1.1      Mon Feb 21 09:37:59 2005
+++ ometah/common/geometry.hpp  Mon Feb 28 14:30:04 2005
@@ -2,7 +2,7 @@
 /***************************************************************************
  *  geometry.hpp
  *
- *  $Id: geometry.hpp,v 1.1 2005/02/21 09:37:59 nojhan Exp $
+ *  $Id: geometry.hpp,v 1.2 2005/02/28 14:30:04 nojhan Exp $
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
 
@@ -25,6 +25,8 @@
 #ifndef GEOMETRY
 #define GEOMETRY
 
+#define PI
+
 //! Translate 2D rectangular coordinates to polar ones
 template<class T, class U>
 U<T> rec2pol_2D(U<T> &recVec);
Index: ometah/common/itsPoint.hpp
diff -u ometah/common/itsPoint.hpp:1.3 ometah/common/itsPoint.hpp:1.4
--- ometah/common/itsPoint.hpp:1.3      Mon Feb 21 09:37:59 2005
+++ ometah/common/itsPoint.hpp  Mon Feb 28 14:30:04 2005
@@ -1,9 +1,6 @@
 /***************************************************************************
- *            itsPoint.hpp
- *
- *  Fri Feb  4 14:33:07 2005
- *  Copyright  2005  Walid TFAILI
- *  address@hidden
+ * $Id: itsPoint.hpp,v 1.4 2005/02/28 14:30:04 nojhan Exp $
+ * Author :  Walid TFAILI <address@hidden>
  ****************************************************************************/
 
 /*
Index: ometah/common/itsSet.hpp
diff -u ometah/common/itsSet.hpp:1.2 ometah/common/itsSet.hpp:1.3
--- ometah/common/itsSet.hpp:1.2        Fri Feb  4 15:10:18 2005
+++ ometah/common/itsSet.hpp    Mon Feb 28 14:30:04 2005
@@ -1,9 +1,6 @@
 /***************************************************************************
- *            itsSet.hpp
- *
- *  Fri Feb  4 15:13:51 2005
- *  Copyright  2005  Walid TFAILI
- *  address@hidden
+ * $Id: itsSet.hpp,v 1.3 2005/02/28 14:30:04 nojhan Exp $
+ * Author: Walid TFAILI <address@hidden>
  ****************************************************************************/
 
 /*
Index: ometah/common/matrix.hpp
diff -u ometah/common/matrix.hpp:1.1 ometah/common/matrix.hpp:1.2
--- ometah/common/matrix.hpp:1.1        Mon Feb 21 09:37:59 2005
+++ ometah/common/matrix.hpp    Mon Feb 28 14:30:04 2005
@@ -2,7 +2,7 @@
 /***************************************************************************
  *  matrix.hpp
  *
- *  $Id: matrix.hpp,v 1.1 2005/02/21 09:37:59 nojhan Exp $
+ *  $Id: matrix.hpp,v 1.2 2005/02/28 14:30:04 nojhan Exp $
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/
 
@@ -35,15 +35,19 @@
 
 //! Create a 2D matrix filled with values
 template<class T, class U>
-U< U<T> > matrixFilled( int dimL, int dimC, T fillValue);
+U< U<T> > matrixFilled( unsigned int dimL, unsigned int dimC, T fillValue);
 
 //! Multipliate two 2D matrix
 template<class T, class U>
 U< U<T> > multiply( U< U<T> > matA, U< U<T> > matB);
 
+//! Multiply each term of a vector by a scalar
+template<class T, class U>
+U<T> multiply(U<T> aVector, T aNb);
+
 //! Cholesky factorization
 template<class T, class U>
-U< U<T> > cholesky( U< U<T> > mat);
+U< U<T> > cholesky( U< U<T> > A);
 
 //! Transposition of a matrix
 template<class T, class U>
@@ -55,7 +59,7 @@
 
 //! Calculate the mean vector of a matrix
 template<class T, class U>
-U<T> mean( U< U<T> > pop);
+U<T> mean( U< U<T> > mat);
 
 //! Calculate the mean of a vector
 template<class T, class U>
@@ -73,10 +77,6 @@
 template<class T, class U>
 T min(U<T> aVector, int Begin=0, int During=0);
 
-//! Multiply each term of a vector by a scalar
-template<class T, class U>
-U<T> multiplyScalar(U<T> aVector, T aNb);
-
 //! Substraction of two vectors, terms by terms
 template<class T, class U>
 U<T> substraction(U<T> from, U<T> that);
@@ -87,6 +87,6 @@
 
 //! Calculate the absolute values of a vector
 template<class T, class U>
-U<T> absolute(U<T> aVector);
+U<T> abs(U<T> aVector);
 
 #endif
Index: ometah/common/string.hpp
diff -u ometah/common/string.hpp:1.1 ometah/common/string.hpp:1.2
--- ometah/common/string.hpp:1.1        Mon Feb 21 09:37:59 2005
+++ ometah/common/string.hpp    Mon Feb 28 14:30:04 2005
@@ -1,8 +1,6 @@
 
 /***************************************************************************
- *  string.hpp
- *
- *  $Id: string.hpp,v 1.1 2005/02/21 09:37:59 nojhan Exp $
+ *  $Id: string.hpp,v 1.2 2005/02/28 14:30:04 nojhan Exp $
  *  Author : Johann Dréo <address@hidden>
  ****************************************************************************/