Changeset 1261

Timestamp:

Apr 8, 2008, 4:01:33 PM (15 years ago)

Author:

Peter

Message:

changing some u_int to size_t

Location:

trunk

Files:

• test/kernel_test.cc (modified) (3 diffs)
• test/vector_test.cc (modified) (2 diffs)
• yat/statistics/VectorFunction.cc (modified) (1 diff)
• yat/statistics/VectorFunction.h (modified) (3 diffs)
• yat/utility/FileUtil.cc (modified) (3 diffs)

trunk/test/kernel_test.cc

@@ -37 +37 @@
 #include <cassert>
 #include <cmath>
+#include <cstddef>
 #include <cstdlib>
 #include <fstream>
@@ -139 +140 @@
   suite.err() << "testing Kernel_MEV" << std::endl;
   classifier::Kernel_MEV kernel(data,*kf);
-  for(u_int i=0;i<control.rows();i++)
-    for(u_int j=0;j<control.columns();j++)
+  for(size_t i=0;i<control.rows();i++)
+    for(size_t j=0;j<control.columns();j++)
       if (std::abs(kernel(i,j)-control(i,j))>error_bound){
         suite.err() << "ERROR: comparing kernel(" << i << "," << j << "): "
@@ -183 +184 @@
   suite.err() << "testing Kernel_SEV" << std::endl;
   classifier::Kernel_SEV kernel(data,*kf);
-  for(u_int i=0;i<control.rows();i++)
-    for(u_int j=0;j<control.columns();j++)
+  for(size_t i=0;i<control.rows();i++)
+    for(size_t j=0;j<control.columns();j++)
       if (std::abs(kernel(i,j)-control(i,j))>error_bound){
         suite.err() << "ERROR: comparing kernel(" << i << "," << j << "): "

trunk/test/vector_test.cc

@@ -34 +34 @@
 #include "yat/utility/VectorView.h"
 
+#include <cstddef>
 #include <fstream>
 #include <sstream>
-
-#include <sys/types.h>
 
 using namespace theplu::yat;
@@ -178 +177 @@
       this_ok=false;
     else
-      for (u_int i=0; i<vec_view2.size(); ++i)
+      for (size_t i=0; i<vec_view2.size(); ++i)
         if ((*vec_view)(i)!=vec_view2(i))
           this_ok=false;

trunk/yat/statistics/VectorFunction.cc

@@ -65 +65 @@
   
 
-  Nth_Element::Nth_Element(u_int N)
+  Nth_Element::Nth_Element(size_t N)
     : N_(N) {}
 

trunk/yat/statistics/VectorFunction.h

@@ -27 +27 @@
 
 #include <vector>
-
-#include <sys/types.h>
 
 namespace theplu {
@@ -109 +107 @@
     /// efficient)
     ///
-    Nth_Element(u_int N);
+    Nth_Element(size_t N);
 
     ///
@@ -117 +115 @@
 
   private:
-    u_int N_;
+    size_t N_;
   };
 

trunk/yat/utility/FileUtil.cc

@@ -28 +28 @@
 
 #include <cerrno>
+#include <cstddef>
 #include <iostream>
 #include <stdexcept>
@@ -33 +34 @@
 
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
@@ -58 +58 @@
     int mode=0;
     bool ok = true;
-    for (u_int i=0; i<bits.length(); i++)
+    for (size_t i=0; i<bits.length(); i++)
       switch (bits[i]) {
           case 'r':