[Aptitude-svn-commit] r3992 - in branches/aptitude-0.3/aptitude: . src/generic tests

Daniel Burrows dburrows at costa.debian.org
Tue Aug 30 16:37:19 UTC 2005


Author: dburrows
Date: Tue Aug 30 16:37:16 2005
New Revision: 3992

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/immset.h
   branches/aptitude-0.3/aptitude/tests/test_wtree.cc
Log:
Make imm::map::put update existing entries.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Aug 30 16:37:16 2005
@@ -1,5 +1,9 @@
 2005-08-30  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/immset.h, tests/test_wtree.cc:
+
+	  Make imm::map::put update existing entries.
+
 	* src/generic/immset.h:
 
 	  Expose key_compare at the toplevel.

Modified: branches/aptitude-0.3/aptitude/src/generic/immset.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/immset.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/immset.h	Tue Aug 30 16:37:16 2005
@@ -820,7 +820,7 @@
     /** Add a binding to this map. */
     void put(const Key &k, const Val &v)
     {
-      contents.insert(binding_type(k, v));
+      contents.insertUpdate(binding_type(k, v));
     }
 
     /** Delete a binding from this map by key. */

Modified: branches/aptitude-0.3/aptitude/tests/test_wtree.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/test_wtree.cc	(original)
+++ branches/aptitude-0.3/aptitude/tests/test_wtree.cc	Tue Aug 30 16:37:16 2005
@@ -77,19 +77,19 @@
     CPPUNIT_ASSERT_LEAF(a_right_right);
 
 
-    CPPUNIT_ASSERT_EQUAL(a_left_left.getVal(), 2);
-    CPPUNIT_ASSERT_EQUAL(a_left.getVal(), 3);
-    CPPUNIT_ASSERT_EQUAL(a_left_right.getVal(), 4);
-    CPPUNIT_ASSERT_EQUAL(a.getVal(), 5);
-    CPPUNIT_ASSERT_EQUAL(a_right_left.getVal(), 6);
-    CPPUNIT_ASSERT_EQUAL(a_right.getVal(), 7);
-    CPPUNIT_ASSERT_EQUAL(a_right_right.getVal(), 8);
+    CPPUNIT_ASSERT_EQUAL(2, a_left_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(3, a_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(4, a_left_right.getVal());
+    CPPUNIT_ASSERT_EQUAL(5, a.getVal());
+    CPPUNIT_ASSERT_EQUAL(6, a_right_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(7, a_right.getVal());
+    CPPUNIT_ASSERT_EQUAL(8, a_right_right.getVal());
 
 
 
     int_node b = a.left_rotate_single();
 
-    CPPUNIT_ASSERT_EQUAL(b.size(), a.size());
+    CPPUNIT_ASSERT_EQUAL(a.size(), b.size());
 
     CPPUNIT_ASSERT(b.isValid());
 
@@ -118,13 +118,13 @@
 
 
 
-    CPPUNIT_ASSERT_EQUAL(b_left_left_left.getVal(), 2);
-    CPPUNIT_ASSERT_EQUAL(b_left_left.getVal(), 3);
-    CPPUNIT_ASSERT_EQUAL(b_left_left_right.getVal(), 4);
-    CPPUNIT_ASSERT_EQUAL(b_left.getVal(), 5);
-    CPPUNIT_ASSERT_EQUAL(b_left_right.getVal(), 6);
-    CPPUNIT_ASSERT_EQUAL(b.getVal(), 7);
-    CPPUNIT_ASSERT_EQUAL(b_right.getVal(), 8);
+    CPPUNIT_ASSERT_EQUAL(2, b_left_left_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(3, b_left_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(4, b_left_left_right.getVal());
+    CPPUNIT_ASSERT_EQUAL(5, b_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(6, b_left_right.getVal());
+    CPPUNIT_ASSERT_EQUAL(7, b.getVal());
+    CPPUNIT_ASSERT_EQUAL(8, b_right.getVal());
   }
 
   void testRotateRight()
@@ -155,19 +155,19 @@
     CPPUNIT_ASSERT_LEAF(a_right_right);
 
 
-    CPPUNIT_ASSERT_EQUAL(a_left_left.getVal(), 2);
-    CPPUNIT_ASSERT_EQUAL(a_left.getVal(), 3);
-    CPPUNIT_ASSERT_EQUAL(a_left_right.getVal(), 4);
-    CPPUNIT_ASSERT_EQUAL(a.getVal(), 5);
-    CPPUNIT_ASSERT_EQUAL(a_right_left.getVal(), 6);
-    CPPUNIT_ASSERT_EQUAL(a_right.getVal(), 7);
-    CPPUNIT_ASSERT_EQUAL(a_right_right.getVal(), 8);
+    CPPUNIT_ASSERT_EQUAL(2, a_left_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(3, a_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(4, a_left_right.getVal());
+    CPPUNIT_ASSERT_EQUAL(5, a.getVal());
+    CPPUNIT_ASSERT_EQUAL(6, a_right_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(7, a_right.getVal());
+    CPPUNIT_ASSERT_EQUAL(8, a_right_right.getVal());
 
 
 
     int_node c = a.right_rotate_single();
 
-    CPPUNIT_ASSERT_EQUAL(c.size(), a.size());
+    CPPUNIT_ASSERT_EQUAL(a.size(), c.size());
     CPPUNIT_ASSERT(c.isValid());
 
     int_node c_left = c.getLeft(), c_right = c.getRight();
@@ -190,13 +190,13 @@
     CPPUNIT_ASSERT_LEAF(c_right_right_left);
     CPPUNIT_ASSERT_LEAF(c_right_right_right);
 
-    CPPUNIT_ASSERT_EQUAL(c_left.getVal(), 2);
-    CPPUNIT_ASSERT_EQUAL(c.getVal(), 3);
-    CPPUNIT_ASSERT_EQUAL(c_right_left.getVal(), 4);
-    CPPUNIT_ASSERT_EQUAL(c_right.getVal(), 5);
-    CPPUNIT_ASSERT_EQUAL(c_right_right_left.getVal(), 6);
-    CPPUNIT_ASSERT_EQUAL(c_right_right.getVal(), 7);
-    CPPUNIT_ASSERT_EQUAL(c_right_right_right.getVal(), 8);
+    CPPUNIT_ASSERT_EQUAL(2, c_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(3, c.getVal());
+    CPPUNIT_ASSERT_EQUAL(4, c_right_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(5, c_right.getVal());
+    CPPUNIT_ASSERT_EQUAL(6, c_right_right_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(7, c_right_right.getVal());
+    CPPUNIT_ASSERT_EQUAL(8, c_right_right_right.getVal());
   }
 
   void testDoubleRotateLeft()
@@ -227,13 +227,13 @@
     CPPUNIT_ASSERT_LEAF(a_right_left_right);
 
 
-    CPPUNIT_ASSERT_EQUAL(a_left.getVal(), 2);
-    CPPUNIT_ASSERT_EQUAL(a.getVal(), 3);
-    CPPUNIT_ASSERT_EQUAL(a_right_left_left.getVal(), 4);
-    CPPUNIT_ASSERT_EQUAL(a_right_left.getVal(), 5);
-    CPPUNIT_ASSERT_EQUAL(a_right_left_right.getVal(), 6);
-    CPPUNIT_ASSERT_EQUAL(a_right.getVal(), 7);
-    CPPUNIT_ASSERT_EQUAL(a_right_right.getVal(), 8);
+    CPPUNIT_ASSERT_EQUAL(2, a_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(3, a.getVal());
+    CPPUNIT_ASSERT_EQUAL(4, a_right_left_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(5, a_right_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(6, a_right_left_right.getVal());
+    CPPUNIT_ASSERT_EQUAL(7, a_right.getVal());
+    CPPUNIT_ASSERT_EQUAL(8, a_right_right.getVal());
 
 
     int_node b = a.left_rotate_double();
@@ -263,13 +263,13 @@
     CPPUNIT_ASSERT_LEAF(b_right_right);
 
 
-    CPPUNIT_ASSERT_EQUAL(b_left_left.getVal(), 2);
-    CPPUNIT_ASSERT_EQUAL(b_left.getVal(), 3);
-    CPPUNIT_ASSERT_EQUAL(b_left_right.getVal(), 4);
-    CPPUNIT_ASSERT_EQUAL(b.getVal(), 5);
-    CPPUNIT_ASSERT_EQUAL(b_right_left.getVal(), 6);
-    CPPUNIT_ASSERT_EQUAL(b_right.getVal(), 7);
-    CPPUNIT_ASSERT_EQUAL(b_right_right.getVal(), 8);
+    CPPUNIT_ASSERT_EQUAL(2, b_left_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(3, b_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(4, b_left_right.getVal());
+    CPPUNIT_ASSERT_EQUAL(5, b.getVal());
+    CPPUNIT_ASSERT_EQUAL(6, b_right_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(7, b_right.getVal());
+    CPPUNIT_ASSERT_EQUAL(8, b_right_right.getVal());
   }
 
   void testDoubleRotateRight()
@@ -300,13 +300,13 @@
     CPPUNIT_ASSERT_LEAF(a_left_right_left);
     CPPUNIT_ASSERT_LEAF(a_left_right_right);
 
-    CPPUNIT_ASSERT_EQUAL(a_left_left.getVal(), 2);
-    CPPUNIT_ASSERT_EQUAL(a_left.getVal(), 3);
-    CPPUNIT_ASSERT_EQUAL(a_left_right_left.getVal(), 4);
-    CPPUNIT_ASSERT_EQUAL(a_left_right.getVal(), 5);
-    CPPUNIT_ASSERT_EQUAL(a_left_right_right.getVal(), 6);
-    CPPUNIT_ASSERT_EQUAL(a.getVal(), 7);
-    CPPUNIT_ASSERT_EQUAL(a_right.getVal(), 8);
+    CPPUNIT_ASSERT_EQUAL(2, a_left_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(3, a_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(4, a_left_right_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(5, a_left_right.getVal());
+    CPPUNIT_ASSERT_EQUAL(6, a_left_right_right.getVal());
+    CPPUNIT_ASSERT_EQUAL(7, a.getVal());
+    CPPUNIT_ASSERT_EQUAL(8, a_right.getVal());
 
 
 
@@ -331,13 +331,13 @@
     CPPUNIT_ASSERT_LEAF(b_right_right);
 
 
-    CPPUNIT_ASSERT_EQUAL(b_left_left.getVal(), 2);
-    CPPUNIT_ASSERT_EQUAL(b_left.getVal(), 3);
-    CPPUNIT_ASSERT_EQUAL(b_left_right.getVal(), 4);
-    CPPUNIT_ASSERT_EQUAL(b.getVal(), 5);
-    CPPUNIT_ASSERT_EQUAL(b_right_left.getVal(), 6);
-    CPPUNIT_ASSERT_EQUAL(b_right.getVal(), 7);
-    CPPUNIT_ASSERT_EQUAL(b_right_right.getVal(), 8);
+    CPPUNIT_ASSERT_EQUAL(2, b_left_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(3, b_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(4, b_left_right.getVal());
+    CPPUNIT_ASSERT_EQUAL(5, b.getVal());
+    CPPUNIT_ASSERT_EQUAL(6, b_right_left.getVal());
+    CPPUNIT_ASSERT_EQUAL(7, b_right.getVal());
+    CPPUNIT_ASSERT_EQUAL(8, b_right_right.getVal());
   }
 
   static bool WTreeValuesMatch(const set<int> &t,
@@ -511,7 +511,7 @@
     {
       wtree_node<int> found = t.find_node(5);
       CPPUNIT_ASSERT(found.isValid());
-      CPPUNIT_ASSERT_EQUAL(found.getVal(), 5);
+      CPPUNIT_ASSERT_EQUAL(5, found.getVal());
     }
 
 
@@ -541,7 +541,7 @@
       wtree_node<int> found = t.find_node(5);
 
       CPPUNIT_ASSERT(found.isValid());
-      CPPUNIT_ASSERT_EQUAL(found.getVal(), 5);
+      CPPUNIT_ASSERT_EQUAL(5, found.getVal());
     }
 
     {
@@ -640,44 +640,47 @@
     map<int, int> m;
 
     CPPUNIT_ASSERT(m.empty());
-    CPPUNIT_ASSERT_EQUAL(m.size(), 0U);
+    CPPUNIT_ASSERT_EQUAL(0U, m.size());
 
     m.put(5, 2);
     CPPUNIT_ASSERT(!m.empty());
-    CPPUNIT_ASSERT_EQUAL(m.size(), 1U);
+    CPPUNIT_ASSERT_EQUAL(1U, m.size());
 
     m.put(3, 10);
     CPPUNIT_ASSERT(!m.empty());
-    CPPUNIT_ASSERT_EQUAL(m.size(), 2U);
+    CPPUNIT_ASSERT_EQUAL(2U, m.size());
 
     m.put(4, 10);
     CPPUNIT_ASSERT(!m.empty());
-    CPPUNIT_ASSERT_EQUAL(m.size(), 3U);
+    CPPUNIT_ASSERT_EQUAL(3U, m.size());
 
     m.put(1, 3);
     CPPUNIT_ASSERT(!m.empty());
-    CPPUNIT_ASSERT_EQUAL(m.size(), 4U);
+    CPPUNIT_ASSERT_EQUAL(4U, m.size());
 
     m.put(2, 8);
     CPPUNIT_ASSERT(!m.empty());
-    CPPUNIT_ASSERT_EQUAL(m.size(), 5U);
+    CPPUNIT_ASSERT_EQUAL(5U, m.size());
 
     m.put(6, 11);
     CPPUNIT_ASSERT(!m.empty());
-    CPPUNIT_ASSERT_EQUAL(m.size(), 6U);
+    CPPUNIT_ASSERT_EQUAL(6U, m.size());
 
     m.put(1, 0);
     CPPUNIT_ASSERT(!m.empty());
-    CPPUNIT_ASSERT_EQUAL(m.size(), 6U);
+    CPPUNIT_ASSERT_EQUAL(6U, m.size());
 
 
-    CPPUNIT_ASSERT_EQUAL(m.get(0, -1), -1);
-    CPPUNIT_ASSERT_EQUAL(m.get(1, -1), 3);
-    CPPUNIT_ASSERT_EQUAL(m.get(2, -1), 8);
-    CPPUNIT_ASSERT_EQUAL(m.get(3, -1), 10);
-    CPPUNIT_ASSERT_EQUAL(m.get(4, -1), 10);
-    CPPUNIT_ASSERT_EQUAL(m.get(5, -1), 2);
-    CPPUNIT_ASSERT_EQUAL(m.get(6, -1), 11);
+    CPPUNIT_ASSERT_EQUAL(-1, m.get(0, -1));
+    CPPUNIT_ASSERT_EQUAL(0, m.get(1, -1));
+    CPPUNIT_ASSERT_EQUAL(8, m.get(2, -1));
+    CPPUNIT_ASSERT_EQUAL(10, m.get(3, -1));
+    CPPUNIT_ASSERT_EQUAL(10, m.get(4, -1));
+    CPPUNIT_ASSERT_EQUAL(2, m.get(5, -1));
+    CPPUNIT_ASSERT_EQUAL(11, m.get(6, -1));
+
+    m.put(6, 12);
+    CPPUNIT_ASSERT_EQUAL(12, m.get(6, -1));
   }
 };
 



More information about the Aptitude-svn-commit mailing list