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

std::for_each -> std::copy

Browse Source
This commit is contained in:
jakepruitt 2016-10-19 13:58:20 -07:00 committed by Jake Pruitt
parent 052b0e831d
commit fa1fc810ea
2 changed files with 48 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
include/engine/datafacade/internal_datafacade.hpp
View File

@ -735,13 +735,11 @@ class InternalDataFacade final : public BaseDataFacade
std::vector<NodeID> result_nodes;
result_nodes.reserve(end - begin);
result_nodes.resize(end - begin);
std::for_each(m_geometry_node_list.begin() + begin,
std::copy(m_geometry_node_list.begin() + begin,
m_geometry_node_list.begin() + end,
[&](const NodeID &node_id) {
result_nodes.emplace_back(node_id);
});
result_nodes.begin());
return result_nodes;
}
@ -760,13 +758,11 @@ class InternalDataFacade final : public BaseDataFacade
std::vector<NodeID> result_nodes;
result_nodes.reserve(end - begin);
result_nodes.resize(end - begin);
std::for_each(m_geometry_node_list.rbegin() + (m_geometry_node_list.size() - end),
std::copy(m_geometry_node_list.rbegin() + (m_geometry_node_list.size() - end),
m_geometry_node_list.rbegin() + (m_geometry_node_list.size() - begin),
[&](const NodeID &node_id) {
result_nodes.emplace_back(node_id);
});
result_nodes.begin());
return result_nodes;
}
@ -785,13 +781,11 @@ class InternalDataFacade final : public BaseDataFacade
const unsigned end = m_geometry_indices.at(id + 1);
std::vector<EdgeWeight> result_weights;
result_weights.reserve(end - begin);
result_weights.resize(end - begin);
std::for_each(m_geometry_fwd_weight_list.begin() + begin,
std::copy(m_geometry_fwd_weight_list.begin() + begin,
m_geometry_fwd_weight_list.begin() + end,
[&](const EdgeWeight &forward_weight) {
result_weights.emplace_back(forward_weight);
});
result_weights.begin());
return result_weights;
}
@ -812,13 +806,11 @@ class InternalDataFacade final : public BaseDataFacade
const signed end = m_geometry_indices.at(id + 1) - 1;
std::vector<EdgeWeight> result_weights;
result_weights.reserve(end - begin);
result_weights.resize(end - begin);
std::for_each(m_geometry_rev_weight_list.rbegin() + (m_geometry_rev_weight_list.size() - end),
std::copy(m_geometry_rev_weight_list.rbegin() + (m_geometry_rev_weight_list.size() - end),
m_geometry_rev_weight_list.rbegin() + (m_geometry_rev_weight_list.size() - begin),
[&](const EdgeWeight &reverse_weight) {
result_weights.emplace_back(reverse_weight);
});
result_weights.begin());
return result_weights;
}
@ -841,7 +833,7 @@ class InternalDataFacade final : public BaseDataFacade
const unsigned end = m_geometry_indices.at(id + 1);
std::vector<uint8_t> result_datasources;
result_datasources.reserve(end - begin);
result_datasources.resize(end - begin);
// If there was no datasource info, return an array of 0's.
if (m_datasource_list.empty())
@ -853,10 +845,10 @@ class InternalDataFacade final : public BaseDataFacade
}
else
{
std::for_each(
std::copy(
m_datasource_list.begin() + begin,
m_datasource_list.begin() + end,
[&](const uint8_t &datasource_id) { result_datasources.push_back(datasource_id); });
result_datasources.begin());
}
return result_datasources;
@ -880,7 +872,7 @@ class InternalDataFacade final : public BaseDataFacade
const unsigned end = m_geometry_indices.at(id + 1) - 1;
std::vector<uint8_t> result_datasources;
result_datasources.reserve(end - begin);
result_datasources.resize(end - begin);
// If there was no datasource info, return an array of 0's.
if (m_datasource_list.empty())
@ -892,10 +884,10 @@ class InternalDataFacade final : public BaseDataFacade
}
else
{
std::for_each(
std::copy(
m_datasource_list.rbegin() + (m_datasource_list.size() - end),
m_datasource_list.rbegin() + (m_datasource_list.size() - begin),
[&](const uint8_t &datasource_id) { result_datasources.push_back(datasource_id); });
result_datasources.begin());
}
return result_datasources;

48
include/engine/datafacade/shared_datafacade.hpp
View File

@ -559,13 +559,11 @@ class SharedDataFacade final : public BaseDataFacade
std::vector<NodeID> result_nodes;
result_nodes.reserve(end - begin);
result_nodes.resize(end - begin);
std::for_each(m_geometry_node_list.begin() + begin,
std::copy(m_geometry_node_list.begin() + begin,
m_geometry_node_list.begin() + end,
[&](const NodeID &node_id) {
result_nodes.emplace_back(node_id);
});
result_nodes.begin());
return result_nodes;
}
@ -584,13 +582,11 @@ class SharedDataFacade final : public BaseDataFacade
std::vector<NodeID> result_nodes;
result_nodes.reserve(end - begin);
result_nodes.resize(end - begin);
std::for_each(m_geometry_node_list.rbegin() + (m_geometry_node_list.size() - end),
std::copy(m_geometry_node_list.rbegin() + (m_geometry_node_list.size() - end),
m_geometry_node_list.rbegin() + (m_geometry_node_list.size() - begin),
[&](const NodeID &node_id) {
result_nodes.emplace_back(node_id);
});
result_nodes.begin());
return result_nodes;
}
@ -609,13 +605,11 @@ class SharedDataFacade final : public BaseDataFacade
const unsigned end = m_geometry_indices.at(id + 1);
std::vector<EdgeWeight> result_weights;
result_weights.reserve(end - begin);
result_weights.resize(end - begin);
std::for_each(m_geometry_fwd_weight_list.begin() + begin,
std::copy(m_geometry_fwd_weight_list.begin() + begin,
m_geometry_fwd_weight_list.begin() + end,
[&](const EdgeWeight &forward_weight) {
result_weights.emplace_back(forward_weight);
});
result_weights.begin());
return result_weights;
}
@ -636,13 +630,15 @@ class SharedDataFacade final : public BaseDataFacade
const signed end = m_geometry_indices.at(id + 1) - 1;
std::vector<EdgeWeight> result_weights;
result_weights.reserve(end - begin);
result_weights.resize(end - begin);
std::for_each(m_geometry_rev_weight_list.rbegin() + (m_geometry_rev_weight_list.size() - end),
std::copy(m_geometry_rev_weight_list.rbegin() + (m_geometry_rev_weight_list.size() - end),
m_geometry_rev_weight_list.rbegin() + (m_geometry_rev_weight_list.size() - begin),
[&](const EdgeWeight &reverse_weight) {
result_weights.emplace_back(reverse_weight);
});
result_weights.begin());
std::cout << "Should be: " << end - begin << std::endl;
std::cout << "Result weights length: " << result_weights.size() << std::endl;
std::cout << "Beginning weights length: " << m_geometry_rev_weight_list.size() << std::endl;
return result_weights;
}
@ -862,7 +858,7 @@ class SharedDataFacade final : public BaseDataFacade
const unsigned end = m_geometry_indices.at(id + 1);
std::vector<uint8_t> result_datasources;
result_datasources.reserve(end - begin);
result_datasources.resize(end - begin);
// If there was no datasource info, return an array of 0's.
if (m_datasource_list.empty())
@ -874,10 +870,10 @@ class SharedDataFacade final : public BaseDataFacade
}
else
{
std::for_each(
std::copy(
m_datasource_list.begin() + begin,
m_datasource_list.begin() + end,
[&](const uint8_t &datasource_id) { result_datasources.push_back(datasource_id); });
result_datasources.begin());
}
return result_datasources;
@ -901,7 +897,7 @@ class SharedDataFacade final : public BaseDataFacade
const unsigned end = m_geometry_indices.at(id + 1) - 1;
std::vector<uint8_t> result_datasources;
result_datasources.reserve(end - begin);
result_datasources.resize(end - begin);
// If there was no datasource info, return an array of 0's.
if (m_datasource_list.empty())
@ -913,10 +909,10 @@ class SharedDataFacade final : public BaseDataFacade
}
else
{
std::for_each(
std::copy(
m_datasource_list.rbegin() + (m_datasource_list.size() - end),
m_datasource_list.rbegin() + (m_datasource_list.size() - begin),
[&](const uint8_t &datasource_id) { result_datasources.push_back(datasource_id); });
result_datasources.begin());
}
return result_datasources;