Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
dynamic-graph
Commits
c5ddeca6
Unverified
Commit
c5ddeca6
authored
Sep 13, 2021
by
Guilhem Saurel
Committed by
GitHub
Sep 13, 2021
Browse files
Merge pull request #92 from nim65s/devel
reformat for clang-format-12
parents
4d6b4a9f
ed589907
Pipeline
#16017
passed with stage
in 1 minute and 25 seconds
Changes
78
Pipelines
2
Expand all
Hide whitespace changes
Inline
Side-by-side
.clang-format
View file @
c5ddeca6
---
Language: Cpp
# BasedOnStyle: Google
AccessModifierOffset: -1
AlignAfterOpenBracket: Align
AlignConsecutiveMacros: None
AlignConsecutiveAssignments: None
AlignConsecutiveBitFields: None
AlignConsecutiveDeclarations: None
AlignEscapedNewlines: Left
AlignOperands: Align
AlignTrailingComments: true
AllowAllArgumentsOnNextLine: true
AllowAllConstructorInitializersOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortEnumsOnASingleLine: true
AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortLambdasOnASingleLine: All
AllowShortIfStatementsOnASingleLine: WithoutElse
AllowShortLoopsOnASingleLine: true
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: Yes
AttributeMacros:
- __capability
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
AfterCaseLabel: false
AfterClass: false
AfterControlStatement: Never
AfterEnum: false
AfterFunction: false
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
AfterExternBlock: false
BeforeCatch: false
BeforeElse: false
BeforeLambdaBody: false
BeforeWhile: false
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBinaryOperators: None
BreakBeforeConceptDeclarations: true
BreakBeforeBraces: Attach
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 80
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DeriveLineEnding: true
DerivePointerAlignment: true
DisableFormat: false
EmptyLineBeforeAccessModifier: LogicalBlock
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
StatementAttributeLikeMacros:
- Q_EMIT
IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^<pinocchio/fwd\.hpp>'
Priority: 1
SortPriority: 0
CaseSensitive: false
- Regex: '^<ext/.*\.h>'
Priority: 3
SortPriority: 0
CaseSensitive: false
- Regex: '^<.*\.h>'
Priority: 2
SortPriority: 0
CaseSensitive: false
- Regex: '^<.*'
Priority: 3
SortPriority: 0
CaseSensitive: false
- Regex: '.*'
Priority: 4
SortPriority: 0
CaseSensitive: false
IncludeIsMainRegex: '([-_](test|unittest))?$'
IncludeIsMainSourceRegex: ''
IndentCaseLabels: true
IndentCaseBlocks: false
IndentGotoLabels: true
IndentPPDirectives: None
IndentExternBlock: AfterExternBlock
IndentRequires: false
IndentWidth: 2
IndentWrappedFunctionNames: false
InsertTrailingCommas: None
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: false
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCBinPackProtocolList: Never
ObjCBlockIndentWidth: 2
ObjCBreakBeforeNestedBlockParam: true
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 1
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 200
PenaltyIndentedWhitespace: 0
PointerAlignment: Left
RawStringFormats:
- Language: Cpp
Delimiters:
- cc
- CC
- cpp
- Cpp
- CPP
- 'c++'
- 'C++'
CanonicalDelimiter: ''
BasedOnStyle: google
- Language: TextProto
Delimiters:
- pb
- PB
- proto
- PROTO
EnclosingFunctions:
- EqualsProto
- EquivToProto
- PARSE_PARTIAL_TEXT_PROTO
- PARSE_TEST_PROTO
- PARSE_TEXT_PROTO
- ParseTextOrDie
- ParseTextProtoOrDie
- ParseTestProto
- ParsePartialTestProto
CanonicalDelimiter: ''
BasedOnStyle: google
ReflowComments: true
SortIncludes: true
SortJavaStaticImport: Before
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: false
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceAroundPointerQualifiers: Default
SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: false
SpacesInConditionalStatement: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
SpaceBeforeSquareBrackets: false
BitFieldColonSpacing: Both
Standard: Auto
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
TabWidth: 8
UseCRLF: false
UseTab: Never
WhitespaceSensitiveMacros:
- STRINGIZE
- PP_STRINGIZE
- BOOST_PP_STRINGIZE
- NS_SWIFT_NAME
- CF_SWIFT_NAME
...
cmake
@
9078d521
Compare
a689714c
...
9078d521
Subproject commit
a689714c0d0890ffff5649ba25cbaed44dd6e660
Subproject commit
9078d521dc23fabae72e3fe8d7c0068c68364eef
include/dynamic-graph/all-commands.h
View file @
c5ddeca6
...
...
@@ -15,4 +15,4 @@
#include
<dynamic-graph/command-setter.h>
#include
<dynamic-graph/command.h>
#endif //! DYNAMIC_GRAPH_ALL_COMMANDS_H
#endif
//! DYNAMIC_GRAPH_ALL_COMMANDS_H
include/dynamic-graph/all-signals.h
View file @
c5ddeca6
...
...
@@ -12,4 +12,4 @@
#include
<dynamic-graph/signal-time-dependent.h>
#include
<dynamic-graph/signal.h>
#endif //! DYNAMIC_GRAPH_ALL_SIGNALS_H
#endif
//! DYNAMIC_GRAPH_ALL_SIGNALS_H
include/dynamic-graph/command-bind.h
View file @
c5ddeca6
This diff is collapsed.
Click to expand it.
include/dynamic-graph/command-direct-getter.h
View file @
c5ddeca6
...
...
@@ -15,15 +15,17 @@
*
*/
#include
"dynamic-graph/command.h"
#include
<boost/assign/list_of.hpp>
#include
"dynamic-graph/command.h"
/* --- GETTER --------------------------------------------------------- */
namespace
dynamicgraph
{
namespace
command
{
template
<
class
E
,
typename
T
>
class
DirectGetter
:
public
Command
{
public:
template
<
class
E
,
typename
T
>
class
DirectGetter
:
public
Command
{
public:
/// Pointer to method that sets parameter of type T
typedef
T
(
E
::*
GetterMethod
)()
const
;
...
...
@@ -31,10 +33,10 @@ public:
DirectGetter
(
E
&
entity
,
T
*
ptr
,
const
std
::
string
&
docString
)
:
Command
(
entity
,
std
::
vector
<
Value
::
Type
>
(),
docString
),
T_ptr
(
ptr
)
{}
protected:
protected:
virtual
Value
doExecute
()
{
return
Value
(
*
T_ptr
);
}
private:
private:
T
*
T_ptr
;
};
...
...
@@ -50,7 +52,7 @@ inline std::string docDirectGetter(const std::string &name,
type
+
".
\n\n
"
;
}
}
// namespace command
}
// namespace dynamicgraph
}
// namespace command
}
// namespace dynamicgraph
#endif // __dg_command_direct_getter_h__
#endif
// __dg_command_direct_getter_h__
include/dynamic-graph/command-direct-setter.h
View file @
c5ddeca6
...
...
@@ -15,29 +15,31 @@
*
*/
#include
"dynamic-graph/command.h"
#include
<boost/assign/list_of.hpp>
#include
"dynamic-graph/command.h"
/* --- SETTER --------------------------------------------------------- */
namespace
dynamicgraph
{
namespace
command
{
template
<
class
E
,
typename
T
>
class
DirectSetter
:
public
Command
{
public:
template
<
class
E
,
typename
T
>
class
DirectSetter
:
public
Command
{
public:
DirectSetter
(
E
&
entity
,
T
*
ptr
,
const
std
::
string
&
docString
)
:
Command
(
entity
,
boost
::
assign
::
list_of
(
ValueHelper
<
T
>::
TypeID
),
docString
),
T_ptr
(
ptr
)
{}
protected:
protected:
virtual
Value
doExecute
()
{
const
std
::
vector
<
Value
>
&
values
=
getParameterValues
();
T
val
=
values
[
0
].
value
();
(
*
T_ptr
)
=
val
;
return
Value
();
// void
return
Value
();
// void
}
private:
private:
T
*
T_ptr
;
};
...
...
@@ -53,7 +55,7 @@ inline std::string docDirectSetter(const std::string &name,
".
\n
Void return.
\n\n
"
;
}
}
// namespace command
}
// namespace dynamicgraph
}
// namespace command
}
// namespace dynamicgraph
#endif // __dg_command_direct_setter_h__
#endif
// __dg_command_direct_setter_h__
include/dynamic-graph/command-getter.h
View file @
c5ddeca6
...
...
@@ -41,21 +41,22 @@ namespace command {
/// \li T should be a type supported by class Value,
/// \li prototype of E::getParameter should be exactly as specified in this
/// example.
template
<
class
E
,
typename
T
>
class
Getter
:
public
Command
{
public:
template
<
class
E
,
typename
T
>
class
Getter
:
public
Command
{
public:
/// Pointer to method that sets parameter of type T
typedef
T
(
E
::*
GetterMethod
)()
const
;
/// Constructor
Getter
(
E
&
entity
,
GetterMethod
getterMethod
,
const
std
::
string
&
docString
);
protected:
protected:
virtual
Value
doExecute
();
private:
private:
GetterMethod
getterMethod_
;
};
}
// namespace command
}
// namespace dynamicgraph
}
// namespace command
}
// namespace dynamicgraph
#include
"dynamic-graph/command-getter.t.cpp"
#endif // DYNAMIC_GRAPH_COMMAND_GETTER_H
#endif
// DYNAMIC_GRAPH_COMMAND_GETTER_H
include/dynamic-graph/command-getter.t.cpp
View file @
c5ddeca6
...
...
@@ -8,6 +8,7 @@
#define DYNAMIC_GRAPH_COMMAND_GETTER_T_CPP
#include
"dynamic-graph/command-getter.h"
#include
<sstream>
namespace
dynamicgraph
{
...
...
@@ -20,12 +21,13 @@ Getter<E, T>::Getter(E &entity, GetterMethod getterMethod,
:
Command
(
entity
,
std
::
vector
<
Value
::
Type
>
(),
docstring
),
getterMethod_
(
getterMethod
)
{}
template
<
class
E
,
typename
T
>
Value
Getter
<
E
,
T
>::
doExecute
()
{
template
<
class
E
,
typename
T
>
Value
Getter
<
E
,
T
>::
doExecute
()
{
E
&
entity
=
static_cast
<
E
&>
(
owner
());
T
value
=
(
entity
.
*
getterMethod_
)();
return
Value
(
value
);
}
}
// namespace command
}
// namespace dynamicgraph
}
// namespace command
}
// namespace dynamicgraph
#endif // DYNAMIC_GRAPH_COMMAND_GETTER_T_CPP
#endif
// DYNAMIC_GRAPH_COMMAND_GETTER_T_CPP
include/dynamic-graph/command-setter.h
View file @
c5ddeca6
...
...
@@ -41,21 +41,22 @@ namespace command {
/// \li T should be a type supported by class Value,
/// \li prototype of E::setParameter should be exactly as specified in this
/// example.
template
<
class
E
,
typename
T
>
class
Setter
:
public
Command
{
public:
template
<
class
E
,
typename
T
>
class
Setter
:
public
Command
{
public:
/// Pointer to method that sets parameter of type T
typedef
void
(
E
::*
SetterMethod
)(
const
T
&
);
/// Constructor
Setter
(
E
&
entity
,
SetterMethod
setterMethod
,
const
std
::
string
&
docString
);
protected:
protected:
virtual
Value
doExecute
();
private:
private:
SetterMethod
setterMethod_
;
};
}
// namespace command
}
// namespace dynamicgraph
}
// namespace command
}
// namespace dynamicgraph
#include
"dynamic-graph/command-setter.t.cpp"
#endif // DYNAMIC_GRAPH_COMMAND_SETTER_H
#endif
// DYNAMIC_GRAPH_COMMAND_SETTER_H
include/dynamic-graph/command-setter.t.cpp
View file @
c5ddeca6
...
...
@@ -8,10 +8,12 @@
#define DYNAMIC_GRAPH_COMMAND_SETTER_T_CPP
#include
"dynamic-graph/command-setter.h"
#include
"dynamic-graph/linear-algebra.h"
#include
<boost/assign/list_of.hpp>
#include
<sstream>
#include
"dynamic-graph/linear-algebra.h"
namespace
dynamicgraph
{
class
Entity
;
namespace
command
{
...
...
@@ -19,19 +21,20 @@ namespace command {
//
// Template specialization: bool
//
template
<
class
E
>
class
Setter
<
E
,
bool
>
:
public
Command
{
public:
template
<
class
E
>
class
Setter
<
E
,
bool
>
:
public
Command
{
public:
/// Pointer to method that sets parameter of type bool
typedef
void
(
E
::*
SetterMethod
)(
const
bool
&
);
/// Constructor
Setter
(
E
&
entity
,
SetterMethod
setterMethod
,
const
std
::
string
&
docString
);
protected:
protected:
virtual
Value
doExecute
();
private:
private:
SetterMethod
setterMethod_
;
};
// Class Setter
};
// Class Setter
template
<
class
E
>
Setter
<
E
,
bool
>::
Setter
(
E
&
entity
,
SetterMethod
setterMethod
,
...
...
@@ -39,7 +42,8 @@ Setter<E, bool>::Setter(E &entity, SetterMethod setterMethod,
:
Command
(
entity
,
boost
::
assign
::
list_of
(
Value
::
BOOL
),
docString
),
setterMethod_
(
setterMethod
)
{}
template
<
class
E
>
Value
Setter
<
E
,
bool
>::
doExecute
()
{
template
<
class
E
>
Value
Setter
<
E
,
bool
>::
doExecute
()
{
const
std
::
vector
<
Value
>
&
values
=
getParameterValues
();
// Get parameter
bool
value
=
values
[
0
].
value
();
...
...
@@ -51,19 +55,20 @@ template <class E> Value Setter<E, bool>::doExecute() {
//
// Template specialization: unsigned
//
template
<
class
E
>
class
Setter
<
E
,
unsigned
>
:
public
Command
{
public:
template
<
class
E
>
class
Setter
<
E
,
unsigned
>
:
public
Command
{
public:
/// Pointer to method that sets parameter of type unsigned
typedef
void
(
E
::*
SetterMethod
)(
const
unsigned
&
);
/// Constructor
Setter
(
E
&
entity
,
SetterMethod
setterMethod
,
const
std
::
string
&
docString
);
protected:
protected:
virtual
Value
doExecute
();
private:
private:
SetterMethod
setterMethod_
;
};
// Class Setter
};
// Class Setter
template
<
class
E
>
Setter
<
E
,
unsigned
>::
Setter
(
E
&
entity
,
SetterMethod
setterMethod
,
...
...
@@ -71,7 +76,8 @@ Setter<E, unsigned>::Setter(E &entity, SetterMethod setterMethod,
:
Command
(
entity
,
boost
::
assign
::
list_of
(
Value
::
UNSIGNED
),
docString
),
setterMethod_
(
setterMethod
)
{}
template
<
class
E
>
Value
Setter
<
E
,
unsigned
>::
doExecute
()
{
template
<
class
E
>
Value
Setter
<
E
,
unsigned
>::
doExecute
()
{
const
std
::
vector
<
Value
>
&
values
=
getParameterValues
();
// Get parameter
unsigned
value
=
values
[
0
].
value
();
...
...
@@ -83,19 +89,20 @@ template <class E> Value Setter<E, unsigned>::doExecute() {
//
// Template specialization: int
//
template
<
class
E
>
class
Setter
<
E
,
int
>
:
public
Command
{
public:
template
<
class
E
>
class
Setter
<
E
,
int
>
:
public
Command
{
public:
/// Pointer to method that sets parameter of type int
typedef
void
(
E
::*
SetterMethod
)(
const
int
&
);
/// Constructor
Setter
(
E
&
entity
,
SetterMethod
setterMethod
,
const
std
::
string
&
docString
);
protected:
protected:
virtual
Value
doExecute
();
private:
private:
SetterMethod
setterMethod_
;
};
// Class Setter
};
// Class Setter
template
<
class
E
>
Setter
<
E
,
int
>::
Setter
(
E
&
entity
,
SetterMethod
setterMethod
,
...
...
@@ -103,7 +110,8 @@ Setter<E, int>::Setter(E &entity, SetterMethod setterMethod,
:
Command
(
entity
,
boost
::
assign
::
list_of
(
Value
::
INT
),
docString
),
setterMethod_
(
setterMethod
)
{}
template
<
class
E
>
Value
Setter
<
E
,
int
>::
doExecute
()
{
template
<
class
E
>
Value
Setter
<
E
,
int
>::
doExecute
()
{
const
std
::
vector
<
Value
>
&
values
=
getParameterValues
();
// Get parameter
int
value
=
values
[
0
].
value
();
...
...
@@ -115,19 +123,20 @@ template <class E> Value Setter<E, int>::doExecute() {
//
// Template specialization: float
//
template
<
class
E
>
class
Setter
<
E
,
float
>
:
public
Command
{
public:
template
<
class
E
>
class
Setter
<
E
,
float
>
:
public
Command
{
public:
/// Pointer to method that sets parameter of type float
typedef
void
(
E
::*
SetterMethod
)(
const
float
&
);
/// Constructor
Setter
(
E
&
entity
,
SetterMethod
setterMethod
,
const
std
::
string
&
docString
);
protected:
protected:
virtual
Value
doExecute
();
private:
private:
SetterMethod
setterMethod_
;
};
// Class Setter
};
// Class Setter
template
<
class
E
>
Setter
<
E
,
float
>::
Setter
(
E
&
entity
,
SetterMethod
setterMethod
,
...
...
@@ -135,7 +144,8 @@ Setter<E, float>::Setter(E &entity, SetterMethod setterMethod,
:
Command
(
entity
,
boost
::
assign
::
list_of
(
Value
::
FLOAT
),
docString
),
setterMethod_
(
setterMethod
)
{}
template
<
class
E
>
Value
Setter
<
E
,
float
>::
doExecute
()
{
template
<
class
E
>
Value
Setter
<
E
,
float
>::
doExecute
()
{
const
std
::
vector
<
Value
>
&
values
=
getParameterValues
();
// Get parameter
float
value
=
values
[
0
].
value
();
...
...
@@ -147,19 +157,20 @@ template <class E> Value Setter<E, float>::doExecute() {
//
// Template specialization: double
//
template
<
class
E
>
class
Setter
<
E
,
double
>
:
public
Command
{
public:
template
<
class
E
>
class
Setter
<
E
,
double
>
:
public
Command
{
public:
/// Pointer to method that sets parameter of type double
typedef
void
(
E
::*
SetterMethod
)(
const
double
&
);
/// Constructor
Setter
(
E
&
entity
,
SetterMethod
setterMethod
,
const
std
::
string
&
docString
);
protected:
protected:
virtual
Value
doExecute
();
private:
private:
SetterMethod
setterMethod_
;
};
// Class Setter
};
// Class Setter
template
<
class
E
>
Setter
<
E
,
double
>::
Setter
(
E
&
entity
,
SetterMethod
setterMethod
,
...
...
@@ -167,7 +178,8 @@ Setter<E, double>::Setter(E &entity, SetterMethod setterMethod,
:
Command
(
entity
,
boost
::
assign
::
list_of
(
Value
::
DOUBLE
),
docString
),
setterMethod_
(
setterMethod
)
{}
template
<
class
E
>
Value
Setter
<
E
,
double
>::
doExecute
()
{
template
<
class
E
>
Value
Setter
<
E
,
double
>::
doExecute
()
{
const
std
::
vector
<
Value
>
&
values
=
getParameterValues
();
// Get parameter
double
value
=
values
[
0
].
value
();
...
...
@@ -179,19 +191,20 @@ template <class E> Value Setter<E, double>::doExecute() {
//
// Template specialization: std::string
//
template
<
class
E
>
class
Setter
<
E
,
std
::
string
>
:
public
Command
{
public:
template
<
class
E
>
class
Setter
<
E
,
std
::
string
>
:
public
Command
{
public:
/// Pointer to method that sets parameter of type std::string
typedef
void
(
E
::*
SetterMethod
)(
const
std
::
string
&
);
/// Constructor
Setter
(
E
&
entity
,
SetterMethod
setterMethod
,
const
std
::
string
&
docString
);
protected:
protected:
virtual
Value
doExecute
();
private:
private:
SetterMethod
setterMethod_
;
};
// Class Setter
};
// Class Setter
template
<
class
E
>
Setter
<
E
,
std
::
string
>::
Setter
(
E
&
entity
,
SetterMethod
setterMethod
,
...
...
@@ -199,7 +212,8 @@ Setter<E, std::string>::Setter(E &entity, SetterMethod setterMethod,
:
Command
(
entity
,
boost
::
assign
::
list_of
(
Value
::
STRING
),
docString
),
setterMethod_
(
setterMethod
)
{}
template
<
class
E
>
Value
Setter
<
E
,
std
::
string
>::
doExecute
()
{
template
<
class
E
>
Value
Setter
<
E
,
std
::
string
>::
doExecute
()
{