priority_queue_cxx 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7abe67c4e9f2b119c40c6313206cbd68b79e56e8c79550d38e5a38f9b33236b2
-  data.tar.gz: 9ff72ad384bd32a437e53011de54fa33f580645a1fc761e9755e95cc733bfb3d
+  metadata.gz: fdf28c23df29684a2a6a9dfb4d5c5b2be60ffa1c4729c0bde44925b3f31c2237
+  data.tar.gz: 90415c07d9cd47d1a4a626abbab3123e724123f95599f09cca420c0d3bd1a752
 SHA512:
-  metadata.gz: 3001a18291bd80439f2beba7a1a560676c30bb591d3d1b04ac7a8fb3ede8084e1bdbfb8554b2590d80c101a7bf216e86cc29cfe1900b0f9dc43356f063f84d79
-  data.tar.gz: 4b477633d626e58227c189b11fb241f4fbdf0f0a0534e6901c5827c32d6ffe0e0e55f2efe63fb9479e56cad3dc3faed2d183fe2b26d08b37f5108a936a913889
+  metadata.gz: fb1167358338c541477a748a303e1c32dd760f7433db2f187d5476a492202e9538244c7f6617299d026718869f0d1d39ba5dda553b2af2ca6f58567b1157cc32
+  data.tar.gz: bbd3e48430af5471fc9e27881a9b4f65571979732412de5352f03691df7ecd85b316cf67055cd4405b292d361505b0ae27bb248aa806b49e68f9a26ce88c7972

data/ext/fast_containers/fc_pq.cpp

@@ -81,15 +81,18 @@ namespace fc_pq {
   }
 
   double second_best_key(PQueue q) {
+     // elements in storage are not necessarily sorted, but the 
+     // second best key is bound to be in one of the first two elements
      if(q->storage.size()==2)
         return q->storage.at(1).second;
 
      double key1 = q->storage.at(1).second;
      double key2 = q->storage.at(2).second;
-     if( key1 > key2 ) {
-        return key1;
-     } else {
+
+    if( q->comparator(q->storage.at(1), q->storage.at(2)) ) {
         return key2;
+     } else {
+        return key1;
      }
   }
 

data/test/test_fast_containers.rb

@@ -19,9 +19,11 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 require "minitest/autorun"
+require 'minitest/spec'
+require 'minitest/autorun'
 require "fc"
 
-class TestFastContainers < MiniTest::Unit::TestCase
+class TestFastContainers < Minitest::Test
   def test_new_object_creation
     assert !FastContainers::PriorityQueue.new(:max).nil?
   end
@@ -177,6 +179,15 @@ class TestFastContainers < MiniTest::Unit::TestCase
     
     assert_equal pq.second_best_key, 95
   end
+
+  def test_second_best_key_on_min_queues
+    pq = FastContainers::PriorityQueue.new(:min)
+    pq.push("a",2)
+    pq.push("b",2)
+    pq.push("c",3)
+
+    assert_equal pq.second_best_key, 2
+  end
   
   def test_second_best_key_on_empty_pq
     pq = FastContainers::PriorityQueue.new(:max)
@@ -239,7 +250,7 @@ class TestFastContainers < MiniTest::Unit::TestCase
       end
     end
     
-    assert_match /a change in the priority queue invalidated the current iterator/, exception.message
+    assert_match (/a change in the priority queue invalidated the current iterator/), exception.message
     assert_equal 4, objects.size
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: priority_queue_cxx
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Roberto Esposito
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.2
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: Fast (c++ wrapper) priority queue implementation for ruby.