From 506d9754562c75930863deb29a1262996c3bd4f3 Mon Sep 17 00:00:00 2001
From: Mohcine Chraibi <m.chraibi@fz-juelich.de>
Date: Tue, 19 Feb 2019 17:38:50 +0100
Subject: [PATCH] WIP: interface for method I
---
Analysis.h | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/Analysis.h b/Analysis.h
index d4e8c5e8..6f89efd5 100644
--- a/Analysis.h
+++ b/Analysis.h
@@ -125,8 +125,14 @@ private:
bool _DoesUseMethodB; // Method B (Zhang2011a)
bool _DoesUseMethodC; // Method C //calculate and save results of classic in separate file
bool _DoesUseMethodD; // Method D--Voronoi method
+ bool _DoesUseMethodI; // Method I--Voronoi method modified
+ // no measurement are)
std::vector<int> _StartFramesMethodD;
std::vector<int> _StopFramesMethodD;
+
+ std::vector<int> _StartFramesMethodI;
+ std::vector<int> _StopFramesMethodI;
+
std::vector<bool> _IndividualFDFlags;
bool _cutByCircle; //Adjust whether cut each original voronoi cell by a circle
double _cutRadius;
@@ -141,6 +147,7 @@ private:
std::vector<bool> _plotTimeseriesA;
std::vector<bool> _plotTimeseriesC;
std::vector<bool> _plotTimeseriesD;
+ std::vector<bool> _plotTimeseriesI;
bool _isOneDimensional;
bool _calcIndividualFD; //Adjust whether analyze the individual density and velocity of each pedestrian in stationary state (ALWAYS VORONOI-BASED)
std::string _vComponent; // to mark whether x, y or x and y coordinate are used when calculating the velocity
@@ -156,6 +163,10 @@ private:
std::vector<MeasurementArea_B*> _areaForMethod_B;
std::vector<MeasurementArea_B*> _areaForMethod_C;
std::vector<MeasurementArea_B*> _areaForMethod_D;
+ std::vector<MeasurementArea_B*> _areaForMethod_I; // we still need to know
+ // the zpos of the
+ // measurement are, even
+ // if we don't use its polygon
};
#endif /*ANALYSIS_H_*/
--
GitLab