|
@@ -1063,15 +1063,16 @@ inline double xodrdijkstra::getedgedis(int vs, int vd)
|
|
std::vector<roadedge > * proadedge = &mroadedge;
|
|
std::vector<roadedge > * proadedge = &mroadedge;
|
|
double dis = std::numeric_limits<double>::max();
|
|
double dis = std::numeric_limits<double>::max();
|
|
|
|
|
|
-// for(i=0;i<mvectorvertexedge[vs].mvectorroadedge.size();i++)
|
|
|
|
-// {
|
|
|
|
-// if((vs == mvectorvertexedge[vs].mvectorroadedge[i]->mvertexstart)&&(vd == mvectorvertexedge[vs].mvectorroadedge[i]->mvertexend))
|
|
|
|
-// {
|
|
|
|
-// dis = mroadedge[i].mlen;
|
|
|
|
-// return dis;
|
|
|
|
-// }
|
|
|
|
-// }
|
|
|
|
-// return dis;
|
|
|
|
|
|
+ for(i=0;i<mvectorvertexedge[vs].mvectorroadedge.size();i++)
|
|
|
|
+ {
|
|
|
|
+ if((vs == mvectorvertexedge[vs].mvectorroadedge[i]->mvertexstart)&&(vd == mvectorvertexedge[vs].mvectorroadedge[i]->mvertexend))
|
|
|
|
+ {
|
|
|
|
+ dis = mvectorvertexedge[vs].mvectorroadedge[i]->mlen;
|
|
|
|
+ // dis = mroadedge[i].mlen;
|
|
|
|
+ return dis;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return dis;
|
|
|
|
|
|
for(i=0;i<mroadedge.size();i++)
|
|
for(i=0;i<mroadedge.size();i++)
|
|
{
|
|
{
|