From d1cd9972b30ed23d9d8b9889b47d9673cc3196b3 Mon Sep 17 00:00:00 2001 From: Maxim Pimenov Date: Tue, 9 Jun 2015 19:57:16 +0300 Subject: [PATCH] Clang-format. --- indexer/index_builder.hpp | 9 ++--- indexer/indexer_tests/index_builder_test.cpp | 4 +- indexer/scale_index_builder.hpp | 39 ++++++++++---------- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/indexer/index_builder.hpp b/indexer/index_builder.hpp index 1a55fd37ff..6b61d7c732 100644 --- a/indexer/index_builder.hpp +++ b/indexer/index_builder.hpp @@ -3,14 +3,11 @@ #include "indexer/data_header.hpp" #include "indexer/scale_index_builder.hpp" - namespace indexer { - template - void BuildIndex(feature::DataHeader const & header, - FeaturesVectorT const & featuresVector, - WriterT & writer, - string const & tmpFilePrefix) +template +void BuildIndex(feature::DataHeader const & header, FeaturesVectorT const & featuresVector, + WriterT & writer, string const & tmpFilePrefix) { LOG(LINFO, ("Building scale index.")); uint64_t indexSize; diff --git a/indexer/indexer_tests/index_builder_test.cpp b/indexer/indexer_tests/index_builder_test.cpp index 262fd03496..7efeb27fb6 100644 --- a/indexer/indexer_tests/index_builder_test.cpp +++ b/indexer/indexer_tests/index_builder_test.cpp @@ -32,9 +32,7 @@ UNIT_TEST(BuildIndexTest) FeaturesVector featuresVector(originalContainer, header); MemWriter > serialWriter(serialIndex); - indexer::BuildIndex(header, - featuresVector, serialWriter, - "build_index_test"); + indexer::BuildIndex(header, featuresVector, serialWriter, "build_index_test"); } // Create a new mwm file. diff --git a/indexer/scale_index_builder.hpp b/indexer/scale_index_builder.hpp index 17c37c0734..4f29aceceb 100644 --- a/indexer/scale_index_builder.hpp +++ b/indexer/scale_index_builder.hpp @@ -22,10 +22,8 @@ #include "std/utility.hpp" #include "std/vector.hpp" - namespace covering { - class CellFeaturePair { public: @@ -78,7 +76,8 @@ template class FeatureCoverer { public: - FeatureCoverer(feature::DataHeader const & header, SorterT & sorter, vector & featuresInBucket, vector & cellsInBucket) + FeatureCoverer(feature::DataHeader const & header, SorterT & sorter, + vector & featuresInBucket, vector & cellsInBucket) : m_header(header), m_bucketsCount(header.GetLastScale() + 1), m_Sorter(sorter), @@ -89,7 +88,7 @@ public: m_featuresInBucket.resize(m_bucketsCount); m_cellsInBucket.resize(m_bucketsCount); } - + template void operator() (TFeature const & f, uint32_t offset) const { @@ -129,7 +128,7 @@ private: ++m_scalesIdx; needReset = true; } - + if (needReset) f.ResetGeometry(); @@ -147,13 +146,13 @@ private: // the feature's geometry except for the type and the LimitRect. minScale = feature::GetMinDrawableScale(f); } - + if (minScale == scale) { skip = false; return true; } - + if (minScale < scale && skip) { skip = false; @@ -197,10 +196,8 @@ private: }; template -inline void IndexScales(feature::DataHeader const & header, - FeaturesVectorT const & featuresVector, - WriterT & writer, - string const & tmpFilePrefix) +inline void IndexScales(feature::DataHeader const & header, FeaturesVectorT const & featuresVector, + WriterT & writer, string const & tmpFilePrefix) { // TODO: Make scale bucketing dynamic. @@ -215,19 +212,22 @@ inline void IndexScales(feature::DataHeader const & header, typedef FileSorter > SorterType; WriterFunctor out(cellsToFeaturesAllBucketsWriter); - SorterType sorter(1024 * 1024 /* bufferBytes */, tmpFilePrefix + CELL2FEATURE_TMP_EXT, out); + SorterType sorter(1024 * 1024 /* bufferBytes */, tmpFilePrefix + CELL2FEATURE_TMP_EXT, out); vector featuresInBucket(bucketsCount); vector cellsInBucket(bucketsCount); - featuresVector.ForEachOffset(FeatureCoverer(header, sorter, featuresInBucket, cellsInBucket)); + featuresVector.ForEachOffset( + FeatureCoverer(header, sorter, featuresInBucket, cellsInBucket)); sorter.SortAndFinish(); - + for (uint32_t bucket = 0; bucket < bucketsCount; ++bucket) { uint32_t numCells = cellsInBucket[bucket]; uint32_t numFeatures = featuresInBucket[bucket]; LOG(LINFO, ("Building scale index for bucket:", bucket)); - double const cellsPerFeature = numFeatures == 0 ? 0.0 : static_cast(numCells) / static_cast(numFeatures); - LOG(LINFO, ("Features:", numFeatures, "cells:", numCells, "cells per feature:", cellsPerFeature)); + double const cellsPerFeature = + numFeatures == 0 ? 0.0 : static_cast(numCells) / static_cast(numFeatures); + LOG(LINFO, + ("Features:", numFeatures, "cells:", numCells, "cells per feature:", cellsPerFeature)); } } @@ -256,16 +256,17 @@ inline void IndexScales(feature::DataHeader const & header, DDVector cellsToFeatures(reader); SubWriter subWriter(writer); LOG(LINFO, ("Building interval index for bucket:", bucket)); - BuildIntervalIndex(cellsToFeatures.begin(), cellsToFeatures.end(), subWriter, RectId::DEPTH_LEVELS * 2 + 1); + BuildIntervalIndex(cellsToFeatures.begin(), cellsToFeatures.end(), subWriter, + RectId::DEPTH_LEVELS * 2 + 1); } recordWriter.FinishRecord(); } // todo(@pimenov). There was an old todo here that said there were // features (coastlines) that have been indexed despite being invisible at the last scale. - // This should be impossible but it is better to re-check it. + // This should be impossible but it is better to recheck it. LOG(LINFO, ("All scale indexes done.")); } -} // namespace covering \ No newline at end of file +} // namespace covering