Changeset 477 for library/bdm/math/chmat.h

Timestamp:

08/05/09 14:40:03 (15 years ago)

Author:

mido

Message:

panove, vite, jak jsem peclivej na upravu kodu.. snad se vam bude libit:) konfigurace je v souboru /system/astylerc

Files:

• library/bdm/math/chmat.h (modified) (3 diffs)

library/bdm/math/chmat.h

@@ -40 +40 @@
         void clear();
         //! add another chmat \c A2 with weight \c w.
-        void add ( const chmat &A2, double w=1.0 ) {
-                it_assert_debug(dim==A2.dim,"Matrices of unequal dimension");
-                mat pre=concat_vertical(Ch,sqrt(w)*A2.Ch); 
-                mat post=zeros(pre.rows(),pre.cols()); 
-                if(!qr(pre,post)) {it_warning("Unstable QR in chmat add");}
-                Ch=post(0,dim-1,0,dim-1);
+        void add ( const chmat &A2, double w = 1.0 ) {
+                it_assert_debug ( dim == A2.dim, "Matrices of unequal dimension" );
+                mat pre = concat_vertical ( Ch, sqrt ( w ) * A2.Ch );
+                mat post = zeros ( pre.rows(), pre.cols() );
+                if ( !qr ( pre, post ) ) {
+                        it_warning ( "Unstable QR in chmat add" );
+                }
+                Ch = post ( 0, dim - 1, 0, dim - 1 );
         };
         //!Inversion in the same form, i.e. cholesky
-        void inv ( chmat &Inv ) const   { ( Inv.Ch ) = itpp::inv ( Ch ).T();}; //Fixme: can be more efficient
+        void inv ( chmat &Inv ) const   {
+                ( Inv.Ch ) = itpp::inv ( Ch ).T();
+        }; //Fixme: can be more efficient
         ;
 //      void inv ( mat &Inv );
@@ -55 +59 @@
         virtual ~chmat() {};
         //!
-        chmat ( ) : sqmat (),Ch ( ) {};
+        chmat ( ) : sqmat (), Ch ( ) {};
         //! Default constructor
-        chmat ( const int dim0 ) : sqmat ( dim0 ),Ch ( dim0,dim0 ) {};
+        chmat ( const int dim0 ) : sqmat ( dim0 ), Ch ( dim0, dim0 ) {};
         //! Default constructor
-        chmat ( const vec &v) : sqmat ( v.length() ),Ch ( diag(sqrt(v)) ) {};
+        chmat ( const vec &v ) : sqmat ( v.length() ), Ch ( diag ( sqrt ( v ) ) ) {};
         //! Copy constructor
-        chmat ( const chmat &Ch0) : sqmat ( Ch0.dim),Ch ( Ch0.dim,Ch0.dim ) {Ch=Ch0.Ch;};
+        chmat ( const chmat &Ch0 ) : sqmat ( Ch0.dim ), Ch ( Ch0.dim, Ch0.dim ) {
+                Ch = Ch0.Ch;
+        };
         //! Default constructor (m3k:cholform)
-        chmat ( const mat &M ) : sqmat ( M.rows() ),Ch ( M.rows(),M.cols() ) {
+        chmat ( const mat &M ) : sqmat ( M.rows() ), Ch ( M.rows(), M.cols() ) {
                 mat Q;
-                it_assert_debug ( M.rows() ==M.cols(),"chmat:: input matrix must be square!" );
-                Ch=chol ( M );
+                it_assert_debug ( M.rows() == M.cols(), "chmat:: input matrix must be square!" );
+                Ch = chol ( M );
         };
         //! Constructor
-        chmat ( const chmat &M, const ivec &perm ):sqmat(M.rows()){it_error("not implemneted");};
+        chmat ( const chmat &M, const ivec &perm ) : sqmat ( M.rows() ) {
+                it_error ( "not implemneted" );
+        };
         //! Access function
-        mat & _Ch() {return Ch;}
+        mat & _Ch() {
+                return Ch;
+        }
         //! Access function
-        const mat & _Ch() const {return Ch;}
+        const mat & _Ch() const {
+                return Ch;
+        }
         //! Access functions
-        void setD ( const vec &nD ) {Ch=diag ( sqrt(nD) );}
+        void setD ( const vec &nD ) {
+                Ch = diag ( sqrt ( nD ) );
+        }
         //! Access functions
         void setCh ( const vec &chQ ) {
-                it_assert_debug(chQ.length()==dim*dim,""); 
-                copy_vector(dim*dim, chQ._data(), Ch._data()); 
+                it_assert_debug ( chQ.length() == dim*dim, "" );
+                copy_vector ( dim*dim, chQ._data(), Ch._data() );
         }
         //! Access functions
-        void setD ( const vec &nD, int i ) {for ( int j=i;j<nD.length();j++ ) {Ch( j,j ) =sqrt(nD ( j-i ));}} //Fixme can be more general
+        void setD ( const vec &nD, int i ) {
+                for ( int j = i; j < nD.length(); j++ ) {
+                        Ch ( j, j ) = sqrt ( nD ( j - i ) );    //Fixme can be more general
+                }
+        }
 
         //! Operators
         chmat& operator += ( const chmat &A2 );
         chmat& operator -= ( const chmat &A2 );
-        chmat& operator * ( const double &d ){Ch*sqrt(d); return *this;};
-        chmat& operator = ( const chmat &A2 ){Ch=A2.Ch;dim=A2.dim;return *this;}
-        chmat& operator *= ( double x ){Ch*=sqrt(x); return *this;};
+        chmat& operator * ( const double &d ) {
+                Ch*sqrt ( d );
+                return *this;
+        };
+        chmat& operator = ( const chmat &A2 ) {
+                Ch = A2.Ch;
+                dim = A2.dim;
+                return *this;
+        }
+        chmat& operator *= ( double x ) {
+                Ch *= sqrt ( x );
+                return *this;
+        };
 };
 
@@ -95 +123 @@
 //////// Operations:
 //!mapping of add operation to operators
-inline chmat& chmat::operator += ( const chmat &A2 )  {this->add ( A2 );return *this;}
+inline chmat& chmat::operator += ( const chmat & A2 )  {
+        this->add ( A2 );
+        return *this;
+}
 //!mapping of negative add operation to operators
-inline chmat& chmat::operator -= ( const chmat &A2 )  {this->add ( A2,-1.0 );return *this;}
+inline chmat& chmat::operator -= ( const chmat & A2 )  {
+        this->add ( A2, -1.0 );
+        return *this;
+}
 
 #endif // CHMAT_H