Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
J
jrl-walkgen
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Guilhem Saurel
jrl-walkgen
Commits
1c577af1
Commit
1c577af1
authored
14 years ago
by
Olivier Stasse
Browse files
Options
Downloads
Patches
Plain Diff
Revert "Add member for the current support state and accessors"
This reverts commit
3e5325dd
.
parent
5ab40cb7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/Mathematics/intermediate-qp-matrices.hh
+5
-17
5 additions, 17 deletions
src/Mathematics/intermediate-qp-matrices.hh
with
5 additions
and
17 deletions
src/Mathematics/intermediate-qp-matrices.hh
+
5
−
17
View file @
1c577af1
...
...
@@ -102,9 +102,6 @@ namespace PatternGeneratorJRL
boost_ublas
::
matrix
<
double
>
V_f
;
/// \}
/// \brief Current support state
support_state_t
SupportState
;
/// \brief Current support foot position
supportfoot_t
SupportFoot
;
...
...
@@ -177,22 +174,13 @@ namespace PatternGeneratorJRL
inline
void
Reference
(
const
reference_t
&
Ref
)
{
m_StateMatrices
.
Ref
=
Ref
;
};
/// \brief Accessors to the
support foot position
/// \brief Accessors to the
Center of Mass
inline
supportfoot_t
const
&
SupportFoot
()
const
{
return
m_StateMatrices
.
SupportFoot
;
};
inline
void
SupportFoot
(
const
supportfoot_t
&
SupportFoot
)
{
m_StateMatrices
.
SupportFoot
=
SupportFoot
;
};
/// \}
/// \brief Accessors to the current support state
inline
support_state_t
const
&
SupportState
()
const
{
return
m_StateMatrices
.
SupportState
;
};
inline
support_state_t
&
SupportState
()
{
return
m_StateMatrices
.
SupportState
;
};
inline
void
SupportState
(
const
support_state_t
&
SupportState
)
{
m_StateMatrices
.
SupportState
=
SupportState
;
};
/// \}
/// \name Displaying
/// \{
/// \brief Dump objective matrices
...
...
@@ -208,23 +196,23 @@ namespace PatternGeneratorJRL
private
:
objective_variant_t
m_MeanVelocity
,
m_MeanVelocity
,
m_InstantVelocity
,
m_COPCentering
,
m_JerkMin
;
state_variant_t
m_StateMatrices
;
m_StateMatrices
;
dynamics_t
m_Position
,
m_Position
,
m_Velocity
,
m_Acceleration
,
m_Jerk
,
m_CoP
;
linear_inequality_t
m_IneqCoP
,
m_IneqCoP
,
m_IneqCoM
,
m_IneqFeet
;
...
...
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