Changeset 376


Ignore:
Timestamp:
Aug 8, 2005, 12:32:48 AM (17 years ago)
Author:
Jari Häkkinen
Message:

Removed polluting inclusions of std namespace.

Location:
trunk/lib/utility
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/utility/Merge.h

    r334 r376  
    1414namespace theplu {
    1515namespace utility {
    16 
    17   using namespace std;
    1816
    1917  ///
     
    3836    /// annotations(vector)
    3937    ///
    40     Merge(istream& data, istream& error, istream& annotations);
     38    Merge(std::istream& data, std::istream& error, std::istream& annotations);
    4139
    4240    ///
     
    4442    /// annotations(vector)
    4543    ///
    46     Merge(gslapi::matrix& data, gslapi::matrix& error, 
    47           vector<string>& annotations);
     44    Merge(gslapi::matrix& data, gslapi::matrix& error,
     45          std::vector<std::string>& annotations);
    4846   
    4947    ///
     
    6563    gslapi::matrix data_;
    6664    gslapi::matrix error_;
    67     vector<string> annots_;
     65    std::vector<std::string> annots_;
    6866    u_int nof_assays_;
    6967
    7068    void calculate_weights(gslapi::matrix&);
    71     void merging(vector<u_int>, gslapi::matrix&);
     69    void merging(std::vector<u_int>, gslapi::matrix&);
    7270  };
    7371
  • trunk/lib/utility/NNI.h

    r303 r376  
    1212namespace theplu {
    1313namespace utility {
    14 
    15   using namespace std;
    1614
    1715  ///
     
    8684    /// @return indices of rows in data matrix not imputed
    8785    ///
    88     inline vector<size_t> not_imputed(void) const { return not_imputed_; }
     86    inline std::vector<size_t> not_imputed(void) const { return not_imputed_; }
    8987
    9088  protected:
    91     vector<pair<u_int,double> > calculate_distances(const u_int) const;
    92     vector<u_int> nearest_neighbours(const u_int,
    93                                      const vector<pair<u_int,double> >&) const;
     89    std::vector<std::pair<u_int,double> > calculate_distances(const u_int) const;
     90    std::vector<u_int> nearest_neighbours(const u_int,
     91                             const std::vector<std::pair<u_int,double> >&) const;
    9492
    9593    const gslapi::matrix& data_;
    9694    gslapi::matrix imputed_data_;
    9795    u_int neighbours_;
    98     vector<size_t> not_imputed_;
     96    std::vector<size_t> not_imputed_;
    9997    const gslapi::matrix& weight_;
    10098  };
  • trunk/lib/utility/WeNNI.h

    r303 r376  
    1414namespace theplu {
    1515namespace utility {
    16 
    17   using namespace std;
    1816
    1917  ///
  • trunk/lib/utility/kNNI.h

    r303 r376  
    3939
    4040  private:
    41     vector<u_int> mv_rows_; // index to rows that have values to estimate
     41    std::vector<u_int> mv_rows_;  // index to rows that have values to estimate
    4242  };
    4343
Note: See TracChangeset for help on using the changeset viewer.