priority_queue_cxx 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2b5bbef541a1b74a11e959cda5b1b11020bda89
-  data.tar.gz: 15d62c6289e5d07cacafba804497305b6719c532
+  metadata.gz: e986c8e1ee2ffadf9ee65bbc906fe3fe980aff79
+  data.tar.gz: 21d4f3c327dbd7c1fe059dc119d6847871259ae4
 SHA512:
-  metadata.gz: 7f14a5601f02ab38049968a222dd01d9403755984f0b91f6365b881cfe5af229173edf16290aa7568e15a87fd343205d965c9f8f2782cf096aed070cbd3ad934
-  data.tar.gz: 264b327c4dbc023d21a06868eebe55b76812d6f48b3a9797dd456aeb206766c936fd00ea1d1ae97ac3e58ae70a04a0b891b866ac14da513ae152f52b1ba3015f
+  metadata.gz: 0b2a75924e27c81bd72609b98766dcf5da2d41a39c08f8d0ec2e391630bd9e0bd7cf78e5382b38fd00694b2c7162fd8d1da2bb946e0f7d7bdff290fdec23bdd0
+  data.tar.gz: 355340dda6b0ebdd4667a9e65db95be6d7b25dd0698e5c57c9f3e5767eff3098e34c08d92bf2439e05e69d051b596a7573302e7aec61fabe8bfaa20862e97404

data/README.md

@@ -1,10 +1,10 @@
 # PriorityQueueCxx
 
