Commit 709900e8 authored by Qiancheng Xu's avatar Qiancheng Xu

fix errors

parent 794d451b
Pipeline #5397 passed with stages
#include "progress_bar.hpp"
#include "string"
ProgressBar::ProgressBar() {}
ProgressBar::ProgressBar(unsigned long n_, std::string description_, std::ostream& out_){
......
......@@ -305,7 +305,7 @@ void Simulation::UpdateRoutesAndLocations()
auto allRooms = _building->GetAllRooms();
#pragma omp parallel for shared(pedsToRemove, allRooms)
for (size_t p = 0; p < allPeds.size(); ++p) {
for (signed int p = 0; p < allPeds.size(); ++p) {
auto ped = allPeds[p];
Room* room = _building->GetRoom(ped->GetRoomID());
SubRoom* sub0 = room->GetSubRoom(ped->GetSubRoomID());
......
......@@ -121,7 +121,7 @@ bool GradientModel::Init (Building* building)
pedsToRemove.clear();
bool error_occurred = false;
#pragma omp parallel for
for(unsigned int p=0;p<allPeds.size();p++) {
for(signed int p=0;p<allPeds.size();p++) {
Pedestrian* ped = allPeds[p];
double cosPhi, sinPhi;
//a destination could not be found for that pedestrian
......
......@@ -27,7 +27,7 @@
*
**/
# define NOMINMAX
#include "../pedestrian/Pedestrian.h"
//#include "../routing/DirectionStrategy.h"
#include "../mpi/LCGrid.h"
......@@ -36,7 +36,6 @@
#include "VelocityModel.h"
#ifdef _OPENMP
#include <omp.h>
#else
......
......@@ -25,7 +25,7 @@
*
**/
#define NOMINMAX
#include <cassert>
#include "../geometry/Building.h"
#include "../geometry/NavLine.h"
......
//
// Created by arne on 5/9/17.
//
#define NOMINMAX
#include <unordered_set>
#include "UnivFFviaFM.h"
#include "../../geometry/Line.h"
......@@ -382,7 +382,7 @@ void UnivFFviaFM::recreateAllForQuickest() {
#pragma omp parallel
{
#pragma omp for
for (unsigned int i = 0; i < _doors.size(); ++i) {
for (signed int i = 0; i < _doors.size(); ++i) {
auto doorPair = _doors.begin();
std::advance(doorPair, i);
addTarget(doorPair->first, _costFieldWithKey[doorPair->first], _directionFieldWithKey[doorPair->first]);
......@@ -1179,7 +1179,7 @@ void UnivFFviaFM::addAllTargetsParallel() {
#pragma omp parallel
{
#pragma omp for
for (unsigned int i = 0; i < _doors.size(); ++i) {
for (signed int i = 0; i < _doors.size(); ++i) {
auto doorPair = _doors.begin();
std::advance(doorPair, i);
addTarget(doorPair->first, _costFieldWithKey[doorPair->first], _directionFieldWithKey[doorPair->first]);
......@@ -1212,7 +1212,7 @@ void UnivFFviaFM::addTargetsParallel(std::vector<int> wantedDoors) {
#pragma omp parallel
{
#pragma omp for
for (unsigned int i = 0; i < wantedDoors.size(); ++i) {
for (signed int i = 0; i < wantedDoors.size(); ++i) {
auto doorUID = wantedDoors.begin();
std::advance(doorUID, i);
addTarget(*doorUID, _costFieldWithKey[*doorUID], _directionFieldWithKey[*doorUID]);
......
......@@ -6,7 +6,7 @@
*/
#define PLOT_VORONOI_DIAGRAM 0
#define NOMINMAX
static int global_count = 0;
......
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