From 5a9041d81b3b5941b8b95aa0e9698efdb93c6cf0 Mon Sep 17 00:00:00 2001
From: Mohcine Chraibi <m.chraibi@fz-juelich.de>
Date: Thu, 8 Nov 2018 10:57:12 +0100
Subject: [PATCH] CI is broken. missing geo dependencies
---
CMakeLists.txt | 8 +++-----
Simulation.cpp | 2 ++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a79f9e2b..7f9fc32c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ IF (POLICY CMP0054)
ENDIF (POLICY CMP0054)
set(JPSCORE_MAJOR_VERSION 0)
set(JPSCORE_MINOR_VERSION 8)
-set(JPSCORE_PATCH_VERSION 3)
+set(JPSCORE_PATCH_VERSION 4)
set(JPSCORE_VERSION
${JPSCORE_MAJOR_VERSION}.${JPSCORE_MINOR_VERSION}.${JPSCORE_PATCH_VERSION})
@@ -283,7 +283,6 @@ set(source_files
IO/TraVisToClient.cpp
math/ForceModel.cpp
- math/Mathematics.cpp
math/ODESolver.cpp
math/GCFMModel.cpp
math/GompertzModel.cpp
@@ -487,7 +486,6 @@ set(header_files
general/ArgumentParser.h
general/Configuration.h
- general/Macros.h
general/randomnumbergenerator.h
IO/GeoFileParser.h
@@ -579,7 +577,7 @@ if(JPSFIRE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DJPSFIRE")
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(core STATIC ${source_files} ${PED_SRC})
@@ -744,7 +742,7 @@ if (BUILD_TESTING OR BUILD_CPPUNIT_TEST)
MATH(EXPR ini_counter "${ini_counter}+1")
set(testName "test_clean_geometry_${ini_counter}")
message(STATUS "Add test " ${SPACES} ${counter} " : " ${testName})
- add_test(NAME "${testName}" COMMAND jpscore "${cgeo-ini}")
+ add_test(NAME ${testName} COMMAND jpscore ${cgeo-ini})
endforeach()
diff --git a/Simulation.cpp b/Simulation.cpp
index 127bf557..bf89f575 100644
--- a/Simulation.cpp
+++ b/Simulation.cpp
@@ -437,6 +437,7 @@ double Simulation::RunBody(double maxSimTime)
//in the case you want to run in no faster than realtime
//time_t starttime, endtime;
//time(&starttime);
+ Log->Write("INFO: run body");
//take the current time from the pedestrian
double t = Pedestrian::GetGlobalTime();
@@ -470,6 +471,7 @@ double Simulation::RunBody(double maxSimTime)
// main program loop
while ((_nPeds || (!_agentSrcManager.IsCompleted()&& _gotSources) ) && t<maxSimTime) {
t = 0+(frameNr-1)*_deltaT;
+ Log->Write("INFO: t %f", t);
//process the queue for incoming pedestrians
ProcessAgentsQueue();
--
GitLab