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

further copy edits

Browse Source
This commit is contained in:
Dennis Luxen 2014-02-17 09:29:29 +01:00
parent c71c8b0047
commit d0349d9b0d
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Contractor/EdgeBasedGraphFactory.cpp
View File

@ -303,6 +303,7 @@ void EdgeBasedGraphFactory::InsertEdgeBasedNode(
for( unsigned i = 0; i < reverse_geometry.size(); ++i ) { for( unsigned i = 0; i < reverse_geometry.size(); ++i ) {
if( forward_geometry[i].first != reverse_geometry[reverse_geometry.size()-1-i].first ) { if( forward_geometry[i].first != reverse_geometry[reverse_geometry.size()-1-i].first ) {
#ifndef NDEBUG #ifndef NDEBUG
//Dumps debug information when data is borked
SimpleLogger().Write() << "size1: " << forward_geometry.size() << ", size2: " << reverse_geometry.size(); SimpleLogger().Write() << "size1: " << forward_geometry.size() << ", size2: " << reverse_geometry.size();
SimpleLogger().Write() << "index1: " << i << ", index2: " << reverse_geometry.size()-1-i; SimpleLogger().Write() << "index1: " << i << ", index2: " << reverse_geometry.size()-1-i;
SimpleLogger().Write() << forward_geometry[0].first << "!=" << reverse_geometry[reverse_geometry.size()-1-i].first; SimpleLogger().Write() << forward_geometry[0].first << "!=" << reverse_geometry[reverse_geometry.size()-1-i].first;

2
DataStructures/HashTable.h
View File

@ -54,7 +54,7 @@ public:
return boost::cref(iter->second); return boost::cref(iter->second);
} }
inline bool Holds( KeyT const & key) const { inline const bool Holds( KeyT const & key) const {
if( super::find(key) == super::end() ) { if( super::find(key) == super::end() ) {
return false; return false;
} }

10
DataStructures/StaticRTree.h
View File

@ -82,7 +82,7 @@ public:
int32_t min_lat, max_lat; int32_t min_lat, max_lat;
inline void InitializeMBRectangle( inline void InitializeMBRectangle(
const DataT * objects, DataT const * objects,
const uint32_t element_count const uint32_t element_count
) { ) {
for(uint32_t i = 0; i < element_count; ++i) { for(uint32_t i = 0; i < element_count; ++i) {
@ -221,9 +221,9 @@ public:
} }
inline bool Contains(const FixedPointCoordinate & location) const { inline bool Contains(const FixedPointCoordinate & location) const {
bool lats_contained = const bool lats_contained =
(location.lat > min_lat) && (location.lat < max_lat); (location.lat > min_lat) && (location.lat < max_lat);
bool lons_contained = const bool lons_contained =
(location.lon > min_lon) && (location.lon < max_lon); (location.lon > min_lon) && (location.lon < max_lon);
return lats_contained && lons_contained; return lats_contained && lons_contained;
} }
@ -315,7 +315,7 @@ public:
for(uint64_t element_counter = 0; element_counter < m_element_count; ++element_counter) { for(uint64_t element_counter = 0; element_counter < m_element_count; ++element_counter) {
input_wrapper_vector[element_counter].m_array_index = element_counter; input_wrapper_vector[element_counter].m_array_index = element_counter;
//Get Hilbert-Value for centroid in mercartor projection //Get Hilbert-Value for centroid in mercartor projection
DataT & current_element = input_data_vector[element_counter]; DataT const & current_element = input_data_vector[element_counter];
FixedPointCoordinate current_centroid = current_element.Centroid(); FixedPointCoordinate current_centroid = current_element.Centroid();
current_centroid.lat = COORDINATE_PRECISION*lat2y(current_centroid.lat/COORDINATE_PRECISION); current_centroid.lat = COORDINATE_PRECISION*lat2y(current_centroid.lat/COORDINATE_PRECISION);
@ -526,7 +526,7 @@ public:
current_leaf_node current_leaf_node
); );
for(uint32_t i = 0; i < current_leaf_node.object_count; ++i) { for(uint32_t i = 0; i < current_leaf_node.object_count; ++i) {
const DataT & current_edge = current_leaf_node.objects[i]; DataT const & current_edge = current_leaf_node.objects[i];
if( if(
ignore_tiny_components && ignore_tiny_components &&
current_edge.belongsToTinyComponent current_edge.belongsToTinyComponent

4
Extractor/ScriptingEnvironment.cpp
View File

@ -58,7 +58,7 @@ ScriptingEnvironment::ScriptingEnvironment(const char * fileName) {
// Add our function to the state's global scope // Add our function to the state's global scope
luabind::module(myLuaState) [ luabind::module(myLuaState) [
luabind::def("print", LUA_print<std::string>), luabind::def("print", LUA_print<std::string>),
luabind::def("parseMaxspeed", parseMaxspeed), // luabind::def("parseMaxspeed", parseMaxspeed),
luabind::def("durationIsValid", durationIsValid), luabind::def("durationIsValid", durationIsValid),
luabind::def("parseDuration", parseDuration) luabind::def("parseDuration", parseDuration)
]; ];
@ -66,7 +66,7 @@ ScriptingEnvironment::ScriptingEnvironment(const char * fileName) {
luabind::module(myLuaState) [ luabind::module(myLuaState) [
luabind::class_<HashTable<std::string, std::string> >("keyVals") luabind::class_<HashTable<std::string, std::string> >("keyVals")
.def("Add", &HashTable<std::string, std::string>::Add) .def("Add", &HashTable<std::string, std::string>::Add)
.def("Find", &HashTable<std::string, std::string>::Find) .def("Get", &HashTable<std::string, std::string>::Get)
.def("Holds", &HashTable<std::string, std::string>::Holds) .def("Holds", &HashTable<std::string, std::string>::Holds)
]; ];