Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fully revert 04f8b653c94614

Browse Source
This commit is contained in:
Daniel Patterson 2016-11-15 16:40:40 -08:00
parent 53ef2e2955
commit 17c32f5ce7
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/engine/datafacade/contiguous_internalmem_datafacade_base.hpp
View File

@ -35,22 +35,12 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <boost/multi_array.hpp>
#include <boost/range/iterator_range.hpp>
namespace osrm namespace osrm
{ {
namespace engine namespace engine
{ {
namespace datafacade namespace datafacade
{ {
namespace
{
template <typename T, typename = std::enable_if<std::is_const<T>::value>>
using ConstArrayRef = boost::iterator_range<T>;
using CoordinateArrayRef = ConstArrayRef<const util::Coordinate *>;
}
/** /**
* This base class implements the Datafacade interface for accessing * This base class implements the Datafacade interface for accessing
@ -69,7 +59,8 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade
using IndexBlock = util::RangeTable<16, true>::BlockT; using IndexBlock = util::RangeTable<16, true>::BlockT;
using InputEdge = QueryGraph::InputEdge; using InputEdge = QueryGraph::InputEdge;
using RTreeLeaf = super::RTreeLeaf; using RTreeLeaf = super::RTreeLeaf;
using SharedRTree = util::StaticRTree<RTreeLeaf, CoordinateArrayRef, true>; using SharedRTree =
util::StaticRTree<RTreeLeaf, util::ShM<util::Coordinate, true>::vector, true>;
using SharedGeospatialQuery = GeospatialQuery<SharedRTree, BaseDataFacade>; using SharedGeospatialQuery = GeospatialQuery<SharedRTree, BaseDataFacade>;
using RTreeNode = SharedRTree::TreeNode; using RTreeNode = SharedRTree::TreeNode;
@ -78,7 +69,7 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade
std::string m_timestamp; std::string m_timestamp;
extractor::ProfileProperties *m_profile_properties; extractor::ProfileProperties *m_profile_properties;
CoordinateArrayRef m_coordinate_list; util::ShM<util::Coordinate, true>::vector m_coordinate_list;
util::PackedVector<OSMNodeID, true> m_osmnodeid_list; util::PackedVector<OSMNodeID, true> m_osmnodeid_list;
util::ShM<GeometryID, true>::vector m_via_geometry_list; util::ShM<GeometryID, true>::vector m_via_geometry_list;
util::ShM<unsigned, true>::vector m_name_ID_list; util::ShM<unsigned, true>::vector m_name_ID_list;
@ -189,10 +180,8 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade
{ {
const auto coordinate_list_ptr = data_layout.GetBlockPtr<util::Coordinate>( const auto coordinate_list_ptr = data_layout.GetBlockPtr<util::Coordinate>(
memory_block, storage::DataLayout::COORDINATE_LIST); memory_block, storage::DataLayout::COORDINATE_LIST);
m_coordinate_list.reset(coordinate_list_ptr,
m_coordinate_list = CoordinateArrayRef( data_layout.num_entries[storage::DataLayout::COORDINATE_LIST]);
coordinate_list_ptr,
coordinate_list_ptr + data_layout.num_entries[storage::DataLayout::COORDINATE_LIST]);
for (unsigned i = 0; i < m_coordinate_list.size(); ++i) for (unsigned i = 0; i < m_coordinate_list.size(); ++i)
{ {