Ignore:
Timestamp:
Aug 31, 2006, 10:52:02 AM (15 years ago)
Author:
Jari Häkkinen
Message:

Removed gslapi namespace and put the code into utility namespace.
Move #ifndef _header_ idiom to top of touched header files.
Removed unneccesary #includes, and added needed #includes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/c++_tools/utility/SVD.h

    r597 r616  
    1 // $Id$
    2 
    31#ifndef _theplu_utility_svd_
    42#define _theplu_utility_svd_
    53
    6 #include <c++_tools/gslapi/matrix.h>
    7 #include <c++_tools/gslapi/vector.h>
     4// $Id$
     5
     6#include <c++_tools/utility/matrix.h>
     7#include <c++_tools/utility/vector.h>
    88
    99#include <gsl/gsl_linalg.h>
     
    5252    /// input matrix is copied for further use in the object.
    5353    ///
    54     inline SVD(const gslapi::matrix& Ain)
     54    inline SVD(const utility::matrix& Ain)
    5555      : U_(Ain), V_(Ain.columns(),Ain.columns()), s_(Ain.columns()) {}
    5656
     
    7373    /// is undefined.
    7474    ///
    75     inline const gslapi::vector& s(void) const { return s_; }
     75    inline const utility::vector& s(void) const { return s_; }
    7676
    7777    ///
     
    8383    /// @return Whatever GSL returns.
    8484    ///
    85     inline int solve(gslapi::vector b, gslapi::vector x)
     85    inline int solve(utility::vector b, utility::vector x)
    8686      { return gsl_linalg_SV_solve(U_.gsl_matrix_p(), V_.gsl_matrix_p(),
    8787                                   s_.gsl_vector_p(), b.gsl_vector_p(),
     
    9696    /// is undefined.
    9797    ///
    98     inline const gslapi::matrix& U(void) const { return U_; }
     98    inline const utility::matrix& U(void) const { return U_; }
    9999
    100100    ///
     
    106106    /// is undefined.
    107107    ///
    108     inline const gslapi::matrix& V(void) const { return V_; }
     108    inline const utility::matrix& V(void) const { return V_; }
    109109
    110110  private:
     
    115115    int modified_golub_reinsch(void);
    116116
    117     gslapi::matrix U_, V_;
    118     gslapi::vector s_;
     117    utility::matrix U_, V_;
     118    utility::vector s_;
    119119  }; 
    120120
Note: See TracChangeset for help on using the changeset viewer.