ewah-bitset 0.0.1 → 0.0.2

data/CHANGELOG

@@ -1 +1,3 @@
-v0.0.1. First version.
+v0.0.2. A few additional library functions exposed.
+
+v0.0.1. First version.

data/README.md

@@ -6,6 +6,12 @@ This library wraps the original C++ implementation written by one of the origina
 
 https://github.com/lemire/EWAHBoolArray
 
+The gem is built and tested against ruby 1.8.7. If anyone wants to modify it to also run in ruby 1.9.x I'd gladly accept the pull requests.
+
+To install simply run
+
+    gem install ewah-bitset
+
 Examples are in the spec but the general idea goes something like this:
 
     require 'ewahbitset'

data/ewah-bitset.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ewah-bitset"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Ferguson"]
-  s.date = "2012-04-21"
+  s.date = "2012-04-23"
   s.description = "A wrapper around Lemire's EWAHBoolArray from https://github.com/lemire/EWAHBoolArray"
   s.email = "josh@besquared.net"
   s.extensions = ["ext/extconf.rb"]

data/ext/ewah-bitset.cpp

@@ -47,6 +47,32 @@ extern "C" VALUE ewah_each(VALUE self) {
   return Qnil;
 }
 
+extern "C" VALUE ewah_each_word(VALUE self) {
+  EWAH *bitset;
+  Data_Get_Struct(self, EWAH, bitset);
+  
+  EWAHBoolArrayIterator<uword64> i = bitset->bits->uncompress();
+  
+  while(i.hasNext()) {
+    rb_yield(INT2FIX(i.next()));
+  }
+  
+  return Qnil;
+}
+
+extern "C" VALUE ewah_each_word_sparse(VALUE self) {
+  EWAH *bitset;
+  Data_Get_Struct(self, EWAH, bitset);
+  
+  EWAHBoolArraySparseIterator<uword64> i = bitset->bits->sparse_uncompress();
+  
+  while(i.hasNext()) {
+    rb_yield(INT2FIX(i.next()));
+  }
+  
+  return Qnil;
+}
+
 extern "C" VALUE ewah_swap(VALUE self, VALUE other) {
   EWAH *bitset;
   EWAH *obitset;
@@ -96,7 +122,20 @@ extern "C" VALUE ewah_logical_and(VALUE self, VALUE other) {
   return newBitset;
 }
 
-extern "C" VALUE ewah_equals(VALUE self, VALUE other) {
+extern "C" VALUE ewah_logical_not(VALUE self) {
+  EWAH *bitset;
+  Data_Get_Struct(self, EWAH, bitset);
+  
+  VALUE newBitset = ewah_new(rb_path2class("EwahBitset"));
+  
+  EWAH *newBits;
+  Data_Get_Struct(newBitset, EWAH, newBits);
+  bitset->bits->logicalnot(*(newBits->bits));
+  
+  return newBitset;
+}
+
+extern "C" VALUE ewah_eq(VALUE self, VALUE other) {
   EWAH *bitset;
   EWAH *obitset;
   Data_Get_Struct(self, EWAH, bitset);
@@ -109,6 +148,19 @@ extern "C" VALUE ewah_equals(VALUE self, VALUE other) {
   }
 }
 
+extern "C" VALUE ewah_neq(VALUE self, VALUE other) {
+  EWAH *bitset;
+  EWAH *obitset;
+  Data_Get_Struct(self, EWAH, bitset);
+  Data_Get_Struct(other, EWAH, obitset);
+  
+  if(*(bitset->bits) != *(obitset->bits)) {
+    return Qtrue;
+  } else {
+    return Qfalse;
+  }
+}
+
 /* Information & Serialization */
 extern "C" VALUE ewah_size_in_bits(VALUE self) {
   EWAH *bitset;
@@ -164,9 +216,15 @@ extern "C" void Init_ewahbitset() {
   rb_define_method(rb_cC, "swap", (ruby_method*) &ewah_swap, 1);
   rb_define_method(rb_cC, "reset", (ruby_method*) &ewah_reset, 0);
   
-  rb_define_method(rb_cC, "==", (ruby_method*) &ewah_equals, 1);
+  rb_define_method(rb_cC, "each_word64", (ruby_method*) &ewah_each_word, 0);
+  rb_define_method(rb_cC, "each_word64_sparse", (ruby_method*) &ewah_each_word_sparse, 0);
+  
+  rb_define_method(rb_cC, "==", (ruby_method*) &ewah_eq, 1);
+  rb_define_method(rb_cC, "!=", (ruby_method*) &ewah_neq, 1);
+  
   rb_define_method(rb_cC, "logical_or", (ruby_method*) &ewah_logical_or, 1);
   rb_define_method(rb_cC, "logical_and", (ruby_method*) &ewah_logical_and, 1);
+  rb_define_method(rb_cC, "logical_not", (ruby_method*) &ewah_logical_not, 1);
   
   rb_define_method(rb_cC, "to_binary_s", (ruby_method*) &ewah_to_binary_s, 0);
   rb_define_method(rb_cC, "serialize", (ruby_method*) &ewah_serialize, 0);

data/spec/ewah_bitset_spec.rb

@@ -99,4 +99,36 @@ describe "An EwahBitset" do
     
     @bitset.should == newbits
   end
+  
+  it "should iterate over each 64 bit word" do
+    0.upto(10) do |i|
+      @bitset.set(i)
+    end
+    
+    output = []
+    @bitset.each_word64 do |word|
+      0.upto(64) do |i|
+        output << ((word >> i) & 0x01)
+      end
+    end
+    
+    output[0,11].uniq.should == [1]
+    output[11,53].uniq.should == [0]
+  end
+  
+  it "should iterate over each 64 bit word sparsely" do
+    0.upto(10) do |i|
+      @bitset.set(i)
+    end
+    
+    output = []
+    @bitset.each_word64_sparse do |word|
+      0.upto(64) do |i|
+        output << ((word >> i) & 0x01)
+      end
+    end
+    
+    output[0,11].uniq.should == [1]
+    output[11,53].uniq.should == [0]
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ewah-bitset
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Josh Ferguson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-21 00:00:00 Z
+date: 2012-04-23 00:00:00 Z
 dependencies: []
 
 description: A wrapper around Lemire's EWAHBoolArray from https://github.com/lemire/EWAHBoolArray