[Bf-blender-cvs] [4b5e581fd26] temp-inplace-priority-queue: cleanup naming

[Jacques Lucke]

Commit: 4b5e581fd26e5635147edf7d8dacd42d99820407
Author: Jacques Lucke
Date:   Tue Dec 15 22:09:26 2020 +0100
Branches: temp-inplace-priority-queue
https://developer.blender.org/rB4b5e581fd26e5635147edf7d8dacd42d99820407

cleanup naming

===================================================================

M	source/blender/blenlib/BLI_inplace_priority_queue.hh
M	source/blender/blenlib/tests/BLI_inplace_priority_queue_test.cc

===================================================================

diff --git a/source/blender/blenlib/BLI_inplace_priority_queue.hh b/source/blender/blenlib/BLI_inplace_priority_queue.hh
index 8b000d0d442..5b047829b1e 100644
--- a/source/blender/blenlib/BLI_inplace_priority_queue.hh
+++ b/source/blender/blenlib/BLI_inplace_priority_queue.hh
@@ -66,13 +66,13 @@ class InplacePriorityQueue {
     return heap_size_ == 0;
   }
 
-  int64_t peek() const
+  int64_t peek_index() const
   {
     BLI_assert(!this->is_empty());
     return heap_to_orig_[0];
   }
 
-  int64_t pop()
+  int64_t pop_index()
   {
     BLI_assert(!this->is_empty());
     const int64_t top_index_orig = heap_to_orig_[0];
@@ -84,6 +84,16 @@ class InplacePriorityQueue {
     return top_index_orig;
   }
 
+  const T &peek() const
+  {
+    return data_[this->peek_index()];
+  }
+
+  const T &pop()
+  {
+    return data_[this->pop_index()];
+  }
+
   void priority_decreased(const int64_t index)
   {
     const int64_t heap_index = orig_to_heap_[index];
diff --git a/source/blender/blenlib/tests/BLI_inplace_priority_queue_test.cc b/source/blender/blenlib/tests/BLI_inplace_priority_queue_test.cc
index f7988f03383..25842206166 100644
--- a/source/blender/blenlib/tests/BLI_inplace_priority_queue_test.cc
+++ b/source/blender/blenlib/tests/BLI_inplace_priority_queue_test.cc
@@ -13,13 +13,13 @@ TEST(inplace_priority_queue, BuildSmall)
   InplacePriorityQueue<int> priority_queue{values};
   priority_queue.build();
 
-  EXPECT_EQ(values[priority_queue.peek()], 8);
-  EXPECT_EQ(values[priority_queue.pop()], 8);
-  EXPECT_EQ(values[priority_queue.peek()], 7);
-  EXPECT_EQ(values[priority_queue.pop()], 7);
-  EXPECT_EQ(values[priority_queue.pop()], 6);
-  EXPECT_EQ(values[priority_queue.pop()], 6);
-  EXPECT_EQ(values[priority_queue.pop()], 5);
+  EXPECT_EQ(priority_queue.peek(), 8);
+  EXPECT_EQ(priority_queue.pop(), 8);
+  EXPECT_EQ(priority_queue.peek(), 7);
+  EXPECT_EQ(priority_queue.pop(), 7);
+  EXPECT_EQ(priority_queue.pop(), 6);
+  EXPECT_EQ(priority_queue.pop(), 6);
+  EXPECT_EQ(priority_queue.pop(), 5);
 }
 
 TEST(inplace_priority_queue, DecreasePriority)
@@ -28,11 +28,11 @@ TEST(inplace_priority_queue, DecreasePriority)
   InplacePriorityQueue<int> priority_queue(values);
   priority_queue.build();
 
-  EXPECT_EQ(values[priority_queue.peek()], 7);
+  EXPECT_EQ(priority_queue.peek(), 7);
   values[2] = 0;
-  EXPECT_EQ(values[priority_queue.peek()], 0);
+  EXPECT_EQ(priority_queue.peek(), 0);
   priority_queue.priority_decreased(2);
-  EXPECT_EQ(values[priority_queue.peek()], 5);
+  EXPECT_EQ(priority_queue.peek(), 5);
 }
 
 TEST(inplace_priority_queue, IncreasePriority)
@@ -41,11 +41,11 @@ TEST(inplace_priority_queue, IncreasePriority)
   InplacePriorityQueue<int> priority_queue(values);
   priority_queue.build();
 
-  EXPECT_EQ(values[priority_queue.peek()], 7);
+  EXPECT_EQ(priority_queue.peek(), 7);
   values[1] = 10;
-  EXPECT_EQ(values[priority_queue.peek()], 7);
+  EXPECT_EQ(priority_queue.peek(), 7);
   priority_queue.priority_increased(1);
-  EXPECT_EQ(values[priority_queue.peek()], 10);
+  EXPECT_EQ(priority_queue.peek(), 10);
 }
 
 TEST(inplace_priority_queue, PopAll)
@@ -61,7 +61,7 @@ TEST(inplace_priority_queue, PopAll)
 
   int last_value = 1000;
   while (!priority_queue.is_empty()) {
-    const int value = values[priority_queue.pop()];
+    const int value = priority_queue.pop();
     EXPECT_LE(value, last_value);
     last_value = value;
   }