Changeset 860

Timestamp:

Sep 7, 2007, 9:39:30 PM (16 years ago)

Author:

Peter

Message:

fixes #149 - Target constructor from Target and vector<string>

Location:

trunk/yat/classifier

Files:

• Target.cc (modified) (3 diffs)
• Target.h (modified) (4 diffs)

trunk/yat/classifier/Target.cc

@@ -4 +4 @@
   Copyright (C) 2005 Peter Johansson
   Copyright (C) 2006 Jari Häkkinen, Markus Ringnér, Peter Johansson
+  Copyright (C) 2007 Peter Johansson
 
   This file is part of the yat library, http://lev.thep.lu.se/trac/yat
@@ -46 +47 @@
   }
   
-  Target::Target(const Target& t, 
-                 const std::vector<size_t>& index)
+
+  Target::Target(const std::vector<std::string>& label,
+                 const Target& t)
     : class_map_(t.class_map_)
   {
     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]];
-    }
     labels_ = t.labels_;
+    classes_.reserve(label.size());
+    for (std::vector<std::string>::const_iterator lab=label.begin(); 
+         lab!=label.end(); ++lab) {
+      std::map<std::string,size_t>::iterator i=class_map_.lower_bound(*lab);
+      if (i->first==*lab) // label exists
+        classes_.push_back(i->second);
+      else {
+        binary_.push_back(0);
+        classes_.push_back(labels_.size());
+        class_map_.insert(i, std::make_pair(*lab, labels_.size()));
+        labels_.push_back(*lab);
+      }
+    }
   }
 
@@ -85 +95 @@
   }
   
+
+  Target::Target(const Target& t, 
+                 const std::vector<size_t>& index)
+    : class_map_(t.class_map_)
+  {
+    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]];
+    }
+    labels_ = t.labels_;
+  }
+
+
   Target::~Target(void)
   {

trunk/yat/classifier/Target.h

@@ -52 +52 @@
     explicit Target(const std::vector<std::string>& labels);
 
+    /**
+       @brief Constructor 
+    */
+    Target(const std::vector<std::string>& labels, const Target&);
+
     ///
     /// @brief istream constructor.
@@ -57 +62 @@
     Target(std::istream&, char sep='\0') 
       throw (utility::IO_error,std::exception);
-
-    ///
-    /// @brief Copy Constructor 
-    ///
-    //Target(const Target& other) 
-    //  : classes_(other.classes_), class_map_(other.class_map_), 
-    //    labels_(other.labels_) {}
 
     ///
@@ -84 +82 @@
     const std::map<std::string,size_t>& classes(void) const;
     
-    ///
-    /// This function is equivalent to Target::classes().size()
-    ///
-    /// @return number of classes
-    ///
+    /**
+       This function is equivalent to Target::classes().size()
+       
+       \return number of classes
+       
+       \note there might be empty classes, i.e., classes with zero
+       samples. This may happen when using 
+       Target(const std::vector<std::string>& labels, const Target&) or
+       Target(const Target& org, const std::vector<size_t>& vec).
+    */
     const size_t nof_classes(void) const;
 
@@ -157 +160 @@
 
   private:
+    /// @brief Copy Constructor 
+    // using compiler generated constructor
+    //Target(const Target& other); 
+
     // binary target for class i
     std::vector<char> binary_; // avoid using vector<bool>