From 211b596991529e2c7f4458454faa92bede554d80 Mon Sep 17 00:00:00 2001 From: Arnur Nigmetov Date: Thu, 6 Apr 2017 12:21:30 +0200 Subject: Minor changes --- geom_bottleneck/bottleneck/src/bottleneck.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'geom_bottleneck/bottleneck/src') diff --git a/geom_bottleneck/bottleneck/src/bottleneck.cpp b/geom_bottleneck/bottleneck/src/bottleneck.cpp index e41e131..da0c425 100644 --- a/geom_bottleneck/bottleneck/src/bottleneck.cpp +++ b/geom_bottleneck/bottleneck/src/bottleneck.cpp @@ -101,7 +101,9 @@ void sampleDiagramForHeur(const DiagramPointSet& dgmIn, DiagramPointSet& dgmOut) }; std::unordered_map, int, pair_hash> m; for(auto ptIter = dgmIn.cbegin(); ptIter != dgmIn.cend(); ++ptIter) { - m[std::make_pair(ptIter->getRealX(), ptIter->getRealY())]++; + if (ptIter->isNormal()) { + m[std::make_pair(ptIter->getRealX(), ptIter->getRealY())]++; + } } if (m.size() < 2) { dgmOut = dgmIn; @@ -122,6 +124,9 @@ void sampleDiagramForHeur(const DiagramPointSet& dgmIn, DiagramPointSet& dgmOut) } } std::vector> vv; + // keep points whose multiplicites are at most cutVal + // quick-and-dirty: fill in vv with copies of each point + // to construct DiagramPointSet from it later for(const auto& ptQty : m) { if (ptQty.second < cutVal) { for(int i = 0; i < ptQty.second; ++i) { @@ -129,7 +134,6 @@ void sampleDiagramForHeur(const DiagramPointSet& dgmIn, DiagramPointSet& dgmOut) } } } - // keep points whose multiplicites are at most cutVal dgmOut.clear(); dgmOut = DiagramPointSet(vv.begin(), vv.end()); } -- cgit v1.2.3