roaring 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f2956df800830dc45bb3b8e63fd1b7795c39a73ab52f5671e651ca1087e1572
-  data.tar.gz: 74b06f13df663851dd703b2888cd3b465fe788a794dcb0cadca5d1b534db023e
+  metadata.gz: c061d28a03b3ba5b386807eb2cf2bde2d1e8309c69316c67bfb3e6d36dd13236
+  data.tar.gz: 52a90f348280c88153f31e6b2a2f2a333bfc8094e813314df5d5f84aa41cb831
 SHA512:
-  metadata.gz: 18a68702d1d236e6817c542dcbb15d32515f76263b0e5f074837bdde8a5bc9ca5ff88976eba18d67b1cd041307b22a81a72e79f6d7b25124b80b2f14028e9ba0
-  data.tar.gz: 44ca8c98572f932a23d7488afd87bc05d3c0618062d912bc71b9f319497ba5ac3e824e046011b192198b8c90686ebeda972f1e15104428684cdb2dcc2761dd3d
+  metadata.gz: 62b208238f339e10313701dc0272d0cdddccfc407b7f78fdf5e3bc86500f36cb5eb0d98741c69a179af085a800eae60740b194963f2ddec6f5b745ad1d89cfe6
+  data.tar.gz: eea3734551e011cb1835d4bf5d3c0d15ddd767dbfa21582f714581e0b8206d1fe608df5eda6d9cb6de71d731c643e3e845fd7ecd6e64be02e37d47f83f5cf1cc

data/ext/roaring/bitmap32.c

@@ -63,7 +63,7 @@ static VALUE rb_roaring32_cardinality(VALUE self)
 {
     roaring_bitmap_t *data = get_bitmap(self);
     uint64_t cardinality = roaring_bitmap_get_cardinality(data);
-    return ULONG2NUM(cardinality);
+    return ULL2NUM(cardinality);
 }
 
 // Adds an element from the bitmap
@@ -309,6 +309,15 @@ static VALUE rb_roaring32_binary_op_bool(VALUE self, VALUE other, binary_func_bo
     return RBOOL(result);
 }
 
+typedef uint64_t binary_func_cardinality(const roaring_bitmap_t *, const roaring_bitmap_t *);
+static VALUE rb_roaring32_binary_op_cardinality(VALUE self, VALUE other, binary_func_cardinality func) {
+    roaring_bitmap_t *self_data = get_bitmap(self);
+    roaring_bitmap_t *other_data = get_bitmap(other);
+
+    uint64_t result = func(self_data, other_data);
+    return ULL2NUM(result);
+}
+
 // Inplace version of {and}
 // @return [self] the modified Bitmap
 static VALUE rb_roaring32_and_inplace(VALUE self, VALUE other)
@@ -358,6 +367,30 @@ static VALUE rb_roaring32_xor(VALUE self, VALUE other)
     return rb_roaring32_binary_op(self, other, roaring_bitmap_xor);
 }
 
+// Computes the cardinality of the intersection between two bitmaps without
+// materializing the result
+// @return [Integer] the number of elements in both `self` and `other`
+static VALUE rb_roaring32_and_cardinality(VALUE self, VALUE other)
+{
+    return rb_roaring32_binary_op_cardinality(self, other, roaring_bitmap_and_cardinality);
+}
+
+// Computes the cardinality of the union between two bitmaps without
+// materializing the result
+// @return [Integer] the number of elements in either `self` or `other`
+static VALUE rb_roaring32_or_cardinality(VALUE self, VALUE other)
+{
+    return rb_roaring32_binary_op_cardinality(self, other, roaring_bitmap_or_cardinality);
+}
+
+// Computes the cardinality of the exclusive or between two bitmaps without
+// materializing the result
+// @return [Integer] the number of elements in one of `self` or `other`, but not both
+static VALUE rb_roaring32_xor_cardinality(VALUE self, VALUE other)
+{
+    return rb_roaring32_binary_op_cardinality(self, other, roaring_bitmap_xor_cardinality);
+}
+
 // Computes the difference between two bitmaps
 // @return [Bitmap32] a new bitmap containing all elements in `self`, but not in `other`
 static VALUE rb_roaring32_andnot(VALUE self, VALUE other)
