Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
JPScore
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
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
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JuPedSim
JPScore
Commits
5a9041d8
Commit
5a9041d8
authored
Nov 8, 2018
by
Mohcine Chraibi
Browse files
Options
Downloads
Patches
Plain Diff
CI is broken. missing geo dependencies
parent
5613fd8a
Branches
cmake_subprojects
No related tags found
1 merge request
!38
Cmake subprojects
Pipeline
#14304
failed
Nov 8, 2018
Stage: configure
Stage: compile
Stage: unit_test
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+3
-5
3 additions, 5 deletions
CMakeLists.txt
Simulation.cpp
+2
-0
2 additions, 0 deletions
Simulation.cpp
with
5 additions
and
5 deletions
CMakeLists.txt
+
3
−
5
View file @
5a9041d8
...
@@ -16,7 +16,7 @@ IF (POLICY CMP0054)
...
@@ -16,7 +16,7 @@ IF (POLICY CMP0054)
ENDIF
(
POLICY CMP0054
)
ENDIF
(
POLICY CMP0054
)
set
(
JPSCORE_MAJOR_VERSION 0
)
set
(
JPSCORE_MAJOR_VERSION 0
)
set
(
JPSCORE_MINOR_VERSION 8
)
set
(
JPSCORE_MINOR_VERSION 8
)
set
(
JPSCORE_PATCH_VERSION
3
)
set
(
JPSCORE_PATCH_VERSION
4
)
set
(
JPSCORE_VERSION
set
(
JPSCORE_VERSION
${
JPSCORE_MAJOR_VERSION
}
.
${
JPSCORE_MINOR_VERSION
}
.
${
JPSCORE_PATCH_VERSION
}
)
${
JPSCORE_MAJOR_VERSION
}
.
${
JPSCORE_MINOR_VERSION
}
.
${
JPSCORE_PATCH_VERSION
}
)
...
@@ -283,7 +283,6 @@ set(source_files
...
@@ -283,7 +283,6 @@ set(source_files
IO/TraVisToClient.cpp
IO/TraVisToClient.cpp
math/ForceModel.cpp
math/ForceModel.cpp
math/Mathematics.cpp
math/ODESolver.cpp
math/ODESolver.cpp
math/GCFMModel.cpp
math/GCFMModel.cpp
math/GompertzModel.cpp
math/GompertzModel.cpp
...
@@ -487,7 +486,6 @@ set(header_files
...
@@ -487,7 +486,6 @@ set(header_files
general/ArgumentParser.h
general/ArgumentParser.h
general/Configuration.h
general/Configuration.h
general/Macros.h
general/randomnumbergenerator.h
general/randomnumbergenerator.h
IO/GeoFileParser.h
IO/GeoFileParser.h
...
@@ -579,7 +577,7 @@ if(JPSFIRE)
...
@@ -579,7 +577,7 @@ if(JPSFIRE)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DJPSFIRE"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DJPSFIRE"
)
endif
()
endif
()
add_library
(
geo STATIC
${
GEOMETRY_SRC
}
)
add_library
(
geo STATIC
${
GEOMETRY_SRC
}
math/Mathematics.cpp general/Macros.h
)
# add_library(ped STATIC ${PED_SRC})
# add_library(ped STATIC ${PED_SRC})
add_library
(
core STATIC
${
source_files
}
${
PED_SRC
}
)
add_library
(
core STATIC
${
source_files
}
${
PED_SRC
}
)
...
@@ -744,7 +742,7 @@ if (BUILD_TESTING OR BUILD_CPPUNIT_TEST)
...
@@ -744,7 +742,7 @@ if (BUILD_TESTING OR BUILD_CPPUNIT_TEST)
MATH
(
EXPR ini_counter
"
${
ini_counter
}
+1"
)
MATH
(
EXPR ini_counter
"
${
ini_counter
}
+1"
)
set
(
testName
"test_clean_geometry_
${
ini_counter
}
"
)
set
(
testName
"test_clean_geometry_
${
ini_counter
}
"
)
message
(
STATUS
"Add test "
${
SPACES
}
${
counter
}
" : "
${
testName
}
)
message
(
STATUS
"Add test "
${
SPACES
}
${
counter
}
" : "
${
testName
}
)
add_test
(
NAME
"
${
testName
}
"
COMMAND jpscore
"
${
cgeo-ini
}
"
)
add_test
(
NAME
${
testName
}
COMMAND jpscore
${
cgeo-ini
}
)
endforeach
()
endforeach
()
...
...
...
...
This diff is collapsed.
Click to expand it.
Simulation.cpp
+
2
−
0
View file @
5a9041d8
...
@@ -437,6 +437,7 @@ double Simulation::RunBody(double maxSimTime)
...
@@ -437,6 +437,7 @@ double Simulation::RunBody(double maxSimTime)
//in the case you want to run in no faster than realtime
//in the case you want to run in no faster than realtime
//time_t starttime, endtime;
//time_t starttime, endtime;
//time(&starttime);
//time(&starttime);
Log
->
Write
(
"INFO: run body"
);
//take the current time from the pedestrian
//take the current time from the pedestrian
double
t
=
Pedestrian
::
GetGlobalTime
();
double
t
=
Pedestrian
::
GetGlobalTime
();
...
@@ -470,6 +471,7 @@ double Simulation::RunBody(double maxSimTime)
...
@@ -470,6 +471,7 @@ double Simulation::RunBody(double maxSimTime)
// main program loop
// main program loop
while
((
_nPeds
||
(
!
_agentSrcManager
.
IsCompleted
()
&&
_gotSources
)
)
&&
t
<
maxSimTime
)
{
while
((
_nPeds
||
(
!
_agentSrcManager
.
IsCompleted
()
&&
_gotSources
)
)
&&
t
<
maxSimTime
)
{
t
=
0
+
(
frameNr
-
1
)
*
_deltaT
;
t
=
0
+
(
frameNr
-
1
)
*
_deltaT
;
Log
->
Write
(
"INFO: t %f"
,
t
);
//process the queue for incoming pedestrians
//process the queue for incoming pedestrians
ProcessAgentsQueue
();
ProcessAgentsQueue
();
...
...
...
...
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
sign in
to comment