-[![Gem Version](https://badge.fury.io/rb/fast_containers.png)](http://badge.fury.io/rb/fast_containers)
+[![Gem Version](https://badge.fury.io/rb/priority_queue_cxx.png)](http://badge.fury.io/rb/priority_queue_cxx)
 
-FastContainers provides a fast implementatin of priority queues for ruby. Speed is achieved by exposing  the c++ standard implementation through a light ruby wrapper. As a bigger project, the library may grow  a number of containers that are not in the standard ruby library and are presently only available as pure ruby libraries, but presently the library includes a single class named PriorityQueue. More containers will be added as necessity arises. Contributors and feature requests are most welcome.
+*FastContainers* provides a fast implementatin of priority queues for ruby. Speed is achieved by exposing  the c++ standard implementation through a light ruby wrapper. As a bigger project, the library may grow to provide a number of containers that are not in the standard ruby library and are presently only available as pure ruby libraries. Presently, however, the library includes a single class named PriorityQueue. More containers will be added as necessity arises. Contributors and feature requests are most welcome.
 
-The library exposes a module named 'FastContainers' (to be required using ```require 'fc'```) which provides the PriorityQueue class.
+The library exposes a module named ```FastContainers``` (to be required using ```require 'fc'```) which provides the PriorityQueue class.
 
 ## Installation
 
@@ -217,7 +217,7 @@ Create a new priority queue and returns it. queue_kind specifies whether to buil
 
 Example:
 
-```ruby 
+```ruby
   pq = FastContainers::PriorityQueue.new(:min)
 ```
 
@@ -291,4 +291,3 @@ The class Includes Enumerable, so that standard enumeration based methods (e.g.,
 ## Notes
 
 <sup id="ref1">1</sup> It is worth mentioning that, due to how priority queue are implemented by the C++ standard library, this implementation can't efficiently support priority changes. In any case, to support this feature would require important changes in the current API.<a href="#which-is-the-best-priority-queue-implementation-for-ruby" title="back reference">&#8617;</a>
-

data/ext/fast_containers/fc_pq.cpp

@@ -22,9 +22,9 @@
 #include <iostream>
 
 namespace fc_pq {
-  
+
   typedef std::pair<void*,double> PQElem;
- 
+
   class PairsComparator
   {
     bool reverse;
@@ -36,54 +36,54 @@ namespace fc_pq {
       else return (lhs.second<rhs.second);
     }
   };
-  
+
   // --------------------------------------
   // PQueue
   // --------------------------------------
-    
+
   typedef std::vector<PQElem> PQueueStorage;
   typedef unsigned int PQueueStorageVersion;
-  
-  typedef struct _PQueue { 
+
+  typedef struct _PQueue {
     PQueueStorage storage;
     PairsComparator comparator;
     PQueueStorageVersion version;
-    
+
     _PQueue(PQueueKind kind) : comparator(kind), version(0) { }
-  }* PQueue;  
+  }* PQueue;
 
   void destroy(PQueue q){
     delete q;
   }
-  
+
   PQueue create(PQueueKind kind) {
     return new _PQueue(kind);
   }
-  
+
   /* Getting the size of the container */
   unsigned int size(PQueue q) {
      return q->storage.size();
   }
-  
-  
+
+
   void push(PQueue q, void* value, double priority) {
     q->version++;
     q->storage.push_back(PQElem(value, priority));
     push_heap(q->storage.begin(), q->storage.end(), q->comparator);
   }
-  
+
   void* top(PQueue q) {
     return q->storage.at(0).first;
   }
-  
+
   double top_key(PQueue q) {
     return q->storage.at(0).second;
   }
-  
+
   double second_best_key(PQueue q) {
      if(q->storage.size()==2)
         return q->storage.at(1).second;
-     
+
      double key1 = q->storage.at(1).second;
      double key2 = q->storage.at(2).second;
      if( key1 > key2 ) {
@@ -92,31 +92,31 @@ namespace fc_pq {
         return key2;
      }
   }
-  
+
   void pop(PQueue q) {
     q->version++;
     pop_heap(q->storage.begin(), q->storage.end(), q->comparator);
     q->storage.pop_back();
   }
-  
+
   bool empty(PQueue q) {
     return q->storage.empty();
   }
-  
+
   // --------------------------------------
   // Iterator
   // --------------------------------------
-  
-  
+
+
   typedef struct _PQueueIterator {
     PQueueStorage::const_iterator iterator;
     PQueue pqueue;
     PQueueStorage* storage;
     PQueueStorageVersion version;
-    
-    _PQueueIterator(PQueue q) : iterator(q->storage.begin()), pqueue(q), storage(&q->storage), version(q->version) 
+
+    _PQueueIterator(PQueue q) : iterator(q->storage.begin()), pqueue(q), storage(&q->storage), version(q->version)
       { }
-    
+
     void checkVersion() throw(PQueueException) {
       if(version != pqueue->version) {
         throw PQueueException("FastContainers::PriorityQueue - a change in the priority queue invalidated the current iterator.");
@@ -124,35 +124,35 @@ namespace fc_pq {
     }
   } PQueueImplIterator;
   #define QIT(it) ((PQueueImplIterator*)(it))
-  
+
   /* Returns a new iterator object */
   PQueueIterator iterator(PQueue q) {
     PQueueImplIterator* it = new PQueueImplIterator(q);
     return it;
   }
-  
+
   void iterator_dispose(PQueueIterator it) {
     delete it;
   }
-  
+
   /* Returns the value of the current element */
   void* iterator_get_value(PQueueIterator it) {
     return it->iterator->first;
   }
-  
+
   /* Returns the priority of the current  element */
   double iterator_get_key(PQueueIterator it) {
     return it->iterator->second;
   }
-  
+
   /* Moves on to the next element */
   PQueueIterator iterator_next(PQueueIterator it) throw(PQueueException) {
     it->checkVersion();
     it->iterator++;
     return it;
   }
-  
+
   bool iterator_end(PQueueIterator it) {
     return it->iterator == it->storage->end();
   }
-}
+}

data/ext/fast_containers/fc_pq.h

@@ -22,64 +22,63 @@
 #define FC_QUEUE_H_KTY6FH1S
 
 #include <queue>
+#include <stdexcept>
 
 namespace fc_pq {
   class PQueueException : public std::runtime_error {
   public:
     PQueueException(const char* msg) : std::runtime_error(msg) {}
   };
-  
+
   typedef struct _PQueue* PQueue;
   typedef struct _PQueueIterator* PQueueIterator;
   typedef enum { MIN_QUEUE, MAX_QUEUE } PQueueKind;
-  
+
   /* Constructor. It defaults to construct a max queue. If true is passed
-  it construct a min queue.*/  
+  it construct a min queue.*/
   PQueue create(PQueueKind kind);
-  
+
   /* Destructor */
-  void destroy(PQueue q); 
-  
+  void destroy(PQueue q);
+
   /* Getting the size of the container */
   unsigned int size(PQueue q);
-  
+
   /* Adding elements */
   void push(PQueue q, void* value, double priority);
-  
+
   /* Inspecting the queue top (for values) */
   void* top(PQueue q);
-  
+
   /* Inspecting the queue top (for priorities) */
   double top_key(PQueue q);
-  
+
  /* Returns the priority of the next best element */
   double second_best_key(PQueue q);
-  
+
   /* Removing the queue top */
   void pop(PQueue q);
-  
+
   /* Returns true if the queue is empty */
   bool empty(PQueue q);
-  
+
   /* Returns a new iterator object */
   PQueueIterator iterator(PQueue q);
-  
+
   /* Dispose the iterator */
   void iterator_dispose(PQueueIterator it);
-  
+
   /* Returns the value of the current element */
   void* iterator_get_value(PQueueIterator it);
-  
+
   /* Returns the priority of the current  element */
   double iterator_get_key(PQueueIterator it);
-  
+
   /* Moves on to the next element */
   PQueueIterator iterator_next(PQueueIterator it) throw(PQueueException);
-  
+
   /* Return true if the iterator is already out of the container */
   bool iterator_end(PQueueIterator it);
 }
 
 #endif /* end of include guard: FC_QUEUE_H_KTY6FH1S */
-
-

data/lib/fc.rb

@@ -21,11 +21,11 @@
 require 'fast_containers'
 
 module FastContainers
-  VERSION = "0.3.2"
-  
+  VERSION = "0.3.3"
+
   class PriorityQueue
     include Enumerable
-    
+
     alias_method :next, :top
     alias_method :next_key, :top_key
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: priority_queue_cxx
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Roberto Esposito
@@ -45,7 +45,7 @@ files:
 - test/performance/test_fc_vs_pqueue.rb
 - test/performance/test_fc_vs_priority_queue.rb
 - test/test_fast_containers.rb
-homepage: https://github.com/boborbt/fast_containers
+homepage: https://github.com/boborbt/priority_queue_cxx
 licenses:
 - MIT
 metadata: {}