Changeset 714 for trunk/yat/classifier

Timestamp:

Dec 22, 2006, 1:10:54 AM (17 years ago)

Author:

Jari Häkkinen

Message:

Addresses #170..

Location:

trunk/yat/classifier

Files:

• SVindex.cc (modified) (4 diffs)
• SVindex.h (modified) (3 diffs)
• Target.cc (modified) (5 diffs)
• Target.h (modified) (6 diffs)

trunk/yat/classifier/SVindex.cc

@@ -51 +51 @@
     for (size_t i=0; i<vec_.size(); i++)
       vec_[i]=i;
+  }
+
+  size_t SVindex::index_first(void) const
+  {
+    assert(index_first_<size());
+    return index_first_;
+  }
+
+  size_t SVindex::index_second(void) const
+  {
+    assert(index_second_<size());
+    return index_second_;
   }
 
@@ -70 +82 @@
   }
 
-  void SVindex::sv_first(void)
-  {
-    // if already sv, do nothing
-    if (index_first_<nof_sv())
-      return;
-
-    // swap elements
-    if(index_second_==nof_sv_){
-      index_second_=index_first_;
-    }
-    vec_[index_first_]=vec_[nof_sv_];
-    vec_[nof_sv_]=value_first_;
-    index_first_ = nof_sv_;
-
-    nof_sv_++;
-
-  }
-
-  void SVindex::sv_second(void)
-  {
-    // if already sv, do nothing
-    if (index_second_<nof_sv())
-      return;
-
-    // swap elements
-    if(index_first_==nof_sv_){
-      index_first_=index_second_;
-    }
-
-    vec_[index_second_]=vec_[nof_sv_];
-    vec_[nof_sv_]=value_second_;
-    index_second_=nof_sv_;
-
-    nof_sv_++;
+  size_t SVindex::nof_sv(void) const
+  {
+    return nof_sv_;
   }
 
@@ -143 +124 @@
   }
 
+  size_t SVindex::size(void) const
+  {
+    return vec_.size();
+  }
+
+  void SVindex::sv_first(void)
+  {
+    // if already sv, do nothing
+    if (index_first_<nof_sv())
+      return;
+
+    // swap elements
+    if(index_second_==nof_sv_){
+      index_second_=index_first_;
+    }
+    vec_[index_first_]=vec_[nof_sv_];
+    vec_[nof_sv_]=value_first_;
+    index_first_ = nof_sv_;
+
+    nof_sv_++;
+
+  }
+
+  void SVindex::sv_second(void)
+  {
+    // if already sv, do nothing
+    if (index_second_<nof_sv())
+      return;
+
+    // swap elements
+    if(index_first_==nof_sv_){
+      index_first_=index_second_;
+    }
+
+    vec_[index_second_]=vec_[nof_sv_];
+    vec_[nof_sv_]=value_second_;
+    index_second_=nof_sv_;
+
+    nof_sv_++;
+  }
+
   void SVindex::update_first(const size_t i)
   {
@@ -157 +179 @@
   }
 
+  size_t SVindex::value_first(void) const
+  {
+    assert(value_first_<size());
+    return value_first_;
+  }
+
+  size_t SVindex::value_second(void) const
+  {
+    assert(value_second_<size());
+    return value_second_;
+  }
+
+  size_t SVindex::operator()(size_t i) const
+  {
+    assert(i<size());
+    assert(vec_[i]<size());
+    return vec_[i];
+  }
+
 }}} // of namespace classifier, yat, and theplu

trunk/yat/classifier/SVindex.h

@@ -50 +50 @@
 
     // @return index_first
-    inline size_t index_first(void) const { return index_first_; }
+    size_t index_first(void) const;
 
     // @return index_second
-    inline size_t index_second(void) const { return index_second_; }
+    size_t index_second(void) const;
 
     // synch the object against alpha
     void init(const utility::vector& alpha, const double);
 
-    // @return nof samples
-    inline size_t size(void) const { return vec_.size(); }
-
     // @return nof support vectors
-    inline size_t nof_sv(void) const { return nof_sv_; }
+    size_t nof_sv(void) const;
 
     // making first to an nsv. If already sv, nothing happens.
@@ -73 +70 @@
     // nof_sv_ (the first nsv)
     void shuffle(void);
+
+    // @return nof samples
+    size_t size(void) const;
 
     // making first to a sv. If already sv, nothing happens.
@@ -87 +87 @@
 
     // @return value_first
-    inline size_t value_first(void) const { return value_first_; }
+    size_t value_first(void) const;
 
     // @return const ref value_second
-    inline size_t value_second(void) const { return value_second_; }
+    size_t value_second(void) const;
 
-    inline size_t operator()(size_t i) const { return vec_[i]; }
+    size_t operator()(size_t i) const;
 
   private:

trunk/yat/classifier/Target.cc

@@ -88 +88 @@
   }
 
+  bool Target::binary(size_t i) const
+  {
+    assert(i<size());
+    return binary_[operator()(i)];
+  }
+
+  const std::map<std::string,size_t>& Target::classes(void) const
+  {
+    return class_map_;
+  }
+
   void Target::init(const std::vector<std::string>& label) 
   {
@@ -118 +129 @@
   }
 
+  const std::vector<std::string>& Target::labels(void)
+  {
+    return labels_;
+  }
+
+  const size_t Target::nof_classes(void) const
+  {
+    return classes().size();
+  }
+
   void Target::random_shuffle(void)
   {
     random::DiscreteUniform d;
     std::random_shuffle(classes_.begin(), classes_.end(),d);
+  }
+
+  void Target::set_binary(size_t i, bool b)
+  {
+    assert(i<nof_classes());
+    binary_[i]=b;
   }
 
@@ -133 +160 @@
   }
   
+  size_t Target::size(void) const
+  {
+    return classes_.size();
+  }
+
   const size_t Target::size(size_t cl) const
   {
@@ -138 +170 @@
   }
 
-
-  std::ostream& operator<<(std::ostream& s, const Target& a)
-  {
-    for (size_t j = 0; j < a.size(); ++j) {
-      s << a(j);
-      if ( (j+1)<a.size() )
-        s << " ";
-    }
-
-    return s;
-  }
-
+  size_t Target::operator()(size_t sample) const
+  {
+    assert(sample<size());
+    return classes_[sample];
+  }
+
+  size_t Target::operator[](size_t sample) const
+  {
+    return this->operator()(sample);
+  }
 
   const Target& Target::operator=(const Target& other)
@@ -161 +191 @@
 
 
+  std::ostream& operator<<(std::ostream& s, const Target& a)
+  {
+    for (size_t j = 0; j < a.size(); ++j) {
+      s << a(j);
+      if ( (j+1)<a.size() )
+        s << " ";
+    }
+
+    return s;
+  }
+
+
 }}} // of namespace classifier, yat, and theplu

trunk/yat/classifier/Target.h

@@ -80 +80 @@
     /// @return a map with label as key and class as value.
     ///
-    inline const std::map<std::string,size_t>& classes(void) const 
-    { return class_map_; }
+    const std::map<std::string,size_t>& classes(void) const;
     
     ///
@@ -88 +87 @@
     /// @return number of classes
     ///
-    inline const size_t nof_classes(void) const { return classes().size(); }
+    const size_t nof_classes(void) const;
 
     ///
@@ -98 +97 @@
     /// @see set_binary
     ///
-    inline bool binary(const size_t i) const { return binary_[operator()(i)]; }
+    bool binary(size_t i) const;
     
     ///
     /// @return vector of labels for classes
     ///
-    inline const std::vector<std::string>& labels() { return labels_; }
+    const std::vector<std::string>& labels(void);
 
     ///
@@ -110 +109 @@
     /// 0 which is set to true.
     ///
-    inline void set_binary(const size_t i, const bool b) { binary_[i]=b; }
+    void set_binary(size_t i, bool b);
 
     ///
@@ -123 +122 @@
     /// @return number of samples
     ///
-    inline size_t size(void) const { return classes_.size(); }
+    size_t size(void) const;
 
     ///
@@ -139 +138 @@
     /// @return the class of @a sample
     ///
-    inline size_t operator()(const size_t sample) const 
-    { return classes_[sample]; }
+    size_t operator()(size_t sample) const;
     
     ///
     /// @return the class of @a sample
     ///
-    inline size_t operator[](const size_t sample) const 
-    { return this->operator()(sample); }
+    size_t operator[](size_t sample) const;
 
     ///