Fix formatting
This commit is contained in:
parent
f983d626ac
commit
f4189d9487
@ -34,8 +34,7 @@ namespace lanes
|
||||
|
||||
namespace
|
||||
{
|
||||
using TurnLaneScenario = enum TurnLaneScenario
|
||||
{
|
||||
using TurnLaneScenario = enum TurnLaneScenario {
|
||||
SIMPLE, // a straightforward assignment
|
||||
PARTITION_LOCAL, // an assignment that requires partitioning, using local turns
|
||||
SIMPLE_PREVIOUS, // an assignemtnn using the turns specified at the previous road (e.g.
|
||||
|
@ -100,7 +100,8 @@ template <storage::Ownership Ownership> class CellStorageImpl
|
||||
{
|
||||
|
||||
using ValueT = decltype(*std::declval<ValuePtrT>());
|
||||
using base_t = boost::iterator_facade<ColumnIterator<ValueT>, ValueT, boost::random_access_traversal_tag>;
|
||||
using base_t = boost::
|
||||
iterator_facade<ColumnIterator<ValueT>, ValueT, boost::random_access_traversal_tag>;
|
||||
|
||||
public:
|
||||
using value_type = typename base_t::value_type;
|
||||
|
@ -49,7 +49,10 @@ class BitIterator : public boost::iterator_facade<BitIterator<DataT>,
|
||||
boost::forward_traversal_tag,
|
||||
const std::size_t>
|
||||
{
|
||||
using base_t = boost::iterator_facade<BitIterator<DataT>, const std::size_t, boost::forward_traversal_tag, const std::size_t>;
|
||||
using base_t = boost::iterator_facade<BitIterator<DataT>,
|
||||
const std::size_t,
|
||||
boost::forward_traversal_tag,
|
||||
const std::size_t>;
|
||||
|
||||
public:
|
||||
using value_type = typename base_t::value_type;
|
||||
|
@ -26,7 +26,10 @@ class filtered_integer_iterator
|
||||
boost::single_pass_traversal_tag,
|
||||
Integer>
|
||||
{
|
||||
using base_t = boost::iterator_facade<filtered_integer_iterator<Integer, Filter>, Integer, boost::single_pass_traversal_tag, Integer>;
|
||||
using base_t = boost::iterator_facade<filtered_integer_iterator<Integer, Filter>,
|
||||
Integer,
|
||||
boost::single_pass_traversal_tag,
|
||||
Integer>;
|
||||
|
||||
public:
|
||||
using value_type = typename base_t::value_type;
|
||||
|
@ -22,7 +22,10 @@ class integer_iterator : public boost::iterator_facade<integer_iterator<Integer>
|
||||
boost::random_access_traversal_tag,
|
||||
Integer>
|
||||
{
|
||||
using base_t = boost::iterator_facade<integer_iterator<Integer>, Integer, boost::random_access_traversal_tag, Integer>;
|
||||
using base_t = boost::iterator_facade<integer_iterator<Integer>,
|
||||
Integer,
|
||||
boost::random_access_traversal_tag,
|
||||
Integer>;
|
||||
|
||||
public:
|
||||
using value_type = typename base_t::value_type;
|
||||
|
@ -336,7 +336,10 @@ template <typename T, std::size_t Bits, storage::Ownership Ownership> class Pack
|
||||
boost::random_access_traversal_tag,
|
||||
ReferenceT>
|
||||
{
|
||||
using base_t = boost::iterator_facade<iterator_impl<DataT, ContainerT, ReferenceT>, DataT, boost::random_access_traversal_tag, ReferenceT>;
|
||||
using base_t = boost::iterator_facade<iterator_impl<DataT, ContainerT, ReferenceT>,
|
||||
DataT,
|
||||
boost::random_access_traversal_tag,
|
||||
ReferenceT>;
|
||||
|
||||
public:
|
||||
using value_type = typename base_t::value_type;
|
||||
|
@ -10,13 +10,15 @@ namespace util
|
||||
|
||||
template <typename It, typename Value> inline void static_assert_iter_value()
|
||||
{
|
||||
using IterValueType = typename std::iterator_traits;<It>::value_type;
|
||||
using IterValueType = typename std::iterator_traits;
|
||||
<It>::value_type;
|
||||
static_assert(std::is_same<IterValueType, Value>::value, "");
|
||||
}
|
||||
|
||||
template <typename It, typename Category> inline void static_assert_iter_category()
|
||||
{
|
||||
using IterCategoryType = typename std::iterator_traits;<It>::iterator_category;
|
||||
using IterCategoryType = typename std::iterator_traits;
|
||||
<It>::iterator_category;
|
||||
static_assert(std::is_base_of<Category, IterCategoryType>::value, "");
|
||||
}
|
||||
|
||||
|
@ -30,7 +30,10 @@ class VectorViewIterator : public boost::iterator_facade<VectorViewIterator<Data
|
||||
boost::random_access_traversal_tag,
|
||||
DataT &>
|
||||
{
|
||||
using base_t = boost::iterator_facade<VectorViewIterator<DataT>, DataT, boost::random_access_traversal_tag, DataT &>;
|
||||
using base_t = boost::iterator_facade<VectorViewIterator<DataT>,
|
||||
DataT,
|
||||
boost::random_access_traversal_tag,
|
||||
DataT &>;
|
||||
|
||||
public:
|
||||
using value_type = typename base_t::value_type;
|
||||
|
@ -22,7 +22,9 @@ struct TestData
|
||||
using TestNodeID = NodeID;
|
||||
using TestKey = int;
|
||||
using TestWeight = int;
|
||||
using storage_types = boost::mpl::list<ArrayStorage<TestNodeID, TestKey>, MapStorage<TestNodeID, TestKey>, UnorderedMapStorage<TestNodeID, TestKey>>;
|
||||
using storage_types = boost::mpl::list<ArrayStorage<TestNodeID, TestKey>,
|
||||
MapStorage<TestNodeID, TestKey>,
|
||||
UnorderedMapStorage<TestNodeID, TestKey>>;
|
||||
|
||||
template <unsigned NUM_ELEM> struct RandomDataFixture
|
||||
{
|
||||
|
@ -174,11 +174,18 @@ struct GraphFixture
|
||||
std::vector<TestData> edges;
|
||||
};
|
||||
|
||||
using TestRandomGraphFixture_LeafHalfFull = RandomGraphFixture<TEST_LEAF_NODE_SIZE * 3, TEST_LEAF_NODE_SIZE / 2>;
|
||||
using TestRandomGraphFixture_LeafFull = RandomGraphFixture<TEST_LEAF_NODE_SIZE * 5, TEST_LEAF_NODE_SIZE>;
|
||||
using TestRandomGraphFixture_TwoLeaves = RandomGraphFixture<TEST_LEAF_NODE_SIZE * 10, TEST_LEAF_NODE_SIZE * 2>;
|
||||
using TestRandomGraphFixture_Branch = RandomGraphFixture<TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 3, TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR>;
|
||||
using TestRandomGraphFixture_MultipleLevels = RandomGraphFixture<TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 3, TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 2>;
|
||||
using TestRandomGraphFixture_LeafHalfFull =
|
||||
RandomGraphFixture<TEST_LEAF_NODE_SIZE * 3, TEST_LEAF_NODE_SIZE / 2>;
|
||||
using TestRandomGraphFixture_LeafFull =
|
||||
RandomGraphFixture<TEST_LEAF_NODE_SIZE * 5, TEST_LEAF_NODE_SIZE>;
|
||||
using TestRandomGraphFixture_TwoLeaves =
|
||||
RandomGraphFixture<TEST_LEAF_NODE_SIZE * 10, TEST_LEAF_NODE_SIZE * 2>;
|
||||
using TestRandomGraphFixture_Branch =
|
||||
RandomGraphFixture<TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 3,
|
||||
TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR>;
|
||||
using TestRandomGraphFixture_MultipleLevels =
|
||||
RandomGraphFixture<TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 3,
|
||||
TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 2>;
|
||||
using TestRandomGraphFixture_10_30 = RandomGraphFixture<10, 30>;
|
||||
|
||||
template <typename RTreeT>
|
||||
|
Loading…
Reference in New Issue
Block a user