ordered_ds 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6202df63f7be8dfd7e47c05b1f4df1fac04921f1aa8a5bfa551d07e76f36c6b
-  data.tar.gz: 6b787b88249091dbbf956a4f9a93eecb74c3aa9d31f249cc49de191d069d0fe3
+  metadata.gz: d9a8a07dd46959758a348493a35f3320ecf7d39f03245c0c0a427e718e936a52
+  data.tar.gz: 0a37156519aa6313ee525a23c2b13eb0447f2d2456b6a7bafa2a7a1ce8d23ea4
 SHA512:
-  metadata.gz: c133ea1c52fe17ab14c8e75e2ab785b1487ac6546bb3b5713c91e3e719519b2155258f187fd1dc613597a78b74381fbf31e98c11c1bd889233b531ed51374c4a
-  data.tar.gz: '096d548ad2745206fb0e14097fbe893e097c44cad955e7429b6ce6b9f3accf54d27723c6564fa4fafd030ca7c3e4650a3faacfd92e690322b170b7dc73948583'
+  metadata.gz: 28540d59778755070c408e372ab9d12616cb08d1d695126d63edfb6c5fc9a16ae3fe7edf23d90f902c7cea4613423e764e05a32666859a1e4bf49f79cf374b2d
+  data.tar.gz: f516ae08fb145bede577be79ea6443fd167b26f27832be19da05895eff7f87889f200de7228c5e9d1f2fb77730470511ee9f16610fbddea59d365713f2ed11f8

data/lib/ordered_ds.rb

@@ -1,25 +1,25 @@
 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 empty? = @z == 0
-
-    def top = @z > 0 ? @a.first : nil
+    def size = @a.size
+    def empty? = @a.empty?
+    def top = @a.first
 
     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
@@ -27,17 +27,19 @@ class PQ
     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.0.1
 platform: ruby
 authors:
 - Viktor Reznov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-27 00:00:00.000000000 Z
+date: 2023-10-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: