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

shape up code

Browse Source
This commit is contained in:
Dennis Luxen 2014-04-22 16:42:55 +02:00
parent c6a58ff1b4
commit 0f8a32f38c
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Contractor/EdgeBasedGraphFactory.cpp
View File

@ -471,7 +471,6 @@ void EdgeBasedGraphFactory::Run(
const unsigned original_number_of_nodes = m_node_based_graph->GetNumberOfNodes(); const unsigned original_number_of_nodes = m_node_based_graph->GetNumberOfNodes();
const unsigned original_number_of_edges = m_node_based_graph->GetNumberOfEdges(); const unsigned original_number_of_edges = m_node_based_graph->GetNumberOfEdges();
SimpleLogger().Write(logDEBUG) << "Input graph has " << original_number_of_nodes << " nodes and " << original_number_of_edges << " edges";
Percent p(original_number_of_nodes); Percent p(original_number_of_nodes);
unsigned removed_node_count = 0; unsigned removed_node_count = 0;
@ -850,7 +849,6 @@ void EdgeBasedGraphFactory::Run(
edge_data_file.write( (char*)&original_edges_counter, sizeof(unsigned) ); edge_data_file.write( (char*)&original_edges_counter, sizeof(unsigned) );
edge_data_file.close(); edge_data_file.close();
SimpleLogger().Write(logDEBUG) << "serializing geometry to " << geometry_filename;
m_geometry_compressor.SerializeInternalVector( geometry_filename ); m_geometry_compressor.SerializeInternalVector( geometry_filename );
SimpleLogger().Write() << "Generated " << m_edge_based_node_list.size() << " edge based nodes"; SimpleLogger().Write() << "Generated " << m_edge_based_node_list.size() << " edge based nodes";

14
DataStructures/SharedMemoryVectorWrapper.h
View File

@ -82,9 +82,7 @@ public:
SharedMemoryWrapper(DataT * ptr, std::size_t size) : SharedMemoryWrapper(DataT * ptr, std::size_t size) :
m_ptr(ptr), m_ptr(ptr),
m_size(size) m_size(size)
{ { }
SimpleLogger().Write(logDEBUG) << "generated std::vector<DataT> of size " << size;
}
void swap( SharedMemoryWrapper<DataT> & other ) { void swap( SharedMemoryWrapper<DataT> & other ) {
BOOST_ASSERT_MSG(m_size != 0 || other.size() != 0, "size invalid"); BOOST_ASSERT_MSG(m_size != 0 || other.size() != 0, "size invalid");
@ -140,16 +138,12 @@ public:
SharedMemoryWrapper() : SharedMemoryWrapper() :
m_ptr(NULL), m_ptr(NULL),
m_size(0) m_size(0)
{ { }
SimpleLogger().Write(logDEBUG) << "generated std::vector<bool> of size " << m_size;
}
SharedMemoryWrapper(unsigned * ptr, std::size_t size) : SharedMemoryWrapper(unsigned * ptr, std::size_t size) :
m_ptr(ptr), m_ptr(ptr),
m_size(size) m_size(size)
{ { }
SimpleLogger().Write(logDEBUG) << "generated std::vector<bool> of size " << m_size;
}
void swap( SharedMemoryWrapper<bool> & other ) { void swap( SharedMemoryWrapper<bool> & other ) {
BOOST_ASSERT_MSG(m_size != 0 || other.size() != 0, "size invalid"); BOOST_ASSERT_MSG(m_size != 0 || other.size() != 0, "size invalid");
@ -191,7 +185,6 @@ public:
} }
}; };
template<typename DataT, bool UseSharedMemory> template<typename DataT, bool UseSharedMemory>
struct ShM { struct ShM {
typedef typename boost::conditional< typedef typename boost::conditional<
@ -201,5 +194,4 @@ struct ShM {
>::type vector; >::type vector;
}; };
#endif //SHARED_MEMORY_VECTOR_WRAPPER_H #endif //SHARED_MEMORY_VECTOR_WRAPPER_H

2
Server/DataStructures/InternalDataFacade.h
View File

@ -133,7 +133,6 @@ private:
std::ios::binary std::ios::binary
); );
SimpleLogger().Write(logDEBUG) << "Loading node data";
NodeInfo current_node; NodeInfo current_node;
unsigned number_of_coordinates = 0; unsigned number_of_coordinates = 0;
nodes_input_stream.read( nodes_input_stream.read(
@ -152,7 +151,6 @@ private:
} }
nodes_input_stream.close(); nodes_input_stream.close();
SimpleLogger().Write(logDEBUG) << "Loading edge data";
boost::filesystem::ifstream edges_input_stream( boost::filesystem::ifstream edges_input_stream(
edges_file, edges_file,
std::ios::binary std::ios::binary