diff --git a/createHierarchy.cpp b/createHierarchy.cpp index 7156cef32..3e38f1251 100644 --- a/createHierarchy.cpp +++ b/createHierarchy.cpp @@ -18,25 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or see http://www.gnu.org/licenses/agpl.txt. */ -extern "C" { -#include -#include -#include -} -#include - -#include - -#include -#include -#include -#include -#include -#include - #include "Algorithms/IteratorBasedCRC32.h" -#include "Util/OpenMPWrapper.h" -#include "typedefs.h" #include "Contractor/Contractor.h" #include "Contractor/EdgeBasedGraphFactory.h" #include "DataStructures/BinaryHeap.h" @@ -47,7 +29,20 @@ extern "C" { #include "Util/GraphLoader.h" #include "Util/InputFileUtil.h" #include "Util/LuaUtil.h" +#include "Util/OpenMPWrapper.h" #include "Util/StringUtil.h" +#include "typedefs.h" + +#include + +#include + +#include +#include +#include +#include +#include +#include typedef QueryEdge::EdgeData EdgeData; typedef DynamicGraph::InputEdge InputEdge; @@ -133,9 +128,9 @@ int main (int argc, char *argv[]) { ERR(lua_tostring(myLuaState,-1)<< " occured in scripting block"); } speedProfile.uTurnPenalty = 10*lua_tointeger(myLuaState, -1); - + speedProfile.has_turn_penalty_function = lua_function_exists( myLuaState, "turn_function" ); - + std::vector edgeList; NodeID nodeBasedNodeNumber = readBinaryOSRMGraphFromStream(in, edgeList, bollardNodes, trafficLightNodes, &internalToExternalNodeMapping, inputRestrictions); in.close();