bitset 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bitset.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitset}
-  s.version = "0.0.0"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler McMullen"]
-  s.date = %q{2011-02-17}
+  s.date = %q{2011-02-19}
   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"]
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "bitset.gemspec",
     "ext/bitset/bitset.c",
     "ext/bitset/extconf.rb",
     "spec/bitset_spec.rb"

data/ext/bitset/bitset.c

@@ -234,6 +234,52 @@ static VALUE rb_bitset_xor(VALUE self, VALUE other) {
     return Data_Wrap_Struct(cBitset, 0, bitset_free, new_bs);
 }
 
+static VALUE rb_bitset_not(VALUE self) {
+    Bitset * bs = get_bitset(self);
+
+    Bitset * new_bs = bitset_new();
+    bitset_setup(new_bs, bs->len);
+
+    int max = ((bs->len-1) >> 6) + 1;
+    int i;
+    for(i = 0; i < max; i++) {
+        uint64_t segment = bs->data[i];
+        new_bs->data[i] = ~segment;
+    }
+
+    return Data_Wrap_Struct(cBitset, 0, bitset_free, new_bs);
+}
+
+static VALUE rb_bitset_to_s(VALUE self) {
+    Bitset * bs = get_bitset(self);
+
+    int i;
+    char * data = malloc(bs->len + 1);
+    for(i = 0; i < bs->len; i++) {
+        data[i] = get_bit(bs, i)  ? '1' : '0';
+    }
+    data[bs->len] = 0;
+
+    return rb_str_new2(data);
+}
+
+static VALUE rb_bitset_from_s(VALUE self, VALUE s) {
+    int length = RSTRING_LEN(s);
+    char* data = StringValuePtr(s);
+
+    Bitset * new_bs = bitset_new();
+    bitset_setup(new_bs, length);
+
+    int i;
+    for (i = 0; i < length; i++) {
+        if (data[i] == '1') {
+            set_bit(new_bs, i);
+        }
+    }
+
+    return Data_Wrap_Struct(cBitset, 0, bitset_free, new_bs);
+}
+
 static VALUE rb_bitset_hamming(VALUE self, VALUE other) {
     Bitset * bs = get_bitset(self);
     Bitset * other_bs = get_bitset(other);
@@ -283,6 +329,10 @@ void Init_bitset() {
     rb_define_method(cBitset, "xor", rb_bitset_xor, 1);
     rb_define_alias(cBitset, "^", "xor");
     rb_define_alias(cBitset, "symmetric_difference", "xor");
+    rb_define_method(cBitset, "not", rb_bitset_not, 0);
+    rb_define_alias(cBitset, "!", "not");
     rb_define_method(cBitset, "hamming", rb_bitset_hamming, 1);
     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);
 }

data/spec/bitset_spec.rb

@@ -1,4 +1,4 @@
-require './bitset'
+require 'bitset'
 
 describe Bitset do
   it 'can be initialized' do
@@ -189,6 +189,17 @@ describe Bitset do
     end
   end
 
+  describe :not do
+    it "returns a new Bitset with is the not of one Bitset" do
+      bs1 = Bitset.new(8)
+      bs1.set 1, 4, 7
+
+      bs2 = bs1.not
+      bs2.set?(0, 2, 3, 5, 6).should == true
+      bs2.clear?(1, 4, 7).should == true
+    end
+  end
+
   describe :hamming do
     it 'returns the hamming distance of two Bitsets' do
       bs1 = Bitset.new(8)
@@ -214,4 +225,19 @@ describe Bitset do
       i.should == 4
     end
   end
+
+  describe :to_s do
+    it 'correctly prints out a binary string' do
+      bs = Bitset.new(4)
+      bs.set 0, 2
+      bs.to_s.should == "1010"
+    end
+  end
+
+  describe :from_s do
+    it 'correctly creates a bitmap from a binary string' do
+      bs = Bitset.from_s("10101")
+      bs.set?(0, 2, 4).should == true
+    end
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Tyler McMullen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -08:00
+date: 2011-02-19 00:00:00 -08:00
 default_executable: 
 dependencies: []