Changeset 1059 for plugins/base2/net.sf.basedb.normalizers/trunk/src/c++/bin/qQN.cc

Timestamp:

May 8, 2009, 3:02:55 PM (13 years ago)

Author:

Jari Häkkinen

Message:

Use functionality already in yat.

File:

• plugins/base2/net.sf.basedb.normalizers/trunk/src/c++/bin/qQN.cc (modified) (4 diffs)

plugins/base2/net.sf.basedb.normalizers/trunk/src/c++/bin/qQN.cc

@@ -34 +34 @@
 #include <yat/utility/OptionOutFile.h>
 #include <yat/utility/OptionSwitch.h>
+#include <yat/utility/stl_utility.h>
 
 #include <cstdlib>
@@ -47 +48 @@
 void create_target(std::vector<double>&, const MatrixWeighted&,
                    const std::string&);
-
-template<typename Iterator> void exp_numbers(Iterator first, Iterator last);
-template<typename Iterator> void log_numbers(Iterator first, Iterator last);
 
 /**
@@ -107 +105 @@
   ( assay.present() ? create_target(target,m,assay.value()) :
                       create_target(target,m) );
-  log_numbers(target.begin(),target.end());
-  log_numbers(m.begin(),m.end());
+  std::transform(target.begin(), target.end(),
+                 target.begin(), theplu::yat::utility::Log<double>());
+  std::transform(data_iterator(m.begin()), data_iterator(m.end()),
+                 data_iterator(m.begin()), theplu::yat::utility::Log<double>());
   qQuantileNormalizer qqn(target.begin(), target.end(), 100);
   ColumnNormalizer<qQuantileNormalizer> cn(qqn);
   MatrixWeighted result(m.rows(),m.columns());
   cn(m,result);
-  exp_numbers(result.begin(),result.end());
+  std::transform(data_iterator(result.begin()), data_iterator(result.end()),
+                 data_iterator(result.begin()), theplu::yat::utility::Exp<double>());
 
   std::ofstream* outfile=NULL;
@@ -183 +184 @@
 
 
-template<typename Iterator> void exp_numbers(Iterator i, Iterator last)
-{
-  while (i!=last) {
-    *data_iterator(i)=std::exp(*data_iterator(i));
-    ++i;
-  }
-}
-
-
-template<typename Iterator> void log_numbers(Iterator i, Iterator last)
-{
-  while (i!=last) {
-    *data_iterator(i)=std::log(*data_iterator(i));
-    ++i;
-  }
-}
-
-
 std::ostream& operator<< (std::ostream& s, const MatrixWeighted& m)
 {