From a827aea0bbc9f24fe040896957a0424e525c7fe9 Mon Sep 17 00:00:00 2001
From: Arne Graf <ar.graf.cst@gmail.com>
Date: Wed, 2 May 2018 10:01:15 +0200
Subject: [PATCH] rdy to merge
---
CMakeLists.txt | 2 +-
math/VelocityModel.cpp | 6 +++---
routing/ff_router/ffRouter.cpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0793e69..229930f4 100644
--- a/CMakeLists.txt
+++ b/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}")
diff --git a/math/VelocityModel.cpp b/math/VelocityModel.cpp
index 0e892420..a25042d5 100644
--- a/math/VelocityModel.cpp
+++ b/math/VelocityModel.cpp
@@ -308,19 +308,19 @@ 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;
ped->SetLastE0(lastE0); //keep old vector (revert set operation done 9 lines above)
}
} else if (dist > J_EPS_GOAL) {
- desired_direction = ped->GetV0(target);
+ desired_direction = ped->GetV0(target);
} else {
ped->SetSmoothTurning();
desired_direction = ped->GetV0();
}
- return desired_direction;
+ return desired_direction;
}
diff --git a/routing/ff_router/ffRouter.cpp b/routing/ff_router/ffRouter.cpp
index 6ca94d4e..c85253cf 100644
--- a/routing/ff_router/ffRouter.cpp
+++ b/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);
--
GitLab