ordered_ds 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6202df63f7be8dfd7e47c05b1f4df1fac04921f1aa8a5bfa551d07e76f36c6b
-  data.tar.gz: 6b787b88249091dbbf956a4f9a93eecb74c3aa9d31f249cc49de191d069d0fe3
+  metadata.gz: 7a943103e96d394a520af9c9ca6377dbd780749064c11e54aa69bfd62e07c25c
+  data.tar.gz: be7562dcc6eb2cb47c37d3f9f53b2014e6c86386fa4ab8be1d01e894688af54a
 SHA512:
-  metadata.gz: c133ea1c52fe17ab14c8e75e2ab785b1487ac6546bb3b5713c91e3e719519b2155258f187fd1dc613597a78b74381fbf31e98c11c1bd889233b531ed51374c4a
-  data.tar.gz: '096d548ad2745206fb0e14097fbe893e097c44cad955e7429b6ce6b9f3accf54d27723c6564fa4fafd030ca7c3e4650a3faacfd92e690322b170b7dc73948583'
+  metadata.gz: 518f0105e1868a804377623f33c2b3bf78efcf54ec926f433c7713cb01c0399ee0c74b8c5e00502224127f72e337941b4cfdcbc828cf81e05cfb52379f60dba9
+  data.tar.gz: 4153bbe301542b4a291f2a19493fcddd91767cdb00e1cc51c0c6dd86e99b831994f9778e7086e777d479f772daf248e9f1cbd038c5a5a09a4e1a7153ffc7ca6e

data/lib/ordered_ds.rb

@@ -1,43 +1,53 @@
 class PQ
 
     def initialize array = [], heapify = true, &is_unordered
-        raise ArgumentError.new 'PQ init' unless array.class == Array &&
-            (heapify == true || heapify == false) && block_given?
-        @a, @z, @u = array, array.size, is_unordered
-        return if @a.empty? || !heapify
-        i = 1 << Math.log(@z, 2).floor
+        raise ArgumentError.new 'PQ init' unless
+            array.class == Array &&
+            (heapify == true || heapify == false) &&
+            block_given?
+        @a, @u = array, is_unordered
+        return unless heapify
+        i = @a.size / 2
         sink i while (i -= 1) >= 0
     end
 
-    def size = @z
+    def size = @a.size
+    def empty? = @a.empty?
+    def top = @a.first
+    def push_pop(x) = !@a.empty? && @u.(x, @a.first) ? pop_push(x) : x
 
-    def empty? = @z == 0
-
-    def top = @z > 0 ? @a.first : nil
+    def pop_push x
+        t, @a[0], = @a.first, x
+        sink 0
+        t
+    end
 
     def << x
-        @a[i = @z] = x
-        @z += 1
+        i = @a.size
+        @a << x
         while i > 0
-            p = (i - (i[0] ^ 1)) / 2
+            p = (i - 1) / 2
             break unless @u.call @a[p], @a[i]
             @a[p], @a[i] = @a[i], @a[p]
             i = p
         end
+        self
     end
 
     def pop
-        return nil unless r = top
-        @a[0] = @a[@z -= 1]
+        return @a.pop if @a.size < 2
+        t, @a[0] = @a.first, @a.pop
         sink 0
-        r
+        t
     end
 
     private
 
     def sink p
-        while (c = p * 2 + 1) < @z
-            c += 1 if c + 1 < @z && @u.(@a[c], @a[c + 1])
+        z = @a.size
+        while (c = p * 2 + 1) < z
+            r = c + 1
+            c = r if r < z && @u.(@a[c], @a[r])
             break unless @u.call @a[p], @a[c]
             @a[p], @a[c] = @a[c], @a[p]
             p = c

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ordered_ds
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Viktor Reznov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-27 00:00:00.000000000 Z
+date: 2023-11-01 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: