Changeset 1273 for trunk/yat

Timestamp:

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

Author:

Jari Häkkinen

Message:

Some more uint, u_int, and u_long fixes.

Location:

trunk/yat/classifier

Files:

• EnsembleBuilder.h (modified) (5 diffs)
• SubsetGenerator.h (modified) (2 diffs)

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)));