bitset 0.0.3 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/bitset.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitset}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler McMullen"]
-  s.date = %q{2011-02-26}
+  s.date = %q{2011-03-03}
   s.description = %q{A fast C-based Bitset. It supports the standard set operations as well as operations you may expect on bit arrays. (popcount, for instance)}
   s.email = %q{tbmcmullen@gmail.com}
   s.extensions = ["ext/bitset/extconf.rb"]

data/ext/bitset/bitset.c

@@ -11,6 +11,9 @@ typedef struct {
     uint64_t * data;
 } Bitset;
 
+#define BYTES(_bs) (((_bs->len-1) >> 3) + 1)
+#define INTS(_bs) (((_bs->len-1) >> 6) + 1)
+
 Bitset * bitset_new() {
     return (Bitset *) malloc(sizeof(Bitset));
 }
@@ -56,7 +59,7 @@ void raise_index_error() {
 }
 
 #define _bit_segment(bit) ((bit) >> 6UL)
-#define _bit_mask(bit) (1UL << ((bit) & 0x3f))
+#define _bit_mask(bit) (((uint64_t) 1) << ((bit) & 0x3f))
 
 void validate_index(Bitset * bs, int idx) {
     if(idx < 0 || idx >= bs->len)
@@ -156,7 +159,7 @@ static VALUE rb_bitset_cardinality(VALUE self) {
     for(i = 0; i < max; i++) {
         uint64_t segment = bs->data[i];
         if(i+1 == max)
-            segment &= ((1 << (bs->len & 0x3F)) - 1);
+            segment &= ((((uint64_t) 1) << (bs->len & 0x3F)) - 1);
         count += __builtin_popcountll(segment);
     }
     return INT2NUM(count);
@@ -307,6 +310,31 @@ static VALUE rb_bitset_each(VALUE self) {
     return self;
 }
 
+static VALUE rb_bitset_marshall_dump(VALUE self) {
+    Bitset * bs = get_bitset(self);
+    VALUE hash = rb_hash_new();
+    VALUE data = rb_str_new(bs->data, BYTES(bs));
+
+    rb_hash_aset(hash, ID2SYM(rb_intern("len")), UINT2NUM(bs->len));
+    rb_hash_aset(hash, ID2SYM(rb_intern("data")), data);
+
+    return hash;
+}
+
+static VALUE rb_bitset_marshall_load(VALUE self, VALUE hash) {
+    Bitset * bs = get_bitset(self);
+    int len = NUM2INT(rb_hash_aref(hash, ID2SYM(rb_intern("len"))));
+
+    VALUE data = rb_hash_aref(hash, ID2SYM(rb_intern("data")));
+
+    bitset_setup(bs, len);
+
+    bs->data = (uint64_t *) calloc(INTS(bs), sizeof(uint64_t));
+    memcpy(bs->data, RSTRING_PTR(data), BYTES(bs));
+
+    return Qnil;
+}
+
 void Init_bitset() {
     cBitset = rb_define_class("Bitset", rb_cObject);
     rb_include_module(cBitset, rb_mEnumerable);
@@ -335,4 +363,6 @@ void Init_bitset() {
     rb_define_method(cBitset, "each", rb_bitset_each, 0);
     rb_define_method(cBitset, "to_s", rb_bitset_to_s, 0);
     rb_define_singleton_method(cBitset, "from_s", rb_bitset_from_s, 1);
+    rb_define_method(cBitset, "marshal_dump", rb_bitset_marshall_dump, 0);
+    rb_define_method(cBitset, "marshal_load", rb_bitset_marshall_load, 1);
 }

data/spec/bitset_spec.rb

@@ -136,6 +136,9 @@ describe Bitset do
       bs = Bitset.new(10_000)
       bs.set(*(0...5000).to_a)
       bs.cardinality.should == 5000
+
+      bs = Bitset.from_s "01001101000000000000000000000011000010100100000000000000010000101000000000000000100000000100000000000010100100010000000010000100000100000001001000110000000000100010000000010100000000000000110000000000000000000000000100000000100010010000000000000000000001000000000000000000000000000001000000000000000000000000000100000000010010000000000000000000100100000000000000001000000010000001000000000000001000001100010001000000000000001000001000001000000000000001100010000010010001000000010000100000000000110000"
+      bs.cardinality.should == 63
     end
   end
 
@@ -250,4 +253,15 @@ describe Bitset do
       bs.set?(0, 2, 4).should == true
     end
   end
+
+  describe :marshalling do
+    it 'can marshal and load' do
+      bs = Bitset.new(68)
+      bs.set 1, 65
+
+      serialized = Marshal.load(Marshal.dump(bs))
+      serialized.set?(1, 65).should == true
+      serialized.cardinality.should == 2
+    end
+  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Tyler McMullen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-26 00:00:00 -08:00
+date: 2011-03-03 00:00:00 -08:00
 default_executable: 
 dependencies: []