Skip to content
This repository was archived by the owner on Nov 5, 2019. It is now read-only.

Commit ea8d491

Browse files
Update documentation
1 parent 73d01ce commit ea8d491

File tree

6 files changed

+31
-5
lines changed

6 files changed

+31
-5
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ ENDIF()
5050
ADD_REQUIRED_DEPENDENCY("hpp-model")
5151
ADD_REQUIRED_DEPENDENCY("hpp-gik")
5252
ADD_REQUIRED_DEPENDENCY("hpp-util")
53+
ADD_DOC_DEPENDENCY("abstract-gik-task")
5354

5455
# Add dependency toward hpp-constrained library in pkg-config file.
5556
PKG_CONFIG_APPEND_LIBS("hpp-constrained")

README.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1-
-*- outline -*-
1+
This package aims at dealing with systems subject to smooth non-linear
2+
equality constraints.
23

3-
* FIXME
4+
The main class hpp::constrained::ConfigProjector numerically projects an input
5+
configuration onto the sub-manifold of the configuration space defined by a
6+
set of non-linear constraints of type CjrlGikStateConstraint.
7+
8+
Two other classes derive from this latter:
9+
- hpp::constrained::ConfigExtendor extends a configuration toward another
10+
configuration by remaining on the constrained submanifold.
11+
- hpp::constrained::GoalConfigGenerator randomly samples the configuration
12+
space and projects each sample onto the submanifold defined by a goal task.

doc/Doxyfile.extra.in

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
INPUT = @CMAKE_SOURCE_DIR@/include
1+
INPUT = @CMAKE_SOURCE_DIR@/include \
2+
@CMAKE_SOURCE_DIR@/doc
3+
4+
TAGS = @HPP_MODEL_DOXYGENDOCDIR@/hpp-model.doxytag=@HPP_MODEL_DOXYGENDOCDIR@ \
5+
@ABSTRACT_GIK_TASK_DOXYGENDOCDIR@/abstract-gik-task.doxytag=@ABSTRACT_GIK_TASK_DOXYGENDOCDIR@

doc/mainpage.hh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
///\mainpage
2+
/// This package aims at dealing with systems subject to smooth non-linear
3+
/// equality constraints.
4+
///
5+
/// The main class hpp::constrained::ConfigProjector numerically projects an input
6+
/// configuration onto the sub-manifold of the configuration space defined by a
7+
/// set of non-linear constraints of type CjrlGikStateConstraint.
8+
///
9+
/// Two other classes derive from this latter:
10+
/// \li hpp::constrained::ConfigExtendor extends a configuration toward another configuration by remaining on the constrained submanifold.
11+
/// \li hpp::constrained::GoalConfigGenerator randomly samples the configuration space and projects each sample onto the submanifold defined by a goal task.

src/config-optimizer.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ namespace hpp {
5858
goalConfig_(i_goalConfig)
5959
{
6060
step_ = 0.01; //Default value
61-
distance_ = CkwsDistance::create();
61+
//distance_ = CkwsDistance::create();
62+
distance_ = CkwsDistanceShPtr();
6263
nbRandCfgs_ = 20; //Default value
6364
progressThreshold_ = 1e-5;
6465
maxOptimizationSteps_ = 20;

src/kws-constraint.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace hpp {
5959

6060
KwsConstraint::KwsConstraint(const std::string & i_name,
6161
ConfigProjector * i_projector):
62-
CkwsConstraint(i_name,i_projector->getRobot()),
62+
CkwsConstraint(i_projector->getRobot()->configSpace (), i_name),
6363
projector_(i_projector)
6464
{
6565
}

0 commit comments

Comments
 (0)