Changeset 101

Timestamp:

05/12/08 14:37:44 (16 years ago)

Author:

mido

Message:

drobny update LDcek - vse je nyni prinejhorsim tak, jako v Matlabu, z nej uz tedy pro LD nic nevzejde; doplneni chybejicich slov INLINE do prislusneho headru

Files:

• bdm/math/chmat.h (modified) (2 diffs)
• bdm/math/libDC.cpp (modified) (1 diff)
• tests/test0.cpp (modified) (1 diff)

bdm/math/chmat.h

@@ -32 +32 @@
 
         void opupdt ( const vec &v, double w );
-        mat to_mat();
+        inline mat to_mat();
         void mult_sym ( const mat &C );
         void mult_sym ( const mat &C , chmat &U ) const;
@@ -38 +38 @@
         void mult_sym_t ( const mat &C, chmat &U ) const;
         double logdet() const;
-        vec sqrt_mult ( const vec &v ) const;
-        double qform ( const vec &v ) const;
-        double invqform ( const vec &v ) const;
-        void clear();
+        inline vec sqrt_mult ( const vec &v ) const;
+        inline double qform ( const vec &v ) const;
+        inline double invqform ( const vec &v ) const;
+        inline void clear();
         //! add another chmat \c A2 with weight \c w.
         void add ( const chmat &A2, double w=1.0 ) {};

bdm/math/libDC.cpp

@@ -121 +121 @@
         mat U = ltuinv( L );
 
-        //Fixme can be done more efficiently either via dydr or ldform
-        for ( int r = 0; r < dim; r++ ) {
-                // Add columns of U as dyads weighted by 1/D
-                Inv.opupdt( U.get_col( r ), 1.0 / D( r ) );
-        }
+        Inv.ldform( U.transpose(), 1.0 / D );
 }
 

tests/test0.cpp

@@ -38 +38 @@
         ld.inv(Il); // 
         mat I = Il.to_mat()*ld.to_mat();
-        cout << "ld:"<<Il.to_mat() << "eye:"<< I <<endl;
+        cout << "ld:" << endl << Il.to_mat() << "eye:" << endl<< I <<endl;
+        getchar();
 
         cout << "Test ldform()"<<endl;