Commit 86e980bb authored by Arne Graf's avatar Arne Graf

variable names misleading, <-fixed

parent f375a1b2
......@@ -54,10 +54,10 @@ FloorfieldViaFM::~FloorfieldViaFM()
}
FloorfieldViaFM::FloorfieldViaFM(const Building* const buildingArg, const double hxArg, const double hyArg,
const double slowdownDistance, const bool useDistancefield, const std::string& filename) {
const double wallAvoidDistance, const bool useDistancefield, const std::string& filename) {
//ctor
threshold = -1; //negative value means: ignore threshold
threshold = slowdownDistance;
threshold = wallAvoidDistance;
if (hxArg != hyArg) std::cerr << "ERROR: hx != hy <=========";
//parse building and create list of walls/obstacles (find xmin xmax, ymin, ymax, and add border?)
......@@ -83,7 +83,7 @@ FloorfieldViaFM::FloorfieldViaFM(const Building* const buildingArg, const double
calculateFloorfield(useDistancefield); //use distance2Wall
testoutput("AAFloorfield.vtk","AAFloorfield.txt", cost);
//testoutput("AAFloorfield.vtk","AAFloorfield.txt", cost);
writeFF(filename);
}
......
......@@ -52,7 +52,7 @@ class FloorfieldViaFM
public:
FloorfieldViaFM();
FloorfieldViaFM(const std::string&);
FloorfieldViaFM(const Building* const buildingArg, const double hxArg, const double hyArg, const double slowdownDistance, const bool useDistancefield, const std::string&);
FloorfieldViaFM(const Building* const buildingArg, const double hxArg, const double hyArg, const double wallAvoidDistance, const bool useDistancefield, const std::string&);
virtual ~FloorfieldViaFM();
FloorfieldViaFM(const FloorfieldViaFM& other);
//FloorfieldViaFM& operator=(const FloorfieldViaFM& other);
......
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