Fix #6 for change_priority and change_priority_by. Publishing new version of crate

Author: Gianmarco Garrisi

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "priority-queue"
-version = "0.4.4"
+version = "0.4.5"
 authors = ["Gianmarco Garrisi <gianmarcogarrisi@tutanota.com>"]
 description = "A Priority Queue implemented as a heap with a function to efficiently change the priority of an item."
 repository = "https://github.com/garro95/priority-queue"

README.rst

@@ -65,6 +65,7 @@ Feel free to contribute to this project with pull requests and/or issues. All co
 Changes
 -------
 
+* 0.4.5 Fix #6 for `change_priority` and `change_priority_by`
 * 0.4.4 Fix #6
 * 0.4.3 Fix #4 changing the way PriorityQueue serializes.
   Note that old serialized PriorityQueues may be incompatible with the new version.

src/lib.rs

@@ -121,12 +121,14 @@ mod tests {
         let mut pq = PriorityQueue::new();
         pq.push("Processor", 1);
         pq.push("Mainboard", 2);
-        pq.push("Ram", 5);
+        pq.push("RAM", 5);
+        pq.push("GPU", 4);
+        pq.push("Disk", 3);
         pq.change_priority("Processor", 10);
         assert_eq!(pq.peek(), Some((&"Processor", &10)));
 
-        pq.change_priority("Ram", 11);
-        assert_eq!(pq.peek(), Some((&"Ram", &11)));
+        pq.change_priority("RAM", 11);
+        assert_eq!(pq.peek(), Some((&"RAM", &11)));
     }
 
     #[test]
@@ -166,11 +168,11 @@ mod tests {
     fn change_priority_by() {
         use std::iter::FromIterator;
 
-        let v = vec!(("a", 1), ("b", 2), ("f", 7));
+        let v = vec!(("a", 1), ("b", 2), ("f", 7), ("g", 6), ("h", 5));
         let mut pq = PriorityQueue::from_iter(v.into_iter());
 
         pq.change_priority_by("b", |b| b+8);
-        assert_eq!(pq.into_sorted_vec().as_slice(), &["b", "f", "a"]);
+        assert_eq!(pq.into_sorted_vec().as_slice(), &["b", "f", "g", "h", "a"]);
     }
 
     #[test]

src/pqueue.rs

@@ -249,7 +249,7 @@ impl<I, P> PriorityQueue<I, P>
                 let tmp = *self.heap.get_unchecked(pos);
                 while (pos > 0) &&
                     (self.map.get_index(*self.heap.get_unchecked(parent(pos))).unwrap().1 <
-                     self.map.get_index(*self.heap.get_unchecked(pos)).unwrap().1)
+                     self.map.get_index(tmp).unwrap().1)
                 {
                     *self.heap.get_unchecked_mut(pos) = *self.heap.get_unchecked(parent(pos));
                     *self.qp.get_unchecked_mut(*self.heap.get_unchecked(pos)) = pos;
@@ -285,7 +285,7 @@ impl<I, P> PriorityQueue<I, P>
                 let tmp = *self.heap.get_unchecked(pos);
                 while (pos > 0) &&
                     (self.map.get_index(*self.heap.get_unchecked(parent(pos))).unwrap().1 <
-                     self.map.get_index(*self.heap.get_unchecked(pos)).unwrap().1)
+                     self.map.get_index(tmp).unwrap().1)
                 {
                     *self.heap.get_unchecked_mut(pos) = *self.heap.get_unchecked(parent(pos));
                     *self.qp.get_unchecked_mut(*self.heap.get_unchecked(pos)) = pos;