Changeset 616 for trunk/c++_tools/utility/NNI.h

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:

• trunk/c++_tools/utility/NNI.h (modified) (5 diffs)

trunk/c++_tools/utility/NNI.h

@@ +1 @@
+#ifndef _theplu_utility_nni_
+#define _theplu_utility_nni_ 
+
 // $Id$
 
@@ -25 +28 @@
 */
 
-#ifndef _theplu_utility_nni_
-#define _theplu_utility_nni_ 
-
 #include <iostream>
 #include <utility>
 #include <vector>
 
-#include <c++_tools/gslapi/matrix.h>
+#include <c++_tools/utility/matrix.h>
 
 namespace theplu {
@@ -88 +88 @@
     /// algorithms.
     ///
-    NNI(const gslapi::matrix& matrix,const gslapi::matrix& weight,
+    NNI(const utility::matrix& matrix,const utility::matrix& weight,
         const u_int neighbours);
 
@@ -103 +103 @@
     /// @return A const reference to the modified data.
     ///
-    const gslapi::matrix& imputed_data(void) const { return imputed_data_; }
+    const utility::matrix& imputed_data(void) const { return imputed_data_; }
 
     ///
@@ -115 +115 @@
                              const std::vector<std::pair<u_int,double> >&) const;
 
-    const gslapi::matrix& data_;
-    gslapi::matrix imputed_data_;
+    const utility::matrix& data_;
+    utility::matrix imputed_data_;
     u_int neighbours_;
     std::vector<size_t> not_imputed_;
-    const gslapi::matrix& weight_;
+    const utility::matrix& weight_;
   };