qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 22:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[util] Fix reversed finite-infinite set union ops

Browse source 
It looks like I tried to test it, but my tests weren't so good This
seems to cover everything for the three main set ops.
This commit is contained in:
Bill Currie 2021-08-09 23:19:17 +09:00
parent c81f2d4b52
commit aa72f1dc31
2 changed files with 83 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/util/set.c
View file

@ -249,9 +249,9 @@ set_union (set_t *dst, const set_t *src)
return _set_intersection (dst, src); return _set_intersection (dst, src);
} else if (src->inverted) { } else if (src->inverted) {
dst->inverted = 1; dst->inverted = 1;
return _set_difference (dst, src);
} else if (dst->inverted) {
return _set_reverse_difference (dst, src); return _set_reverse_difference (dst, src);
} else if (dst->inverted) {
return _set_difference (dst, src);
} else { } else {
return _set_union (dst, src); return _set_union (dst, src);
} }

81
libs/util/test/test-set.c
View file

@ -115,6 +115,25 @@ make_not_55 (void)
return set_invert (make_55 ()); return set_invert (make_55 ());
} }
static set_t *
make_0_1 (void)
{
set_t *set = set_new ();
set_add (set, 0);
set_add (set, 1);
return set;
}
static set_t *
make_not_1_2 (void)
{
set_t *set = set_new ();
set_everything (set);
set_remove (set, 1);
set_remove (set, 2);
return set;
}
static set_t * static set_t *
expand_3xSIZEm1 (set_t *set, const set_t *x) expand_3xSIZEm1 (set_t *set, const set_t *x)
{ {
@ -222,6 +241,41 @@ struct {
{make_5, 0, 0, check_count, 1, 0}, {make_5, 0, 0, check_count, 1, 0},
{make_not_5, 0, 0, check_count, 1, 0}, {make_not_5, 0, 0, check_count, 1, 0},
{make_0_to_SIZEm1, 0, 0, check_size, SIZE, 0}, {make_0_to_SIZEm1, 0, 0, check_size, SIZE, 0},
{make_0_1, 0, 0, 0, 0, "{0 1}"},
{make_not_1_2, 0, 0, check_count, 2,
"{0 3 4 5 6 7 8 9 10 11 12 13 14 15"
" 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31"
" 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47"
" 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 ...}"
},
{make_0_1, make_not_1_2, set_union, check_count, 1,
"{0 1 3 4 5 6 7 8 9 10 11 12 13 14 15"
" 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31"
" 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47"
" 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 ...}"
},
{make_0_1, make_not_1_2, set_intersection, check_count, 1, "{0}"},
{make_0_1, make_not_1_2, set_difference, check_count, 1, "{1}"},
{make_0_1, make_not_1_2, set_reverse_difference, check_count, 3,
"{3 4 5 6 7 8 9 10 11 12 13 14 15"
" 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31"
" 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47"
" 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 ...}"
},
{make_not_1_2, make_0_1, set_union, check_count, 1,
"{0 1 3 4 5 6 7 8 9 10 11 12 13 14 15"
" 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31"
" 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47"
" 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 ...}"
},
{make_not_1_2, make_0_1, set_intersection, check_count, 1, "{0}"},
{make_not_1_2, make_0_1, set_difference, check_count, 3,
"{3 4 5 6 7 8 9 10 11 12 13 14 15"
" 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31"
" 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47"
" 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 ...}"
},
{make_not_1_2, make_0_1, set_reverse_difference, check_count, 1, "{1}"},
}; };
#define num_tests (sizeof (tests) / sizeof (tests[0])) #define num_tests (sizeof (tests) / sizeof (tests[0]))
@ -249,6 +303,33 @@ main (int argc, const char **argv)
dstring_appendstr (str, "}"); dstring_appendstr (str, "}");
tests[6].str_expect = dstring_freeze (str); tests[6].str_expect = dstring_freeze (str);
str = dstring_new ();
for (i = 0; i < SIZE; i++) {
if (i == 1 || i == 2)
continue;
dasprintf (str, "%c%zd", i > 0 ? ' ' : '{', i);
}
dasprintf (str, " %zd ...}", i);
tests[68].str_expect = dstring_freeze (str);
str = dstring_new ();
for (i = 0; i < SIZE; i++) {
if (i == 2)
continue;
dasprintf (str, "%c%zd", i > 0 ? ' ' : '{', i);
}
dasprintf (str, " %zd ...}", i);
tests[69].str_expect = dstring_freeze (str);
tests[73].str_expect = tests[69].str_expect;
str = dstring_new ();
for (i = 3; i < SIZE; i++) {
dasprintf (str, "%c%zd", i > 3 ? ' ' : '{', i);
}
dasprintf (str, " %zd ...}", i);
tests[72].str_expect = dstring_freeze (str);
tests[75].str_expect = tests[72].str_expect;
for (i = 0; i < num_tests; i++) { for (i = 0; i < num_tests; i++) {
set_t *s1, *s2 = 0; set_t *s1, *s2 = 0;
const char *set_str; const char *set_str;