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
JPScore
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
92
Issues
92
List
Boards
Labels
Service Desk
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
JuPedSim
JPScore
Commits
ffc59926
Commit
ffc59926
authored
Jun 10, 2015
by
Oliver Schmidts
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing little bugs and karthiks memory error
parent
95086b3f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
8 deletions
+17
-8
IO/OutputHandler.cpp
IO/OutputHandler.cpp
+3
-3
Utest/test_geometry/testSubRoomBoost.cpp
Utest/test_geometry/testSubRoomBoost.cpp
+9
-0
pedestrian/Pedestrian.cpp
pedestrian/Pedestrian.cpp
+1
-1
pedestrian/Pedestrian.h
pedestrian/Pedestrian.h
+1
-1
pedestrian/StartDistribution.h
pedestrian/StartDistribution.h
+3
-3
No files found.
IO/OutputHandler.cpp
View file @
ffc59926
...
...
@@ -31,6 +31,7 @@
#include <stdio.h>
#include <stdarg.h>
#include <cstdlib>
#include <cmath>
using
namespace
std
;
...
...
@@ -56,8 +57,7 @@ int OutputHandler::GetErrors()
void
OutputHandler
::
Write
(
const
string
&
str
)
{
if
(
this
!=
NULL
)
cout
<<
str
<<
endl
;
cout
<<
str
<<
endl
;
}
void
OutputHandler
::
ProgressBar
(
double
TotalPeds
,
double
NowPeds
)
...
...
@@ -68,7 +68,7 @@ void OutputHandler::ProgressBar(double TotalPeds, double NowPeds)
int
totaldotz
=
40
;
double
fraction
=
NowPeds
/
TotalPeds
;
// part of the progressmeter that's already "full"
int
dotz
=
round
(
fraction
*
totaldotz
);
int
dotz
=
static_cast
<
int
>
(
round
(
fraction
*
totaldotz
)
);
// create the "meter"
int
ii
=
0
;
...
...
Utest/test_geometry/testSubRoomBoost.cpp
View file @
ffc59926
...
...
@@ -33,8 +33,17 @@
#include <vector>
OutputHandler
*
Log
;
BOOST_AUTO_TEST_SUITE
(
SubRoomTest
)
struct
Handler
{
Handler
()
{
Log
=
new
STDIOHandler
();}
~
Handler
()
{
delete
Log
;}
};
BOOST_GLOBAL_FIXTURE
(
Handler
)
BOOST_AUTO_TEST_CASE
(
JTol_WallGap_test
)
{
BOOST_MESSAGE
(
"starting small gap between wall test"
);
...
...
pedestrian/Pedestrian.cpp
View file @
ffc59926
...
...
@@ -91,7 +91,7 @@ Pedestrian::Pedestrian()
_agentsCreated
++
;
//increase the number of object created
}
Pedestrian
::
Pedestrian
(
const
StartDistribution
&
agentsParameters
,
const
Building
&
building
)
Pedestrian
::
Pedestrian
(
const
StartDistribution
&
agentsParameters
,
Building
&
building
)
:
_age
(
agentsParameters
.
GetAge
()),
_gender
(
agentsParameters
.
GetGender
()),
_height
(
agentsParameters
.
GetHeight
()),
...
...
pedestrian/Pedestrian.h
View file @
ffc59926
...
...
@@ -135,7 +135,7 @@ private:
public:
// constructors
Pedestrian
();
explicit
Pedestrian
(
const
StartDistribution
Subroom
&
agentsParameters
,
const
Building
&
building
);
explicit
Pedestrian
(
const
StartDistribution
&
agentsParameters
,
Building
&
building
);
virtual
~
Pedestrian
();
// Setter-Funktionen
...
...
pedestrian/StartDistribution.h
View file @
ffc59926
...
...
@@ -71,13 +71,13 @@ private:
double
_yMax
;
//pre movement time distribution
std
::
normal_distribution
<
double
>
_premovementTime
;
mutable
std
::
normal_distribution
<
double
>
_premovementTime
;
//risk tolerance distribution
std
::
normal_distribution
<
double
>
_riskTolerance
;
mutable
std
::
normal_distribution
<
double
>
_riskTolerance
;
//random number generator engine
std
::
default_random_engine
_generator
;
mutable
std
::
default_random_engine
_generator
;
public:
StartDistribution
(
int
seed
);
...
...
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