Une nouvelle version du portail de gestion des comptes externes sera mise en production lundi 09 août. Elle permettra d'allonger la validité d'un compte externe jusqu'à 3 ans. Pour plus de détails sur cette version consulter : https://doc-si.inria.fr/x/FCeS

Commit be339523 authored by Fabien Grzeskowiak's avatar Fabien Grzeskowiak
Browse files

fix code for linux build

parent ab90473c
......@@ -41,7 +41,9 @@ file( GLOB_RECURSE 3rd_party 3rd-party/tinyxml/* 3rd-party/nanoflann/*)
option(OCSR_USE_MULTITHREADING "Allow the program to use multiple parallel threads" ON)
if (OCSR_USE_MULTITHREADING)
if (MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /openmp")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /openmp")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
endif (MSVC)
endif(OCSR_USE_MULTITHREADING)
......@@ -49,7 +51,7 @@ endif(OCSR_USE_MULTITHREADING)
if (NOT MSVC)
add_definitions(-fPIC)
endif()
endif() #
# === Engine project: a static library that performs the simulation
......
......@@ -16,7 +16,7 @@
**
** Authors: Axel Lopez Gandia, Javad Amirian, Florian Berton,
** Julien Legros, Lucas Pelerin, Beatriz Cabrero Daniel, Fabien Grzeskowiak,
** Alicia Nicás Miquel, Alexandre Bonneau, Wouter Van toll, Benjamin Niay.
** Alicia Nics Miquel, Alexandre Bonneau, Wouter Van toll, Benjamin Niay.
**
** Contact : crowd_group@inria.fr
*/
......@@ -30,6 +30,8 @@
#include <vector>
#include <string>
#include <map>
#include <memory>
#include <limits> // std::reference_wrapper
class WorldBase;
class Agent;
......
......@@ -16,7 +16,7 @@
**
** Authors: Axel Lopez Gandia, Javad Amirian, Florian Berton,
** Julien Legros, Lucas Pelerin, Beatriz Cabrero Daniel, Fabien Grzeskowiak,
** Alicia Nics Miquel, Alexandre Bonneau, Wouter Van toll, Benjamin Niay.
** Alicia Nics Miquel, Alexandre Bonneau, Wouter Van toll, Benjamin Niay.
**
** Contact : crowd_group@inria.fr
*/
......@@ -29,6 +29,7 @@
#include <functional>
#include <map>
#include <string>
#include <memory>
class CostFunctionFactory
{
......
......@@ -16,7 +16,7 @@
**
** Authors: Axel Lopez Gandia, Javad Amirian, Florian Berton,
** Julien Legros, Lucas Pelerin, Beatriz Cabrero Daniel, Fabien Grzeskowiak,
** Alicia Nicás Miquel, Alexandre Bonneau, Wouter Van toll, Benjamin Niay.
** Alicia Nics Miquel, Alexandre Bonneau, Wouter Van toll, Benjamin Niay.
**
** Contact : crowd_group@inria.fr
*/
......@@ -27,6 +27,7 @@
#include <memory>
#include <string>
#include <queue>
#include <limits> // std::reference_wrapper
#include "core/agent.h"
#include "core/AgentKDTree.h"
......
......@@ -16,7 +16,7 @@
**
** Authors: Axel Lopez Gandia, Javad Amirian, Florian Berton,
** Julien Legros, Lucas Pelerin, Beatriz Cabrero Daniel, Fabien Grzeskowiak,
** Alicia Nics Miquel, Alexandre Bonneau, Wouter Van toll, Benjamin Niay.
** Alicia Nics Miquel, Alexandre Bonneau, Wouter Van toll, Benjamin Niay.
**
** Contact : crowd_group@inria.fr
*/
......@@ -31,8 +31,8 @@ using namespace std;
int main( int argc, char * argv[] )
{
std::cout << argc << std::endl;
char * output = "./output/";
char * configFile = "./MainConfig.xml";
const char * output = "./output/";
const char * configFile = "./MainConfig.xml";
if (argc == 2)
{
......
......@@ -16,7 +16,7 @@
**
** Authors: Axel Lopez Gandia, Javad Amirian, Florian Berton,
** Julien Legros, Lucas Pelerin, Beatriz Cabrero Daniel, Fabien Grzeskowiak,
** Alicia Nicás Miquel, Alexandre Bonneau, Wouter Van toll, Benjamin Niay.
** Alicia Nics Miquel, Alexandre Bonneau, Wouter Van toll, Benjamin Niay.
**
** Contact : crowd_group@inria.fr
*/
......
......@@ -16,7 +16,7 @@
**
** Authors: Axel Lopez Gandia, Javad Amirian, Florian Berton,
** Julien Legros, Lucas Pelerin, Beatriz Cabrero Daniel, Fabien Grzeskowiak,
** Alicia Nics Miquel, Alexandre Bonneau, Wouter Van toll, Benjamin Niay.
** Alicia Nics Miquel, Alexandre Bonneau, Wouter Van toll, Benjamin Niay.
**
** Contact : crowd_group@inria.fr
*/
......
......@@ -442,7 +442,9 @@ CrowdSimulator* CrowdSimulator::FromConfigFile(const std::string& filename, bool
CrowdSimulator* crowdsimulator = new CrowdSimulator(isConsoleApplication);
// read the world parameters
auto& worldHandle = docHandle.FirstChildElement("World");
tinyxml2::XMLHandle FirstChildElementWorld = docHandle.FirstChildElement("World");
auto& worldHandle = FirstChildElementWorld;
if (auto* worldElement = worldHandle.ToElement())
{
if (!crowdsimulator->FromConfigFile_loadWorld(worldElement))
......@@ -460,7 +462,8 @@ CrowdSimulator* CrowdSimulator::FromConfigFile(const std::string& filename, bool
}
// read the simulation parameters
auto& simulationHandle = docHandle.FirstChildElement("Simulation");
tinyxml2::XMLHandle SimulationFirstChildElement = docHandle.FirstChildElement("Simulation");
auto& simulationHandle = SimulationFirstChildElement;
if (auto* simulationElement = simulationHandle.ToElement())
{
// the length of a simulation step
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment