Changeset 1203

Timestamp:

Oct 5, 2010, 2:33:57 PM (13 years ago)

Author:

Peter Johansson

Message:

refs #475. prefer operator+= and remove operator+ for Vector class to ensure we use +=

Location:

trunk

Files:

• lib/Functor.h (modified) (1 diff)
• lib/Stats.cc (modified) (2 diffs)
• lib/Vector.h (modified) (1 diff)
• lib/utility.h (modified) (2 diffs)
• test/vector.cc (modified) (1 diff)

trunk/lib/Functor.h

@@ -194 +194 @@
   };
 
+
+  template <typename Key, typename T>
+  struct PairValuePlusAssign :
+    public std::binary_function<T&, const std::pair<const Key, T>&, void>
+  {
+    T operator()(T& x, const std::pair<const Key, T>& p)
+    {
+      x += p.second;
+    }
+  };
+
+
+  /**
+     T1 must be mutable
+   */
+  template<typename T1, typename T2>
+  struct PlusAssign : public std::binary_function<T1, T2, void>
+  {
+    void operator()(T1 t1, T2 t2) const
+    { t1+=t2; }
+  };
+
 }} // end of namespace svndigest end of namespace theplu
 

trunk/lib/Stats.cc

@@ -372 +372 @@
       // keys are equivalent
       else {
-        first2->second = first1->second + first2->second;
+        first2->second += first1->second;
         ++first1;
         ++first2;
@@ -474 +474 @@
       vec_type::iterator j(i);
       i+=authskip;
-      SumVector init;
-      SumVector others =
-        std::accumulate(j, i, init, PairValuePlus<std::string, SumVector>());
+      SumVector others;
+      sum(j, i, others, PairValuePlusAssign<std::string, SumVector>());
       unsigned char r, g, b;
       std::string label("others");

trunk/lib/Vector.h

@@ -201 +201 @@
   };
 
-  template<typename T, class Policy>
-  Vector<T, Policy> operator+(const Vector<T, Policy>& lhs,
-                              const Vector<T, Policy>& rhs)
-  {
-    Vector<T, Policy> result(lhs);
-    result+=rhs;
-    assert(result.size()>=lhs.size());
-    assert(result.size()>=rhs.size());
-    return result;
-  }
-
-
   template<typename T>
   class SparsePolicy

trunk/lib/utility.h

@@ -24 +24 @@
   along with svndigest. If not, see <http://www.gnu.org/licenses/>.
 */
+
+#include "Functor.h"
 
 #include <algorithm>
@@ -212 +214 @@
   time_t str2time(const std::string&);
 
+  /**
+     same as sum(3) but using binary(result, *first) rather than
+     result += *first
+   */
+  template<typename InputIterator, typename T, typename BinaryOperation>
+  void sum(InputIterator first, InputIterator last, T& result, 
+           BinaryOperation binary)
+  {
+    for (; first!=last; ++first)
+      binary(result, *first);
+  }
+
+  /**
+     Add all values of [first, last) to result
+   */
+  template<typename InputIterator, typename T>
+  void sum(InputIterator first, InputIterator last, T& result)
+  {
+    typedef typename std::iterator_traits<InputIterator>::const_reference ref;
+    typedef PlusAssign<T&, ref> binary;
+    return sum(first, last, result, binary());
+  }
+
   ///
   /// If file does not exist create empty file.

trunk/test/vector.cc

@@ -65 +65 @@
   }
 
-  suite.out() << "testing operator+\n";
-  vec3 = vec + vec2;
-  if (vec3.size()!=8) {
-    suite.add(false);
-    suite.out() << "incorrect size: " << vec3.size() << " expected: " 
-                << 8 << "\n";
-  }
-  for (size_t i=0; i<8; ++i)
-    if (!suite.add(vec3[5]==vec[5]+vec2[5]))
-      suite.out() << "operator+ failed: result: " << vec3[i] 
-                  << " expected: " << vec[i] + vec2[i] << "\n";
-
   suite.out() << "testing back()\n";
   vec.resize(0);