Left a few build config changes out. [admin]

Author: trans

.ruby

@@ -1,32 +1,54 @@
---- 
-name: pqueue
-spec_version: 1.0.0
-title: PQueue
-contact: Trans <transfire@gmail.com>
-requires: 
-- group: 
+---
+source:
+- meta
+authors:
+- name: K. Kodama
+- name: Ronald Butler
+- name: Olivier Renaud
+- name: Rick Bradley
+- name: Thomas Sawyer
+  email: transfire@gmail.com
+copyrights:
+- holder: K. Kodama
+  year: '2001'
+replacements: []
+alternatives: []
+requirements:
+- name: detroit
+  groups:
   - build
-  name: syckle
-  version: 0+
-suite: rubyworks
-manifest: 
-- .ruby
-- lib/pqueue.rb
-- test/test_pqueue.rb
-- HISTORY.rdoc
-- LICENSE
-- README.rdoc
-- VERSION
-version: 1.0.0
-licenses: 
-- LGPLv3
-copyright: Copyright (c) 2001 K. Kodama
-description: A priority queue is like a standard queue, except that each inserted elements is given a certain priority, based on the result of the comparison block given at instantiation time. Retrieving an element from the queue will always return the one with the highest priority.
-summary: Queue with prioritized elements
-authors: 
-- K. Kodama
-- Ronald Butler
-- Olivier Renaud
-- Rick Bradley
-- Thomas Sawyer
-created: 2001-03-10
+  development: true
+- name: microtest
+  groups:
+  - test
+  development: true
+- name: ae
+  groups:
+  - test
+  development: true
+dependencies: []
+conflicts: []
+repositories:
+- uri: git://github.com/rubyworks/pqueue.git
+  scm: git
+  name: upstream
+resources: {}
+extra: {}
+load_path:
+- lib
+revision: 0
+created: '2001-03-10'
+summary: Queue of Prioritized Elements
+title: PQueue
+version: 2.0.0
+name: pqueue
+description: ! 'A priority queue is like a standard queue, except that each inserted
+  elements
+
+  is given a certain priority, based on the result of the comparison block given
+
+  at instantiation time. Retrieving an element from the queue will always return
+
+  the one with the highest priority.'
+organization: rubyworks
+date: '2011-10-29'

HISTORY.rdoc

@@ -1,9 +1,18 @@
 = CHANGE HISTORY
 
+== 2.0.0 / 2011-10-29
+
+This is a complete rewrite to simplify the design and use more
+of Ruby's internal methods. Overall performance should be markedly
+improoved. Note that the interal array that stores the queue is not
+in reverse order from the previous version. If using #to_a be aware
+that the priority order is now reversed.
+
+
 == 1.0.0 / 2009-07-05
 
-This is the initial standalone release of PQueue,
-spun-off from the Ruby Facets.
+This is the initial standalone release of PQueue, spun-off from the
+Ruby Facets and originally written by K. Komada.
 
 Changes:
 

README.rdoc

@@ -1,5 +1,11 @@
 = PQueue
 