@@ -421,6 +454,10 @@ rb_roaring32_init(void)
   rb_define_method(cRoaringBitmap32, "xor", rb_roaring32_xor, 1);
   rb_define_method(cRoaringBitmap32, "andnot", rb_roaring32_andnot, 1);
 
+  rb_define_method(cRoaringBitmap32, "and_cardinality", rb_roaring32_and_cardinality, 1);
+  rb_define_method(cRoaringBitmap32, "or_cardinality", rb_roaring32_or_cardinality, 1);
+  rb_define_method(cRoaringBitmap32, "xor_cardinality", rb_roaring32_xor_cardinality, 1);
+
   rb_define_method(cRoaringBitmap32, "==", rb_roaring32_eq, 1);
   rb_define_method(cRoaringBitmap32, "<", rb_roaring32_lt, 1);
   rb_define_method(cRoaringBitmap32, "<=", rb_roaring32_lte, 1);

data/ext/roaring/bitmap64.c

@@ -66,7 +66,7 @@ static VALUE rb_roaring64_cardinality(VALUE self)
 {
     roaring64_bitmap_t *data = get_bitmap(self);
     uint64_t cardinality = roaring64_bitmap_get_cardinality(data);
-    return ULONG2NUM(cardinality);
+    return ULL2NUM(cardinality);
 }
 
 static VALUE rb_roaring64_add(VALUE self, VALUE val)
@@ -281,6 +281,15 @@ static VALUE rb_roaring64_binary_op_bool(VALUE self, VALUE other, binary_func_bo
     return RBOOL(result);
 }
 
+typedef uint64_t binary_func_cardinality(const roaring64_bitmap_t *, const roaring64_bitmap_t *);
+static VALUE rb_roaring64_binary_op_cardinality(VALUE self, VALUE other, binary_func_cardinality func) {
+    roaring64_bitmap_t *self_data = get_bitmap(self);
+    roaring64_bitmap_t *other_data = get_bitmap(other);
+
+    uint64_t result = func(self_data, other_data);
+    return ULL2NUM(result);
+}
+
 static VALUE rb_roaring64_and_inplace(VALUE self, VALUE other)
 {
     return rb_roaring64_binary_op_inplace(self, other, roaring64_bitmap_and_inplace);
@@ -316,6 +325,21 @@ static VALUE rb_roaring64_xor(VALUE self, VALUE other)
     return rb_roaring64_binary_op(self, other, roaring64_bitmap_xor);
 }
 
+static VALUE rb_roaring64_and_cardinality(VALUE self, VALUE other)
+{
+    return rb_roaring64_binary_op_cardinality(self, other, roaring64_bitmap_and_cardinality);
+}
+
+static VALUE rb_roaring64_or_cardinality(VALUE self, VALUE other)
+{
+    return rb_roaring64_binary_op_cardinality(self, other, roaring64_bitmap_or_cardinality);
+}
+
+static VALUE rb_roaring64_xor_cardinality(VALUE self, VALUE other)
+{
+    return rb_roaring64_binary_op_cardinality(self, other, roaring64_bitmap_xor_cardinality);
+}
+
 static VALUE rb_roaring64_andnot(VALUE self, VALUE other)
 {
     return rb_roaring64_binary_op(self, other, roaring64_bitmap_andnot);
@@ -370,6 +394,10 @@ rb_roaring64_init(void)
   rb_define_method(cRoaringBitmap64, "xor", rb_roaring64_xor, 1);
   rb_define_method(cRoaringBitmap64, "andnot", rb_roaring64_andnot, 1);
 
+  rb_define_method(cRoaringBitmap64, "and_cardinality", rb_roaring64_and_cardinality, 1);
+  rb_define_method(cRoaringBitmap64, "or_cardinality", rb_roaring64_or_cardinality, 1);
+  rb_define_method(cRoaringBitmap64, "xor_cardinality", rb_roaring64_xor_cardinality, 1);
+
   rb_define_method(cRoaringBitmap64, "==", rb_roaring64_eq, 1);
   rb_define_method(cRoaringBitmap64, "<", rb_roaring64_lt, 1);
   rb_define_method(cRoaringBitmap64, "<=", rb_roaring64_lte, 1);

data/lib/roaring/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Roaring
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roaring
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - John Hawthorn
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Roaring bitmaps for Ruby
 test_files: []