uintset: add l_uintset_subtract
PATCH 1/2 uintset: add l_uintset_subtract
This subtracts set_b from set_a, and returns the new set.
--- ell/ell.sym | 1 + ell/uintset.c | 37 +++++++++++++++++++++++++++++++++++++ ell/uintset.h | 3 +++ 3 files changed, 41 insertions(+)
ell/ell.sym +1 -0
@@ -537,6 +537,7 @@ global: l_uintset_foreach; l_uintset_clone; l_uintset_intersect; + l_uintset_subtract; l_uintset_isempty; l_uintset_size; /* uuid */
ell/uintset.c +37 -0
@@ -532,6 +532,43 @@ LIB_EXPORT struct l_uintset *l_uintset_intersect(const struct l_uintset *set_a,return intersection; } +/** +* l_uintset_subtract: +* @set_a: The set of numbers +* @set_b: The set of numbers to subtract from set_a +* +* Subtracts two sets of numbers of an equal base, e.g.: +* l_uintset_get_min(set_a) must be equal to l_uintset_get_min(set_b) and +* l_uintset_get_max(set_a) must be equal to l_uintset_get_max(set_b) +* +* Returns: A newly allocated l_uintset containing set_a - set_b +*/ +LIB_EXPORT struct l_uintset *l_uintset_subtract(const struct l_uintset *set_a, +const struct l_uintset *set_b) +{ +struct l_uintset *subtraction; +uint32_t offset; +uint32_t offset_max; + +if (unlikely (!set_a || !set_b)) +return NULL ; + +if (unlikely (set_a->min != set_b->min || set_a->max != set_b->max)) +return NULL ; + + subtraction =l_uintset_new_from_range (set_a->min, set_a->max); + + offset_max = (set_a->size +BITS_PER_LONG -1 ) /BITS_PER_LONG ; + +/* Subtract by: set_a & ~set_b */ +for (offset =0 ; offset < offset_max; offset++) { + subtraction->bits[offset] = + set_a->bits[offset] & ~(set_b->bits[offset]); + } + +return subtraction; +} +/** * l_uintset_isempty * @set: The set of numbers
ell/uintset.h +3 -0
@@ -60,6 +60,9 @@ void l_uintset_foreach(const struct l_uintset *set,struct l_uintset *l_uintset_clone (const struct l_uintset *original);struct l_uintset *l_uintset_intersect (const struct l_uintset *set_a,const struct l_uintset *set_b); +struct l_uintset *l_uintset_subtract (const struct l_uintset *set_a, +const struct l_uintset *set_b); +bool l_uintset_isempty (const struct l_uintset *set);uint32_t l_uintset_size (const struct l_uintset *set);
Signature · 1 line
2.34.1
PATCH 2/2 unit: add unit test for l_uintset_subtract
--- unit/test-uintset.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+)
unit/test-uintset.c +54 -0
@@ -388,6 +388,59 @@ static void test_uintset_size(const void *user_data)l_uintset_free (set); } +static void test_uintset_subtract (const void *data) +{ +struct l_uintset *set_a =l_uintset_new_from_range (0 ,10 ); +struct l_uintset *set_b =l_uintset_new_from_range (1 ,11 ); +struct l_uintset *sub; + +/* Some sanity checks */ +assert (l_uintset_subtract (NULL ,NULL ) ==NULL ); +assert (l_uintset_subtract (set_a, set_b) ==NULL ); + +l_uintset_free (set_a); +l_uintset_free (set_b); + + set_a =l_uintset_new_from_range (0 ,128 ); + set_b =l_uintset_new_from_range (0 ,128 ); + +/* (<empty>) - (<empty>) = (<empty>) */ + sub =l_uintset_subtract (set_a, set_b); +assert (l_uintset_isempty (sub)); +l_uintset_free (sub); + +/* Sanity check this works across word boundaries */ +l_uintset_put (set_b,65 ); +l_uintset_put (set_b,64 ); +l_uintset_put (set_b,63 ); + +/* (<empty>) - (65, 64, 63) = (<empty>) */ + sub =l_uintset_subtract (set_a, set_b); +assert (!l_uintset_contains (sub,64 )); +l_uintset_free (sub); + +l_uintset_put (set_a,64 ); + +/* (64) - (65, 64, 63) = (<empty>) */ + sub =l_uintset_subtract (set_a, set_b); +assert (!l_uintset_contains (sub,64 )); +l_uintset_free (sub); + +l_uintset_take (set_b,64 ); + +/* (64) - (65, 63) = (64) */ + sub =l_uintset_subtract (set_a, set_b); +assert (l_uintset_contains (sub,64 )); +l_uintset_free (sub); + +/* (65, 63) - (64) = (65, 63) */ + sub =l_uintset_subtract (set_b, set_a); +assert (l_uintset_contains (sub,65 )); +assert (!l_uintset_contains (sub,64 )); +assert (l_uintset_contains (sub,63 )); +l_uintset_free (sub); +} +int main (int argc,char *argv[]) {l_test_init (&argc, &argv);
@@ -407,6 +460,7 @@ int main(int argc, char *argv[]) &intersect_data_2);l_test_add ("l_uintset isempty" , test_uintset_isempty,NULL );l_test_add ("l_uintset size" , test_uintset_size,NULL ); +l_test_add ("l_uintset_subtract" , test_uintset_subtract,NULL );return l_test_run (); }
Signature · 1 line
2.34.1
Hi James,
Quoted 7 lines · James Prestwood
This subtracts
set_bfromset_a, and returns the new set.--- ell/ell.sym | 1 + ell/uintset.c | 37 +++++++++++++++++++++++++++++++++++++ ell/uintset.h | 3 +++ 3 files changed, 41 insertions(+)
Both applied, thanks.
Regards,
-Denis