Changeset 706 for trunk/yat/classifier

Timestamp:

Dec 19, 2006, 9:59:19 AM (17 years ago)

Author:

Jari Häkkinen

Message:

Addresses #65 and #170.

Location:

trunk/yat/classifier

Files:

• SVM.cc (modified) (1 diff)
• SVM.h (modified) (2 diffs)
• SVindex.h (modified) (2 diffs)
• Target.h (modified) (4 diffs)

trunk/yat/classifier/SVM.cc

@@ -149 +149 @@
   }
 
+  void SVM::reset(void)
+  {
+    trained_=false;
+    alpha_=utility::vector(target_.size(), 0);
+  }
+
   bool SVM::train(void) 
   {

trunk/yat/classifier/SVM.h

@@ -92 +92 @@
     /// @returns mean of vector \f$ C_i \f$
     ///
-    inline double C(void) const { return 1/C_inverse_; }
+    inline double C(void) const { return 1.0/C_inverse_; }
 
     ///
@@ -139 +139 @@
 
     ///
-    /// Function sets \f$ \alpha=0 \f$ and makes SVM untrained.
-    ///
-    inline void reset(void) 
-    { trained_=false; alpha_=utility::vector(target_.size(),0); }
+    /// @brief Function sets \f$ \alpha=0 \f$ and makes SVM untrained.
+    ///
+    void reset(void);
 
     ///

trunk/yat/classifier/SVindex.h

@@ -50 +50 @@
 
     // @return index_first
-    inline size_t index_first(void) const 
-    { assert(index_first_<size()); return index_first_; }
+    inline size_t index_first(void) const { return index_first_; }
 
     // @return index_second
-    inline size_t index_second(void) const 
-    { assert(index_second_<size()); return index_second_; }
+    inline size_t index_second(void) const { return index_second_; }
 
     // synch the object against alpha
@@ -89 +87 @@
 
     // @return value_first
-    inline size_t value_first(void) const 
-    { assert(value_first_<size()); return value_first_; }
+    inline size_t value_first(void) const { return value_first_; }
 
     // @return const ref value_second
-    inline size_t value_second(void) const 
-    { assert(value_first_<size()); return value_second_; }
+    inline size_t value_second(void) const { return value_second_; }
 
-    inline size_t operator()(size_t i) const { 
-      assert(i<size()); assert(vec_[i]<size()); return vec_[i]; }
+    inline size_t operator()(size_t i) const { return vec_[i]; }
 
   private:

trunk/yat/classifier/Target.h

@@ -91 +91 @@
 
     ///
-    /// Default binary is set to false for all classes except class 0.
+    /// @brief Default binary is set to false for all classes except
+    /// class 0.
     ///
     /// @return binary target for sample @a i
@@ -97 +98 @@
     /// @see set_binary
     ///
-    inline bool binary(const size_t i) const 
-    { assert(i<size()); return binary_[operator()(i)]; }
+    inline bool binary(const size_t i) const { return binary_[operator()(i)]; }
     
     ///
@@ -110 +110 @@
     /// 0 which is set to true.
     ///
-    inline void set_binary(const size_t i, const bool b) 
-    { assert(i<nof_classes()); binary_[i]=b; }
+    inline void set_binary(const size_t i, const bool b) { binary_[i]=b; }
 
     ///
@@ -141 +140 @@
     ///
     inline size_t operator()(const size_t sample) const 
-    { assert(sample<size()); return classes_[sample]; }
+    { return classes_[sample]; }
     
     ///