rdy to merge

CMakeLists.txt

@@ -30,7 +30,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
   elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
       message(STATUS "Compiling with Intel settings")
    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -w")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -Og -w -tcheck")
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0 -w -tcheck")
 elseif ()
 endif ()
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${warnings}")

math/VelocityModel.cpp

@@ -308,7 +308,7 @@ Point VelocityModel::e0(Pedestrian* ped, Room* room) const
       if ( (dynamic_cast<DirectionFloorfield*>(_direction.get())) ||
            (dynamic_cast<DirectionLocalFloorfield*>(_direction.get())) ||
            (dynamic_cast<DirectionSubLocalFloorfield*>(_direction.get()))  ) {
-          if (dist > 5*J_EPS_GOAL) {
+          if (dist > 50*J_EPS_GOAL) {
                desired_direction = target - pos; //ped->GetV0(target);
           } else {
                desired_direction = lastE0;

routing/ff_router/ffRouter.cpp

@@ -176,7 +176,7 @@ bool FFRouter::Init(Building* building)
           auto pairRoomIt = allRooms.begin();
           std::advance(pairRoomIt, i);
           UnivFFviaFM *locffptr = nullptr;
-          locffptr = new UnivFFviaFM(pairRoomIt->second.get(), building, 0.0625, 0.0, false);
+          locffptr = new UnivFFviaFM(pairRoomIt->second.get(), building, 0.125, 0.0, false);
 
           locffptr->setUser(DISTANCE_MEASUREMENTS_ONLY);
           locffptr->setMode(CENTERPOINT);