E5EB Adds a rank-select data structure, see #14 by daniel-j-h · Pull Request #41 · tinygraph/tinygraph · GitHub
[go: up one dir, main page]
Skip to content

Adds a rank-select data structure, see #14 #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daniel-j-h wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Adds a rank-select data structure, see #14 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tinygraph/tinygraph-bits.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ uint32_t tinygraph_bits_select_512(const uint64_t *p, uint32_t n) {
uint32_t count = 0;

for (uint32_t i = 0; i < 7; ++i) {
uint32_t block = tinygraph_bits_count(p[i]);
const uint32_t block = tinygraph_bits_count(p[i]);

if ((count + block) > n) {
return i * 64 + tinygraph_bits_select(p[i], n - count);
Expand Down
19 changes: 16 additions & 3 deletions tinygraph/tinygraph-bitset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <stdlib.h>
#include <string.h>

#include "tinygraph-align.h"
#include "tinygraph-utils.h"
#include "tinygraph-bitset.h"

Expand Down Expand Up @@ -33,14 +34,16 @@ tinygraph_bitset* tinygraph_bitset_construct(uint64_t size) {

uint64_t num_blocks = ceil(size / 64.f);

uint64_t *blocks = calloc(num_blocks, sizeof(uint64_t));
uint64_t *blocks = tinygraph_align_malloc(64, num_blocks * sizeof(uint64_t));

if (!blocks) {
free(out);

return NULL;
}

memset(blocks, 0, num_blocks * sizeof(uint64_t));

out->blocks = blocks;
out->blocks_len = num_blocks;

Expand All @@ -53,12 +56,13 @@ tinygraph_bitset* tinygraph_bitset_copy(const tinygraph_bitset * const bitset) {
return NULL;
}

tinygraph_bitset *copy = tinygraph_bitset_construct(bitset->blocks_len);
tinygraph_bitset *copy = tinygraph_bitset_construct(bitset->size);

if (!copy) {
return NULL;
}

TINYGRAPH_ASSERT(copy->size == bitset->size);
TINYGRAPH_ASSERT(copy->blocks_len == bitset->blocks_len);

if (bitset->blocks_len > 0) {
Expand All @@ -79,7 +83,7 @@ void tinygraph_bitset_destruct(tinygraph_bitset * const bitset) {

TINYGRAPH_ASSERT(bitset->blocks || bitset->blocks_len == 0);

free(bitset->blocks);
tinygraph_align_free(bitset->blocks);

bitset->blocks = NULL;
bitset->blocks_len = 0;
Expand All @@ -91,6 +95,7 @@ void tinygraph_bitset_destruct(tinygraph_bitset * const bitset) {
void tinygraph_bitset_set_at(tinygraph_bitset * const bitset, uint64_t i) {
TINYGRAPH_ASSERT(bitset);
TINYGRAPH_ASSERT(bitset->blocks_len > 0);
TINYGRAPH_ASSERT(i < bitset->size);
TINYGRAPH_ASSERT((i >> 6) < bitset->blocks_len);

bitset->blocks[i >> 6] |= (UINT64_C(1) << (i & UINT64_C(63)));
Expand All @@ -100,6 +105,7 @@ void tinygraph_bitset_set_at(tinygr 7440 aph_bitset * const bitset, uint64_t i) {
bool tinygraph_bitset_get_at(const tinygraph_bitset * const bitset, uint64_t i) {
TINYGRAPH_ASSERT(bitset);
TINYGRAPH_ASSERT(bitset->blocks_len > 0);
TINYGRAPH_ASSERT(i < bitset->size);
TINYGRAPH_ASSERT((i >> 6) < bitset->blocks_len);

return (bitset->blocks[i >> 6] & (UINT64_C(1) << (i & UINT64_C(63)))) != 0;
Expand All @@ -124,6 +130,13 @@ void tinygraph_bitset_clear(tinygraph_bitset * const bitset) {
}


const uint64_t * tinygraph_bitset_get_data(const tinygraph_bitset * const bitset) {
TINYGRAPH_ASSERT(bitset);

return bitset->blocks;
}


void tinygraph_bitset_not(tinygraph_bitset * const bitset) {
TINYGRAPH_ASSERT(bitset);

Expand Down
3 changes: 3 additions & 0 deletions tinygraph/tinygraph-bitset.h
View file
Open in desktop
6A12
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ uint64_t tinygraph_bitset_get_size(tinygraph_bitset_const_s bitset);

void tinygraph_bitset_clear(tinygraph_bitset_s bitset);

TINYGRAPH_WARN_UNUSED
const uint64_t * tinygraph_bitset_get_data(tinygraph_bitset_const_s bitset);

void tinygraph_bitset_not(tinygraph_bitset_s bitset);
void tinygraph_bitset_and(tinygraph_bitset_s bitset, tinygraph_bitset_const_s other);
void tinygraph_bitset_or(tinygraph_bitset_s bitset, tinygraph_bitset_const_s other);
Expand Down
Loading
0