depq 0.4 → 0.5

data/README

@@ -21,6 +21,7 @@ depq is double-ended stable priority queue with priority update operation implem
 * ((<reference manual|URL:http://depq.rubyforge.org/rdoc/classes/Depq.html>))
 * ((<home page on rubyforge|URL:http://depq.rubyforge.org/>))
 * ((<project info on rubyforge|URL:http://rubyforge.org/projects/depq/>))
+* ((<depq on gemcutter|URL:http://gemcutter.org/gems/depq>))
 * ((<source repository on github|URL:http://github.com/akr/depq>))
 * ((<raa entry|URL:http://raa.ruby-lang.org/project/depq/>))
 

data/lib/depq.rb

@@ -1,10 +1,10 @@
 # depq.rb - Double-Ended Priority Queue.
 #
-# Copyright (C) 2009 Tanaka Akira  <akr@fsij.org>
-# 
+# Copyright (C) 2009-2011 Tanaka Akira  <akr@fsij.org>
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 #  1. Redistributions of source code must retain the above copyright notice, this
 #     list of conditions and the following disclaimer.
 #  2. Redistributions in binary form must reproduce the above copyright notice,
@@ -12,7 +12,7 @@
 #     and/or other materials provided with the distribution.
 #  3. The name of the author may not be used to endorse or promote products
 #     derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
 # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
@@ -34,7 +34,7 @@
 # * priority - you can get a value with minimum priority
 # * double-ended - you can get a value with maximum priority too
 # * stable - you will get the value inserted first with minimum/maximum priority
-# * priority update - usable for Dijkstra's shortest path algorithm and various graph algorithms
+# * priority change - you can change the priority of a inserted value.  (usable for Dijkstra's shortest path algorithm and various graph algorithms)
 # * implicit heap - compact heap representation using array.  most operations are O(log n) at worst
 # * iterator operations: nlargest, nsmallest and merge
 #
@@ -420,9 +420,9 @@ class Depq
   #   class Cmp
   #     def call(a,b) a.casecmp(b) end
   #   end
-  #   q = Depq.new(Cmp.new)                         
-  #   q.insert "Foo"            
-  #   q.insert "bar"            
+  #   q = Depq.new(Cmp.new)
+  #   q.insert "Foo"
+  #   q.insert "bar"
   #   p q.delete_min   #=> "bar"
   #   p q.delete_min   #=> "Foo"
   #
@@ -785,12 +785,12 @@ class Depq
   #
   # This method doesn't delete the element from the queue.
   #
-  #   q = Depq.new 
-  #   p q.find_min_locator     #=> nil 
-  #   q.insert 3 
-  #   q.insert 1 
-  #   q.insert 2 
-  #   p q.find_min_locator     #=> #<Depq::Locator: 1> 
+  #   q = Depq.new
+  #   p q.find_min_locator     #=> nil
+  #   q.insert 3
+  #   q.insert 1
+  #   q.insert 2
+  #   p q.find_min_locator     #=> #<Depq::Locator: 1>
   #   p q.find_min_locator     #=> #<Depq::Locator: 1>
   #   p q.delete_min           #=> 1
   #   p q.find_min_locator     #=> #<Depq::Locator: 2>
@@ -827,12 +827,12 @@ class Depq
   #
   # This method doesn't delete the element from the queue.
   #
-  #   q = Depq.new 
-  #   p q.find_min     #=> nil 
-  #   q.insert 3 
-  #   q.insert 1 
-  #   q.insert 2 
-  #   p q.find_min     #=> 1 
+  #   q = Depq.new
+  #   p q.find_min     #=> nil
+  #   q.insert 3
+  #   q.insert 1
+  #   q.insert 2
+  #   p q.find_min     #=> 1
   #   p q.find_min     #=> 1
   #   p q.delete_min   #=> 1
   #   p q.find_min     #=> 2
@@ -952,12 +952,16 @@ class Depq
   #
   def delete_locator(loc)
     check_locator(loc)
-    if @heapsize <= loc.send(:index)
-      _, priority, subpriority = delete_entry(loc.send(:index))
-      loc.send(:index).upto(self.size-1) {|i|
-        loc2, _ = get_entry(i)
-        loc2.send(:index=, i)
-      }
+    index = loc.send(:index)
+    if @heapsize <= index
+      _, priority, subpriority = get_entry(index)
+      last = self.size - 1
+      if index != last
+        loc2, priority2, subpriority2 = get_entry(last)
+        set_entry(index, loc2, priority2, subpriority2)
+        loc2.send(:index=, index)
+      end
+      delete_entry(last)
       loc.send(:internal_deleted, priority, subpriority)
       loc
     else
@@ -1173,7 +1177,7 @@ class Depq
   #   q.insert 4
   #   q.insert 3
   #   p q.min           #=> 2
-  #   q.replace_min(5) 
+  #   q.replace_min(5)
   #   p q.delete_min    #=> 3
   #   p q.delete_min    #=> 4
   #   p q.delete_min    #=> 5
@@ -1275,34 +1279,48 @@ class Depq
     nil
   end
 
+  # :call-seq:
+  #   Depq.nlargest(n, iter)
+  #   Depq.nlargest(n, iter) {|e| order }
+  #
   # returns the largest n elements in iter as an array.
   #
   # The result array is ordered from the minimum element.
   #
   #   p Depq.nlargest(3, [5, 2, 3, 1, 4, 6, 7]) #=> [5, 6, 7]
   #
+  # If the block is given, the elements are compared by
+  # the corresponding block values.
+  #
+  #   p Depq.nlargest(3, [5, 2, 3, 1, 4, 6, 7]) {|e| -e } #=> [3, 2, 1]
+  #
   def Depq.nlargest(n, iter)
     limit = (n * Math.log(1+n)).ceil
     limit = 1024 if limit < 1024
     q = Depq.new
     threshold = nil
-    iter.each {|v|
+    iter.each {|e|
+      if block_given?
+        v = yield e
+      else
+        v = e
+      end
       if q.size < n
         if q.size == 0
           threshold = v
         else
           threshold = v if (v <=> threshold) < 0
         end
-        q.insert v
+        q.insert e, v
       else
         if (v <=> threshold) > 0
-          q.insert v
+          q.insert e, v
           if limit < q.size
             tmp = []
-            n.times { tmp << q.delete_max }
+            n.times { tmp << q.delete_max_locator }
             q.clear
-            q.insert_all tmp
-            threshold = tmp.last
+            tmp.each {|loc| q.insert_locator loc }
+            threshold = tmp.last.priority
           end
         end
       end
@@ -1314,34 +1332,48 @@ class Depq
     a
   end
 
+  # :call-seq:
+  #   Depq.nsmallest(n, iter)
+  #   Depq.nsmallest(n, iter) {|e| order }
+  #
   # returns the smallest n elements in iter as an array.
   #
   # The result array is ordered from the minimum element.
   #
   #   p Depq.nsmallest(5, [5, 2, 3, 1, 4, 6, 7]) #=> [1, 2, 3, 4, 5]
   #
+  # If the block is given, the elements are compared by
+  # the corresnponding block values.
+  #
+  #   p Depq.nsmallest(5, [5, 2, 3, 1, 4, 6, 7]) {|e| -e } #=> [7, 6, 5, 4, 3]
+  #
   def Depq.nsmallest(n, iter)
     limit = (n * Math.log(1+n)).ceil
     limit = 1024 if limit < 1024
     q = Depq.new
     threshold = nil
-    iter.each {|v|
+    iter.each {|e|
+      if block_given?
+        v = yield e
+      else
+        v = e
+      end
       if q.size < n
         if q.size == 0
           threshold = v
         else
           threshold = v if (v <=> threshold) > 0
         end
-        q.insert v
+        q.insert e, v
       else
         if (v <=> threshold) < 0
-          q.insert v
+          q.insert e, v
           if limit < q.size
             tmp = []
-            n.times { tmp << q.delete_min }
+            n.times { tmp << q.delete_min_locator }
             q.clear
-            q.insert_all tmp
-            threshold = tmp.last
+            tmp.each {|loc| q.insert_locator loc }
+            threshold = tmp.last.priority
           end
         end
       end

data/test/test-depq.rb

@@ -1,10 +1,10 @@
 # test-depq.rb - test for depq.rb
 #
 # Copyright (C) 2009 Tanaka Akira  <akr@fsij.org>
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 #  1. Redistributions of source code must retain the above copyright notice, this
 #     list of conditions and the following disclaimer.
 #  2. Redistributions in binary form must reproduce the above copyright notice,
@@ -12,7 +12,7 @@
 #     and/or other materials provided with the distribution.
 #  3. The name of the author may not be used to endorse or promote products
 #     derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
 # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
@@ -92,7 +92,7 @@ class Depq
       if loc.send(:index) != i
         raise "index mismatch"
       end
-      unless self.equal? loc.depq 
+      unless self.equal? loc.depq
         raise "depq mismatch"
       end
       i += 1
@@ -401,13 +401,13 @@ class TestDepq < Test::Unit::TestCase
      q.insert "bar"
      assert_equal("Foo", q.delete_min)
      assert_equal("bar", q.delete_min)
-  
+
      q = Depq.new(:casecmp)
      q.insert "Foo"
      q.insert "bar"
      assert_equal("bar", q.delete_min)
      assert_equal("Foo", q.delete_min)
-  
+
      q = Depq.new(lambda {|a,b| a.casecmp(b) })
      q.insert "Foo"
      q.insert "bar"
@@ -1030,6 +1030,9 @@ class TestDepq < Test::Unit::TestCase
     a = Depq.nlargest(3, [5, 1, 3, 2, 4, 6, 7])
     assert_equal([5, 6, 7], a)
 
+    a = Depq.nlargest(3, [5, 1, 3, 2, 4, 6, 7]) {|e| -e }
+    assert_equal([3, 2, 1], a)
+
     assert_equal([1,2], Depq.nlargest(3, [1,2]))
 
     a = []
@@ -1042,6 +1045,9 @@ class TestDepq < Test::Unit::TestCase
     a = Depq.nsmallest(5, [5, 2, 3, 1, 4, 6, 7])
     assert_equal([1, 2, 3, 4, 5], a)
 
+    a = Depq.nsmallest(5, [5, 2, 3, 1, 4, 6, 7]) {|e| -e }
+    assert_equal([7, 6, 5, 4, 3], a)
+
     assert_equal([1,2], Depq.nsmallest(3, [1,2]))
 
     a = []

metadata

@@ -1,61 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: depq
-version: !ruby/object:Gem::Version 
-  version: "0.4"
+version: !ruby/object:Gem::Version
+  version: '0.5'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Tanaka Akira
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-11-29 00:00:00 +09:00
-default_executable: 
+date: 2011-10-27 00:00:00.000000000 Z
 dependencies: []
+description: ! 'depq is a Double-Ended Priority Queue library.
+
+  It is a data structure which can insert elements and delete elements with minimum
+  and maximum priority.
 
-description: |
-  depq is a Double-Ended Priority Queue library.
-  It is a data structure which can insert elements and delete elements with minimum and maximum priority.
   If there are elements which has same priority, the element inserted first is chosen.
+
   The priority can be changed after the element is inserted.
 
+'
 email: akr@fsij.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README
 - lib/depq.rb
-has_rdoc: true
+- test/test-depq.rb
 homepage: http://depq.rubyforge.org/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: depq
-rubygems_version: 1.3.4
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Stable Double-Ended Priority Queue.
-test_files: 
+test_files:
 - test/test-depq.rb