Changeset 108 for bdm/math

Timestamp:

05/12/08 17:56:55 (16 years ago)

Author:

smidl

Message:

Fixes for compilation on Win32 platform

Location:

bdm/math

Files:

• chmat.cpp (modified) (2 diffs)
• chmat.h (modified) (2 diffs)

bdm/math/chmat.cpp

@@ -17 +17 @@
         Ch = R ( 0, Ch.rows()-1, 0, Ch.cols()-1 );
 };
-inline mat chmat::to_mat() {mat F=Ch.T() *Ch;return F;};
+mat chmat::to_mat() {mat F=Ch.T() *Ch;return F;};
 void chmat::mult_sym ( const mat &C ) {
         it_error ( "not implemented" );
@@ -37 +37 @@
 };
 //TODO can be done more efficiently using BLAS, see triangular matrices
-inline vec chmat::sqrt_mult ( const vec &v ) const {vec pom; pom = Ch*v; return pom;};
-inline double chmat::qform ( const vec &v ) const {vec pom; pom = Ch*v; return pom*pom;};
-inline double chmat::invqform ( const vec &v ) const {
+vec chmat::sqrt_mult ( const vec &v ) const {vec pom; pom = Ch*v; return pom;};
+double chmat::qform ( const vec &v ) const {vec pom; pom = Ch*v; return pom*pom;};
+double chmat::invqform ( const vec &v ) const {
         vec pom(v.length());
         forward_substitution(Ch.T(),v,pom);
         return pom*pom;
 };
-inline void chmat::clear() {Ch.clear();};
+void chmat::clear() {Ch.clear();};

bdm/math/chmat.h

@@ -32 +32 @@
 
         void opupdt ( const vec &v, double w );
-        inline mat to_mat();
+        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;
-        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();
+        vec sqrt_mult ( const vec &v ) const;
+        double qform ( const vec &v ) const;
+        double invqform ( const vec &v ) const;
+        void clear();
         //! add another chmat \c A2 with weight \c w.
         void add ( const chmat &A2, double w=1.0 ) {};