Changeset 19 for bdm/math

Timestamp:

02/16/08 15:12:24 (16 years ago)

Author:

smidl

Message:

Switch to CMake

Location:

bdm/math

Files:

• Makefile (deleted)
• libDC.cpp (modified) (6 diffs)
• libDC.h (modified) (2 diffs)

bdm/math/libDC.cpp

@@ -22 +22 @@
 
 ldmat::ldmat() {
-        vec D ;
-        mat L;
         dim = 0;
+}
+
+ldmat::ldmat(const vec D0) {
+        D = D0;
+        dim = D0.length();
+        L = eye(dim);
 }
 
@@ -65 +69 @@
         os << "L:" << ld.L << endl;
         os << "D:" << ld.D << endl;
+        return os;
 }
 
@@ -165 +170 @@
 // sum logarithms of diagobal elements
         for ( i=0; i<D.length(); i++ ){ldet+=log( D( i ) );};
+        return ldet;
 }
 
@@ -182 +188 @@
         int i;
         for ( i=0;i<D.length();i++ ){D( i )*=x;};
+        return *this;
 }
 
@@ -187 +194 @@
         int i,j;
         vec res( dim );
-        double sum;
+        //double sum;
         for ( i=0;i<dim;i++ ) {//for each element of result
                 res( i ) = 0.0;
@@ -194 +201 @@
                 }
         }
-        vec res2 = L.transpose()*diag( sqrt( D ) )*x;
-        return res2;
+//      vec res2 = L.transpose()*diag( sqrt( D ) )*x;
+        return res;
 }
 

bdm/math/libDC.h

@@ -114 +114 @@
         //! Construct by decomposition of full matrix V.
         ldmat( mat V );
+        //! Construct diagonal matrix with diagonal D0
+        ldmat( vec D0 );
         ldmat ();
 
@@ -170 +172 @@
 inline ldmat& ldmat::operator += (const ldmat &ldA)  {this->add(ldA);return *this;}
 inline ldmat& ldmat::operator -= (const ldmat &ldA)  {this->add(ldA,-1.0);return *this;}
-inline int ldmat::cols(){return L.cols();}
-inline int ldmat::rows(){return L.rows();}
+inline int ldmat::cols(){return dim;}
+inline int ldmat::rows(){return dim;}
 
 #endif // DC_H