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

Add max-cell-sizes option to partitioner

Browse Source
This commit is contained in:
Michael Krasnyk 2017-03-27 12:17:01 +02:00
parent 379380abd8
commit 3dcc7132b6
No known key found for this signature in database
GPG Key ID: 49C12AD0F43D2108
5 changed files with 59 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
features/options/partition/help.feature
View File

@ -10,11 +10,11 @@ Feature: osrm-partition command line options: help
And stdout should contain "--help"
And stdout should contain "Configuration:"
And stdout should contain "--threads"
And stdout should contain "--min-cell-size"
And stdout should contain "--balance"
And stdout should contain "--boundary"
And stdout should contain "--optimizing-cuts"
And stdout should contain "--small-component-size"
And stdout should contain "--max-cell-sizes"
And it should exit with an error
Scenario: osrm-partition - Help, short
@ -26,11 +26,11 @@ Feature: osrm-partition command line options: help
And stdout should contain "--help"
And stdout should contain "Configuration:"
And stdout should contain "--threads"
And stdout should contain "--min-cell-size"
And stdout should contain "--balance"
And stdout should contain "--boundary"
And stdout should contain "--optimizing-cuts"
And stdout should contain "--small-component-size"
And stdout should contain "--max-cell-sizes"
And it should exit successfully
Scenario: osrm-partition - Help, long
@ -42,9 +42,9 @@ Feature: osrm-partition command line options: help
And stdout should contain "--help"
And stdout should contain "Configuration:"
And stdout should contain "--threads"
And stdout should contain "--min-cell-size"
And stdout should contain "--balance"
And stdout should contain "--boundary"
And stdout should contain "--optimizing-cuts"
And stdout should contain "--small-component-size"
And stdout should contain "--max-cell-sizes"
And it should exit successfully

8
features/testbot/multi_level_routing.feature
View File

