Replace deallocation vector with std::vector and different merge algorithm

This commit is contained in:
Patrick Niklaus
2017-10-11 23:23:57 +00:00
committed by Patrick Niklaus
parent 69db219423
commit 9b87b8b7b1
5 changed files with 86 additions and 69 deletions
+3 -5
View File
@@ -1,5 +1,7 @@
#include "partition/renumber.hpp"
#include "util/permutation.hpp"
#include <tbb/parallel_sort.h>
namespace osrm
@@ -64,11 +66,7 @@ std::vector<std::uint32_t> makePermutation(const DynamicEdgeBasedGraph &graph,
return border_level[lhs] > border_level[rhs];
});
std::vector<std::uint32_t> permutation(ordering.size());
for (auto index : util::irange<std::uint32_t>(0, ordering.size()))
permutation[ordering[index]] = index;
return permutation;
return util::orderingToPermutation(ordering);
}
}
}