+{Home}[http://rubyworks.github.com/pqueue] |
+{Code}[http://github.com/rubyworks/pqueue] |
+{Docs}[http://rubydoc.info/gems/pqueue/frames] |
+{Mail}[http://groups.google.com/group/rubyworks] | #rubyworks
+
+
 == DESCRIPTION
 
 Priority queue with array based heap.
@@ -19,41 +25,32 @@ Heap.rb by Ronald Butler. The two libraries were later merged
 and generally improved by Olivier Renaud.
 
 
-== RESOURCES
-
-* home: http://rubyworks.github.com/pqueue
-* code: http://github.com/rubyworks/pqueue
-* docs: http://rubyworks.github.com/pqueue/rdoc
-* talk: http://googlegroups.com/group/rubyworks
-
-
 == SYNOPSIS
 
   require 'pqueue'
 
-  pq = PQueue.new([1,2,3]){ |a,b| a > b }
+  pq = PQueue.new([2,3,1]){ |a,b| a > b }
 
   pq.pop  #=> 3
 
 
-== COPYING
+== ACKNOWLEDGEMENT
+
+Although the library has been completely rewritten since, we still would
+like to acknowledge the efforts of the original PQueue authors and
+contributors.
+
+* Olivier Renaud (2007)
+* Rick Bradley (2003)
+* Ronald Butler (2002)
+* K. Kodama (2001, original library)
+
 
-* Copyright (c) 2011 Thomas Sawyer
-* Copyright (c) 2007 Olivier Renaud
-* Copyright (c) 2005 K.Kodama
-* Copyright (c) 2003 Rick Bradley
-* Copyright (c) 2002 Ronald Butler
-* Copyright (c) 2001 K.Kodama
+== COPYRIGHTS
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this program except in compliance with the License.
-You may obtain a copy of the License at
+Copyright (c) 2011 Rubyworks.
 
-   http://www.apache.org/licenses/LICENSE-2.0
+PQueue is distributable in accordance with the *FreeBSD* license.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+See the COPYING.rdoc file for details.
 

VERSION

@@ -1,17 +1,30 @@
+require 'microtest'
+require 'ae/legacy'
+
 require 'pqueue'
-require 'test/unit'
 
-class TC_PQueue < Test::Unit::TestCase
-  ARY_TEST = [2,6,1,3,8,15,0,-4,7,8,10]
+class TC_PQueue < MicroTest::TestCase
+  include AE::Legacy::Assertions
+
+  ARY_TEST   = [2,6,1,3,8,15,0,-4,7,8,10]
   ARY_TEST_2 = [25,10,5,13,16,9,16,12]
 
-  def test_initialize
-    assert_nothing_raised { PQueue.new }
-    assert_nothing_raised { PQueue.new([3]) }
-    assert_nothing_raised { PQueue.new(ARY_TEST) }
-    assert_nothing_raised { PQueue.new {|a,b| a<b} }
-    assert_nothing_raised { PQueue.new([3]) {|a,b| a<b} }
-    assert_nothing_raised { PQueue.new(ARY_TEST) {|a,b| a<b} }
+  def test_initialize_empty
+    PQueue.new
+  end
+
+  def test_initialize_single_element
+    PQueue.new([3])
+  end
+
+  def test_initialize_multiple_elements
+    PQueue.new(ARY_TEST)
+  end
+
+  def test_initialize_with_custom_comparison
+    PQueue.new {|a,b| b<=>a}
+    PQueue.new([3]) {|a,b| b<=>a}
+    PQueue.new(ARY_TEST) {|a,b| b<=>a}
   end
 
   def test_top
@@ -36,14 +49,18 @@ def test_insertion
     ret = q.push(24)
     assert_equal(q, ret)
     assert_equal(ARY_TEST.size+1, q.size)
+  end
+
+  def test_concat
+    q = PQueue.new(ARY_TEST)
 
-    ret = q.push_all(ARY_TEST_2)
+    ret = q.concat(ARY_TEST_2)
     assert_equal(q, ret)
-    assert_equal(ARY_TEST.size+1+ARY_TEST_2.size, q.size)
+    assert_equal(ARY_TEST.size+ARY_TEST_2.size, q.size)
 
     q = PQueue.new(ARY_TEST)
     r = PQueue.new(ARY_TEST_2)
-    q.push_all(r)
+    q.concat(r)
     assert_equal(ARY_TEST.size + ARY_TEST_2.size, q.size)
   end
 
@@ -70,9 +87,9 @@ def test_inspect
 
   def test_to_a
     q = PQueue.new(ARY_TEST)
-    assert_equal(ARY_TEST.sort.reverse, q.sort)
+    assert_equal(ARY_TEST.sort, q.to_a)
     q = PQueue.new(0..4)
-    assert_equal([4,3,2,1,0], q.sort)
+    assert_equal([0,1,2,3,4], q.to_a)
   end
 
   def pop_array
@@ -90,20 +107,20 @@ def test_include
     assert_equal(false, q.include?(15))
   end
 
-  def test_assert_equal
+  def test_equal
     assert_equal(PQueue.new, PQueue.new)
     assert_equal(PQueue.new(ARY_TEST), PQueue.new(ARY_TEST.sort_by{rand}))
   end
 
-  def test_replace_top
+  def test_swap
     q = PQueue.new
-    assert_nil(q.replace_top(6))
+    assert_nil(q.swap(6))
     assert_equal(6, q.top)
 
     q = PQueue.new(ARY_TEST)
     h = PQueue.new(ARY_TEST)
     q.pop; q.push(11)
-    h.replace_top(11)
+    h.swap(11)
     assert_equal(q, h)
   end
 
@@ -126,7 +143,7 @@ def test_array_copied
 
     ary = ARY_TEST.dup
     q = PQueue.new([1])
-    q.push_all(ary)
+    q.concat(ary)
     q.pop
     assert_equal(ARY_TEST, ary)