dumb_numb_set 0.0.2 → 0.0.3

data/lib/dumb_numb_set.rb

@@ -50,16 +50,16 @@ class DumbNumbSet
   # Add a non-negative integer to the set.
   # Raises an ArgumentError if the number given is not a non-negative integer.
   def add num
-    check_num num
+    raise ArgumentError, "Argument must be positive integer" unless num.is_a? Fixnum and num.integer? and num >= 0
 
-    index = bitset_index num
+    index = num / @div
 
     bitset = @bitsets[index]
 
     if bitset
-      @bitsets[index] = (bitset | bin_index(num))
+      @bitsets[index] = (bitset | (1 << (num % @div)))
     else
-      @bitsets[index] = bin_index(num)
+      @bitsets[index] = (1 << (num % @div))
     end
 
     self
@@ -67,18 +67,25 @@ class DumbNumbSet
 
   alias << add
 
+  # Merge a collection of numbers into the set.
+  # Modifes and returns the target set.
+  def merge nums
+    nums.each do |num|
+      self.add num
+    end
+
+    self
+  end
+
   # Remove number from set.
-  # Raises an ArgumentError if the number given is not a non-negative integer.
   def remove num
-    check_num num
-
-    index = bitset_index num
+    index = num / @div
 
     bitset = @bitsets[index]
 
     return false unless bitset
 
-    @bitsets[index] = (bitset ^ bin_index(num))
+    @bitsets[index] = (bitset ^ (1 << (num % @div)))
 
     if @bitsets[index] == 0
       @bitsets.delete index
@@ -92,40 +99,19 @@ class DumbNumbSet
   # Returns true if the given number is in the set.
   # Raises an ArgumentError if the number given is not a non-negative integer.
   def include? num
-    check_num num
-
-    index = bitset_index num
+    index = num / @div
 
     bitset = @bitsets[index]
 
     return false unless bitset
 
-    bitset & bin_index(num) != 0
+    bitset & (1 << (num % @div)) != 0
   end
 
   # Returns number of keys in set (not number of values).
   def size
     @bitsets.length
   end
-
-  private
-
-  # Calculate the bitmask to index the given number in the bitset.
-  def bin_index num
-    1 << (num % @div)
-  end
-
-  # Calculate the key of the bitset for a given number.
-  def bitset_index num
-    (num / @div)
-  end
-
-  # Check that the argument is a valid number.
-  def check_num num
-    unless num.is_a? Fixnum and num.integer? and num >= 0
-      raise ArgumentError, "Argument must be positive integer"
-    end
-  end
 end
 
 # Custom marshal technique if MessagePack is available. Saves some bytes,

metadata

@@ -1,26 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: dumb_numb_set
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  prerelease:
+  version: 0.0.3
 platform: ruby
 authors:
 - Justin Collins
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-09-01 00:00:00.000000000 Z
 dependencies: []
-description: ! 'Ever needed to compactly store and query a set of mostly consecutive,
-
+description: |
+  Ever needed to compactly store and query a set of mostly consecutive,
   non-negative integers? Probably not, but if you do this library may work for
-
-  you. It''s just about as fast as a Set and a lot smaller for numbers that stay
-
+  you. It's just about as fast as a Set and a lot smaller for numbers that stay
   close together.
-
-'
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -29,26 +25,26 @@ files:
 homepage: https://github.com/presidentbeef/dumb-numb-set
 licenses:
 - MIT
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.25
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: A compact data structure for mostly consecutive, non-negative integers.
 test_files: []