Skip to content

Commit 2a9fbd7

Browse files
committed
pre-commit run -a
1 parent bcf3ac4 commit 2a9fbd7

File tree

257 files changed

+3385
-3023
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

257 files changed

+3385
-3023
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ include/sot-core/import-default-paths.h
44
unitTesting/test-paths.h
55
*~
66
_build*
7-
*__pycache__*
7+
*__pycache__*

INSTALL

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ It is recommended to create a specific directory to install this package.
99
mkdir build
1010
cd build
1111
cmake [Options] ..
12-
make
12+
make
1313
make install
1414

1515
Options:

NEWS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,3 @@ New in version 1.1 - 2010/09/30
163163
Packages libraries in Debian package.
164164
Extend description of Debian package.
165165
Add missing build dependencies.
166-

doc/pictures/feature.fig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Landscape
33
Center
44
Metric
5-
A4
5+
A4
66
100.00
77
Single
88
-2

doc/pictures/task.fig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Landscape
33
Center
44
Metric
5-
A4
5+
A4
66
100.00
77
Single
88
-2

include/sot/core/abstract-sot-external-interface.hh

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ namespace dynamicgraph {
1818
namespace sot {
1919

2020
class SOT_CORE_EXPORT NamedVector {
21-
22-
private:
21+
private:
2322
std::string name_;
2423
std::vector<double> values_;
2524

26-
public:
25+
public:
2726
NamedVector() {}
2827
~NamedVector() {}
2928

@@ -39,30 +38,30 @@ typedef NamedVector SensorValues;
3938
typedef NamedVector ControlValues;
4039

4140
class SOT_CORE_EXPORT AbstractSotExternalInterface {
42-
public:
41+
public:
4342
AbstractSotExternalInterface() {}
4443

4544
virtual ~AbstractSotExternalInterface() {}
4645

47-
virtual void
48-
setupSetSensors(std::map<std::string, SensorValues> &sensorsIn) = 0;
46+
virtual void setupSetSensors(
47+
std::map<std::string, SensorValues> &sensorsIn) = 0;
4948

50-
virtual void
51-
nominalSetSensors(std::map<std::string, SensorValues> &sensorsIn) = 0;
49+
virtual void nominalSetSensors(
50+
std::map<std::string, SensorValues> &sensorsIn) = 0;
5251

53-
virtual void
54-
cleanupSetSensors(std::map<std::string, SensorValues> &sensorsIn) = 0;
52+
virtual void cleanupSetSensors(
53+
std::map<std::string, SensorValues> &sensorsIn) = 0;
5554

5655
virtual void getControl(std::map<std::string, ControlValues> &) = 0;
5756
virtual void setSecondOrderIntegration(void) = 0;
5857
virtual void setNoIntegration(void) = 0;
5958
};
60-
} // namespace sot
61-
} // namespace dynamicgraph
59+
} // namespace sot
60+
} // namespace dynamicgraph
6261

6362
typedef dynamicgraph::sot::AbstractSotExternalInterface *
6463
createSotExternalInterface_t();
6564
typedef void destroySotExternalInterface_t(
6665
dynamicgraph::sot::AbstractSotExternalInterface *);
6766

68-
#endif // ABSTRACT_SOT_EXTERNAL_INTERFACE_HH
67+
#endif // ABSTRACT_SOT_EXTERNAL_INTERFACE_HH

include/sot/core/additional-functions.hh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88
*/
99

1010
/* SOT */
11-
#include "sot/core/api.hh"
1211
#include <dynamic-graph/pool.h>
1312
#include <dynamic-graph/signal-base.h>
13+
1414
#include <sot/core/exception-factory.hh>
1515
#include <sot/core/pool.hh>
1616

17+
#include "sot/core/api.hh"
18+
1719
/* --- STD --- */
1820
#include <map>
1921
#include <sstream>
@@ -31,7 +33,7 @@ namespace sot {
3133
to allow creation of tasks and features as well as entities.
3234
*/
3335
class AdditionalFunctions {
34-
public:
36+
public:
3537
AdditionalFunctions();
3638
~AdditionalFunctions();
3739
static void cmdFlagSet(const std::string &cmd, std::istringstream &args,

include/sot/core/admittance-control-op-point.hh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131

3232
#include <dynamic-graph/signal-helper.h>
3333

34+
#include <sot/core/matrix-geometry.hh>
35+
3436
#include "pinocchio/spatial/force.hpp"
3537
#include "pinocchio/spatial/motion.hpp"
3638
#include "pinocchio/spatial/se3.hpp"
3739

38-
#include <sot/core/matrix-geometry.hh>
39-
4040
namespace dynamicgraph {
4141
namespace sot {
4242
namespace core {
@@ -60,7 +60,7 @@ class ADMITTANCECONTROLOPPOINT_EXPORT AdmittanceControlOpPoint
6060
: public ::dynamicgraph::Entity {
6161
DYNAMIC_GRAPH_ENTITY_DECL();
6262

63-
public:
63+
public:
6464
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
6565

6666
/* --- CONSTRUCTOR ---- */
@@ -106,7 +106,7 @@ public:
106106
/* --- ENTITY INHERITANCE --- */
107107
virtual void display(std::ostream &os) const;
108108

109-
protected:
109+
protected:
110110
/// Dimension of the force signals and of the output
111111
int m_n;
112112
/// True if the entity has been successfully initialized
@@ -118,10 +118,10 @@ protected:
118118
// Weight of the end-effector
119119
double m_mass;
120120

121-
}; // class AdmittanceControlOpPoint
121+
}; // class AdmittanceControlOpPoint
122122

123-
} // namespace core
124-
} // namespace sot
125-
} // namespace dynamicgraph
123+
} // namespace core
124+
} // namespace sot
125+
} // namespace dynamicgraph
126126

127-
#endif // #ifndef __sot_core_admittance_control_op_point_H__
127+
#endif // #ifndef __sot_core_admittance_control_op_point_H__

include/sot/core/binary-int-to-uint.hh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
/* SOT */
1818
#include <dynamic-graph/all-signals.h>
1919
#include <dynamic-graph/entity.h>
20+
2021
#include <sot/core/exception-task.hh>
2122

2223
/* --------------------------------------------------------------------- */
@@ -37,16 +38,16 @@ namespace dynamicgraph {
3738
namespace sot {
3839

3940
class SOTBINARYINTTOUINT_EXPORT BinaryIntToUint : public dynamicgraph::Entity {
40-
public:
41+
public:
4142
static const std::string CLASS_NAME;
4243
virtual const std::string &getClassName(void) const { return CLASS_NAME; }
4344

4445
/* --- SIGNALS ------------------------------------------------------------ */
45-
public:
46+
public:
4647
dynamicgraph::SignalPtr<int, int> binaryIntSIN;
4748
dynamicgraph::SignalTimeDependent<unsigned, int> binaryUintSOUT;
4849

49-
public:
50+
public:
5051
BinaryIntToUint(const std::string &name);
5152
virtual ~BinaryIntToUint() {}
5253

include/sot/core/binary-op.hh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
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

3232
namespace dynamicgraph {
3333
namespace 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

Comments
 (0)