Commit d2b1b97c authored by Fabien Grzeskowiak's avatar Fabien Grzeskowiak

fix compilation error

parent ba69a594
......@@ -23,8 +23,8 @@
** Contact: crowd_group@inria.fr
*/
#ifndef LIB_GOAL_REACHING_H
#define LIB_GOAL_REACHING_H
#ifndef LIB_DIRGOAL_REACHING_H
#define LIB_DIRGOAL_REACHING_H
#include <core/costFunction.h>
......@@ -51,4 +51,4 @@ class DirGoalReaching : public CostFunction
virtual ~DirGoalReaching();
};
#endif //LIB_GOAL_REACHING_H
#endif //LIB_DIRGOAL_REACHING_H
......@@ -28,6 +28,7 @@
#include "core/crowdSimulator.h"
#include <CostFunctions/goalReaching.h>
#include <CostFunctions/socialforces.h>
#include <CostFunctions/directionalGoalReaching.h>
#include <iostream>
#include <fstream>
......
<?xml version="1.0" encoding="utf-8"?>
<configPath path="../test/TtcaDcaExample.xml"/>
<configPath path="../examples/SocialForceAvoidanceDirGoalReaching/config.xml"/>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -8,6 +8,7 @@
#include "CostFunctions/TtcaDca.h"
#include "CostFunctions/RandomFunction.h"
#include "CostFunctions/PowerLaw.h"
#include "CostFunctions/directionalGoalReaching.h"
#include <iostream>
CostFunctionFactory::CostFunctionFactory()
{
......@@ -48,6 +49,9 @@ std::shared_ptr<CostFunction>
if (name == PowerLaw::Name) {
return std::make_shared<PowerLaw>();
}
if (name == DirGoalReaching::Name) {
return std::make_shared<DirGoalReaching>();
}
std::cerr << "The given cost function name does not exist" << std::endl;
return nullptr;
}
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