Maj terminée. Pour consulter la release notes associée voici le lien :
https://about.gitlab.com/releases/2021/07/07/critical-security-release-gitlab-14-0-4-released/

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

Resolve "Better organisation of the files"

parent 801623e7
......@@ -37,4 +37,4 @@ endif (WIN32)
file( GLOB_RECURSE source_files src/* include/* )
add_executable( my_app ${source_files} include/obstacle/Obstacle.cpp include/obstacle/Obstacle.h include/crowdSimulator/CrowdSimulator.cpp include/crowdSimulator/CrowdSimulator.h include/policy/Policy.cpp include/policy/Policy.h)
add_executable( my_app ${source_files} )
......@@ -28,7 +28,7 @@
#include <iostream>
#include <tools/vector2D.h>
#include <policy/Policy.h>
#include <core/policy.h>
/**
* Represents an agent, contains its position, speed and the policy to influence its motion.
......
......@@ -27,7 +27,7 @@
#define LIB_CROWD_SIMULATOR_H
#include <world/world.h>
#include <core/world.h>
class CrowdSimulator {
private:
......
......@@ -27,7 +27,7 @@
#define LIB_POLICY_H
#include <costFunction/costFunction.h>
#include <core/costFunction.h>
#include <vector>
class Policy {
......
......@@ -27,8 +27,8 @@
#define LIB_WORLD_H
#include <vector>
#include "agent/agent.h"
#include "obstacle/Obstacle.h"
#include "core/agent.h"
#include "core/obstacle.h"
#include "tools/vector2D.h"
#include "tools/lq2D.h"
......
......@@ -23,7 +23,7 @@
** Contact: crowd_group@inria.fr
*/
#include <agent/agent.h>
#include <core/agent.h>
Agent::Agent():
position_(0.0, 0.0),
......
......@@ -23,8 +23,8 @@
** Contact: crowd_group@inria.fr
*/
#include <costFunction/costFunction.h>
#include <world/world.h>
#include <core/costFunction.h>
#include <core/world.h>
CostFunction::CostFunction()
//: agentId_(0),
......@@ -48,4 +48,4 @@ float CostFunction::avoidanceCost() {
float CostFunction::totalCost() {
return 0.0;
}
*/
\ No newline at end of file
*/
......@@ -23,4 +23,4 @@
** Contact: crowd_group@inria.fr
*/
#include "CrowdSimulator.h"
#include <core/crowdSimulator.h>
......@@ -23,6 +23,6 @@
** Contact: crowd_group@inria.fr
*/
#include "Obstacle.h"
#include <core/obstacle.h>
......@@ -23,8 +23,8 @@
** Contact: crowd_group@inria.fr
*/
#include "Policy.h"
#include <core/policy.h>
double Policy::getNewVelocity() {
return 0;
}
\ No newline at end of file
}
......@@ -23,7 +23,7 @@
** Contact: crowd_group@inria.fr
*/
#include <world/world.h>
#include <core/world.h>
World::World()//:
//agents_(),obstacles_()
......
......@@ -25,32 +25,11 @@
#include <vector>
#include <iostream>
#include <agent/agent.h>
#include <costFunction/costFunction.h>
#include <world/world.h>
#include <core/agent.h>
#include <core/costFunction.h>
#include <core/world.h>
#include <tools/vector2D.h>
#define MAX_AGENTS 100
int main( int argc, char * argv[] ){
Agent *a = new Agent();
//a->printPosition();
std::cout << "---------------" << std::endl;
std::cout << "---------------" << std::endl;
std::vector<Agent*> agents;
for(int i = 0; i < MAX_AGENTS; i++){
agents.push_back(new Agent());
}
//agents[20]->printPosition();
}
......@@ -63,7 +63,7 @@
/* ------------------------------------------------------------------ */
#include <stdlib.h>
#include <float.h>
#include "lq2D.h"
#include <tools/lq2D.h>
/* ------------------------------------------------------------------ */
/* Allocate and initialize an LQ database, return a pointer to it.
......
......@@ -35,7 +35,7 @@
//========================================================================
#include "xmlparser.h"
#include <tools/xmlparser.h>
XMLParser::XMLParser()
{
......
......@@ -33,7 +33,7 @@
*/
//========================================================================
#include "xmlparsertest.h"
#include <tools/xmlparsertest.h>
#include "math.h"
void XMLParserTest::test(const std::string &filename)
......
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