Changeset 1713 for trunk

Timestamp:

Jan 13, 2009, 8:07:56 PM (12 years ago)

Author:

Jari Häkkinen

Message:

Addresses #425. Added static_cast to get rid of compiler warnings. Fixed index problems in Partitioner.

File:

• trunk/yat/normalizer/qQuantileNormalizer.cc (modified) (4 diffs)

trunk/yat/normalizer/qQuantileNormalizer.cc

@@ -42 +42 @@
     assert(N>1);
     assert(N<=vec.size());
-    double range=vec.size();
-    range/=N;
+    double range=static_cast<double>(vec.size())/N;
     assert(range);
     utility::Vector sortedvec(vec);
     std::sort(sortedvec.begin(),sortedvec.end());
-    unsigned int first=0;
+    unsigned int start=0;
     for (unsigned int i=0; i<N; ++i) {
-      unsigned int end   = ( i==(N-1) ? sortedvec.size() : first+range );
+      unsigned int end = ( i==(N-1) ? sortedvec.size() :
+                           static_cast<unsigned int>((i+1)*range) );
       statistics::Averager av;
-      for (unsigned int r=first; r<end; ++r)
+      for (unsigned int r=start; r<end; ++r)
         av.add(sortedvec(r));
       average_(i)=av.mean();
-      index_(i)= (i+0.5)*range;
-      first=end;
+      index_(i)= static_cast<double>(end-start)/2 + start;
+      start=end;
     }
   }
@@ -107 +107 @@
       // all points in the first part.
       size_t start=0;
-      size_t end=idx(0);
+      size_t end=static_cast<unsigned int>(idx(0));
       for (size_t row=start; row<end; ++row) {
         size_t srow=sorted_index[column][row];
@@ -115 +115 @@
       // cspline interpolation for all data between the first and last
       // parts
-      start=idx(0);
-      end=idx(target_.size()-1);
+      start=static_cast<unsigned int>(idx(0));
+      end=static_cast<unsigned int>(idx(target_.size()-1));
       for (size_t row=start; row<=end; ++row) {
         size_t srow=sorted_index[column][row];
@@ -124 +124 @@
       // linear interpolation for last part, i.e., use last diff for
       // all points in the last part.
-      start=idx(target_.size()-1)+1;
+      start=static_cast<unsigned int>(idx(target_.size()-1)+1);
       end=result.rows();
       for (size_t row=start; row<end; ++row) {