mirror/astronomy
1
0
Fork 0
mirror of https://github.com/cosinekitty/astronomy.git synced 2026-05-24 08:45:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

TOP2013: NudgeSearch randomly shuffles the order it searches the coordinates.

Browse Source
This commit is contained in:
Don Cross
2020-07-05 20:19:17 -04:00
parent ab815498af
commit 07887d30b8
1 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
generate/generate.c
View File

@@ -2267,6 +2267,7 @@ typedef struct
{
int found;
int keep[TOP_NCOORDS];
int fshuffle[TOP_NCOORDS];
}
nudge_solution_t;
@@ -2284,6 +2285,36 @@ static int NudgeSearch(
int error = 1;
int delta, sum, checksum, f;
double arcmin;
FILE *rand = NULL;
if (depth == 0)
{
int r, swap;
/* Shuffle the order in which we search the coordinates. */
rand = fopen("/dev/urandom", "rb");
if (rand == NULL)
FAIL("NudgeSearch: cannot open /dev/urandom");
for (f=0; f<TOP_NCOORDS; ++f)
solution->fshuffle[f] = f;
for (f=1; f<TOP_NCOORDS; ++f)
{
if (1 != fread(&r, sizeof(r), 1, rand))
FAIL("NudgeSearch: unable to read integer from /dev/urandom");
r = (r & 0x7fffffff) % (f + 1);
swap = solution->fshuffle[f];
solution->fshuffle[f] = solution->fshuffle[r];
solution->fshuffle[r] = swap;
}
printf("fshuffle = [");
for (f=0; f<TOP_NCOORDS; ++f)
printf("%2d", solution->fshuffle[f]);
printf("]\n");
}
if (depth == TOP_NCOORDS)
{
@@ -2316,21 +2347,23 @@ static int NudgeSearch(
}
else
{
f = solution->fshuffle[depth];
for (delta = -1; delta <= +1; ++delta)
{
int oldskip = map->list[depth].skip;
int newskip = delta + (map->list[depth].nterms - keep[depth]);
if (0 <= newskip && newskip < map->list[depth].nterms)
int oldskip = map->list[f].skip;
int newskip = delta + (map->list[f].nterms - keep[f]);
if (0 <= newskip && newskip < map->list[f].nterms)
{
map->list[depth].skip = newskip;
map->list[f].skip = newskip;
CHECK(NudgeSearch(outFileName, smaller, model, map, best, solution, keep, depth+1));
map->list[depth].skip = oldskip;
map->list[f].skip = oldskip;
}
}
}
error = 0;
fail:
if (rand) fclose(rand);
return error;
}
@@ -2439,6 +2472,7 @@ fail:
return error;
}
static int TopFileInfo(const char *filename, const char *name)
{
int error = 1;