Changeset 2239

Timestamp:

Apr 11, 2010, 1:05:12 AM (12 years ago)

Author:

Peter

Message:

closes #612

Location:

trunk

Files:

• test/utility_test.cc (modified) (3 diffs)
• yat/utility/stl_utility.h (modified) (1 diff)

trunk/test/utility_test.cc

@@ -60 +60 @@
 void test_sort_index(test::Suite& suite);
 void test_less_nan(test::Suite& suite);
+void test_ptr_compare(test::Suite& suite);
 
 int main(int argc, char* argv[])
@@ -168 +169 @@
   test_less_nan(suite);
   test_errno_error(suite);
+  test_ptr_compare(suite);
 
   return suite.return_value();
@@ -370 +372 @@
   }
 }
+
+void test_ptr_compare(test::Suite& suite)
+{
+  double* a = new double(0);
+  double* b = new double(1);
+
+  utility::PtrCompare<double> ptr_less;
+  if (!ptr_less(a, b)) {
+    suite.out() << "ptr_less(a, b) returned false\n";
+    suite.add(false);
+  }
+  if (ptr_less(b, a)) {
+    suite.out() << "ptr_less(b, a) returned true\n";
+    suite.add(false);
+  }
+
+  utility::PtrCompare<double, std::greater<double> > ptr_greater;
+  if (ptr_greater(a, b)) {
+    suite.out() << "ptr_greater(a, b) returned true\n";
+    suite.add(false);
+  }
+  if (!ptr_greater(b, a)) {
+    suite.out() << "ptr_greater(b, a) returned false\n";
+    suite.add(false);
+  }
+  delete a;
+  delete b;
+
+  std::vector<double*> vec(10);
+  std::greater<double> d_greater;
+  utility::PtrCompare<double, std::greater<double> > ptr_greater2(d_greater);
+  for (size_t i=0; i<vec.size(); ++i)
+    vec[i] = new double(i);
+  std::sort(vec.begin(), vec.end(), ptr_greater2);
+  for (size_t i=1; i<vec.size(); ++i) {
+    suite.add( *vec[i-1] > *vec[i]);
+  }
+  for (size_t i=0; i<vec.size(); ++i)
+    delete vec[i];
+
+}

trunk/yat/utility/stl_utility.h

@@ -499 +499 @@
 
 
-
+  /**
+     Adaptor class that can be used to compare pointers, T*, when you
+     want to compare them with respect to the objects they point to.
+
+     Example:
+     \code
+     std::vector<MyClass*> vec(18);
+     ...
+     PtrCompare<MyClass, std::greater<MyClass> > ptr_compare;
+     std::sort(vec.begin(), vec.end(), ptr_compare);
+     \endcode
+
+     The class Compare must be a <a
+     href="http://www.sgi.com/tech/stl/BinaryFunction.html">binary
+     functor</a> that takes two \c const \c T& and returns \c bool.
+
+     \since New in yat 0.7
+   */
+  template<typename T, class Compare = std::less<T> >
+  class PtrCompare : std::binary_function<T const* const, T const* const, bool>
+  {
+  public:
+    /**
+       \brief Constructor.
+
+       Creates an instance of Compare using its default constructor.
+     */
+    PtrCompare(void)
+    {
+      BOOST_CONCEPT_ASSERT((boost::BinaryFunction<Compare, bool, const T&, 
+                            const T&>));
+    }
+
+    /**
+       \brief Constructor.
+
+       Creates a copy of \a c that will be used later.
+     */
+    PtrCompare(Compare c)
+      : compare_(c) 
+    {
+      BOOST_CONCEPT_ASSERT((boost::BinaryFunction<Compare, bool, const T&, 
+                            const T&>));
+    }
+
+    /**
+       \return true iff Compare(* \a lhs, * \a rhs ) is true.
+     */
+    bool operator()(T const* const lhs, T const* const rhs) const
+    { 
+      return compare_(*lhs, *rhs); 
+    }
+  private:
+    Compare compare_;
+
+    // using compiler generated copy
+    // PtrCompare(const PtrCompare&)
+    // PtrCompare& operator=(const PtrCompare&)
+  };
 
   ///