First implementation of moving the algorithmic core into a library

CMakeLists.txt

@@ -12,11 +12,17 @@ file(GLOB PrepareGlob Contractor/*.cpp)
 set(PrepareSources createHierarchy.cpp ${PrepareGlob})
 add_executable(osrm-prepare ${PrepareSources})
 
-file(GLOB RoutedGlob Server/DataStructures/*.cpp Descriptors/*.cpp DataStructures/SearchEngine*.cpp)
+add_executable(osrm-routed routed.cpp)
-set(RoutedSources routed.cpp ${RoutedGlob})
-add_executable(osrm-routed ${RoutedSources})
 set_target_properties(osrm-routed PROPERTIES COMPILE_FLAGS -DROUTED)
 
+file(GLOB DescriptorGlob Descriptors/*.cpp)
+file(GLOB LibOSRMGlob Library/*.cpp)
+file(GLOB SearchEngineSource DataStructures/SearchEngine*.cpp)
+file(GLOB ServerStructureGlob Server/DataStructures/*.cpp)
+
+set(OSRMSources ${LibOSRMGlob} ${DescriptorGlob} ${SearchEngineSource} ${ServerStructureGlob})
+add_library(OSRM SHARED ${OSRMSources})
+
 # Check the release mode
 if(NOT CMAKE_BUILD_TYPE MATCHES Debug)
 	set(CMAKE_BUILD_TYPE Release)
@@ -55,9 +61,11 @@ if (NOT Boost_FOUND)
       message(FATAL_ERROR "Fatal error: Boost (version >= 1.44.0) required.\n")
 endif (NOT Boost_FOUND)
 include_directories(${Boost_INCLUDE_DIRS})
+
+target_link_libraries( OSRM ${Boost_LIBRARIES})
 target_link_libraries( osrm-extract ${Boost_LIBRARIES} )
 target_link_libraries( osrm-prepare ${Boost_LIBRARIES} )
-target_link_libraries( osrm-routed ${Boost_LIBRARIES} )
+target_link_libraries( osrm-routed ${Boost_LIBRARIES} OSRM)
 
 find_package ( BZip2 REQUIRED )
 include_directories(${BZIP_INCLUDE_DIRS})

Contractor/TemporaryStorage.cpp

@@ -18,8 +18,6 @@
  or see http://www.gnu.org/licenses/agpl.txt.
  */
 
-#include <boost/foreach.hpp>
-
 #include "TemporaryStorage.h"
 
 TemporaryStorage::TemporaryStorage() {

Contractor/TemporaryStorage.h

@@ -24,6 +24,7 @@
 #include <vector>
 #include <fstream>
 
+#include <boost/foreach.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 #include <boost/shared_ptr.hpp>

DataStructures/BinaryHeap.h

@@ -23,13 +23,15 @@ or see http://www.gnu.org/licenses/agpl.txt.
 
 //Not compatible with non contiguous node ids
 
-#include <cassert>
-#include <limits>
-#include <vector>
-#include <algorithm>
-#include <map>
 #include <boost/unordered_map.hpp>
 
+#include <cassert>
+
+#include <algorithm>
+#include <limits>
+#include <map>
+#include <vector>
+
 template< typename NodeID, typename Key >
 class ArrayStorage {
 public:

DataStructures/NodeCoords.h

@@ -21,12 +21,13 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef _NODE_COORDS_H
 #define _NODE_COORDS_H
 
+#include "../typedefs.h"
+
 #include <cassert>
 #include <cstddef>
 #include <climits>
-#include <limits>
 
-#include "../typedefs.h"
+#include <limits>
 
 template<typename NodeT>
 struct NodeCoords {

DataStructures/SegmentInformation.h

@@ -21,9 +21,10 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef SEGMENTINFORMATION_H_
 #define SEGMENTINFORMATION_H_
 
-#include <climits>
-
 #include "TurnInstructions.h"
+#include "../typedefs.h"
+
+#include <climits>
 
 struct SegmentInformation {
     _Coordinate location;

DataStructures/StaticGraph.h

@@ -21,11 +21,10 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef STATICGRAPH_H_INCLUDED
 #define STATICGRAPH_H_INCLUDED
 
-#include <vector>
-#include <algorithm>
-
 #include "../typedefs.h"
-#include "ImportEdge.h"
+
+#include <algorithm>
+#include <vector>
 
 template< typename EdgeDataT>
 class StaticGraph {

DataStructures/XORFastHashStorage.h

@@ -21,12 +21,12 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef XORFASTHASHSTORAGE_H_
 #define XORFASTHASHSTORAGE_H_
 
+#include "XORFastHash.h"
+
 #include <climits>
 #include <vector>
 #include <bitset>
 
-#include "XORFastHash.h"
-
 template< typename NodeID, typename Key >
 class XORFastHashStorage {
 public:

Descriptors/BaseDescriptor.h

@@ -21,19 +21,19 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef BASE_DESCRIPTOR_H_
 #define BASE_DESCRIPTOR_H_
 
-#include <cassert>
-#include <cmath>
-#include <cstdio>
-#include <string>
-#include <vector>
-
-#include "../typedefs.h"
 #include "../DataStructures/HashTable.h"
 #include "../DataStructures/PhantomNodes.h"
 #include "../DataStructures/SearchEngine.h"
-#include "../Util/StringUtil.h"
-
 #include "../Plugins/RawRouteData.h"
+#include "../Util/StringUtil.h"
+#include "../typedefs.h"
+
+#include <cassert>
+#include <cmath>
+#include <cstdio>
+
+#include <string>
+#include <vector>
 
 struct _DescriptorConfig {
     _DescriptorConfig() : instructions(true), geometry(true), encodeGeometry(true), z(18) {}

Descriptors/DescriptionFactory.h

@@ -21,15 +21,15 @@
 #ifndef DESCRIPTIONFACTORY_H_
 #define DESCRIPTIONFACTORY_H_
 
-#include <vector>
-
-#include "../typedefs.h"
 #include "../Algorithms/DouglasPeucker.h"
 #include "../Algorithms/PolylineCompressor.h"
 #include "../DataStructures/Coordinate.h"
 #include "../DataStructures/SearchEngine.h"
 #include "../DataStructures/SegmentInformation.h"
 #include "../DataStructures/TurnInstructions.h"
+#include "../typedefs.h"
+
+#include <vector>
 
 /* This class is fed with all way segments in consecutive order
  *  and produces the description plus the encoded polyline */

Descriptors/GPXDescriptor.h

@@ -21,9 +21,10 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef GPX_DESCRIPTOR_H_
 #define GPX_DESCRIPTOR_H_
 
-#include <boost/foreach.hpp>
 #include "BaseDescriptor.h"
 
+#include <boost/foreach.hpp>
+
 class GPXDescriptor : public BaseDescriptor{
 private:
     _DescriptorConfig config;

Descriptors/JSONDescriptor.h

@@ -21,11 +21,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef JSON_DESCRIPTOR_H_
 #define JSON_DESCRIPTOR_H_
 
-#include <algorithm>
-
-#include <boost/lambda/lambda.hpp>
-#include <boost/bind.hpp>
-
 #include "BaseDescriptor.h"
 #include "DescriptionFactory.h"
 #include "../Algorithms/ObjectToBase64.h"
@@ -34,6 +29,11 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include "../Util/Azimuth.h"
 #include "../Util/StringUtil.h"
 
+#include <boost/bind.hpp>
+#include <boost/lambda/lambda.hpp>
+
+#include <algorithm>
+
 class JSONDescriptor : public BaseDescriptor{
 private:
     _DescriptorConfig config;

RoutingAlgorithms/AlternativePathRouting.h

@@ -21,11 +21,10 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef ALTERNATIVEROUTES_H_
 #define ALTERNATIVEROUTES_H_
 
-#include <boost/unordered_map.hpp>
-#include <vector>
-#include <cmath>
-
 #include "BasicRoutingInterface.h"
+#include <boost/unordered_map.hpp>
+#include <cmath>
+#include <vector>
 
 const double VIAPATH_ALPHA   = 0.15;
 const double VIAPATH_EPSILON = 0.10; //alternative at most 15% longer

RoutingAlgorithms/ShortestPathRouting.h

@@ -73,23 +73,23 @@ public:
             //insert new starting nodes into forward heap, adjusted by previous distances.
             if(searchFrom1stStartNode) {
                 forward_heap1.Insert(phantomNodePair.startPhantom.edgeBasedNode, -phantomNodePair.startPhantom.weight1, phantomNodePair.startPhantom.edgeBasedNode);
-                INFO("fw1: " << phantomNodePair.startPhantom.edgeBasedNode << "´, w: " << -phantomNodePair.startPhantom.weight1);
+                // INFO("fw1: " << phantomNodePair.startPhantom.edgeBasedNode << "´, w: " << -phantomNodePair.startPhantom.weight1);
                 forward_heap2.Insert(phantomNodePair.startPhantom.edgeBasedNode, -phantomNodePair.startPhantom.weight1, phantomNodePair.startPhantom.edgeBasedNode);
-                INFO("fw2: " << phantomNodePair.startPhantom.edgeBasedNode << "´, w: " << -phantomNodePair.startPhantom.weight1);
+                // INFO("fw2: " << phantomNodePair.startPhantom.edgeBasedNode << "´, w: " << -phantomNodePair.startPhantom.weight1);
            }
             if(phantomNodePair.startPhantom.isBidirected() && searchFrom2ndStartNode) {
                 forward_heap1.Insert(phantomNodePair.startPhantom.edgeBasedNode+1, -phantomNodePair.startPhantom.weight2, phantomNodePair.startPhantom.edgeBasedNode+1);
-                INFO("fw1: " << phantomNodePair.startPhantom.edgeBasedNode+1 << "´, w: " << -phantomNodePair.startPhantom.weight2);
+                // INFO("fw1: " << phantomNodePair.startPhantom.edgeBasedNode+1 << "´, w: " << -phantomNodePair.startPhantom.weight2);
                 forward_heap2.Insert(phantomNodePair.startPhantom.edgeBasedNode+1, -phantomNodePair.startPhantom.weight2, phantomNodePair.startPhantom.edgeBasedNode+1);
-                INFO("fw2: " << phantomNodePair.startPhantom.edgeBasedNode+1 << "´, w: " << -phantomNodePair.startPhantom.weight2);
+                // INFO("fw2: " << phantomNodePair.startPhantom.edgeBasedNode+1 << "´, w: " << -phantomNodePair.startPhantom.weight2);
             }
 
             //insert new backward nodes into backward heap, unadjusted.
             reverse_heap1.Insert(phantomNodePair.targetPhantom.edgeBasedNode, phantomNodePair.targetPhantom.weight1, phantomNodePair.targetPhantom.edgeBasedNode);
-            INFO("rv1: " << phantomNodePair.targetPhantom.edgeBasedNode << ", w;" << phantomNodePair.targetPhantom.weight1 );
+            // INFO("rv1: " << phantomNodePair.targetPhantom.edgeBasedNode << ", w;" << phantomNodePair.targetPhantom.weight1 );
             if(phantomNodePair.targetPhantom.isBidirected() ) {
                 reverse_heap2.Insert(phantomNodePair.targetPhantom.edgeBasedNode+1, phantomNodePair.targetPhantom.weight2, phantomNodePair.targetPhantom.edgeBasedNode+1);
-                INFO("rv2: " << phantomNodePair.targetPhantom.edgeBasedNode+1 << ", w;" << phantomNodePair.targetPhantom.weight2 );
+                // INFO("rv2: " << phantomNodePair.targetPhantom.edgeBasedNode+1 << ", w;" << phantomNodePair.targetPhantom.weight2 );
            }
             const int forward_offset = phantomNodePair.startPhantom.weight1 + (phantomNodePair.startPhantom.isBidirected() ? phantomNodePair.startPhantom.weight2 : 0);
             const int reverse_offset = phantomNodePair.targetPhantom.weight1 + (phantomNodePair.targetPhantom.isBidirected() ? phantomNodePair.targetPhantom.weight2 : 0);