asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix weigth scale of A* being applied to the whole path and estimation

Browse source 
Attempt to fix #8584
This commit is contained in:
Bojidar Marinov 2017-05-16 14:46:13 +03:00
parent ce2077262a
commit bd91730347
No known key found for this signature in database
GPG key ID: 4D546A8F1E091856
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/math/a_star.cpp
View file

@ -190,8 +190,7 @@ bool AStar::_solve(Point *begin_point, Point *end_point) {
Point *n = begin_point->neighbours[i]; Point *n = begin_point->neighbours[i];
n->prev_point = begin_point; n->prev_point = begin_point;
n->distance = _compute_cost(n->id, begin_point->id); n->distance = _compute_cost(begin_point->id, n->id) * n->weight_scale;
n->distance *= n->weight_scale;
n->last_pass = pass; n->last_pass = pass;
open_list.add(&n->list); open_list.add(&n->list);
@ -219,7 +218,6 @@ bool AStar::_solve(Point *begin_point, Point *end_point) {
real_t cost = p->distance; real_t cost = p->distance;
cost += _estimate_cost(p->id, end_point->id); cost += _estimate_cost(p->id, end_point->id);
cost *= p->weight_scale;
if (cost < least_cost) { if (cost < least_cost) {
@ -236,8 +234,7 @@ bool AStar::_solve(Point *begin_point, Point *end_point) {
Point *e = p->neighbours[i]; Point *e = p->neighbours[i];
real_t distance = _compute_cost(p->id, e->id) + p->distance; real_t distance = _compute_cost(p->id, e->id) * e->weight_scale + p->distance;
distance *= e->weight_scale;
if (e->last_pass == pass) { if (e->last_pass == pass) {
//oh this was visited already, can we win the cost? //oh this was visited already, can we win the cost?