Commit 9bd82776 authored by tobias schroedter's avatar tobias schroedter

Added some folders to gitignore

parent 777f68e7
......@@ -169,3 +169,8 @@ packages/
/geometry.png
/run.py
/Utest/Validation/7test_BO/jpsreport_ini.xml
/doc*
/cmake-*
/issues
/latex
\ No newline at end of file
......@@ -379,7 +379,7 @@ bool Building::InitInsideGoals()
for (auto& goalItr : _goals){
Goal* goal = goalItr.second;
if (goal->GetRoomID() == -1){
found == true;
found = true;
std::cout << "Goal " << goal->GetId() << " is outside" << std::endl;
continue;
}
......@@ -873,6 +873,7 @@ bool Building::AddTransition(Transition* line)
exit(EXIT_FAILURE);
}
_transitions[line->GetID()] = line;
return true;
}
......
......@@ -365,10 +365,10 @@ Point VelocityModel::e0(Pedestrian* ped, Room* room) const
desired_direction = ped->GetV0();
}
//Log->Write("%f %f", desired_direction._x, desired_direction._y);
if (desired_direction.NormSquare() < 0.1) {
Log->Write("ERROR:\t desired_direction in VelocityModel::e0 is too small (%f, %f)", desired_direction._x, desired_direction._y);
}
// if (desired_direction.NormSquare() < 0.1) {
// Log->Write("ERROR:\t desired_direction in VelocityModel::e0 is too small (%f, %f)", desired_direction._x, desired_direction._y);
//
// }
return desired_direction;
}
......
......@@ -51,6 +51,7 @@ public:
virtual Point GetTarget(Room* room, Pedestrian* ped) const = 0;
virtual double GetDistance2Wall(Pedestrian* ped) const;
virtual double GetDistance2Target(Pedestrian* ped, int UID);
};
......@@ -138,6 +139,27 @@ protected:
std::string _filename;
};
// class DirectionLocalFloorfield : public DirectionStrategy {
// public:
// DirectionLocalFloorfield();
// void Init(Building* building, double stepsize, double threshold,
// bool useDistanceMap);
// ~DirectionLocalFloorfield();
// virtual Point GetTarget(Room* room, Pedestrian* ped) const;
// virtual Point GetDir2Wall(Pedestrian* ped) const;
// virtual double GetDistance2Wall(Pedestrian* ped) const;
// virtual double GetDistance2Target(Pedestrian* ped, int UID);
// protected:
// std::map<int, UnivFFviaFM*> _locffviafm;
// bool _initDone;
// Building* _building;
// double _stepsize;
// double _wallAvoidDistance;
// bool _useDistancefield;
// std::string _filename;
// };
class DirectionSubLocalFloorfieldTrips : public DirectionStrategy {
public:
DirectionSubLocalFloorfieldTrips();
......
......@@ -84,6 +84,11 @@ bool IsEnoughInSubroom( SubRoom* subroom, Point& pt, double radius )
return true;
}
//Point ComputeBestPositionVoronoiBoost(Goal* goal, std::vector<Pedestrian*>& pedInside)
//{
//
//}
bool ComputeBestPositionVoronoiBoost(AgentsSource* src, std::vector<Pedestrian*>& peds,
Building* building, std::vector<Pedestrian*>& peds_queue)
{
......
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