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

Algorithmic changes in lookupParent

Browse source
This commit is contained in:
Guilhem Lavaux 2010-09-19 10:34:01 +02:00
parent 0ca75f1846
commit 9260208edc
5 changed files with 79 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

9
mytools/loadZobov.cpp
View file

@ -4,6 +4,7 @@
#include <vector>
#include <cstdlib>
#include <sstream>
#include <algorithm>
#include "loadZobov.hpp"
using namespace std;
@ -70,7 +71,8 @@ bool loadZobov(const char *descName, const char *adjName, const char *volName, Z
volFile.read((char *)zId, sizeof(int)*numZinV);
for (int k = 0; k < numZinV; k++)
z.allVoids[v].zId[k] = &z.allZones[zId[k]];
z.allVoids[v].zId[k] = zId[k];
std::sort(&z.allVoids[v].zId[0], &z.allVoids[v].zId[numZinV]);
delete[] zId;
}
@ -114,7 +116,10 @@ bool loadZobov(const char *descName, const char *adjName, const char *volName, Z
// Sanity check
int actualNumber = 0;
for (int j = 0; j < z.allVoids[volId].zId.size(); j++)
actualNumber += z.allVoids[volId].zId[j]->pId.size();
{
int zzid = z.allVoids[volId].zId[j];
actualNumber += z.allZones[zzid].pId.size();
}
if (actualNumber != numInVoid)
{