Clean class Flags.

Author: jmirabel

include/sot/core/flags.hh

@@ -31,59 +31,37 @@ namespace sot {
 
 class SOT_CORE_EXPORT Flags {
 protected:
-  std::vector<char> flags;
-  bool reverse;
-
-  char operator[](const unsigned int &i) const;
+  std::vector<bool> flags;
+  bool outOfRangeFlag;
 
 public:
   Flags(const bool &b = false);
-  Flags(const char &c);
-  Flags(const int &c4);
+  Flags(const char *flags);
+  Flags(std::vector<bool> &&flags);
 
-  void add(const char &c);
-  void add(const int &c4);
+  void add(const bool &b);
 
   Flags operator!(void) const;
   SOT_CORE_EXPORT friend Flags operator&(const Flags &f1, const Flags &f2);
   SOT_CORE_EXPORT friend Flags operator|(const Flags &f1, const Flags &f2);
   Flags &operator&=(const Flags &f2);
   Flags &operator|=(const Flags &f2);
 
-  SOT_CORE_EXPORT friend Flags operator&(const Flags &f1, const bool &b);
-  SOT_CORE_EXPORT friend Flags operator|(const Flags &f1, const bool &b);
-  Flags &operator&=(const bool &b);
-  Flags &operator|=(const bool &b);
-
   SOT_CORE_EXPORT friend std::ostream &operator<<(std::ostream &os,
                                                   const Flags &fl);
-  SOT_CORE_EXPORT friend char operator>>(const Flags &flags, const int &i);
   SOT_CORE_EXPORT friend std::istream &operator>>(std::istream &is, Flags &fl);
   bool operator()(const int &i) const;
 
   operator bool(void) const;
 
   void unset(const unsigned int &i);
   void set(const unsigned int &i);
-
-public: /* Selec "matlab-style" : 1:15, 1:, :45 ... */
-  static void readIndexMatlab(std::istream &iss, unsigned int &indexStart,
-                              unsigned int &indexEnd, bool &unspecifiedEnd);
-  static Flags readIndexMatlab(std::istream &iss);
 };
 
-SOT_CORE_EXPORT extern const Flags FLAG_LINE_1;
-SOT_CORE_EXPORT extern const Flags FLAG_LINE_2;
-SOT_CORE_EXPORT extern const Flags FLAG_LINE_3;
-SOT_CORE_EXPORT extern const Flags FLAG_LINE_4;
-SOT_CORE_EXPORT extern const Flags FLAG_LINE_5;
-SOT_CORE_EXPORT extern const Flags FLAG_LINE_6;
-SOT_CORE_EXPORT extern const Flags FLAG_LINE_7;
-SOT_CORE_EXPORT extern const Flags FLAG_LINE_8;
-
 } // namespace sot
 
-template <> struct signal_io<sot::Flags> : signal_io_unimplemented<sot::Flags> {};
+template <>
+struct signal_io<sot::Flags> : signal_io_unimplemented<sot::Flags> {};
 } // namespace dynamicgraph
 
 #endif /* #ifndef __SOT_FLAGS_H */

src/python-module.cc

@@ -48,18 +48,17 @@ BOOST_PYTHON_MODULE(wrap)
     ;
 
   using dgs::Flags;
-  bp::class_<Flags>("Flags", bp::init<const bool&>())
-    .def(bp::init<const char&>())
-    .def(bp::init<const int &>())
-    .def("add", static_cast<void(Flags::*)(const char&)>(&Flags::add))
-    .def("add", static_cast<void(Flags::*)(const int &)>(&Flags::add))
+  bp::class_<Flags>("Flags", bp::init<>())
+    .def(bp::init<const char*>())
+    //TODO .def(bp::init<std::vector<bool>&& >())
+    .def("add", &Flags::add)
     .def("set", &Flags::set)
     .def("unset", &Flags::unset)
 
-    .def(bp::self & bool())
-    .def(bp::self | bool())
-    .def(bp::self &= bool())
-    .def(bp::self |= bool())
+    .def(bp::self & bp::self)
+    .def(bp::self | bp::self)
+    .def(bp::self &= bp::self)
+    .def(bp::self |= bp::self)
 
     .def("__call__", &Flags::operator())
     .def("__bool__", &Flags::operator bool)