Changeset 1054

Timestamp:

May 7, 2009, 12:41:50 AM (14 years ago)

Author:

Jari Häkkinen

Message:

Cleaned up iterator usage in qQN.cc

Location:

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

Files:

• bin/qQN.cc (modified) (4 diffs)
• configure.ac (modified) (1 diff)

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

@@ -48 +48 @@
                    const std::string&);
 
-void exp_numbers(MatrixWeighted&);
+template<typename Iterator> void exp_numbers(Iterator first, Iterator last);
 template<typename Iterator> void log_numbers(Iterator first, Iterator last);
-void log_numbers(MatrixWeighted&);
 
 /**
@@ -109 +108 @@
                       create_target(target,m) );
   log_numbers(target.begin(),target.end());
-  log_numbers(m);
+  log_numbers(m.begin(),m.end());
   qQuantileNormalizer qqn(target.begin(), target.end(), 100);
   ColumnNormalizer<qQuantileNormalizer> cn(qqn);
   MatrixWeighted result(m.rows(),m.columns());
   cn(m,result);
-  exp_numbers(result);
+  exp_numbers(result.begin(),result.end());
 
   std::ofstream* outfile=NULL;
@@ -184 +183 @@
 
 
-void exp_numbers(MatrixWeighted& m)
-{
-  MatrixWeighted::iterator i=m.begin();
-  while (i!=m.end()) {
-    i->data() =std::exp(i->data());
+template<typename Iterator> void exp_numbers(Iterator i, Iterator last)
+{
+  while (i!=last) {
+    *data_iterator(i)=std::exp(*data_iterator(i));
     ++i;
   }
@@ -197 +195 @@
 {
   while (i!=last) {
-    *i=std::log(*i);
-    ++i;
-  }
-}
-
-
-void log_numbers(MatrixWeighted& m)
-{
-  MatrixWeighted::iterator i=m.begin();
-  while (i!=m.end()) {
-    i->data() =std::log(i->data());
+    *data_iterator(i)=std::log(*data_iterator(i));
     ++i;
   }

plugins/base2/net.sf.basedb.normalizers/trunk/src/c++/configure.ac

@@ -69 +69 @@
 else
   yat_found="no"
-  yat_version="0.5.3"
+  yat_version="0.5.2"
   YAT_CHECK_YAT([${yat_version}],[yat_found="yes"])
   if (test "${yat_found}" = "yes") ; then