Rewrite rrtce, add rrtce 36, 37

diff --git a/incl/rrtce.hh b/incl/rrtce.hh
index de04476a00b8d2cb91b2e23ff6f5afe7b4d898ad..5eab2e33f3f5166f3dc1627b04b8b33bf5972b25 100644 (file)
--- a/incl/rrtce.hh
+++ b/incl/rrtce.hh
@@ -1,16 +1,58 @@
 /*! \brief RRT compound extensions.
+ *
+ * This file contains compound extensions. The goal is to merge multiple
+ * extensions from `rrtext.h` in one.
+ *
+ * Compound extensions have no implementation.
+ *
+ * \file
+ */
+#ifndef RRTS_RRTCE_H
+#define RRTS_RRTCE_H
 
-This file contains compound extensions. The goal is to merge multiple
-extensions from `rrtext.h` in one.
+#include "rrtext.hh"
 
-Compound extensions have no implementation.
-*/
-#ifndef RRTCE_H
-#define RRTCE_H
+namespace rrts {
 
-#include "rrts.h"
-#include "rrtext.h"
+class RRTCE37 : public RRTExt2, public RRTExt8, public RRTExt10,
+               public RRTExt14, public RRTExt15, public RRTExt16,
+               public RRTExt18 {
+public:
+       Json::Value json() const
+       {
+               return RRTExt15::json();
+       }
+       void json(Json::Value jvi)
+       {
+               RRTExt2::json(jvi);
+       }
+       void reset()
+       {
+               RRTExt8::reset();
+               RRTExt14::reset();
+       }
+};
+
+class RRTCE36 : public RRTExt2, public RRTExt8, public RRTExt10,
+               public RRTExt14, public RRTExt15, public RRTExt16,
+               public RRTExt17 {
+public:
+       Json::Value json() const
+       {
+               return RRTExt15::json();
+       }
+       void json(Json::Value jvi)
+       {
+               RRTExt2::json(jvi);
+       }
+       void reset()
+       {
+               RRTExt8::reset();
+               RRTExt14::reset();
+       }
+};
 
+#if 0
 class RRTCE35
        : public RRTExt2
        , public RRTExt11
@@ -642,5 +684,7 @@ class RRTCE1
        , public RRTExt3
        , public RRTExt1
 {};
+#endif
 
-#endif /* RRTCE_H */
+} // namespace rrts
+#endif /* RRTS_RRTCE_H */