2020/* SOT */
2121#include < dynamic-graph/all-signals.h>
2222#include < dynamic-graph/entity.h>
23+
2324#include < sot/core/flags.hh>
2425#include < sot/core/matrix-geometry.hh>
2526#include < sot/core/pool.hh>
2627
2728/* STD */
28- #include < string>
29-
3029#include < boost/function.hpp>
30+ #include < string>
3131
3232namespace dynamicgraph {
3333namespace sot {
@@ -36,14 +36,15 @@ namespace sot {
3636/* --- CLASS ----------------------------------------------------------- */
3737/* --------------------------------------------------------------------- */
3838
39- template <typename Operator> class BinaryOp : public Entity {
39+ template <typename Operator>
40+ class BinaryOp : public Entity {
4041 Operator op;
4142 typedef typename Operator::Tin1 Tin1;
4243 typedef typename Operator::Tin2 Tin2;
4344 typedef typename Operator::Tout Tout;
4445 typedef BinaryOp<Operator> Self;
4546
46- public: /* --- CONSTRUCTION --- */
47+ public: /* --- CONSTRUCTION --- */
4748 static std::string getTypeIn1Name (void ) { return Operator::nameTypeIn1 (); }
4849 static std::string getTypeIn2Name (void ) { return Operator::nameTypeIn2 (); }
4950 static std::string getTypeOutName (void ) { return Operator::nameTypeOut (); }
@@ -66,20 +67,20 @@ public: /* --- CONSTRUCTION --- */
6667
6768 virtual ~BinaryOp (void ){};
6869
69- public: /* --- SIGNAL --- */
70+ public: /* --- SIGNAL --- */
7071 SignalPtr<Tin1, int > SIN1;
7172 SignalPtr<Tin2, int > SIN2;
7273 SignalTimeDependent<Tout, int > SOUT;
7374
74- protected:
75+ protected:
7576 Tout &computeOperation (Tout &res, int time) {
7677 const Tin1 &x1 = SIN1 (time);
7778 const Tin2 &x2 = SIN2 (time);
7879 op (x1, x2, res);
7980 return res;
8081 }
8182};
82- } // namespace sot
83- } // namespace dynamicgraph
83+ } // namespace sot
84+ } // namespace dynamicgraph
8485
85- #endif // #ifndef SOT_CORE_BINARYOP_HH
86+ #endif // #ifndef SOT_CORE_BINARYOP_HH
0 commit comments