Changeset 520

Timestamp:

Feb 22, 2006, 4:01:10 PM (16 years ago)

Author:

Peter

Message:

changed internal representation in Target

Location:

trunk/lib/classifier

Files:

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

trunk/lib/classifier/EnsembleBuilder.h

@@ -35 +35 @@
 
     ///
-    /// Generate ensemble
+    /// Generate ensemble. Function trains each member of the Ensemble.
     ///
     void build(void);

trunk/lib/classifier/SVM.cc

@@ -239 +239 @@
             
       epochs++;  
-      if (epochs>max_epochs_)
+      if (epochs>max_epochs_){
+        std::cerr << "WARNING: SVM: maximal number of epochs reached.\n";
         return false;
+      }
     }
     

trunk/lib/classifier/SVM.h

@@ -117 +117 @@
 
     ///
+    /// @return \f$\alpha\f$
+    ///
+    inline const gslapi::vector& alpha(void) const { return alpha_; }
+
+    ///
     /// The C-parameter is the balance term (see train()). A very
     /// large C means the training will be focused on getting samples
@@ -131 +136 @@
     ///
     inline double C(void) const { return 1/C_inverse_; }
-
-    ///
-    /// @return \f$\alpha\f$
-    ///
-    inline const gslapi::vector& alpha(void) const { return alpha_; }
 
     ///

trunk/lib/classifier/Target.cc

@@ -25 +25 @@
     : class_map_(t.class_map_)
   {
-    binary_.resize(index.size());
+    binary_=t.binary_;
     classes_.resize(index.size());
     for (size_t i=0; i<index.size(); i++) {
       assert(index[i]<t.size());
       classes_[i]=t.classes_[index[i]];
-      binary_[i]=t.binary_[index[i]];
     }
     labels_ = t.labels_;
@@ -90 +89 @@
     }
     // setting binary to false for every class
-    binary_=std::vector<short>(label.size(),0);
+    binary_=std::vector<char>(nof_classes(),false);
     
     set_binary(0,true);
 
   }
-
-  //  const Target& Target::operator=(const Target& other)
-  //{
-  //  classes_=other.classes_;    
-  //  class_map_=other.class_map_;    
-  //  labels_=other.labels_;
-  //  return *this;
-  //}
-
-  void Target::set_binary(const size_t target, const bool b)
-  {
-    for (size_t i=0; i<classes_.size(); i++)
-      if (classes_[i]==target)
-        binary_[i]=b;
-  }
-
 
   std::ostream& operator<<(std::ostream& s, const Target& a)

trunk/lib/classifier/Target.h

@@ -69 +69 @@
 
     ///
-    /// Default binary is set to false for all classes except class 0
+    /// Default binary is set to false for all classes except class 0.
     ///
-    /// @return true if class of sample @a i is set to true
+    /// @return binary target for sample @a i
     ///
     /// @see set_binary
     ///
     inline bool binary(const size_t i) const 
-    { assert(i<size()); return binary_[i]; }
+    { assert(i<size()); return binary_[operator()(i)]; }
     
     ///
-    /// Class @a target is set to @a b. Default is binary set to false
-    /// for each class.
+    /// Binary target for each sample with class @a i is set to @a
+    /// b. Default is binary set to false for each class except class
+    /// 0 which is set to true.
     ///
-    void set_binary(const size_t target, const bool b); 
+    inline void set_binary(const size_t i, const bool b) 
+    { assert(i<nof_classes()); binary_[i]=b; }
 
     ///
@@ -102 +104 @@
 
   private:
-    std::vector<short> binary_; // avoid using vector<bool>
+    // binary target for class i
+    std::vector<char> binary_; // avoid using vector<bool>
     std::vector<size_t> classes_; // class of sample i
     std::map<std::string,size_t> class_map_;