Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
JPSreport
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JuPedSim
JPSreport
Commits
506d9754
Verified
Commit
506d9754
authored
6 years ago
by
Mohcine Chraibi
Browse files
Options
Downloads
Patches
Plain Diff
WIP: interface for method I
parent
d02f6095
No related branches found
No related tags found
2 merge requests
!15
Resolve "Method D | IndividualFD file use wrong PersID"
,
!14
Resolve "Method I | new measurement method"
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Analysis.h
+11
-0
11 additions, 0 deletions
Analysis.h
with
11 additions
and
0 deletions
Analysis.h
+
11
−
0
View file @
506d9754
...
...
@@ -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_*/
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment