Changeset 485

Timestamp:

Oct 13, 2007, 10:13:54 PM (16 years ago)

Author:

Peter Johansson

Message:

Fixes #267 in trunk. This ChangeSet? should be equivalent with [478], but using a back_insert_iterator to speed up it slightly.

File:

• trunk/lib/Functor.h (modified) (1 diff)

trunk/lib/Functor.h

@@ -167 +167 @@
                               const std::vector<T>& v) const 
     {
+      std::vector<T> res;
+      res.reserve(std::max(u.size(), v.size()));
+      std::back_insert_iterator<std::vector<T> > inserter(res);
       if ( u.size() > v.size() ){
-        std::vector<T> res(u.size());
-        transform(u.begin(), u.end(), v.begin(), res.begin(), std::plus<T>());
-        copy(u.begin()+v.size(), u.end(), res.begin()+v.size());
-        return res;
+        std::transform(v.begin(), v.end(), u.begin(), inserter, std::plus<T>());
+        std::copy(u.begin()+v.size(), u.end(), inserter);
       }
-  
-      std::vector<T> res(v.size());
-      transform(v.begin(), v.end(), u.begin(), res.begin(), std::plus<T>());
-      if ( v.size() > u.size() )
-        copy(v.begin()+u.size(), v.end(), res.begin()+u.size());
+      else {
+        std::transform(u.begin(), u.end(), v.begin(), inserter, std::plus<T>());
+        std::copy(v.begin()+u.size(), v.end(), inserter);
+      }
       return res;
     }