guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-05 07:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed old unused code (jozov_persistent). Activated jozov2 cleaned implementation of jozov in C++.

Browse source
This commit is contained in:
Guilhem Lavaux 2013-04-01 09:02:59 -04:00
parent 6a15e59521
commit 60e692a0cb
3 changed files with 96 additions and 617 deletions
Download patch file Download diff file Expand all files Collapse all files

23
c_tools/zobov2/jozov2.cpp
View file

@ -391,28 +391,28 @@ void doWatershed(const std::string& zonfile2, PARTICLE *p, pid_t np, ZONE *z, in
inyet2 = new char[numZones];
zonelist = new int[numZones];
zonelist2 = new int[numZones];
done_zones = new bool[nzones];
done_zones = new bool[numZones];
fill(inyet, inyet + numZones, 0);
fill(inyet2, inyet2 + numZones, 0);
fill(done_zones, done_zones + numZones, false);
sorter = new double[nzones+1];
double *sorter = new double[numZones+1];
/* Assign sorter by probability (could use volume instead) */
for (int h = 0; h < nzones; h++)
for (int h = 0; h < numZones; h++)
sorter[h] = (double)z[h].core;
/* Text output file */
printf("about to sort (pre-watershed sort) ...\n");FF;
iord = new int[nzones];
iord = new int[numZones];
findrtop(sorter, numZones, iord, numZones);
delete[] sorter;
nhl = 0;
for (int ii = 0; ii < numZones; h++)
for (int ii = 0; ii < numZones; ii++)
{
int nhlcount = 0;
int h = iord[ii];
@ -580,11 +580,18 @@ void doWatershed(const std::string& zonfile2, PARTICLE *p, pid_t np, ZONE *z, in
done_zones[h] = true;
z[h].nhl = nhl;
zon2.write((char *)&nhl, sizeof(int));
zon2.write((char *)zonelist, nhl*sizeof(int));
}
delete[] zonelist;
delete[] zonelist2;
delete[] links;
delete[] iord;
cout << "Writing void/zone relations..." << endl;
for (int h = 0; h < numZones; h++)
{
zon2.write((char *)&z[h].nhl, sizeof(int));
zon2.write((char *)z[h].zonelist, z[h].nhl*sizeof(int));
}
cout << format("Maxdenscontrast = %f.") % maxdenscontrast << endl;
}