[Bf-blender-cvs] [8d547164460] temp-inplace-priority-queue: simplify naming

[Jacques Lucke]

Commit: 8d547164460f43acb04e743bbbb29bf97e3e2439
Author: Jacques Lucke
Date:   Tue Dec 15 21:52:37 2020 +0100
Branches: temp-inplace-priority-queue
https://developer.blender.org/rB8d547164460f43acb04e743bbbb29bf97e3e2439

simplify 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 2515c3128ad..8b000d0d442 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_top() const
+  int64_t peek() const
   {
     BLI_assert(!this->is_empty());
     return heap_to_orig_[0];
   }
 
-  int64_t pop_top()
+  int64_t pop()
   {
     BLI_assert(!this->is_empty());
     const int64_t top_index_orig = heap_to_orig_[0];
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 42ba6c3254f..78dab20f235 100644
--- a/source/blender/blenlib/tests/BLI_inplace_priority_queue_test.cc
+++ b/source/blender/blenlib/tests/BLI_inplace_priority_queue_test.cc
@@ -17,16 +17,16 @@ TEST(inplace_priority_queue, BuildSmall)
   data[1] = 7.5f;
   priority_queue.priority_changed(1);
 
-  // Vector<float> sorted_data;
+  Vector<float> sorted_data;
 
-  // while (!priority_queue.is_empty()) {
-  //   sorted_data.append(data.weights[priority_queue.pop_top()]);
-  // }
+  while (!priority_queue.is_empty()) {
+    sorted_data.append(data[priority_queue.pop()]);
+  }
 
-  // for (float v : sorted_data) {
-  //   std::cout << v << ", ";
-  // }
-  // std::cout << "\n";
+  for (float v : sorted_data) {
+    std::cout << v << ", ";
+  }
+  std::cout << "\n";
 
   std::cout << priority_queue.all_to_dot() << "\n";
 }