Ignore:
Timestamp:
Aug 31, 2006, 10:52:02 AM (16 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/NNI.h

    r570 r616  
     1#ifndef _theplu_utility_nni_
     2#define _theplu_utility_nni_
     3
    14// $Id$
    25
     
    2528*/
    2629
    27 #ifndef _theplu_utility_nni_
    28 #define _theplu_utility_nni_
    29 
    3030#include <iostream>
    3131#include <utility>
    3232#include <vector>
    3333
    34 #include <c++_tools/gslapi/matrix.h>
     34#include <c++_tools/utility/matrix.h>
    3535
    3636namespace theplu {
     
    8888    /// algorithms.
    8989    ///
    90     NNI(const gslapi::matrix& matrix,const gslapi::matrix& weight,
     90    NNI(const utility::matrix& matrix,const utility::matrix& weight,
    9191        const u_int neighbours);
    9292
     
    103103    /// @return A const reference to the modified data.
    104104    ///
    105     const gslapi::matrix& imputed_data(void) const { return imputed_data_; }
     105    const utility::matrix& imputed_data(void) const { return imputed_data_; }
    106106
    107107    ///
     
    115115                             const std::vector<std::pair<u_int,double> >&) const;
    116116
    117     const gslapi::matrix& data_;
    118     gslapi::matrix imputed_data_;
     117    const utility::matrix& data_;
     118    utility::matrix imputed_data_;
    119119    u_int neighbours_;
    120120    std::vector<size_t> not_imputed_;
    121     const gslapi::matrix& weight_;
     121    const utility::matrix& weight_;
    122122  };
    123123
Note: See TracChangeset for help on using the changeset viewer.