Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
JPSreport
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
JuPedSim
JPSreport
Commits
9858aafa
Verified
Commit
9858aafa
authored
Feb 22, 2019
by
Mohcine Chraibi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove some warning, check for missing unit
parent
18b706d8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
general/ArgumentParser.cpp
general/ArgumentParser.cpp
+10
-7
methods/Method_I.cpp
methods/Method_I.cpp
+1
-1
No files found.
general/ArgumentParser.cpp
View file @
9858aafa
...
...
@@ -342,9 +342,9 @@ bool ArgumentParser::ParseIniFile(const string& inifile)
}
else
{
fs
::
path
p
(
GetProjectRootDir
());
p
=
canonical
(
p
);
_trajectoriesLocation
=
p
.
string
();
fs
::
path
p
ath_root
(
GetProjectRootDir
());
p
ath_root
=
canonical
(
path_root
);
_trajectoriesLocation
=
p
ath_root
.
string
();
}
Log
->
Write
(
"INFO:
\t
Input directory for loading trajectory is <%s>"
,
_trajectoriesLocation
.
string
().
c_str
());
...
...
@@ -354,9 +354,9 @@ bool ArgumentParser::ParseIniFile(const string& inifile)
if
(
exists
(
_trajectoriesLocation
))
{
/* print all the files and directories within directory */
fs
::
path
p
(
GetTrajectoriesLocation
());
p
=
canonical
(
p
);
for
(
auto
&
filename
:
boost
::
make_iterator_range
(
fs
::
directory_iterator
(
p
),
{}))
fs
::
path
p
ath_traj
(
GetTrajectoriesLocation
());
p
ath_traj
=
canonical
(
path_traj
);
for
(
auto
&
filename
:
boost
::
make_iterator_range
(
fs
::
directory_iterator
(
p
ath_traj
),
{}))
{
string
s
=
filename
.
path
().
string
();
if
(
boost
::
algorithm
::
ends_with
(
s
,
fmt
))
...
...
@@ -453,7 +453,9 @@ bool ArgumentParser::ParseIniFile(const string& inifile)
//measurement area
if
(
xMainNode
->
FirstChild
(
"measurement_areas"
))
{
string
unit
=
xMainNode
->
FirstChildElement
(
"measurement_areas"
)
->
Attribute
(
"unit"
);
string
unit
=
""
;
if
(
xMainNode
->
FirstChildElement
(
"measurement_areas"
)
->
Attribute
(
"unit"
))
unit
=
xMainNode
->
FirstChildElement
(
"measurement_areas"
)
->
Attribute
(
"unit"
);
if
(
unit
!=
"m"
)
{
Log
->
Write
(
"WARNING:
\t
only <m> unit is supported. Convert your units."
);
...
...
@@ -495,6 +497,7 @@ bool ArgumentParser::ParseIniFile(const string& inifile)
double
geo_minY
=
building
->
_yMin
;
double
geo_maxX
=
building
->
_xMax
;
double
geo_maxY
=
building
->
_yMax
;
Log
->
Write
(
"INFO:
\t
Bounding box:
\n
\t\t
minX = %.2f
\n
\t\t
maxX = %.2f
\n
\t\t
minY = %.2f
\n\t\t
maxY = %.2f"
,
geo_minX
,
geo_maxX
,
geo_minY
,
geo_maxY
);
std
::
map
<
int
,
polygon_2d
>
geoPoly
;
...
...
methods/Method_I.cpp
View file @
9858aafa
...
...
@@ -121,7 +121,7 @@ bool Method_I::Process (const PedData& peddata,const fs::path& scriptsLocation,
return_value
=
false
;
}
}
Log
->
Write
(
"------------------------
Analyzing with Method D
-----------------------------"
);
Log
->
Write
(
"------------------------
Analyzing with Method I
-----------------------------"
);
//for(int frameNr = 0; frameNr < peddata.GetNumFrames(); frameNr++ )
//for(std::map<int , std::vector<int> >::iterator ite=_peds_t.begin();ite!=_peds_t.end();ite++)
for
(
auto
ite
:
_peds_t
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment