From: Jiri Vlasak Date: Wed, 30 Jun 2021 06:51:29 +0000 (+0200) Subject: F 179e12c X-Git-Tag: v0.7.0~4^2~7 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/hubacji1/rrts.git/commitdiff_plain/ad2130156d2bc6a7f0ed61a37cb760839141b74a F 179e12c --- diff --git a/src/rrtext3.cc b/src/rrtext3.cc index 9db9c78..aff866c 100644 --- a/src/rrtext3.cc +++ b/src/rrtext3.cc @@ -8,7 +8,7 @@ std::vector RRTExt3::first_path_optimization() if (this->orig_path().size() == 0) return this->orig_path(); else - this->orig_path_cost(cc(*this->orig_path().back())); + this->orig_path_cost(this->orig_path().back()->cc); } class DijkstraNode : public RRTNode { public: @@ -55,14 +55,14 @@ std::vector RRTExt3::first_path_optimization() || n->t(RRTNodeType::connected) ) { dn.push_back(DijkstraNode(*n)); - dn.back().cc = cc(*n); + dn.back().cc = n->cc; dn.back().s = &dn.back(); dn.back().n = n; dn.back().i = dncnt++; } } dn.push_back(DijkstraNode(*this->orig_path().back())); - dn.back().cc = cc(*this->orig_path().back()); + dn.back().cc = this->orig_path().back()->cc; dn.back().s = &dn.back(); dn.back().n = this->orig_path().back(); dn.back().i = dncnt++; @@ -162,14 +162,14 @@ std::vector RRTExt3::second_path_optimization() || n->t(RRTNodeType::connected) ) { dn.push_back(DijkstraNode(*n)); - dn.back().cc = cc(*n); + dn.back().cc = n->cc; dn.back().s = &dn.back(); dn.back().n = n; dn.back().i = dncnt++; } } dn.push_back(DijkstraNode(*this->orig_path().back())); - dn.back().cc = cc(*this->orig_path().back()); + dn.back().cc = this->orig_path().back()->cc; dn.back().s = &dn.back(); dn.back().n = this->orig_path().back(); dn.back().i = dncnt++; @@ -229,7 +229,7 @@ std::vector RRTExt3::path() this->first_optimized_path_ = this->first_path_optimization(); if (this->first_optimized_path_.size() > 0) this->first_optimized_path_cost( - cc(*this->first_optimized_path_.back()) + this->first_optimized_path_.back()->cc ); else return this->orig_path();