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

clang-format and remove debug

Browse Source
This commit is contained in:
jakepruitt
2016-10-19 17:11:36 -07:00
committed by Jake Pruitt
parent fa1fc810ea
commit c30784895d
5 changed files with 75 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/contractor/contractor.cpp
+11 -16
View File
@@ -543,16 +543,13 @@ EdgeID Contractor::LoadEdgeExpandedGraph(
if (number_of_compressed_geometries > 0)
{
geometry_stream.read((char *)&(m_geometry_node_list[0]),
number_of_compressed_geometries *
sizeof(NodeID));
number_of_compressed_geometries * sizeof(NodeID));
geometry_stream.read((char *)&(m_geometry_fwd_weight_list[0]),
number_of_compressed_geometries *
sizeof(EdgeWeight));
number_of_compressed_geometries * sizeof(EdgeWeight));
geometry_stream.read((char *)&(m_geometry_rev_weight_list[0]),
number_of_compressed_geometries *
sizeof(EdgeWeight));
number_of_compressed_geometries * sizeof(EdgeWeight));
}
};
@@ -611,10 +608,10 @@ EdgeID Contractor::LoadEdgeExpandedGraph(
m_geometry_fwd_weight_list[forward_begin + leaf_object.fwd_segment_position];
u = &(internal_to_external_node_map
[m_geometry_node_list[forward_begin +
leaf_object.fwd_segment_position]]);
[m_geometry_node_list[forward_begin + leaf_object.fwd_segment_position]]);
v = &(internal_to_external_node_map
[m_geometry_node_list[forward_begin + leaf_object.fwd_segment_position + 1]]);
[m_geometry_node_list[forward_begin + leaf_object.fwd_segment_position +
1]]);
const double segment_length = util::coordinate_calculation::greatCircleDistance(
util::Coordinate{u->lon, u->lat}, util::Coordinate{v->lon, v->lat});
@@ -629,7 +626,8 @@ EdgeID Contractor::LoadEdgeExpandedGraph(
current_fwd_weight,
log_edge_updates_factor);
m_geometry_fwd_weight_list[forward_begin + 1 + leaf_object.fwd_segment_position] =
m_geometry_fwd_weight_list[forward_begin + 1 +
leaf_object.fwd_segment_position] =
new_segment_weight;
m_geometry_datasource[forward_begin + 1 + leaf_object.fwd_segment_position] =
forward_speed_iter->speed_source.source;
@@ -714,14 +712,11 @@ EdgeID Contractor::LoadEdgeExpandedGraph(
geometry_stream.write(reinterpret_cast<const char *>(&number_of_compressed_geometries),
sizeof(unsigned));
geometry_stream.write(reinterpret_cast<char *>(&(m_geometry_node_list[0])),
number_of_compressed_geometries *
sizeof(NodeID));
number_of_compressed_geometries * sizeof(NodeID));
geometry_stream.write(reinterpret_cast<char *>(&(m_geometry_fwd_weight_list[0])),
number_of_compressed_geometries *
sizeof(EdgeWeight));
number_of_compressed_geometries * sizeof(EdgeWeight));
geometry_stream.write(reinterpret_cast<char *>(&(m_geometry_rev_weight_list[0])),
number_of_compressed_geometries *
sizeof(EdgeWeight));
number_of_compressed_geometries * sizeof(EdgeWeight));
};
const auto save_datasource_indexes = [&] {
src/extractor/compressed_edge_container.cpp
+8 -4
View File
@@ -81,7 +81,8 @@ void CompressedEdgeContainer::SerializeInternalVector(const std::string &path) c
BOOST_ASSERT(std::numeric_limits<unsigned>::max() != compressed_geometry_indices);
geometry_out_stream.write((char *)&compressed_geometry_indices, sizeof(unsigned));
geometry_out_stream.write((char *)(m_compressed_geometry_index.data()), sizeof(unsigned) * m_compressed_geometry_index.size());
geometry_out_stream.write((char *)(m_compressed_geometry_index.data()),
sizeof(unsigned) * m_compressed_geometry_index.size());
// sentinel element
geometry_out_stream.write((char *)&(compressed_geometries), sizeof(unsigned));
@@ -90,13 +91,16 @@ void CompressedEdgeContainer::SerializeInternalVector(const std::string &path) c
geometry_out_stream.write((char *)&(compressed_geometries), sizeof(unsigned));
// write compressed geometry node id's
geometry_out_stream.write((char *)(m_compressed_geometry_nodes.data()), sizeof(NodeID) * m_compressed_geometry_nodes.size());
geometry_out_stream.write((char *)(m_compressed_geometry_nodes.data()),
sizeof(NodeID) * m_compressed_geometry_nodes.size());
// write compressed geometry forward weights
geometry_out_stream.write((char *)(m_compressed_geometry_fwd_weights.data()), sizeof(EdgeWeight) * m_compressed_geometry_fwd_weights.size());
geometry_out_stream.write((char *)(m_compressed_geometry_fwd_weights.data()),
sizeof(EdgeWeight) * m_compressed_geometry_fwd_weights.size());
// write compressed geometry reverse weights
geometry_out_stream.write((char *)(m_compressed_geometry_rev_weights.data()), sizeof(EdgeWeight) * m_compressed_geometry_rev_weights.size());
geometry_out_stream.write((char *)(m_compressed_geometry_rev_weights.data()),
sizeof(EdgeWeight) * m_compressed_geometry_rev_weights.size());
}
// Adds info for a compressed edge to the container. edge_id_2
src/storage/storage.cpp
+13 -15
View File
@@ -329,12 +329,12 @@ Storage::ReturnCode Storage::Run(int max_wait)
boost::iostreams::seek(
geometry_input_stream, number_of_geometries_indices * sizeof(unsigned), BOOST_IOS::cur);
geometry_input_stream.read((char *)&number_of_compressed_geometries, sizeof(unsigned));
shared_layout_ptr->SetBlockSize<NodeID>(
SharedDataLayout::GEOMETRIES_NODE_LIST, number_of_compressed_geometries);
shared_layout_ptr->SetBlockSize<EdgeWeight>(
SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST, number_of_compressed_geometries);
shared_layout_ptr->SetBlockSize<EdgeWeight>(
SharedDataLayout::GEOMETRIES_REV_WEIGHT_LIST, number_of_compressed_geometries);
shared_layout_ptr->SetBlockSize<NodeID>(SharedDataLayout::GEOMETRIES_NODE_LIST,
number_of_compressed_geometries);
shared_layout_ptr->SetBlockSize<EdgeWeight>(SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST,
number_of_compressed_geometries);
shared_layout_ptr->SetBlockSize<EdgeWeight>(SharedDataLayout::GEOMETRIES_REV_WEIGHT_LIST,
number_of_compressed_geometries);
// load datasource sizes. This file is optional, and it's non-fatal if it doesn't
// exist.
@@ -605,9 +605,8 @@ Storage::ReturnCode Storage::Run(int max_wait)
(char *)geometries_index_ptr,
shared_layout_ptr->GetBlockSize(SharedDataLayout::GEOMETRIES_INDEX));
}
NodeID *geometries_node_id_list_ptr =
shared_layout_ptr->GetBlockPtr<NodeID, true>(
shared_memory_ptr, SharedDataLayout::GEOMETRIES_NODE_LIST);
NodeID *geometries_node_id_list_ptr = shared_layout_ptr->GetBlockPtr<NodeID, true>(
shared_memory_ptr, SharedDataLayout::GEOMETRIES_NODE_LIST);
geometry_input_stream.read((char *)&temporary_value, sizeof(unsigned));
BOOST_ASSERT(temporary_value ==
@@ -619,9 +618,8 @@ Storage::ReturnCode Storage::Run(int max_wait)
(char *)geometries_node_id_list_ptr,
shared_layout_ptr->GetBlockSize(SharedDataLayout::GEOMETRIES_NODE_LIST));
}
EdgeWeight *geometries_fwd_weight_list_ptr =
shared_layout_ptr->GetBlockPtr<EdgeWeight, true>(
shared_memory_ptr, SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST);
EdgeWeight *geometries_fwd_weight_list_ptr = shared_layout_ptr->GetBlockPtr<EdgeWeight, true>(
shared_memory_ptr, SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST);
BOOST_ASSERT(temporary_value ==
shared_layout_ptr->num_entries[SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST]);
@@ -632,9 +630,8 @@ Storage::ReturnCode Storage::Run(int max_wait)
(char *)geometries_fwd_weight_list_ptr,
shared_layout_ptr->GetBlockSize(SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST));
}
EdgeWeight *geometries_rev_weight_list_ptr =
shared_layout_ptr->GetBlockPtr<EdgeWeight, true>(
shared_memory_ptr, SharedDataLayout::GEOMETRIES_REV_WEIGHT_LIST);
EdgeWeight *geometries_rev_weight_list_ptr = shared_layout_ptr->GetBlockPtr<EdgeWeight, true>(
shared_memory_ptr, SharedDataLayout::GEOMETRIES_REV_WEIGHT_LIST);
BOOST_ASSERT(temporary_value ==
shared_layout_ptr->num_entries[SharedDataLayout::GEOMETRIES_REV_WEIGHT_LIST]);
@@ -816,6 +813,7 @@ Storage::ReturnCode Storage::Run(int max_wait)
static_cast<SharedDataTimestamp *>(data_type_memory->Ptr());
{
boost::interprocess::scoped_lock<boost::interprocess::named_upgradable_mutex>
current_regions_exclusive_lock;