From c9ee8e2593cd0860d23600634a7354bf833c98e8 Mon Sep 17 00:00:00 2001 From: Jiri Vlasak Date: Thu, 16 Mar 2023 14:08:13 +0100 Subject: [PATCH] Remove unused json methods --- rrts/incl/rrtext.hh | 2 -- rrts/incl/rrts.hh | 8 ++++---- rrts/src/rrtext13.cc | 6 ------ rrts/src/rrtext2.cc | 6 ------ rrts/src/rrts.cc | 2 +- 5 files changed, 5 insertions(+), 19 deletions(-) diff --git a/rrts/incl/rrtext.hh b/rrts/incl/rrtext.hh index 17962fa..2fa6958 100644 --- a/rrts/incl/rrtext.hh +++ b/rrts/incl/rrtext.hh @@ -150,7 +150,6 @@ private: public: RRTExt13(); Json::Value json() const; - void json(Json::Value jvi); void reset(); }; @@ -213,7 +212,6 @@ private: bool collide_steered(); public: RRTExt2(); - Json::Value json() const; void json(Json::Value jvi); void reset(); }; diff --git a/rrts/incl/rrts.hh b/rrts/incl/rrts.hh index 97d03bb..6bab6ae 100644 --- a/rrts/incl/rrts.hh +++ b/rrts/incl/rrts.hh @@ -166,13 +166,13 @@ public: /*! Set eta. */ void eta(double e); - +public: /*! Generate JSON output. */ - Json::Value json() const; + virtual Json::Value json(void) const; /*! Load JSON input. */ - void json(Json::Value jvi); -public: + virtual void json(Json::Value jvi); + /*! Run next RRT* iteration. Return True if should continue. */ virtual bool next(); diff --git a/rrts/src/rrtext13.cc b/rrts/src/rrtext13.cc index 147e26b..758f4d9 100644 --- a/rrts/src/rrtext13.cc +++ b/rrts/src/rrtext13.cc @@ -271,12 +271,6 @@ RRTExt13::json() const return jvo; } -void -RRTExt13::json(Json::Value jvi) -{ - RRTS::json(jvi); -} - void RRTExt13::reset() { diff --git a/rrts/src/rrtext2.cc b/rrts/src/rrtext2.cc index 3450735..087e863 100644 --- a/rrts/src/rrtext2.cc +++ b/rrts/src/rrtext2.cc @@ -68,12 +68,6 @@ RRTExt2::reset() this->c2_bc_.verts[3].y = this->_bc.rfy(); } -Json::Value -RRTExt2::json() const -{ - return RRTS::json(); -} - void RRTExt2::json(Json::Value jvi) { diff --git a/rrts/src/rrts.cc b/rrts/src/rrts.cc index 4c016b2..4f13114 100644 --- a/rrts/src/rrts.cc +++ b/rrts/src/rrts.cc @@ -374,7 +374,7 @@ RRTS::eta(double e) } Json::Value -RRTS::json() const +RRTS::json(void) const { Json::Value jvo; unsigned int i = 0, j = 0; -- 2.39.2