@ -3,7 +3,7 @@ Feature: Multi level routing
Background:
Given the profile "testbot"
And the partition extra arguments "--min-cell-size 4 --small-component-size 1"
And the partition extra arguments "--small-component-size 1 --max-cell-sizes 4 16 64 --"
Scenario: Testbot - Multi level routing check partition
Given the node map
@ -31,7 +31,7 @@ Feature: Multi level routing
| be | primary |
And the data has been extracted
When I run "osrm-partition --min-cell-size 4 --small-component-size 1 {processed_file}"
When I run "osrm-partition --max-cell-sizes 4 16 --small-component-size 1 {processed_file}"
Then it should exit successfully
And stdout should not contain "level 1 #cells 1 bit size 1"
@ -57,7 +57,6 @@ Feature: Multi level routing
| cm | primary |
| hj | primary |
| kp | primary |
And the partition extra arguments "--min-cell-size 4 --small-component-size 1"
When I route I should get
| from | to | route | time |
@ -88,7 +87,6 @@ Feature: Multi level routing
| dim | primary |
| glr | primary |
| ot | secondary |
And the partition extra arguments "--min-cell-size 4 --small-component-size 1"
When I route I should get
| from | to | route | time |
@ -113,6 +111,7 @@ Feature: Multi level routing
│ │
l───k
"""
And the partition extra arguments "--small-component-size 1 --max-cell-sizes 4 16 --"
And the ways
| nodes | maxspeed |
| abcda | 5 |
@ -124,7 +123,6 @@ Feature: Multi level routing
| fi | 15 |
| gi | 15 |
| hf | 100 |
And the partition extra arguments "--min-cell-size 4 --small-component-size 1"
When I route I should get
| from | to | route | time |

9
include/partition/partition_config.hpp
View File

@ -13,7 +13,12 @@ namespace partition
struct PartitionConfig
{
PartitionConfig() : requested_num_threads(0) {}
PartitionConfig()
: requested_num_threads(0), balance(1.2), boundary_factor(0.25), num_optimizing_cuts(10),
small_component_size(1000),
max_cell_sizes{128, 128 * 32, 128 * 32 * 16, 128 * 32 * 16 * 32}
{
}
void UseDefaults()
{
@ -49,11 +54,11 @@ struct PartitionConfig
unsigned requested_num_threads;
std::size_t minimum_cell_size;
double balance;
double boundary_factor;
std::size_t num_optimizing_cuts;
std::size_t small_component_size;
std::vector<std::size_t> max_cell_sizes;
};
}
}

10
src/partition/partitioner.cpp
View File

@ -108,12 +108,12 @@ int Partitioner::Run(const PartitionConfig &config)
makeBisectionGraph(compressed_node_based_graph.coordinates,
adaptToBisectionEdge(std::move(compressed_node_based_graph.edges)));
util::Log() << " running partition: " << config.minimum_cell_size << " " << config.balance
util::Log() << " running partition: " << config.max_cell_sizes.front() << " " << config.balance
<< " " << config.boundary_factor << " " << config.num_optimizing_cuts << " "
<< config.small_component_size
<< " # max_cell_size balance boundary cuts small_component_size";
RecursiveBisection recursive_bisection(graph,
config.minimum_cell_size,
config.max_cell_sizes.front(),
config.balance,
config.boundary_factor,
config.num_optimizing_cuts,
@ -161,11 +161,7 @@ int Partitioner::Run(const PartitionConfig &config)
std::vector<Partition> partitions;
std::vector<std::uint32_t> level_to_num_cells;
std::tie(partitions, level_to_num_cells) =
bisectionToPartition(edge_based_partition_ids,
{config.minimum_cell_size,
config.minimum_cell_size * 32,
config.minimum_cell_size * 32 * 16,
config.minimum_cell_size * 32 * 16 * 32});
bisectionToPartition(edge_based_partition_ids, config.max_cell_sizes);
auto num_unconnected = removeUnconnectedBoundaryNodes(*edge_based_graph, partitions);
util::Log() << "Fixed " << num_unconnected << " unconnected nodes";

59
src/tools/partition.cpp
View File

@ -8,9 +8,11 @@
#include <tbb/task_scheduler_init.h>
#include <boost/algorithm/string/join.hpp>
#include <boost/assert.hpp>
#include <boost/filesystem.hpp>
#include <boost/program_options.hpp>
#include <boost/range/adaptor/transformed.hpp>
#include <iostream>
@ -23,7 +25,7 @@ enum class return_code : unsigned
exit
};
return_code parseArguments(int argc, char *argv[], partition::PartitionConfig &partition_config)
return_code parseArguments(int argc, char *argv[], partition::PartitionConfig &config)
{
// declare a group of options that will be allowed only on command line
boost::program_options::options_description generic_options("Options");
@ -34,40 +36,47 @@ return_code parseArguments(int argc, char *argv[], partition::PartitionConfig &p
config_options.add_options()
//
("threads,t",
boost::program_options::value<unsigned int>(&partition_config.requested_num_threads)
boost::program_options::value<unsigned int>(&config.requested_num_threads)
->default_value(tbb::task_scheduler_init::default_num_threads()),
"Number of threads to use")
//
("min-cell-size",
boost::program_options::value<std::size_t>(&partition_config.minimum_cell_size)
->default_value(128),
"Bisection termination citerion based on cell size")
//
("balance",
boost::program_options::value<double>(&partition_config.balance)->default_value(1.2),
boost::program_options::value<double>(&config.balance)->default_value(config.balance),
"Balance for left and right side in single bisection")
//
("boundary",
boost::program_options::value<double>(&partition_config.boundary_factor)
->default_value(0.25),
boost::program_options::value<double>(&config.boundary_factor)
->default_value(config.boundary_factor),
"Percentage of embedded nodes to contract as sources and sinks")
//
("optimizing-cuts",
boost::program_options::value<std::size_t>(&partition_config.num_optimizing_cuts)
->default_value(10),
boost::program_options::value<std::size_t>(&config.num_optimizing_cuts)
->default_value(config.num_optimizing_cuts),
"Number of cuts to use for optimizing a single bisection")
//
("small-component-size",
boost::program_options::value<std::size_t>(&partition_config.small_component_size)
->default_value(1000),
"Size threshold for small components.");
boost::program_options::value<std::size_t>(&config.small_component_size)
->default_value(config.small_component_size),
"Size threshold for small components.")
//
("max-cell-sizes",
boost::program_options::value<std::vector<std::size_t>>(&config.max_cell_sizes)
->multitoken()
->default_value(config.max_cell_sizes,
boost::algorithm::join(
config.max_cell_sizes |
boost::adaptors::transformed(
static_cast<std::string (*)(std::size_t)>(std::to_string)),
" ")),
"Maximum cell sizes starting from the level 1. The first cell size value is a bisection "
"termination citerion");
// hidden options, will be allowed on command line, but will not be
// shown to the user
boost::program_options::options_description hidden_options("Hidden options");
hidden_options.add_options()(
"input,i",
boost::program_options::value<boost::filesystem::path>(&partition_config.base_path),
boost::program_options::value<boost::filesystem::path>(&config.base_path),
"Input file in .osrm format");
// positional option
@ -119,6 +128,24 @@ return_code parseArguments(int argc, char *argv[], partition::PartitionConfig &p
return return_code::fail;
}
if (config.max_cell_sizes.empty())
{
util::Log(logERROR) << "The maximum cell sizes array must be non-empty";
return return_code::fail;
}
if (!std::is_sorted(config.max_cell_sizes.begin(), config.max_cell_sizes.end()))
{
util::Log(logERROR) << "The maximum cell sizes array must be sorted in non-descending order.";
return return_code::fail;
}
if (config.max_cell_sizes.front() < 2)
{
util::Log(logERROR) << "Cells on the first level must have at least 2 nodes";
return return_code::fail;
}
return return_code::ok;
}