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

Fixed a lot of the voidtree logic

Browse source
This commit is contained in:
Guilhem Lavaux 2011-06-17 07:16:29 -04:00
parent 26c71d6825
commit 890a8c8491
1 changed files with 47 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

56
mytools/voidTree.hpp
View file

@ -66,16 +66,21 @@ public:
break; break;
++iter_candidate; ++iter_candidate;
} }
if (iter_candidate == candidateList.begin()) if (iter_candidate == candidateList.end())
{ {
// std::cout << "Failure to lookup parent" << std::endl; // std::cout << "Failure to lookup parent" << std::endl;
return -1; return -1;
} }
// voidId must be in the list. // voidId must be in the list.
assert(iter_candidate != candidateList.end()); // assert(iter_candidate != candidateList.end());
// Go back // Go back
iter_candidate = candidateList.end();
int vid_good_candidate = -1;
int old_good_candidate_size = zobov.allZones.size()+1;
do do
{ {
int vid_candidate; int vid_candidate;
@ -85,12 +90,11 @@ public:
vid_candidate = *iter_candidate; vid_candidate = *iter_candidate;
std::vector<int>& candidate_zIds = zobov.allVoids[vid_candidate].zId; std::vector<int>& candidate_zIds = zobov.allVoids[vid_candidate].zId;
if (voidId == vid_candidate)
continue;
if (candidate_zIds.size() < ref_void.zId.size()) if (candidate_zIds.size() < ref_void.zId.size())
{ {
if (iter_candidate == candidateList.begin())
return -1;
--iter_candidate;
continue; continue;
} }
@ -109,13 +113,22 @@ public:
break; break;
} }
if (k==ref_void.zId.size()) if (k==ref_void.zId.size())
return vid_candidate; {
if (candidate_zIds.size() < old_good_candidate_size)
{
vid_good_candidate = vid_candidate;
old_good_candidate_size = candidate_zIds.size();
}
// std::cout << "Found parent " << vid_candidate << std::endl;
// return vid_candidate;
}
// Go bigger, though I would say we should not to. // Go bigger, though I would say we should not to.
} }
while (iter_candidate != candidateList.begin()) ; while (iter_candidate != candidateList.begin()) ;
// std::cout << "Failure to lookup parent (2)" << std::endl; if (vid_good_candidate < 0)
return -1; std::cout << "Failure to lookup parent (2)" << std::endl;
return vid_good_candidate;
} }
VoidTree(ZobovRep& rep, std::istream& disk) VoidTree(ZobovRep& rep, std::istream& disk)
@ -148,6 +161,8 @@ public:
nodes[i].parent->children.push_back(&nodes[i]); nodes[i].parent->children.push_back(&nodes[i]);
} }
} }
computeMaxDepth();
} }
VoidTree(ZobovRep& rep) VoidTree(ZobovRep& rep)
@ -177,7 +192,7 @@ public:
std::cout << "Linking voids together..." << std::endl; std::cout << "Linking voids together..." << std::endl;
double volMin = 0;// 4*M_PI/3*pow(4.*512/500.,3); double volMin = 0;// 4*M_PI/3*pow(4.*512/500.,3);
int inserted = 0; int inserted = 0;
for (int i = rep.allVoids.size()-1; i>=0;i--) for (int i = 0; i < rep.allVoids.size(); i++)
{ {
if (rep.allVoids[i].volume < volMin) continue; if (rep.allVoids[i].volume < volMin) continue;
@ -205,6 +220,8 @@ public:
rootNode->children.push_back(&nodes[i]); rootNode->children.push_back(&nodes[i]);
} }
activeNodes = inserted+1; activeNodes = inserted+1;
computeMaxDepth();
} }
~VoidTree() ~VoidTree()
@ -212,6 +229,25 @@ public:
delete[] nodes; delete[] nodes;
} }
int _depth_computer(VoidNode *node)
{
VoidList::iterator i = node->children.begin();
int d = 0;
while (i != node->children.end())
{
d = std::max(d,_depth_computer(*i));
++i;
}
return d+1;
}
void computeMaxDepth()
{
std::cout << "maximum depth is " << _depth_computer(rootNode) << std::endl;
}
int getParent(int vid) const int getParent(int vid) const
{ {
assert(nodes[vid].parent != 0); assert(nodes[vid].parent != 0);