Changeset 1221 for trunk/yat

Timestamp:

Mar 11, 2008, 11:43:22 AM (16 years ago)

Author:

Peter

Message:

writing size_t directly rather than vector<>::size_type

Location:

trunk/yat/classifier

Files:

• EnsembleBuilder.h (modified) (1 diff)
• Sampler.cc (modified) (1 diff)
• Sampler.h (modified) (3 diffs)

trunk/yat/classifier/EnsembleBuilder.h

@@ -52 +52 @@
 
     /**
-       Type of container used for storing data e.g. MatrixLookup or KernelLookup
+       Type of container used for storing data. Must be MatrixLookup,
+       MatrixLookupWeighted, or KernelLookup
      */
     typedef Data data_type;

trunk/yat/classifier/Sampler.cc

@@ -53 +53 @@
   }
 
-  const utility::Index&
-  Sampler::training_index(std::vector<size_t>::size_type i) const
+  const utility::Index& Sampler::training_index(size_t i) const
   {
     return training_index_[i];
   }
 
-  const Target& 
-  Sampler::training_target(std::vector<Target>::size_type i) const 
+  const Target& Sampler::training_target(size_t i) const 
   {
     return training_target_[i];
   }
 
-  const utility::Index& 
-  Sampler::validation_index(std::vector<size_t>::size_type i) const
+  const utility::Index& Sampler::validation_index(size_t i) const
   {
     return validation_index_[i];
   }
 
-  const Target& 
-  Sampler::validation_target(std::vector<Target>::size_type i) const 
+  const Target& Sampler::validation_target(size_t i) const 
   {
     return validation_target_[i];

trunk/yat/classifier/Sampler.h

@@ -77 +77 @@
     /// @note if state is invalid the result is undefined
     ///
-    const Target&
-    training_target(std::vector<Target>::size_type i) const;
+    const Target& training_target(size_t i) const;
 
     ///
@@ -85 +84 @@
     /// @note if state is invalid the result is undefined
     ///
-    const utility::Index&
-    validation_index(std::vector<size_t>::size_type i) const;
+    const utility::Index& validation_index(size_t i) const;
 
     ///
@@ -93 +91 @@
     /// @note if state is invalid the result is undefined
     ///
-    const Target& validation_target(std::vector<Target>::size_type i) const;
+    const Target& validation_target(size_t i) const;
 
   protected: