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

Partial revert of 04f8b653c94614 - the PackedVector is special.

Browse Source
This commit is contained in:
Daniel Patterson 2016-11-14 22:07:50 -08:00
parent 83a9d0590d
commit 49f960064c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,6 @@ template <typename T, typename = std::enable_if<std::is_const<T>::value>>
using ConstArrayRef = boost::iterator_range<T>; using ConstArrayRef = boost::iterator_range<T>;
using CoordinateArrayRef = ConstArrayRef<const util::Coordinate *>; using CoordinateArrayRef = ConstArrayRef<const util::Coordinate *>;
using OSMNodeArrayRef = ConstArrayRef<const OSMNodeID *>;
} }
/** /**
@ -80,7 +79,7 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade
extractor::ProfileProperties *m_profile_properties; extractor::ProfileProperties *m_profile_properties;
CoordinateArrayRef m_coordinate_list; CoordinateArrayRef m_coordinate_list;
OSMNodeArrayRef 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;
util::ShM<LaneDataID, true>::vector m_lane_data_id; util::ShM<LaneDataID, true>::vector m_lane_data_id;
@ -199,11 +198,13 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade
BOOST_ASSERT(GetCoordinateOfNode(i).IsValid()); BOOST_ASSERT(GetCoordinateOfNode(i).IsValid());
} }
const auto osmnodeid_list_ptr = data_layout->GetBlockPtr<OSMNodeID>( const auto osmnodeid_list_ptr = data_layout->GetBlockPtr<std::uint64_t>(
memory_block, storage::DataLayout::OSM_NODE_ID_LIST); memory_block, storage::DataLayout::OSM_NODE_ID_LIST);
m_osmnodeid_list = OSMNodeArrayRef( m_osmnodeid_list.reset(osmnodeid_list_ptr,
osmnodeid_list_ptr, data_layout->num_entries[storage::DataLayout::OSM_NODE_ID_LIST]);
osmnodeid_list_ptr + data_layout->num_entries[storage::DataLayout::COORDINATE_LIST]); // We (ab)use the number of coordinates here because we know we have the same amount of ids
m_osmnodeid_list.set_number_of_entries(
data_layout->num_entries[storage::DataLayout::COORDINATE_LIST]);
const auto travel_mode_list_ptr = data_layout->GetBlockPtr<extractor::TravelMode>( const auto travel_mode_list_ptr = data_layout->GetBlockPtr<extractor::TravelMode>(
memory_block, storage::DataLayout::TRAVEL_MODE); memory_block, storage::DataLayout::TRAVEL_MODE);
@ -478,7 +479,7 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade
OSMNodeID GetOSMNodeIDOfNode(const unsigned id) const override final OSMNodeID GetOSMNodeIDOfNode(const unsigned id) const override final
{ {
return m_osmnodeid_list[id]; return m_osmnodeid_list.at(id);
} }
virtual std::vector<NodeID> GetUncompressedForwardGeometry(const EdgeID id) const override final virtual std::vector<NodeID> GetUncompressedForwardGeometry(const EdgeID id) const override final