Changeset 2294

Timestamp:

Jul 7, 2010, 8:19:22 PM (13 years ago)

Author:

Peter

Message:

refs #635. fix return type (int) in compare_3way and add some more test for Segment.

Location:

trunk

Files:

• test/segment_test.cc (modified) (1 diff)
• yat/utility/Segment.h (modified) (2 diffs)

trunk/test/segment_test.cc

@@ -88 +88 @@
   suite.add(segment14.end()==2);
 
+  if (!suite.add(compare(Segment<double>(0,2), Segment<double>(3,4))))
+    suite.err() << "error: compare: expected 1\n";
+  if (!suite.add(compare_3way(Segment<double>(0,2), Segment<double>(3,4))==-1))
+    suite.err() << "error: compare_3way: expected -1\n";
+
+  if (!suite.add(compare(Segment<double>(0,2), Segment<double>(1,2))==false))
+    suite.err() << "error: compare: expected 0\n";
+  if (!suite.add(compare_3way(Segment<double>(0,2), Segment<double>(1,2))==0))
+    suite.err() << "error: compare_3way: expected 0\n";
+
+  if (!suite.add(compare(Segment<double>(3,4), Segment<double>(0,2))==false))
+    suite.err() << "error: compare: expected 0\n";
+  if (!suite.add(compare_3way(Segment<double>(3,4), Segment<double>(0,2))==1))
+    suite.err() << "error: compare_3way: expected 1\n";
+
   return suite.return_value();
 }

trunk/yat/utility/Segment.h

@@ -113 +113 @@
    */
   template<typename T, class Compare>
-  bool compare_3way(const Segment<T, Compare>& lhs, 
+  int compare_3way(const Segment<T, Compare>& lhs, 
                     const Segment<T, Compare>& rhs)
   {
@@ -132 +132 @@
    */
   template<typename T, class Compare>
-  bool compare_3way(const T& lhs, 
-                    const Segment<T, Compare>& rhs)
+  int compare_3way(const T& lhs, 
+                   const Segment<T, Compare>& rhs)
   {
     Compare comp;