Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
sot-dyninv
Commits
1060be49
Commit
1060be49
authored
Jul 02, 2013
by
Francesco Morsillo
Browse files
Added underscore to attribute name secondOrderKinematics in solver-kine.cpp
parent
53e890c7
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/solver-kine.cpp
View file @
1060be49
...
...
@@ -14,8 +14,8 @@
* with sot-dyninv. If not, see <http://www.gnu.org/licenses/>.
*/
#define VP_DEBUG
#define VP_DEBUG_MODE 50
//
#define VP_DEBUG
//
#define VP_DEBUG_MODE 50
#include <sot/core/debug.hh>
#include <exception>
#ifdef VP_DEBUG
...
...
@@ -118,7 +118,7 @@ namespace dynamicgraph
dampingSIN
)
,
controlFreeFloating
(
true
)
,
secondOrderKinematics
(
false
)
,
secondOrderKinematics
_
(
false
)
,
hsolver
()
...
...
@@ -160,7 +160,7 @@ namespace dynamicgraph
docstring
));
addCommand
(
"getSecondOrderKine"
,
makeDirectGetter
(
*
this
,
&
secondOrderKinematics
,
makeDirectGetter
(
*
this
,
&
secondOrderKinematics
_
,
docDirectGetter
(
"second order kinematic inversion"
,
"bool"
)));
ADD_COMMANDS_FOR_THE_STACK
;
...
...
@@ -172,7 +172,7 @@ namespace dynamicgraph
void
SolverKine
::
push
(
TaskAbstract
&
task
)
{
if
(
secondOrderKinematics
)
{
if
(
secondOrderKinematics
_
)
{
checkDynamicTask
(
task
);
}
sot
::
Stack
<
TaskAbstract
>::
push
(
task
);
...
...
@@ -199,7 +199,7 @@ namespace dynamicgraph
(
"The solver should contain no task before switching to second order mode."
);
}
}
secondOrderKinematics
=
secondOrder
;
secondOrderKinematics
_
=
secondOrder
;
}
SolverKine
::
TaskDependancyList_t
SolverKine
::
...
...
@@ -336,7 +336,7 @@ namespace dynamicgraph
/* -Tasks 1:n- */
/* Ctaski = [ Ji 0 0 0 0 0 ] */
if
(
!
secondOrderKinematics
)
if
(
!
secondOrderKinematics
_
)
{
for
(
int
i
=
0
;
i
<
(
int
)
stack
.
size
();
++
i
)
{
...
...
src/solver-kine.h
View file @
1060be49
...
...
@@ -94,7 +94,7 @@ namespace dynamicgraph {
void
resetAset
(
void
);
void
getDecomposition
(
const
int
&
stage
);
bool
controlFreeFloating
;
bool
secondOrderKinematics
;
bool
secondOrderKinematics
_
;
/// Push the task in the stack.
/// Call parent implementation anc check that task is
/// of type dynamic if necessary
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment