Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pinocchio
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stack Of Tasks
pinocchio
Commits
81f44f4a
Verified
Commit
81f44f4a
authored
6 years ago
by
Justin Carpentier
Browse files
Options
Downloads
Patches
Plain Diff
spatial/Force: remove __equal__ method and use operator= instead
parent
3c24f145
Loading
Loading
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/spatial/force-base.hpp
+2
-1
2 additions, 1 deletion
src/spatial/force-base.hpp
src/spatial/force-dense.hpp
+7
-7
7 additions, 7 deletions
src/spatial/force-dense.hpp
src/spatial/force-tpl.hpp
+0
-7
0 additions, 7 deletions
src/spatial/force-tpl.hpp
with
9 additions
and
15 deletions
src/spatial/force-base.hpp
+
2
−
1
View file @
81f44f4a
...
...
@@ -127,7 +127,8 @@ namespace se3
/** \brief Copies the Derived Force into *this
* \return a reference to *this
*/
Derived
&
operator
=
(
const
ForceBase
<
Derived
>
&
other
)
{
return
derived
().
__equl__
(
other
.
derived
());
}
Derived
&
operator
=
(
const
ForceBase
<
Derived
>
&
other
)
{
return
derived
().
setFrom
(
other
.
derived
());
}
/**
* \brief Replaces *this by *this + other.
...
...
This diff is collapsed.
Click to expand it.
src/spatial/force-dense.hpp
+
7
−
7
View file @
81f44f4a
...
...
@@ -63,13 +63,19 @@ namespace se3
// Arithmetic operators
template
<
typename
D2
>
Derived
&
__equl__
(
const
ForceDense
<
D2
>
&
other
)
Derived
&
setFrom
(
const
ForceDense
<
D2
>
&
other
)
{
linear
()
=
other
.
linear
();
angular
()
=
other
.
angular
();
return
derived
();
}
template
<
typename
D2
>
Derived
&
operator
=
(
const
ForceDense
<
D2
>
&
other
)
{
return
derived
().
setFrom
(
other
.
derived
());
}
template
<
typename
V6
>
Derived
&
operator
=
(
const
Eigen
::
MatrixBase
<
V6
>
&
v
)
{
...
...
@@ -79,12 +85,6 @@ namespace se3
return
derived
();
}
template
<
typename
D2
>
Derived
&
operator
=
(
const
ForceDense
<
D2
>
&
other
)
{
return
derived
().
__equl__
(
other
.
derived
());
}
ForcePlain
operator
-
()
const
{
return
derived
().
__opposite__
();
}
template
<
typename
F1
>
ForcePlain
operator
+
(
const
ForceDense
<
F1
>
&
f
)
const
{
return
derived
().
__plus__
(
f
.
derived
());
}
...
...
This diff is collapsed.
Click to expand it.
src/spatial/force-tpl.hpp
+
0
−
7
View file @
81f44f4a
...
...
@@ -85,13 +85,6 @@ namespace se3
explicit
ForceTpl
(
const
ForceDense
<
M2
>
&
clone
)
{
linear
()
=
clone
.
linear
();
angular
()
=
clone
.
angular
();
}
template
<
int
O2
>
ForceTpl
&
__equl__
(
const
ForceTpl
<
Scalar
,
O2
>
&
other
)
{
m_data
=
other
.
toVector
();
return
*
this
;
}
// initializers
static
ForceTpl
Zero
()
{
return
ForceTpl
(
Vector6
::
Zero
());
}
static
ForceTpl
Random
()
{
return
ForceTpl
(
Vector6
::
Random
());
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment