Changeset 376

Timestamp:

Aug 8, 2005, 12:32:48 AM (18 years ago)

Author:

Jari Häkkinen

Message:

Removed polluting inclusions of std namespace.

Location:

trunk/lib/utility

Files:

• Merge.h (modified) (4 diffs)
• NNI.h (modified) (2 diffs)
• WeNNI.h (modified) (1 diff)
• kNNI.h (modified) (1 diff)

trunk/lib/utility/Merge.h

@@ -14 +14 @@
 namespace theplu {
 namespace utility {
-
-  using namespace std;
 
   ///
@@ -38 +36 @@
     /// annotations(vector)
     ///
-    Merge(istream& data, istream& error, istream& annotations);
+    Merge(std::istream& data, std::istream& error, std::istream& annotations);
 
     ///
@@ -44 +42 @@
     /// annotations(vector)
     ///
-    Merge(gslapi::matrix& data, gslapi::matrix& error, 
-          vector<string>& annotations);
+    Merge(gslapi::matrix& data, gslapi::matrix& error,
+          std::vector<std::string>& annotations);
     
     ///
@@ -65 +63 @@
     gslapi::matrix data_;
     gslapi::matrix error_;
-    vector<string> annots_;
+    std::vector<std::string> annots_;
     u_int nof_assays_;
 
     void calculate_weights(gslapi::matrix&);
-    void merging(vector<u_int>, gslapi::matrix&);
+    void merging(std::vector<u_int>, gslapi::matrix&);
   };
 

trunk/lib/utility/NNI.h

@@ -12 +12 @@
 namespace theplu {
 namespace utility {
-
-  using namespace std;
 
   ///
@@ -86 +84 @@
     /// @return indices of rows in data matrix not imputed
     ///
-    inline vector<size_t> not_imputed(void) const { return not_imputed_; }
+    inline std::vector<size_t> not_imputed(void) const { return not_imputed_; }
 
   protected:
-    vector<pair<u_int,double> > calculate_distances(const u_int) const;
-    vector<u_int> nearest_neighbours(const u_int,
-                                     const vector<pair<u_int,double> >&) const;
+    std::vector<std::pair<u_int,double> > calculate_distances(const u_int) const;
+    std::vector<u_int> nearest_neighbours(const u_int,
+                             const std::vector<std::pair<u_int,double> >&) const;
 
     const gslapi::matrix& data_;
     gslapi::matrix imputed_data_;
     u_int neighbours_;
-    vector<size_t> not_imputed_;
+    std::vector<size_t> not_imputed_;
     const gslapi::matrix& weight_;
   };

trunk/lib/utility/WeNNI.h

@@ -14 +14 @@
 namespace theplu {
 namespace utility {
-
-  using namespace std;
 
   ///

trunk/lib/utility/kNNI.h

@@ -39 +39 @@
 
   private:
-    vector<u_int> mv_rows_; // index to rows that have values to estimate
+    std::vector<u_int> mv_rows_;  // index to rows that have values to estimate
   };