Commit 03f1fe6a authored by untereiner's avatar untereiner
Browse files

some changes in MR filtering

parent 03f8878d
...@@ -51,16 +51,26 @@ unsigned int vertexLevel(typename PFP::MAP& map, Dart d) ...@@ -51,16 +51,26 @@ unsigned int vertexLevel(typename PFP::MAP& map, Dart d)
assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"edgeLevel : called with a dart inserted after current level") ; assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"edgeLevel : called with a dart inserted after current level") ;
unsigned int level = map.getMaxLevel(); unsigned int level = map.getMaxLevel();
Dart dit = d;
do TraversorDartsOfOrbit<typename PFP::MAP,VERTEX> tv(map,d);
for(Dart dit = tv.begin() ; dit != tv.end() ; dit = tv.next())
{ {
unsigned int ldit = map.getDartLevel(dit) ; unsigned int ldit = map.getDartLevel(dit) ;
if(ldit < level) if(ldit < level)
level = ldit; level = ldit;
dit = map.phi2(map.phi_1(dit));
} }
while(dit != d);
// Dart dit = d;
// do
// {
// unsigned int ldit = map.getDartLevel(dit) ;
// if(ldit < level)
// level = ldit;
//
// dit = map.phi2(map.phi_1(dit));
// }
// while(dit != d);
return level; return level;
} }
...@@ -133,7 +143,7 @@ void frequencyDeformation(typename PFP::MAP& map, VertexAttribute<T>& attIn, uns ...@@ -133,7 +143,7 @@ void frequencyDeformation(typename PFP::MAP& map, VertexAttribute<T>& attIn, uns
for (Dart d = tv.begin(); d != tv.end(); d = tv.next()) for (Dart d = tv.begin(); d != tv.end(); d = tv.next())
{ {
if(vertexLevel<PFP>(map,d) == cutoffLevel) if(vertexLevel<PFP>(map,d) == cutoffLevel)
attIn[d] *= 2.0;//T(0.0,6.0,0.0); attIn[d] += T(0.0,0.0,0.2);
} }
map.setCurrentLevel(cur); map.setCurrentLevel(cur);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment