depq 0.3 → 0.4

data/{test-depq.rb → test/test-depq.rb}

@@ -24,54 +24,63 @@
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
 # OF SUCH DAMAGE.
 
-require './depq'
+require 'depq'
 require 'test/unit'
 
 class Depq
-  module SimpleHeap
-    def validation(q, ary)
-      0.upto(size(ary)-1) {|i|
-        _, x = get_entry(ary, i)
-        j = i*2+1
-        k = i*2+2
-        if j < size(ary) && !upper?(q, ary, i, j)
-          _, y = get_entry(ary, j)
-          raise "wrong binary heap: pri[#{i}]=#{x.inspect} > #{y.inspect}=pri[#{j}]"
-        end
-        if k < size(ary) && !upper?(q, ary, i, k)
-          _, z = get_entry(ary, k)
-          raise "wrong binary heap: pri[#{i}]=#{x.inspect} > #{z.inspect}=pri[#{k}]"
-        end
-      }
-    end
+  def mm_validation(&upper)
+    0.upto(self.size-1) {|i|
+      _, x = get_entry(i)
+      j = i*2+1
+      k = i*2+2
+      if j < self.size && !upper.call(i, j)
+        _, y = get_entry(j)
+        raise "wrong binary heap: pri[#{i}]=#{x.inspect} > #{y.inspect}=pri[#{j}]"
+      end
+      if k < self.size && !upper.call(i, k)
+        _, z = get_entry(k)
+        raise "wrong binary heap: pri[#{i}]=#{x.inspect} > #{z.inspect}=pri[#{k}]"
+      end
+    }
   end
 
-  def IntervalHeap.validation(q, ary)
-    range=0...size(ary)
+  def min_validation
+    mm_validation &method(:min_upper?)
+  end
+  MinMode[:validation] = :min_validation
+
+  def max_validation
+    mm_validation &method(:max_upper?)
+  end
+  MaxMode[:validation] = :max_validation
+
+  def itv_validation
+    range=0...self.size
     range.each {|j|
       imin = parent_minside(j)
       imax = parent_maxside(j)
       jmin = minside(j)
-      if minside?(j) && range.include?(imin) && pcmp(q, ary, imin, j) > 0
+      if minside?(j) && range.include?(imin) && pcmp(imin, j) > 0
         raise "ary[#{imin}].priority > ary[#{j}].priority "
       end
-      if maxside?(j) && range.include?(imax) && pcmp(q, ary, imax, j) < 0
+      if maxside?(j) && range.include?(imax) && pcmp(imax, j) < 0
         raise "ary[#{imax}].priority < ary[#{j}].priority "
       end
-      if range.include?(imin) && pcmp(q, ary, imin, j) == 0 && scmp(q, ary, imin, j) > 0
+      if range.include?(imin) && pcmp(imin, j) == 0 && scmp(imin, j) > 0
         raise "ary[#{imin}].subpriority < ary[#{j}].subpriority "
       end
-      if range.include?(imax) && pcmp(q, ary, imax, j) == 0 && scmp(q, ary, imax, j) > 0
+      if range.include?(imax) && pcmp(imax, j) == 0 && scmp(imax, j) > 0
         raise "ary[#{imax}].subpriority < ary[#{j}].subpriority "
       end
-      if maxside?(j) && range.include?(jmin) && pcmp(q, ary, jmin, j) == 0 && scmp(q, ary, jmin, j) > 0
+      if maxside?(j) && range.include?(jmin) && pcmp(jmin, j) == 0 && scmp(jmin, j) > 0
         raise "ary[#{jmin}].subpriority < ary[#{j}].subpriority "
       end
     }
   end
+  IntervalMode[:validation] = :itv_validation
 
   def validation
-    @mode.validation(self, @ary) if @mode
+    send(Mode[@mode][:validation]) if @mode
     if @ary.length % ARY_SLICE_SIZE != 0
       raise "wrong length"
     end
@@ -945,6 +954,42 @@ class TestDepq < Test::Unit::TestCase
     assert_equal(nil, q.delete_unspecified_locator)
   end
 
+  def test_replace_min
+    q = Depq.new
+    q.insert 1
+    q.insert 2
+    q.insert 0
+    assert_equal(0, q.min)
+    loc = q.find_min_locator
+    assert_equal(2, loc.subpriority)
+    assert_equal(3, q.totalcount)
+    assert_equal(loc, q.replace_min(10))
+    assert_equal(4, q.totalcount)
+    assert_equal(1, q.delete_min)
+    assert_equal(2, q.delete_min)
+    assert_equal(3, q.find_min_locator.subpriority)
+    assert_equal(10, q.delete_min)
+    assert_equal(nil, q.delete_min)
+  end
+
+  def test_replace_max
+    q = Depq.new
+    q.insert 3
+    q.insert 4
+    q.insert 2
+    assert_equal(4, q.max)
+    loc = q.find_max_locator
+    assert_equal(1, loc.subpriority)
+    assert_equal(3, q.totalcount)
+    assert_equal(loc, q.replace_max(1))
+    assert_equal(4, q.totalcount)
+    assert_equal(3, q.delete_max)
+    assert_equal(2, q.delete_max)
+    assert_equal(3, q.find_min_locator.subpriority)
+    assert_equal(1, q.delete_max)
+    assert_equal(nil, q.delete_max)
+  end
+
   def test_each
     q = Depq.new
     a = [1,2,0]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: depq
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: "0.4"
 platform: ruby
 authors: 
 - Tanaka Akira
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-23 00:00:00 +09:00
+date: 2009-11-29 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +28,7 @@ extra_rdoc_files: []
 
 files: 
 - README
-- depq.rb
+- lib/depq.rb
 has_rdoc: true
 homepage: http://depq.rubyforge.org/
 licenses: []
@@ -37,7 +37,7 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- .
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
@@ -58,4 +58,4 @@ signing_key:
 specification_version: 3
 summary: Stable Double-Ended Priority Queue.
 test_files: 
-- test-depq.rb
+- test/test-depq.rb