Commit ff8ea18c authored by Colby Green's avatar Colby Green
Browse files

bs

parent 78545b59
......@@ -20,14 +20,15 @@ public:
};
bool promising(size_t permLength){
if ((path.size() - permLength) <= 5){
if ((path.size() - permLength) <= 6){
return true;
}
vector<Vertex> v;
for (size_t i = permLength - 1; i <= path.size(); i++){
for (size_t i = permLength - 1; i < path.size(); i++){
Vertex vertex;
vertex.index = (i == path.size()) ? 0 : size_t(path[i]);
//vertex.index = size_t(path[i]);
if (i == 0){
vertex.minDistanceTo = 0;
}else {
......@@ -77,6 +78,7 @@ public:
}
}
distance *= 1.1;
double totalDistanceLowerBound = curPathDistance + distance;
return totalDistanceLowerBound < bestPathDistance;
}
......
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