From ca17efd764592dd2a6c6a11129140312c58fd3ac Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Mon, 9 Dec 2013 11:45:45 -0500 Subject: [PATCH] break out OriginalEdgeData class into its own include --- Contractor/EdgeBasedGraphFactory.h | 1 + DataStructures/QueryEdge.h | 32 ++++++++-------------- Server/DataStructures/InternalDataFacade.h | 7 +++-- Server/RequestHandler.cpp | 11 ++++---- datastore.cpp | 7 +++-- 5 files changed, 26 insertions(+), 32 deletions(-) diff --git a/Contractor/EdgeBasedGraphFactory.h b/Contractor/EdgeBasedGraphFactory.h index 053a6bfe9..3126fb155 100644 --- a/Contractor/EdgeBasedGraphFactory.h +++ b/Contractor/EdgeBasedGraphFactory.h @@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../DataStructures/EdgeBasedNode.h" #include "../DataStructures/HashTable.h" #include "../DataStructures/ImportEdge.h" +#include "../DataStructures/OriginalEdgeData.h" #include "../DataStructures/Percent.h" #include "../DataStructures/QueryEdge.h" #include "../DataStructures/TurnInstructions.h" diff --git a/DataStructures/QueryEdge.h b/DataStructures/QueryEdge.h index 53a671616..41c9e066f 100644 --- a/DataStructures/QueryEdge.h +++ b/DataStructures/QueryEdge.h @@ -28,32 +28,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef QUERYEDGE_H_ #define QUERYEDGE_H_ -#include "TurnInstructions.h" #include "../typedefs.h" #include -struct OriginalEdgeData{ - explicit OriginalEdgeData( - NodeID viaNode, - unsigned nameID, - TurnInstruction turnInstruction - ) : viaNode(viaNode), nameID(nameID), turnInstruction(turnInstruction) {} - OriginalEdgeData() : viaNode(UINT_MAX), nameID(UINT_MAX), turnInstruction(UCHAR_MAX) {} - NodeID viaNode; - unsigned nameID; - TurnInstruction turnInstruction; -}; - struct QueryEdge { NodeID source; NodeID target; struct EdgeData { NodeID id:31; - bool shortcut:1; - int distance:30; - bool forward:1; - bool backward:1; + bool shortcut:1; + int distance:30; + bool forward:1; + bool backward:1; } data; bool operator<( const QueryEdge& right ) const { @@ -64,9 +51,14 @@ struct QueryEdge { } bool operator== ( const QueryEdge& right ) const { - return ( source == right.source && target == right.target && data.distance == right.data.distance && - data.shortcut == right.data.shortcut && data.forward == right.data.forward && data.backward == right.data.backward - && data.id == right.data.id + return ( + source == right.source && + target == right.target && + data.distance == right.data.distance && + data.shortcut == right.data.shortcut && + data.forward == right.data.forward && + data.backward == right.data.backward && + data.id == right.data.id ); } }; diff --git a/Server/DataStructures/InternalDataFacade.h b/Server/DataStructures/InternalDataFacade.h index 644becc28..025790c41 100644 --- a/Server/DataStructures/InternalDataFacade.h +++ b/Server/DataStructures/InternalDataFacade.h @@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BaseDataFacade.h" #include "../../DataStructures/Coordinate.h" +#include "../../DataStructures/OriginalEdgeData.h" #include "../../DataStructures/QueryNode.h" #include "../../DataStructures/QueryEdge.h" #include "../../DataStructures/SharedMemoryVectorWrapper.h" @@ -154,9 +155,9 @@ private: (char*)&(current_edge_data), sizeof(OriginalEdgeData) ); - m_via_node_list[i] = current_edge_data.viaNode; - m_name_ID_list[i] = current_edge_data.nameID; - m_turn_instruction_list[i] = current_edge_data.turnInstruction; + m_via_node_list[i] = current_edge_data.via_node; + m_name_ID_list[i] = current_edge_data.name_id; + m_turn_instruction_list[i] = current_edge_data.turn_instruction; } edges_input_stream.close(); } diff --git a/Server/RequestHandler.cpp b/Server/RequestHandler.cpp index 2e140d81b..af4566d0e 100644 --- a/Server/RequestHandler.cpp +++ b/Server/RequestHandler.cpp @@ -35,7 +35,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include RequestHandler::RequestHandler() : routing_machine(NULL) { } @@ -60,14 +59,14 @@ void RequestHandler::handle_request(const http::Request& req, http::Reply& rep){ req.referrer << ( 0 == req.referrer.length() ? "- " :" ") << req.agent << ( 0 == req.agent.length() ? "- " :" ") << req.uri; - RouteParameters routeParameters; - APIGrammarParser apiParser(&routeParameters); + RouteParameters route_parameters; + APIGrammarParser api_parser(&route_parameters); std::string::iterator it = request.begin(); const bool result = boost::spirit::qi::parse( it, request.end(), - apiParser + api_parser ); if ( !result || (it != request.end()) ) { @@ -93,10 +92,10 @@ void RequestHandler::handle_request(const http::Request& req, http::Reply& rep){ routing_machine != NULL, "pointer not init'ed" ); - routing_machine->RunQuery(routeParameters, rep); + routing_machine->RunQuery(route_parameters, rep); return; } - } catch(std::exception& e) { + } catch(const std::exception& e) { rep = http::Reply::StockReply(http::Reply::internalServerError); SimpleLogger().Write(logWARNING) << "[server error] code: " << e.what() << ", uri: " << req.uri; diff --git a/datastore.cpp b/datastore.cpp index 7619a4a3a..3c51c54b8 100644 --- a/datastore.cpp +++ b/datastore.cpp @@ -25,6 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "DataStructures/OriginalEdgeData.h" #include "DataStructures/QueryEdge.h" #include "DataStructures/SharedMemoryFactory.h" #include "DataStructures/SharedMemoryVectorWrapper.h" @@ -324,9 +325,9 @@ int main( const int argc, const char * argv[] ) { (char*)&(current_edge_data), sizeof(OriginalEdgeData) ); - via_node_ptr[i] = current_edge_data.viaNode; - name_id_ptr[i] = current_edge_data.nameID; - turn_instructions_ptr[i] = current_edge_data.turnInstruction; + via_node_ptr[i] = current_edge_data.via_node; + name_id_ptr[i] = current_edge_data.name_id; + turn_instructions_ptr[i] = current_edge_data.turn_instruction; } edges_input_stream.close();