zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-20 15:41:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove size parameter from dsf init and copy functions.

Browse Source 
Now that the dsf knows its own size internally, there's no need to
tell it again when one is copied or reinitialised.

This makes dsf_init much more about *re*initialising a dsf, since now
dsfs are always allocated using a function that will initialise them
anyway. So I think it deserves a rename.
This commit is contained in:
Simon Tatham
2023-04-20 14:46:46 +01:00
parent dad2f35502
commit 348aac4c85
15 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dsf.c
View File

@ -66,11 +66,12 @@ done:
sfree(inverse_elements);
}*/
void dsf_init(DSF *dsf, int size)
void dsf_reinit(DSF *dsf)
{
int i;
for (i = 0; i < size; i++) dsf->p[i] = 6;
for (i = 0; i < dsf->size; i++)
dsf->p[i] = 6;
/* Bottom bit of each element of this array stores whether that
* element is opposite to its parent, which starts off as
* false. Second bit of each element stores whether that element
@ -79,9 +80,10 @@ void dsf_init(DSF *dsf, int size)
* bits are the number of elements in the tree. */
}
void dsf_copy(DSF *to, DSF *from, int size)
void dsf_copy(DSF *to, DSF *from)
{
memcpy(to->p, from->p, size * sizeof(int));
assert(to->size == from->size && "Mismatch in dsf_copy");
memcpy(to->p, from->p, to->size * sizeof(int));
}
DSF *snew_dsf(int size)
@ -90,7 +92,7 @@ DSF *snew_dsf(int size)
ret->size = size;
ret->p = snewn(size, int);
dsf_init(ret, size);
dsf_reinit(ret);
/*print_dsf(ret, size); */