Rename circle/segment obstacles getter

The name collides with `cos` math function.

diff --git a/base/rrtbase.cc b/base/rrtbase.cc
index f4b5720a100f0f9db5f14d35f8c3f5f64ad16ada..4a1d9478aa8dfae9f6a585a3e4e715e40fb0a025 100644 (file)
--- a/base/rrtbase.cc
+++ b/base/rrtbase.cc
@@ -95,12 +95,12 @@ std::vector<RRTNode *> &RRTBase::samples()
         return this->samples_;
 }
 
-std::vector<CircleObstacle> *RRTBase::cos()
+std::vector<CircleObstacle> *RRTBase::co()
 {
         return this->cobstacles_;
 }
 
-std::vector<SegmentObstacle> *RRTBase::sos()
+std::vector<SegmentObstacle> *RRTBase::so()
 {
         return this->sobstacles_;
 }

diff --git a/incl/rrtbase.h b/incl/rrtbase.h
index cdf1bb063dad4df15bab41e699e14a946d385234..71e8a0970cc42f92869e39bc749d987808138dbe 100644 (file)
--- a/incl/rrtbase.h
+++ b/incl/rrtbase.h
@@ -65,8 +65,8 @@ class RRTBase {
                 std::vector<RRTNode *> &dnodes();
                 std::vector<RRTNode *> &samples();
                 std::vector<RRTNode *> iy_[IYSIZE];
-                std::vector<CircleObstacle> *cos();
-                std::vector<SegmentObstacle> *sos();
+                std::vector<CircleObstacle> *co();
+                std::vector<SegmentObstacle> *so();
                 std::vector<float> &clog();
                 std::vector<float> &nlog();
                 std::vector<std::vector<RRTEdge *>> &rlog();