Changeset 1273

Timestamp:

Apr 10, 2008, 9:59:23 AM (13 years ago)

Author:

Jari Häkkinen

Message:

Some more uint, u_int, and u_long fixes.

Location:

trunk

Files:

• test/averager_test.cc (modified) (9 diffs)
• test/commandline_test.cc (modified) (6 diffs)
• test/distance_test.cc (modified) (2 diffs)
• test/nni_test.cc (modified) (1 diff)
• test/subset_generator_test.cc (modified) (2 diffs)
• yat/classifier/EnsembleBuilder.h (modified) (5 diffs)
• yat/classifier/SubsetGenerator.h (modified) (2 diffs)

trunk/test/averager_test.cc

@@ -44 +44 @@
 
 //Forward declarations
-bool equal(const Averager&, const Averager&, u_int, Suite&);
-bool equal(const AveragerWeighted&, const AveragerWeighted&, u_int, 
+bool equal(const Averager&, const Averager&, unsigned int, Suite&);
+bool equal(const AveragerWeighted&, const AveragerWeighted&, unsigned int, 
            Suite& suite);
-bool equal(const Averager&, const AveragerWeighted&, u_int, Suite& suite);
-bool equal(const AveragerPair&, const AveragerPair&, u_int, Suite& suite);
-bool equal(const AveragerPair&, const AveragerPairWeighted&, u_int, 
+bool equal(const Averager&, const AveragerWeighted&, unsigned int, Suite& suite);
+bool equal(const AveragerPair&, const AveragerPair&, unsigned int, Suite& suite);
+bool equal(const AveragerPair&, const AveragerPairWeighted&, unsigned int, 
            Suite& suite);
-bool equal(const AveragerPairWeighted&, const AveragerPairWeighted&, u_int, 
-           Suite& suite);
+bool equal(const AveragerPairWeighted&, const AveragerPairWeighted&,
+           unsigned int, Suite& suite);
 
 
@@ -73 +73 @@
 
   Averager* a1 = new Averager(1.0+3+5,1.0+9+25,3);
-  u_int tol = 10;
+  unsigned int tol = 10;
   if (!equal(a,*a1, tol, suite)){
     suite.add(false);
@@ -84 +84 @@
     suite.err() << a.mean() - a1->mean() << std::endl;
     suite.err() << a.variance() - a1->variance() << std::endl;
-    suite.err() << "error: Averager(double x, double xx, u_long n)\n";
+    suite.err() << "error: Averager(double x, double xx, unsigned long n)\n";
   }
   delete a1;
@@ -238 +238 @@
 }
 
-bool equal(const Averager& a, const Averager& b, u_int tol, 
+bool equal(const Averager& a, const Averager& b, unsigned int tol, 
            Suite& suite)
 {
@@ -249 +249 @@
 
 bool equal(const AveragerWeighted& a, const AveragerWeighted& b, 
-           const u_int tol, Suite& suite)
+           const unsigned int tol, Suite& suite)
 {
   bool equal = true;
@@ -269 +269 @@
 }
 
-bool equal(const Averager& a, const AveragerWeighted& b, const u_int tol, 
+bool equal(const Averager& a, const AveragerWeighted& b, const unsigned int tol, 
            Suite& suite)
 {
@@ -290 +290 @@
 
 bool equal(const AveragerPair& a, const AveragerPair& b, 
-           const u_int tol, Suite& suite)
+           const unsigned int tol, Suite& suite)
 {
   bool ok = true;
@@ -306 +306 @@
 
 bool equal(const AveragerPair& a, const AveragerPairWeighted& b, 
-           const u_int tol, Suite& suite)
+           const unsigned int tol, Suite& suite)
 {
   bool ok = true;
@@ -329 +329 @@
 }
 bool equal(const AveragerPairWeighted& a, const AveragerPairWeighted& b, 
-           const u_int tol, Suite& suite)
+           const unsigned int tol, Suite& suite)
 {
   bool ok = true;

trunk/test/commandline_test.cc

@@ -33 +33 @@
 #include <fstream>
 #include <stdexcept>
-
-#include <sys/types.h>
 
 using namespace theplu;
@@ -151 +149 @@
   CommandLine cmd;
   OptionArg<std::string> input(cmd, "i,input", "input file");
-  OptionArg<u_int> n(cmd, "n", "number of lines");
+  OptionArg<unsigned int> n(cmd, "n", "number of lines");
 
   suite.err() << "Testing OptionArg existence -i file...";
@@ -220 +218 @@
   }
 
-  suite.err() << "Testing OptionArg u_int value -n 3...";
+  suite.err() << "Testing OptionArg unsigned int value -n 3...";
   {
     int ac = 3;
@@ -257 +255 @@
   OptionSwitch verbose(cmd, "v,verbose", "explain what is being done");
   OptionArg<std::string> input(cmd, "i,input", "input file");
-  OptionArg<u_int> n(cmd, "n", "number of lines");
+  OptionArg<unsigned int> n(cmd, "n", "number of lines");
 
   suite.err() << "Testing unknown option --peter...";
@@ -303 +301 @@
 
 
-  suite.err() << "Testing 23.12 is not u_int...";
+  suite.err() << "Testing 23.12 is not unsigned int...";
   {
     int ac = 3;
@@ -317 +315 @@
   }
 
-  suite.err() << "Testing -1 is not u_int...";
+  suite.err() << "Testing -1 is not unsigned int...";
   {
     int ac = 3;

trunk/test/distance_test.cc

@@ -42 +42 @@
 
 void check_equality(double, double, test::Suite&, const std::string&, 
-                    u_int N=1);
+                    unsigned long int N=1);
 utility::Matrix data(void);
 
@@ -154 +154 @@
 
 void check_equality(double dist1, double dist2, test::Suite& suite, 
-                    const std::string& msg, u_int N)
+                    const std::string& msg, unsigned long int N)
 {
   if (!suite.equal(dist1, dist2, N)) {

trunk/test/nni_test.cc

@@ -50 +50 @@
   test::Suite suite(argc, argv);
 
-  uint neighbours=3;
+  unsigned int neighbours=3;
   std::string knni_data(test::filename("data/knni_matrix.data"));
   std::string knni_result(test::filename("data/knni_result.data"));

trunk/test/subset_generator_test.cc

@@ -129 +129 @@
   std::vector<double> t_value(4,0);
   std::vector<double> v_value(4,0); 
-  for(u_long k=0;k<cv_test.size();k++) {
+  for(unsigned long k=0;k<cv_test.size();k++) {
     
     const classifier::MatrixLookup& tv_view=cv_test.training_data(k);
@@ -160 +160 @@
     std::vector<size_t> t_class_count(3,0);
     std::vector<size_t> t_class_count2(3,0);
-    for(u_long l=0;l<cv_training.size();l++) {
+    for(unsigned long l=0;l<cv_training.size();l++) {
       const classifier::MatrixLookup& t_view=cv_training.training_data(l);
       const classifier::Target& t_target=cv_training.training_target(l);

trunk/yat/classifier/EnsembleBuilder.h

@@ -89 +89 @@
     /// is issued size is zero.
     ///
-    u_long size(void) const;
+    unsigned long size(void) const;
 
     ///
@@ -160 +160 @@
   {
     if (classifier_.empty()){
-      for(u_long i=0; i<subset_->size();++i) {
+      for(unsigned long i=0; i<subset_->size();++i) {
         C* classifier = mother_.make_classifier();
         classifier->train(subset_->training_data(i), 
@@ -187 +187 @@
     utility::Matrix prediction;  
 
-    for(u_long k=0;k<size();++k) {        
+    for(unsigned long k=0;k<size();++k) {       
       D sub_data =  test_data(data, k);
       classifier(k).predict(sub_data,prediction);
@@ -199 +199 @@
   
   template <class C, class D> 
-  u_long EnsembleBuilder<C, D>::size(void) const
+  unsigned long EnsembleBuilder<C, D>::size(void) const
   {
     return classifier_.size();
@@ -259 +259 @@
 
     utility::Matrix prediction;  
-    for(u_long k=0;k<size();k++) {
+    for(unsigned long k=0;k<size();k++) {
       classifier(k).predict(subset_->validation_data(k),prediction);
       

trunk/yat/classifier/SubsetGenerator.h

@@ -298 +298 @@
       features_.push_back(utility::Index(ml.rows()));
 
-    for (u_long k=0; k<size(); k++){
+    for (unsigned long k=0; k<size(); k++){
       training_target_.push_back(Target(target(),training_index(k)));
       validation_target_.push_back(Target(target(),validation_index(k)));
@@ -324 +324 @@
   void SubsetGenerator<Data>::build(const KernelLookup& kernel)
   {
-    for (u_long k=0; k<size(); k++){
+    for (unsigned long k=0; k<size(); k++){
       training_target_.push_back(Target(target(),training_index(k)));
       validation_target_.push_back(Target(target(),validation_index(k)));