Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fixing typo

Browse Source
This commit is contained in:
DennisOSRM 2013-01-06 12:39:12 +01:00
parent 00168cb12f
commit 06c22a478f
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Descriptors/JSONDescriptor.h
View File

@ -262,23 +262,25 @@ public:
std::vector<Segment> shortestDifference(shortestSegments.size()); std::vector<Segment> shortestDifference(shortestSegments.size());
std::vector<Segment> alternativeDifference(alternativeSegments.size()); std::vector<Segment> alternativeDifference(alternativeSegments.size());
std::set_difference(shortestSegments.begin(), shortestSegments.end(), alternativeSegments.begin(), alternativeSegments.end(), shortestDifference.begin(), boost::bind(&Segment::nameID, _1) < boost::bind(&Segment::nameID, _2) ); std::set_difference(shortestSegments.begin(), shortestSegments.end(), alternativeSegments.begin(), alternativeSegments.end(), shortestDifference.begin(), boost::bind(&Segment::nameID, _1) < boost::bind(&Segment::nameID, _2) );
if(0 < shortestDifference.size() ) { int size_of_difference = shortestDifference.size();
if(0 < size_of_difference ) {
unsigned i = 0; unsigned i = 0;
while( i < shortestDifference.size() && shortestDifference[i].nameID == shortestSegments[0].nameID) { while( i < size_of_difference && shortestDifference[i].nameID == shortestSegments[0].nameID) {
++i; ++i;
} }
if(i < shortestDifference.size()) { if(i < size_of_difference ) {
shortestSegment2 = shortestDifference[i]; shortestSegment2 = shortestDifference[i];
} }
} }
std::set_difference(alternativeSegments.begin(), alternativeSegments.end(), shortestSegments.begin(), shortestSegments.end(), alternativeDifference.begin(), boost::bind(&Segment::nameID, _1) < boost::bind(&Segment::nameID, _2) ); std::set_difference(alternativeSegments.begin(), alternativeSegments.end(), shortestSegments.begin(), shortestSegments.end(), alternativeDifference.begin(), boost::bind(&Segment::nameID, _1) < boost::bind(&Segment::nameID, _2) );
if(0 < alternativeDifference.size() ) { size_of_difference = alternativeDifference.size();
if(0 < size_of_difference ) {
unsigned i = 0; unsigned i = 0;
while( i < alternativeDifference.size() && alternativeDifference[i].nameID == alternativeSegments[0].nameID) { while( i < size_of_difference && alternativeDifference[i].nameID == alternativeSegments[0].nameID) {
++i; ++i;
} }
if(i < alternativeDifference.size()) { if(i < size_of_difference ) {
alternativeSegment2 = alternativeDifference[i]; alternativeSegment2 = alternativeDifference[i];
} }
} }
@ -292,7 +294,7 @@ public:
routeNames.shortestPathName2 = sEngine.GetEscapedNameForNameID(shortestSegment2.nameID); routeNames.shortestPathName2 = sEngine.GetEscapedNameForNameID(shortestSegment2.nameID);
routeNames.alternativePathName1 = sEngine.GetEscapedNameForNameID(alternativeSegment1.nameID); routeNames.alternativePathName1 = sEngine.GetEscapedNameForNameID(alternativeSegment1.nameID);
routeNames.alternativePathName2 += sEngine.GetEscapedNameForNameID(alternativeSegment2.nameID); routeNames.alternativePathName2 = sEngine.GetEscapedNameForNameID(alternativeSegment2.nameID);
} }
} }