From f15df4f10d5adffeeacd812cd1f29b0b18f530b2 Mon Sep 17 00:00:00 2001
From: Mohcine Chraibi <m.chraibi@fz-juelich.de>
Date: Wed, 27 Feb 2019 20:47:45 +0100
Subject: [PATCH] WIP: ignore dummy pedestrians
---
methods/VoronoiDiagram.cpp | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/methods/VoronoiDiagram.cpp b/methods/VoronoiDiagram.cpp
index 1c49edfd..61160a7d 100644
--- a/methods/VoronoiDiagram.cpp
+++ b/methods/VoronoiDiagram.cpp
@@ -65,22 +65,26 @@ std::vector<std::pair<polygon_2d, int> > VoronoiDiagram::getVoronoiPolygons(vect
XInFrame.push_back(XInFrame[0]+10);
YInFrame.push_back(YInFrame[0]+10);
VInFrame.push_back(VInFrame[0]);
- IdInFrame.push_back(IdInFrame[0]+1);
+ //IdInFrame.push_back(IdInFrame[0]+1);
+ IdInFrame.push_back(-1);
// up left
XInFrame.push_back(XInFrame[0]-10);
YInFrame.push_back(YInFrame[0]+10);
VInFrame.push_back(VInFrame[0]);
- IdInFrame.push_back(IdInFrame[0]+2);
+ //IdInFrame.push_back(IdInFrame[0]+2);
+ IdInFrame.push_back(-2);
// down right
XInFrame.push_back(XInFrame[0]+10);
YInFrame.push_back(YInFrame[0]-10);
VInFrame.push_back(VInFrame[0]);
- IdInFrame.push_back(IdInFrame[0]+3);
+ //IdInFrame.push_back(IdInFrame[0]+3);
+ IdInFrame.push_back(-3);
// down left
XInFrame.push_back(XInFrame[0]-10);
YInFrame.push_back(YInFrame[0]-10);
VInFrame.push_back(VInFrame[0]);
- IdInFrame.push_back(IdInFrame[0]+4);
+ // IdInFrame.push_back(IdInFrame[0]+4);
+ IdInFrame.push_back(-4);
}
for (int i = 0; i < numPedsInFrame; i++)
@@ -129,6 +133,9 @@ std::vector<std::pair<polygon_2d, int> > VoronoiDiagram::getVoronoiPolygons(vect
break;
}
}
+ if(IdInFrame[Ncell] < 0 )
+ continue;
+
XInFrame[Ncell] = thispoint.x();
YInFrame[Ncell] = thispoint.y();
int NumVertex = 0;
@@ -222,9 +229,14 @@ std::vector<std::pair<polygon_2d, int> > VoronoiDiagram::getVoronoiPolygons(vect
//cout << "poly is: " << typeid(poly).name() << '\n'
int id_ped = IdInFrame[Ncell];
std::pair<polygon_2d, int> poly_id = std::make_pair(poly, id_ped);
+ // if (id_ped < 0 )
+ // {
+ // std::cout << "HH id: " << id_ped << "\n";
+ // continue;
+ // }
polygons_id.push_back(poly_id);
Ncell++;
- }
+ }// for voronoi cells
return polygons_id;
}
--
GitLab