penguin_queue 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4fd3cc82db722d18ca04d5041814b763bb57b2c
-  data.tar.gz: ef46be32133f2656159e46f7adf8ddf7960386ee
+  metadata.gz: 9d70fcdcdbb5aebbebec83821a6127e80fc6f583
+  data.tar.gz: 0efca553d509e7a8951f9c3cd44315dff21d632b
 SHA512:
-  metadata.gz: f23b0a538c39f318e66a28e37d5182d619182070ad71db09599f6d0dc286b1426c6d10a631708e93803dd5ee517ba65c3d163d4734496e5c86c85754965df064
-  data.tar.gz: 7e75329a8025a5d5090b40d053b23d884831d35d68b29f297a88e2fd6fa2d08c67474670a3aabe6dbefdd79c03124adf2eb7cefb90106775621e7527c57cb8d0
+  metadata.gz: bceb560f69ff8e4f61afcc0a227ad7d43c10b960c0d4a1c487c3e874eb51a9950573521ef4c5159f55d6ab87ad38d8f7d0a9d80ea8e003cab4be93c4542b873a
+  data.tar.gz: 4fa133b95cf698d674ba7ae9eb5831500a213f2f78a0781237f6d9345dc5a67bc50b742818b91639488d4496656457292ce57842f0b8bcf43eaab4735e67b3b6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    penguin_queue (0.1.1)
+    penguin_queue (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -38,7 +38,7 @@ pq.size.times.map { pq.deq } #=> [8, 6, 4, 2, 0]
 ```ruby
 # initialize
 PenguinQueue.new
-PenguinQueue.new(order: :max) # min(default) or max
+PenguinQueue.new(order) # min(default) or max
 PenguinQueue.new(&calc_priority_from_element_proc)
 # enqueue
 <<(e) enq(e) push(e) unshift(e)

data/ext/penguin_queue/penguin_queue.c

@@ -89,10 +89,8 @@ VALUE queue_alloc(VALUE klass){
 VALUE queue_initialize(int argc, VALUE *argv, VALUE self){
   QUEUE_PREPARE(self, ptr);
   VALUE opts, order;
-  if(!OPTHASH_GIVEN_P(opts))return self;
-  ID keyword_ids[] = {id_order};
-	rb_get_kwargs(opts, keyword_ids, 0, 1, &order);
-  if(order == Qundef)return self;
+  if(argc == 0)return self;
+  rb_scan_args(argc, argv, "1", &order);
   if(order == ID2SYM(id_max)){
     ptr->compare_sgn = -1;
   }else if(order != ID2SYM(id_min)){
@@ -120,7 +118,7 @@ void queue_up(VALUE self, VALUE node){
       VALUE pnode = heap[pindex];
       NODE_PREPARE(pnode, pptr);
       long cmp = compare(pptr->priority, nptr->priority)*sgn;
-      if(!cmp)cmp=compare_id(pptr->id, nptr->id)*sgn;
+      if(!cmp)cmp=compare_id(pptr->id, nptr->id);
       if(cmp<0)break;
       pptr->index = index;
       heap[index] = pnode;
@@ -146,7 +144,7 @@ void queue_down(VALUE self, VALUE node){
         VALUE rnode = heap[lindex+1];
         NODE_PREPARE(rnode, rptr);
         long cmp = compare(lptr->priority, rptr->priority)*sgn;
-        if(!cmp)cmp=compare_id(lptr->id, rptr->id)*sgn;
+        if(!cmp)cmp=compare_id(lptr->id, rptr->id);
         if(cmp >= 0){
           lindex += 1;
           lnode = rnode;
@@ -154,7 +152,7 @@ void queue_down(VALUE self, VALUE node){
         }
       }
       long cmp = compare(nptr->priority, lptr->priority)*sgn;
-      if(!cmp)cmp=compare_id(nptr->id, lptr->id)*sgn;
+      if(!cmp)cmp=compare_id(nptr->id, lptr->id);
       if(cmp <= 0)break;
       lptr->index = index;
       heap[index] = lnode;
@@ -179,7 +177,7 @@ VALUE queue_remove_node(VALUE self, VALUE node){
     heap[nptr->index] = replace_node;
     rptr->index = nptr->index;
     long cmp = compare(rptr->priority, nptr->priority)*sgn;
-    if(!cmp)cmp = compare_id(rptr->id, nptr->id)*sgn;
+    if(!cmp)cmp = compare_id(rptr->id, nptr->id);
     if(cmp > 0){
       queue_down(nptr->queue, replace_node);
     }else{
@@ -364,7 +362,6 @@ void Init_penguin_queue(void){
   id_cmp = rb_intern("<=>");
   id_max = rb_intern("max");
   id_min = rb_intern("min");
-  id_order = rb_intern("order");
 
   VALUE queue_class = rb_define_class("PenguinQueue", rb_cObject);
   rb_define_alloc_func(queue_class, queue_alloc);

data/lib/penguin_queue/version.rb

@@ -1,3 +1,3 @@
 class PenguinQueue
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: penguin_queue
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - tompng