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

add missing include and clang-format

Browse Source
This commit is contained in:
Huyen Chau Nguyen 2015-08-31 18:02:07 +02:00
parent a71159667d
commit f6a90e9b42
3 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
algorithms/tarjan_scc.hpp
View File

@ -44,6 +44,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <cstdint>
#include <memory>
#include <algorithm>
#include <climits>
#include <stack>
#include <vector>

8
algorithms/trip_brute_force.hpp
View File

@ -57,8 +57,9 @@ EdgeWeight ReturnDistance(const DistTableWrapper<EdgeWeight> &dist_table,
while (i < location_order.size() && (route_dist < min_route_dist))
{
route_dist += dist_table(location_order[i], location_order[(i + 1) % component_size]);
BOOST_ASSERT_MSG(dist_table(location_order[i], location_order[(i + 1) % component_size])
!= INVALID_EDGE_WEIGHT, "invalid route found");
BOOST_ASSERT_MSG(dist_table(location_order[i], location_order[(i + 1) % component_size]) !=
INVALID_EDGE_WEIGHT,
"invalid route found");
++i;
}
@ -82,8 +83,7 @@ std::vector<NodeID> BruteForceTrip(const NodeIDIterator start,
// check length of all possible permutation of the component ids
BOOST_ASSERT_MSG(perm.size() > 0,
"no permutation given");
BOOST_ASSERT_MSG(perm.size() > 0, "no permutation given");
BOOST_ASSERT_MSG(*(std::max_element(std::begin(perm), std::end(perm))) < number_of_locations,
"invalid node id");
BOOST_ASSERT_MSG(*(std::min_element(std::begin(perm), std::end(perm))) >= 0, "invalid node id");

52
plugins/trip.hpp
View File

@ -36,15 +36,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../algorithms/trip_farthest_insertion.hpp"
#include "../algorithms/trip_brute_force.hpp"
#include "../data_structures/search_engine.hpp"
#include "../data_structures/matrix_graph_wrapper.hpp" // wrapper to use tarjan
// scc on dist table
#include "../descriptors/descriptor_base.hpp" // to make json output
#include "../descriptors/json_descriptor.hpp" // to make json output
#include "../data_structures/matrix_graph_wrapper.hpp" // wrapper to use tarjan
// scc on dist table
#include "../descriptors/descriptor_base.hpp" // to make json output
#include "../descriptors/json_descriptor.hpp" // to make json output
#include "../util/make_unique.hpp"
#include "../util/timing_util.hpp" // to time runtime
#include "../util/simple_logger.hpp" // for logging output
#include "../util/dist_table_wrapper.hpp" // to access the dist
// table more easily
#include "../util/timing_util.hpp" // to time runtime
#include "../util/simple_logger.hpp" // for logging output
#include "../util/dist_table_wrapper.hpp" // to access the dist
// table more easily
#include <osrm/json_container.hpp>
#include <boost/assert.hpp>
@ -122,8 +122,7 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
BOOST_ASSERT_MSG(in_component.size() >= in_range.size(),
"scc component and its ranges do not match");
BOOST_ASSERT_MSG(in_component.size() > 0,
"there's no scc component");
BOOST_ASSERT_MSG(in_component.size() > 0, "there's no scc component");
BOOST_ASSERT_MSG(*std::max_element(in_range.begin(), in_range.end()) <=
in_component.size(),
"scc component ranges are out of bound");
@ -135,11 +134,11 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
// constructor to use when whole graph is one single scc
SCC_Component(std::vector<NodeID> in_component)
: component(in_component), range({0, in_component.size()}){};
: component(in_component), range({0, in_component.size()}){};
std::size_t GetNumberOfComponents() const {
BOOST_ASSERT_MSG(range.size() > 0,
"there's no range");
std::size_t GetNumberOfComponents() const
{
BOOST_ASSERT_MSG(range.size() > 0, "there's no range");
return range.size() - 1;
}
@ -154,7 +153,8 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
const DistTableWrapper<EdgeWeight> &result_table)
{
if (std::find(std::begin(result_table), std::end(result_table), INVALID_EDGE_WEIGHT) == std::end(result_table))
if (std::find(std::begin(result_table), std::end(result_table), INVALID_EDGE_WEIGHT) ==
std::end(result_table))
{
// whole graph is one scc
std::vector<NodeID> location_ids(number_of_locations);
@ -162,7 +162,6 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
return SCC_Component(std::move(location_ids));
}
// Run TarjanSCC
auto wrapper = std::make_shared<MatrixGraphWrapper<EdgeWeight>>(result_table.GetTable(),
number_of_locations);
@ -217,8 +216,7 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
{
const auto from_node = *it;
// if from_node is the last node, compute the route from the last to the first location
const auto to_node =
std::next(it) != end ? *std::next(it) : *start;
const auto to_node = std::next(it) != end ? *std::next(it) : *start;
viapoint =
PhantomNodes{phantom_node_vector[from_node][0], phantom_node_vector[to_node][0]};
@ -283,16 +281,11 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
if (component_size < BF_MAX_FEASABLE)
{
scc_route =
osrm::trip::BruteForceTrip(start,
end,
number_of_locations,
result_table);
osrm::trip::BruteForceTrip(start, end, number_of_locations, result_table);
}
else
{
scc_route = osrm::trip::FarthestInsertionTrip(start,
end,
number_of_locations,
scc_route = osrm::trip::FarthestInsertionTrip(start, end, number_of_locations,
result_table);
}
@ -321,19 +314,22 @@ template <class DataFacadeT> class RoundTripPlugin final : public BasePlugin
comp_route.reserve(route_result.size());
for (std::size_t r = 0; r < route_result.size(); ++r)
{
comp_route.push_back(ComputeRoute(phantom_node_vector, route_parameters, route_result[r]));
comp_route.push_back(
ComputeRoute(phantom_node_vector, route_parameters, route_result[r]));
}
TIMER_STOP(TRIP_TIMER);
SimpleLogger().Write() << "Trip calculation took: " << TIMER_MSEC(TRIP_TIMER) / 1000. << "s";
SimpleLogger().Write() << "Trip calculation took: " << TIMER_MSEC(TRIP_TIMER) / 1000.
<< "s";
// prepare JSON output
// create a json object for every trip
osrm::json::Array trip;
for (std::size_t i = 0; i < route_result.size(); ++i)
{
std::unique_ptr<BaseDescriptor<DataFacadeT>> descriptor = osrm::make_unique<JSONDescriptor<DataFacadeT>>(facade);
std::unique_ptr<BaseDescriptor<DataFacadeT>> descriptor =
osrm::make_unique<JSONDescriptor<DataFacadeT>>(facade);
descriptor->SetConfig(route_parameters);
osrm::json::Object scc_trip;