Commit a827aea0 authored by Arne Graf's avatar Arne Graf

rdy to merge

parent c7610f80
Pipeline #9249 failed with stages
in 12 seconds
......@@ -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}")
......
......@@ -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;
}
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment