Skip to content
Snippets Groups Projects
Commit 5a9041d8 authored by Mohcine Chraibi's avatar Mohcine Chraibi
Browse files

CI is broken. missing geo dependencies

parent 5613fd8a
No related tags found
1 merge request!38Cmake subprojects
Pipeline #14304 failed
...@@ -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()
... ...
......
...@@ -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();
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment