Changeset 660 for trunk

Timestamp:

Sep 27, 2006, 10:53:56 AM (17 years ago)

Author:

Peter

Message:

closes #140 moved Index class to its own file and changed name to SVindex

Location:

trunk/c++_tools/classifier

Files:

• Makefile.am (modified) (2 diffs)
• SVM.cc (modified) (1 diff)
• SVM.h (modified) (3 diffs)
• SVindex.cc (added)
• SVindex.h (added)

trunk/c++_tools/classifier/Makefile.am

@@ -48 +48 @@
   SubsetGenerator.cc \
   SupervisedClassifier.cc \
+  SVindex.cc \
   SVM.cc \
   Target.cc \
@@ -80 +81 @@
   SubsetGenerator.h \
   SupervisedClassifier.h \
+  SVindex.h \
   SVM.h \
   Target.h \

trunk/c++_tools/classifier/SVM.cc

@@ -352 +352 @@
   }
 
-  Index::Index(void)
-    : nof_sv_(0), vec_(std::vector<size_t>(0))
-  {
-  }
-
-  Index::Index(const size_t n)
-    : nof_sv_(0), vec_(std::vector<size_t>(n))
-  {
-    for (size_t i=0; i<vec_.size(); i++)
-      vec_[i]=i;
-  }
-
-  void Index::init(const utility::vector& alpha, const double tol)
-  {
-    nof_sv_=0;
-    size_t nof_nsv=0;
-    for (size_t i=0; i<alpha.size(); i++) 
-      if (alpha(i)<tol){
-        nof_nsv++;
-        vec_[vec_.size()-nof_nsv]=i;
-      }
-      else{
-        vec_[nof_sv_]=i;
-        nof_sv_++;
-      }
-    assert(nof_sv_+nof_nsv==vec_.size());
-
-  }
-
-  void Index::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 Index::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 Index::nsv_first(void)
-  {
-    // if already nsv, do nothing
-    if ( !(index_first_<nof_sv()) )
-      return;
-    
-    if(index_second_==nof_sv_-1)
-      index_second_=index_first_;
-    vec_[index_first_]=vec_[nof_sv_-1];
-    vec_[nof_sv_-1]=value_first_;
-    index_first_=nof_sv_-1;
-    
-    nof_sv_--;
-  }
-
-  void Index::nsv_second(void)
-  {
-    // if already nsv, do nothing
-    if ( !(index_second_<nof_sv()) )
-      return;
-
-    if(index_first_==nof_sv_-1)
-      index_first_=index_second_;
-    vec_[index_second_]=vec_[nof_sv_-1];
-    vec_[nof_sv_-1]=value_second_;
-    index_second_ = nof_sv_-1;
-    
-    nof_sv_--;
-  }
-
-
-  void Index::shuffle(void)
-  {
-    random::DiscreteUniform a;
-    random_shuffle(vec_.begin()+nof_sv_, vec_.end(), a); 
-  }
-
-  void Index::update_first(const size_t i)
-  {
-    assert(i<size());
-    index_first_=i;
-    value_first_=vec_[i];
-  }
-
-  void Index::update_second(const size_t i)
-  {
-    assert(i<size());
-    index_second_=i;
-    value_second_=vec_[i];
-  }
 
 }} // of namespace classifier and namespace theplu

trunk/c++_tools/classifier/SVM.h

@@ -6 +6 @@
 #include <c++_tools/classifier/KernelLookup.h>
 #include <c++_tools/classifier/SupervisedClassifier.h>
+#include <c++_tools/classifier/SVindex.h>
 #include <c++_tools/classifier/Target.h>
 #include <c++_tools/utility/vector.h>
 
-#include <cassert>
 #include <utility>
 #include <vector>
@@ -18 +18 @@
 
   class DataLookup2D;
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-  /// @internal Class keeping track of which samples are support vectors and
-  /// not. The first nof_sv elements in the vector are indices of the
-  /// support vectors
-  ///
-  class Index
-  {
-
-  public:
-    //Default Contructor
-    Index(); 
-
-    // 
-    Index(const size_t);
-
-    // @return index_first
-    inline size_t index_first(void) const 
-    { assert(index_first_<size()); return index_first_; }
-
-    // @return index_second
-    inline size_t index_second(void) const 
-    { assert(index_second_<size()); return index_second_; }
-
-    // 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_; }
-
-    // making first to an nsv. If already sv, nothing happens.
-    void nsv_first(void);
-
-    // making second to an nsv. If already sv, nothing happens.
-    void nsv_second(void);   
-
-    // randomizes the nsv part of vector and sets index_first to
-    // nof_sv_ (the first nsv)
-    void shuffle(void);
-
-    // making first to a sv. If already sv, nothing happens.
-    void sv_first(void);
-
-    // making second to a sv. If already sv, nothing happens.
-    void sv_second(void);
-
-    //
-    void update_first(const size_t);
-
-    //
-    void update_second(const size_t);
-
-    // @return value_first
-    inline size_t value_first(void) const 
-    { assert(value_first_<size()); 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 operator()(size_t i) const { 
-      assert(i<size()); assert(vec_[i]<size()); return vec_[i]; }
-
-  private:
-    size_t index_first_;
-    size_t index_second_;
-    size_t nof_sv_;
-    std::vector<size_t> vec_;
-    size_t value_first_; // vec_[index_first_] exists for fast access
-    size_t value_second_; // vec_[index_second_] exists for fast access
-    
-  };
-#endif /* DOXYGEN_SHOULD_SKIP_THIS */ 
-
   ///
   /// @brief Support Vector Machine 
@@ -266 +190 @@
     utility::vector output_;
     bool owner_;
-    Index sample_;
+    SVindex sample_;
     bool trained_;
     double tolerance_;