Commit 6d261c0e authored by Ulrich Kemloh's avatar Ulrich Kemloh

Version 0.6 and minor formating.

parent 6af96ae6
......@@ -89,7 +89,7 @@ void OutputHandler::ProgressBar(double TotalPeds, double NowPeds)
}
void OutputHandler::Write(const char* message,...)
{
{
char msg[CLENGTH]="";
va_list ap;
va_start(ap, message);
......
......@@ -129,7 +129,7 @@ ArgumentParser::ArgumentParser()
bool ArgumentParser::ParseArgs(int argc, char **argv)
bool ArgumentParser::ParseArgs(int argc, char **argv)
{
//special case of the default configuration ini.xml
if (argc == 1)
......
......@@ -119,10 +119,10 @@ enum RoutingStrategy {
enum OperativModels {
MODEL_GFCM=1,
MODEL_GOMPERTZ,
// MODEL_ORCA,
// MODEL_CFM,
// MODEL_VELO
// MODEL_GNM
// MODEL_ORCA,
// MODEL_CFM,
// MODEL_VELO
// MODEL_GNM
};
enum AgentColorMode {
......@@ -247,8 +247,8 @@ inline std::string concatenate(std::string const& name, int i) {
inline void _printDebugLine(const std::string& fileName, int lineNumber)
{
unsigned found = fileName.find_last_of("/\\");
std::cerr << "["<< lineNumber << "]: ---"<< fileName.substr(found+1)<< " ---"<<std::endl;
unsigned found = fileName.find_last_of("/\\");
std::cerr << "["<< lineNumber << "]: ---"<< fileName.substr(found+1)<< " ---"<<std::endl;
}
#define dtrace(...) \
......
......@@ -407,7 +407,7 @@ vector<point_type2> VoronoiDiagram::add_bounding_points(const point_type2& pt1,
//-----------In getIntersectionPoint() the edges of the square is vertical or horizontal segment--------------
point_type2 VoronoiDiagram::getIntersectionPoint(const point_2d& pt0, const point_2d& pt1, const polygon_2d& square)
point_type2 VoronoiDiagram::getIntersectionPoint(const point_2d& pt0, const point_2d& pt1, const polygon_2d& square)
{
vector<point_2d> pt;
segment edge0(pt0, pt1);
......
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