roboptim-commit Mailing List for RobOptim (Page 84)
Status: Beta
Brought to you by:
flamiraux
Menu
▾
▴
roboptim-commit — Commit mailing-list (high volume)
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(62) |
Jul
(62) |
Aug
(36) |
Sep
(24) |
Oct
(41) |
Nov
(182) |
Dec
(8) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(12) |
Feb
(13) |
Mar
(104) |
Apr
(95) |
May
(90) |
Jun
(90) |
Jul
(93) |
Aug
(97) |
Sep
(91) |
Oct
(93) |
Nov
(90) |
Dec
(95) |
| 2011 |
Jan
(96) |
Feb
(84) |
Mar
(94) |
Apr
(91) |
May
(93) |
Jun
(91) |
Jul
(93) |
Aug
(93) |
Sep
(107) |
Oct
(93) |
Nov
(58) |
Dec
|
| 2012 |
Jan
(8) |
Feb
(4) |
Mar
|
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(6) |
Dec
(5) |
| 2013 |
Jan
(16) |
Feb
(22) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <no-...@ro...> - 2009-11-17 02:22:58
|
The Buildbot has finished a build of roboptim-core-cfsqp-plugin on RobOptim. Full details are available at: http://cleo.laas.fr:8010/builders/roboptim-core-cfsqp-plugin/builds/13 Buildbot URL: http://cleo.laas.fr:8010/ Buildslave for this Build: cleo Build Reason: The Nightly scheduler named 'nightly' triggered this build Build Source Stamp: HEAD Blamelist: BUILD FAILED: failed shell_4 sincerely, -The Buildbot |
|
From: <no-...@ro...> - 2009-11-17 02:08:52
|
The Buildbot has finished a build of roboptim-core on RobOptim. Full details are available at: http://cleo.laas.fr:8010/builders/roboptim-core/builds/28 Buildbot URL: http://cleo.laas.fr:8010/ Buildslave for this Build: cleo Build Reason: The Nightly scheduler named 'nightly' triggered this build Build Source Stamp: HEAD Blamelist: BUILD FAILED: failed shell_4 sincerely, -The Buildbot |
|
From: <no-...@ro...> - 2009-11-17 02:05:47
|
The Buildbot has finished a build of roboptim-trajectory on RobOptim. Full details are available at: http://cleo.laas.fr:8010/builders/roboptim-trajectory/builds/15 Buildbot URL: http://cleo.laas.fr:8010/ Buildslave for this Build: cleo Build Reason: The Nightly scheduler named 'nightly' triggered this build Build Source Stamp: HEAD Blamelist: BUILD FAILED: failed shell_4 sincerely, -The Buildbot |
|
From: Thomas M. <tho...@us...> - 2009-11-16 18:34:21
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "web".
The branch, master has been updated
via 483c88c4deabcb89c3b0da161cfe7ffce6b5acb7 (commit)
from 600851cc0dc39dd02b1371cf85f5a9a150af7e52 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 483c88c4deabcb89c3b0da161cfe7ffce6b5acb7
Author: Thomas Moulard <tho...@gm...>
Date: Mon Nov 16 19:34:07 2009 +0100
Fix documentation links, add 0.4 release information.
* htdocs/index.html: Here.
Signed-off-by: Thomas Moulard <tho...@gm...>
diff --git a/ChangeLog b/ChangeLog
index d6e23dd..bf108c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-16 Thomas Moulard <tho...@gm...>
+
+ Fix documentation links, add 0.4 release information.
+ * htdocs/index.html: Here.
+
2009-10-07 Thomas Moulard <tho...@gm...>
Fix HTML errors in project web page.
diff --git a/htdocs/index.html b/htdocs/index.html
index 95ef53c..45a1e67 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -49,6 +49,10 @@
<h2><a name="releases"></a>Releases</h2>
<dl>
+ <dt>2009-11-16</dt> <dd>Release 0.4
+ (<a href="https://sourceforge.net/projects/roboptim/files/">download</a>).
+ </dd>
+
<dt>2009-09-25</dt> <dd>Release 0.3
(<a href="https://sourceforge.net/projects/roboptim/files/roboptim-core/0.3/roboptim-core-0.3.tar.bz2/download">download</a>).
</dd>
@@ -73,13 +77,14 @@
<li><a href="doc/core/0.1/">HTML (0.1)</a></li>
<li><a href="doc/core/0.2/">HTML (0.2)</a></li>
<li><a href="doc/core/0.3/">HTML (0.3)</a></li>
+ <li><a href="doc/core/0.4/">HTML (0.4)</a></li>
<li><a href="doc/core/HEAD/">HTML (development version)</a></li>
<li>
Plug-ins:
<ul>
<li>Ipopt
<ul>
- <li><a href="doc/core-plugin/ipopt/0.2/">HTML
+ <li><a href="doc/core-ipopt-plugin/0.2/">HTML
(0.2)</a></li>
<li><a href="doc/core-ipopt-plugin/HEAD/">HTML
(development version)</a></li>
@@ -87,8 +92,10 @@
</li>
<li>CFSQP
<ul>
- <li><a href="doc/core-plugin/cfsqp/0.2/">HTML
+ <li><a href="doc/core-cfsqp-plugin/0.2/">HTML
(0.2)</a></li>
+ <li><a href="doc/core-cfsqp-plugin/0.4/">HTML
+ (0.4)</a></li>
<li><a href="doc/core-cfsqp-plugin/HEAD/">HTML
(development version)</a></li>
</ul>
@@ -97,23 +104,18 @@
</li>
</ul>
- <h3>Posture</h3>
- <ul>
- <li> <a href="#">HTML (development version) - Soon</a></li>
- </ul>
-
<h3>Trajectory</h3>
<ul>
<li><a href="doc/trajectory/0.2.1/">HTML (0.2.1)</a></li>
+ <li><a href="doc/trajectory/0.4/">HTML (0.4)</a></li>
<li><a href="doc/trajectory/HEAD/">HTML (development version)</a></li>
</ul>
Documentation can also be generated through <code>make doc</code>.<br/>
If the package is installed on your system, this documentation should be available in
- <code>/usr/share/doc/roboptim-core/html</code>,
- <code>/usr/share/doc/roboptim-trajectory/html</code> or
- <code>/usr/share/doc/roboptim-posture/html</code>.
+ <code>/usr/share/doc/roboptim-core/doxygen-html</code>,
+ <code>/usr/share/doc/roboptim-trajectory/doxygen-html</code>.
</div>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
htdocs/index.html | 22 ++++++++++++----------
2 files changed, 17 insertions(+), 10 deletions(-)
hooks/post-receive
--
web
|
|
From: <no-...@ro...> - 2009-11-16 18:04:35
|
The Buildbot has finished a build of roboptim-trajectory on RobOptim. Full details are available at: http://cleo.laas.fr:8010/builders/roboptim-trajectory/builds/14 Buildbot URL: http://cleo.laas.fr:8010/ Buildslave for this Build: cleo Build Reason: The web-page 'force build' button was pressed by 'Thomas Moulard': Build Source Stamp: HEAD Blamelist: Build succeeded! sincerely, -The Buildbot |
|
From: Thomas M. <tho...@us...> - 2009-11-16 17:58:35
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "roboptim-trajectory".
The annotated tag, v0.4 has been created
at 8bf73e001d103cd240e8d4477d14f4d1883d6c64 (tag)
tagging a6dd6e904a8f35e851cc1d6bb02dcc5b0fca0dff (commit)
replaces v0.2
tagged by Thomas Moulard
on Mon Nov 16 18:58:16 2009 +0100
- Log -----------------------------------------------------------------
Release 0.4.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAksBkrgACgkQ2c3AurFAup538ACfVib0Zv9qZW3UqlYZjXG/rfFi
5PEAn0YDFmRLjp8sP5L38AcNrkJBDb5Y
=EU8z
-----END PGP SIGNATURE-----
Thomas Moulard (46):
Fix documentation dependencies.
Synchronize.
Merge remote branches 'origin/master' and 'laas/master'
Check FreeTimeTrajectory::variationDerivWrtParam.
Fix variationDerivWrtParam check in test suite.
Add optional dependency toward CFSQP plug-in.
Regenerate test suite output.
Synchronize.
Rename state-cost into state-function.
Rename StateCost class into StateFunction.
Make StateFunction only usable with fixed point trajectory.
Implement FixedPointStateFunction.
Check FixedPointTrajectory class.
Implement resize in all trajectory classes.
Fix FixedPointStateFunction implementation.
Make Spline display more informative.
Add post-condition to resize method.
Add missing end of line in Spline display.
Add missing semi-colon in Spline class.
Check scaling functions in FreeTimeTrajectory test.
Fix function naming.
Check interval unscaling.
Fix free time trajectory and stable time point implementatation.
Check free time trajectory and stable time points.
Fix FreeTimeTrajectory variationConfigWrtParam.
Display more information test case.
Fix free time trajectory variationDerivWrtParam computation.
Simplify FixedPointStateFunction implementation.
Check all components in FixedPointStateFunction.
Fix implementation.
Implement gradient for FixedPointStateFunction.
Rename FixedPointStateFunction into StablePointStateFunction.
Add RPM support.
Fix test case.
Fix spec file.
Fix spec file.
Fix spec file.
Make test suite more robust.
Aesthetic change.
Normalize test output.
Normalize Gnuplot output and tests output.
Regenerate tests.
Normalize test output.
Clean interface.
Add release related Makefile rules.
Update NEWS.
florent (2):
Set m=0.5 instead of m=2.0 and bound control points.
Synchronize.
-----------------------------------------------------------------------
hooks/post-receive
--
roboptim-trajectory
|
|
From: Thomas M. <tho...@us...> - 2009-11-16 17:58:31
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "roboptim-trajectory".
The annotated tag, v0.2.1b has been created
at 3ff7fd6ac373db8e479a3bdbf6a80acf56ffa7f0 (tag)
tagging 33b4067d6381764475bb2a5511c19b94dcede26a (commit)
tagged by Thomas Moulard
on Mon Oct 19 12:39:15 2009 +0200
- Log -----------------------------------------------------------------
Release v0.2.1.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
iEYEABECAAYFAkrcQdMACgkQ2c3AurFAup6xQgCfbMqReEXAwZtF4X2c2QTnWSgU
XdMAnizPSVZ1YtxWfFH5+yUV4S8eOMKB
=X97L
-----END PGP SIGNATURE-----
Thomas Moulard (29):
Initial commit.
Add a dependency against roboptim-core.
Fix documentation upload script.
Add cubic spline implementation from Sylvain Miossec.
Clean code.
Add Trajectory class and updated spline implementation.
Add Spline class, fix Trajectory class.
Add missing operator() method in Spline class.
Implement Split class constructor.
*** empty log message ***
Fix constructor arguments.
Revert "Fix constructor arguments."
Revert "*** empty log message ***"
Imtegrate BSpline.
Import FreeTimeTrajectory class.
Import StateCost and TrajectoryCost.
Fix permissions on documentation before updating web site.
Implement SumCost (trajectory cost is the sum of some states' costs).
Debug Spline class.
Fix SumCost/StateCost implementation.
Generate gnuplot display when testing Spline class.
Add spline optimization test.
Add updateParameters to Spline class.
Add missing method.
Use roboptim-core to plot trajectories.
Use pkg-config to detect roboptim-core.
Update trajectory to match new organization of roboptim-core.
Release 0.2.1.
Fix pkg-config require field.
florent (1):
If roboptim-core is not found, trigger pkg-config.
-----------------------------------------------------------------------
hooks/post-receive
--
roboptim-trajectory
|
|
From: Thomas M. <tho...@us...> - 2009-11-16 17:58:08
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "roboptim-trajectory".
The branch, master has been updated
via a6dd6e904a8f35e851cc1d6bb02dcc5b0fca0dff (commit)
from 2d23206816ba919f00dac7efa8b4bf306c31a518 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a6dd6e904a8f35e851cc1d6bb02dcc5b0fca0dff
Author: Thomas Moulard <tho...@gm...>
Date: Mon Nov 16 18:57:51 2009 +0100
Update NEWS.
* NEWS: Fill release v0.4 information.
Signed-off-by: Thomas Moulard <tho...@gm...>
diff --git a/ChangeLog b/ChangeLog
index 9cacb67..9cff87f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-11-16 Thomas Moulard <tho...@gm...>
+ Update NEWS.
+ * NEWS: Fill release v0.4 information.
+
+2009-11-16 Thomas Moulard <tho...@gm...>
+
Add release related Makefile rules.
* Makefile.am: Here.
* build-aux: Synchronize.
diff --git a/NEWS b/NEWS
index a179ce2..cbb40ab 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
-*- outline -*-
+New in 0.4, 2009-11-16:
+* Fixed /severe/ computation bugs.
+* Clean interface.
+* Document.
+* Misc. bug fix.
+
New in 0.2.1, 2009-05-03:
* Abstract classes for costs on states and trajectories.
* Implementation of the cost on a trajectory as the sum of costs on differents
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
NEWS | 6 ++++++
2 files changed, 11 insertions(+), 0 deletions(-)
hooks/post-receive
--
roboptim-trajectory
|
|
From: Thomas M. <tho...@us...> - 2009-11-16 17:55:25
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "roboptim-trajectory".
The branch, master has been updated
via 2d23206816ba919f00dac7efa8b4bf306c31a518 (commit)
from cf076c099ea28c840df6b2a725d4135b3f74dbe1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2d23206816ba919f00dac7efa8b4bf306c31a518
Author: Thomas Moulard <tho...@gm...>
Date: Mon Nov 16 18:55:07 2009 +0100
Add release related Makefile rules.
* Makefile.am: Here.
* build-aux: Synchronize.
* doc/Makefile.am: Fix include path.
Signed-off-by: Thomas Moulard <tho...@gm...>
diff --git a/ChangeLog b/ChangeLog
index 71d65de..9cacb67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2009-11-16 Thomas Moulard <tho...@gm...>
+ Add release related Makefile rules.
+ * Makefile.am: Here.
+ * build-aux: Synchronize.
+ * doc/Makefile.am: Fix include path.
+
+2009-11-16 Thomas Moulard <tho...@gm...>
+
Clean interface.
* include/roboptim/trajectory/free-time-trajectory.hh,
* include/roboptim/trajectory/free-time-trajectory.hxx,
diff --git a/Makefile.am b/Makefile.am
index b4491a4..07d26ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,9 +18,15 @@ EXTRA_DIST += bootstrap \
all:
# Include various rules...
+include $(top_srcdir)/build-aux/dist-sign.mk
include $(top_srcdir)/build-aux/doc-recursive.mk
include $(top_srcdir)/build-aux/libtool.mk
include $(top_srcdir)/build-aux/pkg-config.mk
include $(top_srcdir)/build-aux/git-version-gen.mk
include $(top_srcdir)/build-aux/rpm.mk
+
+
+SF_PROJECT_ID=roboptim
+include $(top_srcdir)/build-aux/announce-gen.mk
+include $(top_srcdir)/build-aux/sf-release.mk
diff --git a/build-aux b/build-aux
index 02d1097..5a66ce9 160000
--- a/build-aux
+++ b/build-aux
@@ -1 +1 @@
-Subproject commit 02d1097a8b1f7c2c605b5446caab7485fa2e1092
+Subproject commit 5a66ce9ec1c6100da8b652f144a377c94355f7b4
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 604ad39..dc7dc61 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,3 @@
include $(top_srcdir)/build-aux/init.mk
include $(top_srcdir)/build-aux/doxygen.mk
-include $(top_srcdir)/build-aux/sf.mk
+include $(top_srcdir)/build-aux/sf-doc.mk
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
Makefile.am | 6 ++++++
build-aux | 2 +-
doc/Makefile.am | 2 +-
4 files changed, 15 insertions(+), 2 deletions(-)
hooks/post-receive
--
roboptim-trajectory
|
|
From: <no-...@ro...> - 2009-11-16 17:46:51
|
The Buildbot has finished a build of roboptim-core-cfsqp-plugin on RobOptim. Full details are available at: http://cleo.laas.fr:8010/builders/roboptim-core-cfsqp-plugin/builds/12 Buildbot URL: http://cleo.laas.fr:8010/ Buildslave for this Build: cleo Build Reason: The web-page 'force build' button was pressed by 'Thomas Moulard': Build Source Stamp: HEAD Blamelist: BUILD FAILED: failed shell_4 sincerely, -The Buildbot |
|
From: <no-...@ro...> - 2009-11-16 17:42:48
|
The Buildbot has finished a build of roboptim-core-cfsqp-plugin on RobOptim. Full details are available at: http://cleo.laas.fr:8010/builders/roboptim-core-cfsqp-plugin/builds/11 Buildbot URL: http://cleo.laas.fr:8010/ Buildslave for this Build: cleo Build Reason: The web-page 'force build' button was pressed by 'Thomas Moulard': Build Source Stamp: HEAD Blamelist: Build succeeded! sincerely, -The Buildbot |
|
From: <no-...@ro...> - 2009-11-16 17:37:31
|
The Buildbot has finished a build of roboptim-core-cfsqp-plugin on RobOptim. Full details are available at: http://cleo.laas.fr:8010/builders/roboptim-core-cfsqp-plugin/builds/10 Buildbot URL: http://cleo.laas.fr:8010/ Buildslave for this Build: cleo Build Reason: The web-page 'force build' button was pressed by 'Thomas Moulard': Build Source Stamp: HEAD Blamelist: BUILD FAILED: failed shell_5 sincerely, -The Buildbot |
|
From: Thomas M. <tho...@us...> - 2009-11-16 17:32:42
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "roboptim-core".
The branch, master has been updated
via de151642ac7e24bd10f88c4cc079ad30f07790ad (commit)
from 361e082b0f17af194dedcccd1f452aa373002dc6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit de151642ac7e24bd10f88c4cc079ad30f07790ad
Author: Thomas Moulard <tho...@gm...>
Date: Mon Nov 16 18:32:30 2009 +0100
Fix announce-gen download links.
* Makefile.am: Re-order included rules.
* build-aux: Synchronize.
Signed-off-by: Thomas Moulard <tho...@gm...>
diff --git a/ChangeLog b/ChangeLog
index fb3182a..fa6f19c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2009-11-16 Thomas Moulard <tho...@gm...>
+ Fix announce-gen download links.
+ * Makefile.am: Re-order included rules.
+ * build-aux: Synchronize.
+
+2009-11-16 Thomas Moulard <tho...@gm...>
+
Synchronize.
* build-aux: Here.
diff --git a/Makefile.am b/Makefile.am
index 6646abb..4685fc7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,6 @@ EXTRA_DIST += msvc
all:
# Include various rules...
-include $(top_srcdir)/build-aux/announce-gen.mk
include $(top_srcdir)/build-aux/dist-sign.mk
include $(top_srcdir)/build-aux/doc-recursive.mk
include $(top_srcdir)/build-aux/libtool.mk
@@ -36,4 +35,5 @@ include $(top_srcdir)/build-aux/rpm.mk
SF_PROJECT_ID=roboptim
+include $(top_srcdir)/build-aux/announce-gen.mk
include $(top_srcdir)/build-aux/sf-release.mk
diff --git a/build-aux b/build-aux
index bb53575..5a66ce9 160000
--- a/build-aux
+++ b/build-aux
@@ -1 +1 @@
-Subproject commit bb535755e38264bdcfbe12649bf4917ca7051985
+Subproject commit 5a66ce9ec1c6100da8b652f144a377c94355f7b4
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
Makefile.am | 2 +-
build-aux | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
roboptim-core
|
|
From: Thomas M. <tho...@us...> - 2009-11-16 17:31:09
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "build-aux".
The branch, master has been updated
via 5a66ce9ec1c6100da8b652f144a377c94355f7b4 (commit)
from bb535755e38264bdcfbe12649bf4917ca7051985 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5a66ce9ec1c6100da8b652f144a377c94355f7b4
Author: Thomas Moulard <tho...@gm...>
Date: Mon Nov 16 18:30:55 2009 +0100
Fix announce-gen download link.
* announce-gen.mk: Fix download link.
Signed-off-by: Thomas Moulard <tho...@gm...>
diff --git a/ChangeLog b/ChangeLog
index 7ea2631..f101441 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-11-16 Thomas Moulard <tho...@gm...>
+ Fix announce-gen download link.
+ * announce-gen.mk: Fix download link.
+
+2009-11-16 Thomas Moulard <tho...@gm...>
+
Fix release type detection in SourceForge rules.
* sf-doc.mk,
* sf-release.mk: Fix regexp.
diff --git a/announce-gen.mk b/announce-gen.mk
index 332e490..4948d44 100644
--- a/announce-gen.mk
+++ b/announce-gen.mk
@@ -48,7 +48,7 @@ announce-mail: $(distdir).tar.gz
--release-type=$(RELEASE_TYPE) \
--package-name='@PACKAGE_TARNAME@' \
--current-version='@PACKAGE_VERSION@' \
- --url-directory='http://dl.sf.net/sourceforge' \
+ --url-directory='http://dl.sourceforge.net/$(SF_PROJECT_ID)'\
--news=$(srcdir)/NEWS \
--bootstrap-tools=autoconf,automake,libtool \
--previous-version='FIXME' \
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
announce-gen.mk | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
hooks/post-receive
--
build-aux
|
|
From: Thomas M. <tho...@us...> - 2009-11-16 17:25:24
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "roboptim-core".
The branch, master has been updated
via 361e082b0f17af194dedcccd1f452aa373002dc6 (commit)
from 7f4f0f098c4e75f9549b30ad413f6360acc0408b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 361e082b0f17af194dedcccd1f452aa373002dc6
Author: Thomas Moulard <tho...@gm...>
Date: Mon Nov 16 18:25:12 2009 +0100
Synchronize.
* build-aux: Here.
Signed-off-by: Thomas Moulard <tho...@gm...>
diff --git a/ChangeLog b/ChangeLog
index f4681c4..fb3182a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-11-16 Thomas Moulard <tho...@gm...>
+ Synchronize.
+ * build-aux: Here.
+
+2009-11-16 Thomas Moulard <tho...@gm...>
+
Update NEWS.
* NEWS: Fill 0.4 release information.
diff --git a/build-aux b/build-aux
index 9dee8a9..bb53575 160000
--- a/build-aux
+++ b/build-aux
@@ -1 +1 @@
-Subproject commit 9dee8a90debab18bb9b07d3dd538ef2a28a3d49a
+Subproject commit bb535755e38264bdcfbe12649bf4917ca7051985
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
build-aux | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
hooks/post-receive
--
roboptim-core
|
|
From: Thomas M. <tho...@us...> - 2009-11-16 17:23:42
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "build-aux".
The branch, master has been updated
via bb535755e38264bdcfbe12649bf4917ca7051985 (commit)
from 9dee8a90debab18bb9b07d3dd538ef2a28a3d49a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bb535755e38264bdcfbe12649bf4917ca7051985
Author: Thomas Moulard <tho...@gm...>
Date: Mon Nov 16 18:23:31 2009 +0100
Fix release type detection in SourceForge rules.
* sf-doc.mk,
* sf-release.mk: Fix regexp.
Signed-off-by: Thomas Moulard <tho...@gm...>
diff --git a/ChangeLog b/ChangeLog
index aab595b..7ea2631 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2009-11-16 Thomas Moulard <tho...@gm...>
+ Fix release type detection in SourceForge rules.
+ * sf-doc.mk,
+ * sf-release.mk: Fix regexp.
+
+2009-11-16 Thomas Moulard <tho...@gm...>
+
Add release related Makefile rules.
* announce-gen.mk: New.
* dist-sign.mk: Copy from sf.mk.
diff --git a/sf-doc.mk b/sf-doc.mk
index 53d0f44..91b7655 100644
--- a/sf-doc.mk
+++ b/sf-doc.mk
@@ -31,7 +31,8 @@
# Print version number if package is stable or an empty
# string otherwise.
SF_VERSION=`echo '@PACKAGE_VERSION@' \
- | $(GREP) '^[:digit:]+\.[:digit:]+(\.[:digit:]+)$$'`
+ | $(GREP) '^[0-9]\+.[0-9]\+\(.[0-9]\+\|\)'$$`
+
# Generate shell script that allows documentation upload.
sf-upload.sh: $(top_srcdir)/build-aux/sf-upload.sh.in
@@ -42,4 +43,5 @@ sf-upload.sh: $(top_srcdir)/build-aux/sf-upload.sh.in
# Upload documentation to SourceForge.
sf-doc-upload: sf-upload.sh doc
- ./sf-upload.sh VERSION=$(SF_VERSION)
+ export VERSION="$(SF_VERSION)"; \
+ ./sf-upload.sh
diff --git a/sf-release.mk b/sf-release.mk
index 7a33179..042cf8e 100644
--- a/sf-release.mk
+++ b/sf-release.mk
@@ -29,7 +29,8 @@
# Upload tarball to SourceForge server.
SF_VERSION=`echo '@PACKAGE_VERSION@' \
- | $(GREP) '^[:digit:]+\.[:digit:]+(\.[:digit:]+)$$'`
+ | $(GREP) '^[0-9]\+.[0-9]\+\(.[0-9]\+\|\)'$$`
+
SF_FRS_LOGIN=$$SF_USERNAME,$(SF_PROJECT_ID)
SF_FRS_PATH=/home/frs/project/`echo $(SF_PROJECT_ID) | head -c1`/` echo $(SF_PROJECT_ID) | head -c2`/$(SF_PROJECT_ID)/@PACKAGE_TARNAME@/@PACKAGE_VERSION@/
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sf-doc.mk | 6 ++++--
sf-release.mk | 3 ++-
3 files changed, 12 insertions(+), 3 deletions(-)
hooks/post-receive
--
build-aux
|
|
From: <no-...@ro...> - 2009-11-16 17:08:22
|
The Buildbot has finished a build of roboptim-core on RobOptim. Full details are available at: http://cleo.laas.fr:8010/builders/roboptim-core/builds/27 Buildbot URL: http://cleo.laas.fr:8010/ Buildslave for this Build: cleo Build Reason: The web-page 'force build' button was pressed by 'Thomas Moulard': Build Source Stamp: HEAD Blamelist: Build succeeded! sincerely, -The Buildbot |
|
From: Thomas M. <tho...@us...> - 2009-11-16 17:00:54
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "roboptim-core".
The annotated tag, v0.4 has been created
at fb4e47ee01e8e24abb2eec237740ba99af7ffad4 (tag)
tagging 7f4f0f098c4e75f9549b30ad413f6360acc0408b (commit)
replaces v0.3
tagged by Thomas Moulard
on Mon Nov 16 17:55:34 2009 +0100
- Log -----------------------------------------------------------------
Release 0.4.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAksBhAYACgkQ2c3AurFAup64+QCcCB1pXj0K5///3SP+6/kxt2Wv
yJMAoKaBR0D2oep0W51wWIUPfmwIfTDM
=bqr+
-----END PGP SIGNATURE-----
Thomas Moulard (40):
Synchronize.
Synchronize.
Enhance bad gradient class.
Synchronize.
Synchronize.
Synchronize.
Synchronize.
Synchronize.
Synchronize.
Reorganize configure.ac.
Make plug-in loading more robust.
Enhance error message in solver-factory.hxx.
Add missing ROBOPTIM_DLLEXPORT.
Handle symbol visibility under Linux.
Distribute Windows related files.
Limit output precision when displaying a function.
Move common.hh to shared-tests submodule.
Factorize rules using build-aux.
Synchronize.
Add ``this->'' in template code to help the compiler.
Synchronize.
Add ROBOPTIM_DLLLOCAL when needed.
Add RPM spec file.
Fix spec file.
Fix spec files.
Fix spec file.
Add rpm support.
Synchronize.
Fix spec file.
Fix spec file.
Fix spec file.
Fix spec file.
Fix spec file.
Fix spec file.
Normalize floating points numbers before display.
Implement display normalization for vectors.
Add more implementation of normalize.
Fix normalize implementation.
Update release scripts.
Update NEWS.
-----------------------------------------------------------------------
hooks/post-receive
--
roboptim-core
|
|
From: <no-...@ro...> - 2009-11-16 16:54:19
|
The Buildbot has finished a build of roboptim-core on RobOptim. Full details are available at: http://cleo.laas.fr:8010/builders/roboptim-core/builds/26 Buildbot URL: http://cleo.laas.fr:8010/ Buildslave for this Build: cleo Build Reason: The web-page 'force build' button was pressed by 'Thomas Moulard': Build Source Stamp: HEAD Blamelist: Build succeeded! sincerely, -The Buildbot |
|
From: Thomas M. <tho...@us...> - 2009-11-16 16:43:59
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "roboptim-core".
The branch, master has been updated
via 7f4f0f098c4e75f9549b30ad413f6360acc0408b (commit)
via bb5a063eceb25af169042f90bba501463ccb2d0a (commit)
from 5da2999e8dff926ae91b45c828290e383346be9d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7f4f0f098c4e75f9549b30ad413f6360acc0408b
Author: Thomas Moulard <tho...@gm...>
Date: Mon Nov 16 17:43:41 2009 +0100
Update NEWS.
* NEWS: Fill 0.4 release information.
Signed-off-by: Thomas Moulard <tho...@gm...>
diff --git a/ChangeLog b/ChangeLog
index 2402030..f4681c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-11-16 Thomas Moulard <tho...@gm...>
+ Update NEWS.
+ * NEWS: Fill 0.4 release information.
+
+2009-11-16 Thomas Moulard <tho...@gm...>
+
Update release scripts.
* Makefile.am: Include new scripts.
* build-aux: Synchronize.
diff --git a/NEWS b/NEWS
index 5670306..6adddb5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,12 @@
-*- outline -*-
+
+New in 0.4, 2009-11-16:
+* Make plug-in loading more robust.
+* Enhanced gradient checks.
+* Handle symbol visibility under Linux properly.
+* Uniformized floating point number display.
+* Bug fix
+
New in 0.3, 2009-09-25:
* Finite difference gradients
* New kinds of functions: constant, identity function.
commit bb5a063eceb25af169042f90bba501463ccb2d0a
Author: Thomas Moulard <tho...@gm...>
Date: Mon Nov 16 17:43:25 2009 +0100
Update release scripts.
* Makefile.am: Include new scripts.
* build-aux: Synchronize.
* doc/Makefile.am: Fix include path.
Signed-off-by: Thomas Moulard <tho...@gm...>
diff --git a/ChangeLog b/ChangeLog
index 5e15648..2402030 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-16 Thomas Moulard <tho...@gm...>
+
+ Update release scripts.
+ * Makefile.am: Include new scripts.
+ * build-aux: Synchronize.
+ * doc/Makefile.am: Fix include path.
+
2009-11-15 Thomas Moulard <tho...@gm...>
Fix normalize implementation.
diff --git a/Makefile.am b/Makefile.am
index 88dea4d..6646abb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,9 +25,15 @@ EXTRA_DIST += msvc
all:
# Include various rules...
+include $(top_srcdir)/build-aux/announce-gen.mk
+include $(top_srcdir)/build-aux/dist-sign.mk
include $(top_srcdir)/build-aux/doc-recursive.mk
include $(top_srcdir)/build-aux/libtool.mk
include $(top_srcdir)/build-aux/pkg-config.mk
include $(top_srcdir)/build-aux/git-version-gen.mk
include $(top_srcdir)/build-aux/rpm.mk
+
+
+SF_PROJECT_ID=roboptim
+include $(top_srcdir)/build-aux/sf-release.mk
diff --git a/build-aux b/build-aux
index 02d1097..9dee8a9 160000
--- a/build-aux
+++ b/build-aux
@@ -1 +1 @@
-Subproject commit 02d1097a8b1f7c2c605b5446caab7485fa2e1092
+Subproject commit 9dee8a90debab18bb9b07d3dd538ef2a28a3d49a
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 604ad39..dc7dc61 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,3 @@
include $(top_srcdir)/build-aux/init.mk
include $(top_srcdir)/build-aux/doxygen.mk
-include $(top_srcdir)/build-aux/sf.mk
+include $(top_srcdir)/build-aux/sf-doc.mk
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 12 ++++++++++++
Makefile.am | 6 ++++++
NEWS | 8 ++++++++
build-aux | 2 +-
doc/Makefile.am | 2 +-
5 files changed, 28 insertions(+), 2 deletions(-)
hooks/post-receive
--
roboptim-core
|
|
From: Thomas M. <tho...@us...> - 2009-11-16 16:33:28
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "build-aux".
The branch, master has been updated
via 9dee8a90debab18bb9b07d3dd538ef2a28a3d49a (commit)
from 02d1097a8b1f7c2c605b5446caab7485fa2e1092 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9dee8a90debab18bb9b07d3dd538ef2a28a3d49a
Author: Thomas Moulard <tho...@gm...>
Date: Mon Nov 16 17:33:14 2009 +0100
Add release related Makefile rules.
* announce-gen.mk: New.
* dist-sign.mk: Copy from sf.mk.
* sf-doc.mk: Copy from sf.mk.
* sf-release.mk: Rename from sf.mk.
Signed-off-by: Thomas Moulard <tho...@gm...>
diff --git a/ChangeLog b/ChangeLog
index 1bda58c..aab595b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-16 Thomas Moulard <tho...@gm...>
+
+ Add release related Makefile rules.
+ * announce-gen.mk: New.
+ * dist-sign.mk: Copy from sf.mk.
+ * sf-doc.mk: Copy from sf.mk.
+ * sf-release.mk: Rename from sf.mk.
+
2009-11-11 Thomas Moulard <tho...@gm...>
Fix spec file generation rule.
diff --git a/announce-gen.mk b/announce-gen.mk
new file mode 100644
index 0000000..332e490
--- /dev/null
+++ b/announce-gen.mk
@@ -0,0 +1,56 @@
+# -*-Automake-*-
+# Copyright (C) 2009 by Thomas Moulard, AIST, CNRS, INRIA.
+# This file is part of the roboptim.
+#
+# roboptim is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Additional permission under section 7 of the GNU General Public
+# License, version 3 ("GPLv3"):
+#
+# If you convey this file as part of a work that contains a
+# configuration script generated by Autoconf, you may do so under
+# terms of your choice.
+#
+# roboptim is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with roboptim. If not, see <http://www.gnu.org/licenses/>.
+
+# ------ #
+# README #
+# ------ #
+#
+# This mk file contains a rule for release announcement generation.
+#
+# To use this file, you must include first ``init.mk'' in your
+# local ``Makefile.am''.
+#
+# It also requires that ``make dist'' produces a ``.tar.gz'' file.
+
+
+# Distributed files.
+EXTRA_DIST += \
+ $(top_srcdir)/build-aux/announce-gen
+
+IS_MAJOR=$$(echo '@PACKAGE_VERSION@' \
+ | $(GREP) '^[:digit:]+\.[:digit:]+(\.[:digit:]+)$$')
+
+RELEASE_TYPE=$$(if test x = x$(IS_MAJOR); then echo alpha; else echo major; fi)
+
+announce-mail: $(distdir).tar.gz
+ $(top_srcdir)/build-aux/announce-gen \
+ --release-type=$(RELEASE_TYPE) \
+ --package-name='@PACKAGE_TARNAME@' \
+ --current-version='@PACKAGE_VERSION@' \
+ --url-directory='http://dl.sf.net/sourceforge' \
+ --news=$(srcdir)/NEWS \
+ --bootstrap-tools=autoconf,automake,libtool \
+ --previous-version='FIXME' \
+ --gpg-key-id='FIXME' \
+ | tee "$@"
diff --git a/sf.mk b/dist-sign.mk
similarity index 74%
copy from sf.mk
copy to dist-sign.mk
index de6ff7c..78fc230 100644
--- a/sf.mk
+++ b/dist-sign.mk
@@ -25,10 +25,20 @@
# ------ #
# README #
# ------ #
+#
+# This mk file contains a rule for generating tarballs cryptographic signature.
+#
+# To use this file, you must include first ``init.mk'' in your
+# local ``Makefile.am''.
+
+
+.PHONY: announce
+
+SIGN=gpg --batch -b "$<"
+VERIFY=gpg --batch --verify "$@"
-# SourceForge related Makefile rules.
+$(distdir).tar.gz.sig: $(distdir).tar.gz
+ $(SIGN) && $(VERIFY)
-# --- SourceForge upload script.
-# sf-upload.sh generation rule.
-sf-upload.sh: $(top_srcdir)/build-aux/sf-upload.sh.in
- @$(top_builddir)/config.status --file="$@":"$<" && chmod a+x "$@"
+$(distdir).tar.bz2.sig: $(distdir).tar.bz2
+ $(SIGN) && $(VERIFY)
diff --git a/sf.mk b/sf-doc.mk
similarity index 70%
copy from sf.mk
copy to sf-doc.mk
index de6ff7c..53d0f44 100644
--- a/sf.mk
+++ b/sf-doc.mk
@@ -25,10 +25,21 @@
# ------ #
# README #
# ------ #
+#
+# SourceForge documentation related Makefile rules.
-# SourceForge related Makefile rules.
+# Print version number if package is stable or an empty
+# string otherwise.
+SF_VERSION=`echo '@PACKAGE_VERSION@' \
+ | $(GREP) '^[:digit:]+\.[:digit:]+(\.[:digit:]+)$$'`
-# --- SourceForge upload script.
-# sf-upload.sh generation rule.
+# Generate shell script that allows documentation upload.
sf-upload.sh: $(top_srcdir)/build-aux/sf-upload.sh.in
- @$(top_builddir)/config.status --file="$@":"$<" && chmod a+x "$@"
+ $(top_builddir)/config.status \
+ --file="$@":"$<" && chmod a+x "$@"
+
+.PHONY: sf-doc-upload
+
+# Upload documentation to SourceForge.
+sf-doc-upload: sf-upload.sh doc
+ ./sf-upload.sh VERSION=$(SF_VERSION)
diff --git a/sf.mk b/sf-release.mk
similarity index 56%
rename from sf.mk
rename to sf-release.mk
index de6ff7c..7a33179 100644
--- a/sf.mk
+++ b/sf-release.mk
@@ -25,10 +25,25 @@
# ------ #
# README #
# ------ #
+#
+# Upload tarball to SourceForge server.
+
+SF_VERSION=`echo '@PACKAGE_VERSION@' \
+ | $(GREP) '^[:digit:]+\.[:digit:]+(\.[:digit:]+)$$'`
+
+SF_FRS_LOGIN=$$SF_USERNAME,$(SF_PROJECT_ID)
+SF_FRS_PATH=/home/frs/project/`echo $(SF_PROJECT_ID) | head -c1`/` echo $(SF_PROJECT_ID) | head -c2`/$(SF_PROJECT_ID)/@PACKAGE_TARNAME@/@PACKAGE_VERSION@/
-# SourceForge related Makefile rules.
+.PHONY: sf-dist-upload
-# --- SourceForge upload script.
-# sf-upload.sh generation rule.
-sf-upload.sh: $(top_srcdir)/build-aux/sf-upload.sh.in
- @$(top_builddir)/config.status --file="$@":"$<" && chmod a+x "$@"
+# Generate a release.
+sf-dist-upload: $(distdir).tar.gz $(distdir).tar.bz2 \
+ $(distdir).tar.gz.sig $(distdir).tar.bz2.sig
+ @if test x = x$(SF_VERSION) && test x = x$$SF_FORCE_UPLOAD; then\
+ echo "Development version are not uploaded to SourceForge."; \
+ echo "Set SF_FORCE_UPLOAD to 1 to override."; \
+ echo "Skipping..."; \
+ else \
+ echo "Publishing release on SourceForge..."; \
+ rsync -vPe ssh $^ $(SF_FRS_LOGIN)@frs.sourceforge.net:$(SF_FRS_PATH);\
+ fi
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++++++
doxygen.m4 => announce-gen.mk | 57 ++++++++++++++++++-----------------------
sf.mk => dist-sign.mk | 20 +++++++++++---
sf.mk => sf-doc.mk | 19 +++++++++++---
sf.mk => sf-release.mk | 25 ++++++++++++++---
5 files changed, 83 insertions(+), 46 deletions(-)
copy doxygen.m4 => announce-gen.mk (54%)
copy sf.mk => dist-sign.mk (74%)
copy sf.mk => sf-doc.mk (70%)
rename sf.mk => sf-release.mk (56%)
hooks/post-receive
--
build-aux
|
|
From: <no-...@ro...> - 2009-11-16 14:03:19
|
The Buildbot has finished a build of roboptim-core-cfsqp-plugin on RobOptim. Full details are available at: http://cleo.laas.fr:8010/builders/roboptim-core-cfsqp-plugin/builds/9 Buildbot URL: http://cleo.laas.fr:8010/ Buildslave for this Build: cleo Build Reason: The web-page 'force build' button was pressed by 'Thomas Moulard': Build Source Stamp: HEAD Blamelist: Build succeeded! sincerely, -The Buildbot |
|
From: <no-...@ro...> - 2009-11-16 14:03:13
|
The Buildbot has finished a build of roboptim-trajectory on RobOptim. Full details are available at: http://cleo.laas.fr:8010/builders/roboptim-trajectory/builds/13 Buildbot URL: http://cleo.laas.fr:8010/ Buildslave for this Build: cleo Build Reason: The web-page 'force build' button was pressed by 'Thomas Moulard': Build Source Stamp: HEAD Blamelist: Build succeeded! sincerely, -The Buildbot |
|
From: <no-...@ro...> - 2009-11-16 14:03:05
|
The Buildbot has finished a build of roboptim-core on RobOptim. Full details are available at: http://cleo.laas.fr:8010/builders/roboptim-core/builds/25 Buildbot URL: http://cleo.laas.fr:8010/ Buildslave for this Build: cleo Build Reason: The web-page 'force build' button was pressed by 'Thomas Moulard': Build Source Stamp: HEAD Blamelist: Build succeeded! sincerely, -The Buildbot |
|
From: Thomas M. <tho...@us...> - 2009-11-16 12:42:28
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "roboptim-trajectory".
The branch, master has been updated
via cf076c099ea28c840df6b2a725d4135b3f74dbe1 (commit)
from ba9c15a73fa4e3f5e5824ad9702f028f2e0ae196 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cf076c099ea28c840df6b2a725d4135b3f74dbe1
Author: Thomas Moulard <tho...@gm...>
Date: Mon Nov 16 13:42:12 2009 +0100
Clean interface.
* include/roboptim/trajectory/free-time-trajectory.hh,
* include/roboptim/trajectory/free-time-trajectory.hxx,
* include/roboptim/trajectory/fwd.hh,
* include/roboptim/trajectory/stable-point-state-function.hh,
* include/roboptim/trajectory/state-function.hh,
* include/roboptim/trajectory/state-function.hxx,
* tests/anthropomorphic-cost-function.cc,
* tests/free-time-trajectory-stable-time-point.cc,
* tests/free-time-trajectory.cc,
* tests/spline-time-optimization.cc,
* tests/stable-point-state-function.cc,
* tests/state-function.cc: Update interface so that classes
are always parametrized by the trajectory classes types.
Signed-off-by: Thomas Moulard <tho...@gm...>
diff --git a/ChangeLog b/ChangeLog
index f181643..71d65de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
2009-11-16 Thomas Moulard <tho...@gm...>
+ Clean interface.
+ * include/roboptim/trajectory/free-time-trajectory.hh,
+ * include/roboptim/trajectory/free-time-trajectory.hxx,
+ * include/roboptim/trajectory/fwd.hh,
+ * include/roboptim/trajectory/stable-point-state-function.hh,
+ * include/roboptim/trajectory/state-function.hh,
+ * include/roboptim/trajectory/state-function.hxx,
+ * tests/anthropomorphic-cost-function.cc,
+ * tests/free-time-trajectory-stable-time-point.cc,
+ * tests/free-time-trajectory.cc,
+ * tests/spline-time-optimization.cc,
+ * tests/stable-point-state-function.cc,
+ * tests/state-function.cc: Update interface so that classes
+ are always parametrized by the trajectory classes types.
+
+2009-11-16 Thomas Moulard <tho...@gm...>
+
Normalize test output.
* tests/spline-optimization.cc: Here.
diff --git a/include/roboptim/trajectory/free-time-trajectory.hh b/include/roboptim/trajectory/free-time-trajectory.hh
index 756aae5..5f8b35b 100644
--- a/include/roboptim/trajectory/free-time-trajectory.hh
+++ b/include/roboptim/trajectory/free-time-trajectory.hh
@@ -18,7 +18,10 @@
#ifndef ROBOPTIM_TRAJECTORY_FREETIMETRAJECTORY_HH
# define ROBOPTIM_TRAJECTORY_FREETIMETRAJECTORY_HH
# include <roboptim/trajectory/sys.hh>
+
# include <boost/numeric/ublas/vector_proxy.hpp>
+# include <boost/static_assert.hpp>
+# include <boost/type_traits/is_base_of.hpp>
# include <roboptim/trajectory/trajectory.hh>
@@ -31,12 +34,21 @@ namespace roboptim
///
/// Build a trajectory from an input trajectory and a time scale
/// factor.
- template <unsigned DerivabilityOrder>
- class FreeTimeTrajectory : public Trajectory<DerivabilityOrder>
+ template <typename T>
+ class FreeTimeTrajectory : public Trajectory<T::derivabilityOrder>
{
+ /// Check that T is a trajectory type.
+ BOOST_STATIC_ASSERT((boost::is_base_of
+ <Trajectory<T::derivabilityOrder>, T>::value));
+
public:
/// \brief Parent type.
- typedef Trajectory<DerivabilityOrder> parent_t;
+ typedef Trajectory<T::derivabilityOrder> parent_t;
+ /// \brief Fixed point trajectory type.
+ typedef T fixedTimeTrajectory_t;
+ /// \brief Self type.
+ typedef FreeTimeTrajectory<T> self_t;
+
/// \brief Import value type.
typedef typename parent_t::value_type value_type;
@@ -61,10 +73,10 @@ namespace roboptim
///
/// \param traj trajectory defining this one by reparameterization
/// \param s time scale
- FreeTimeTrajectory (const Trajectory<DerivabilityOrder>& traj, value_type s)
+ FreeTimeTrajectory (const fixedTimeTrajectory_t& traj, value_type s)
throw ();
- FreeTimeTrajectory (const FreeTimeTrajectory<DerivabilityOrder>& traj) throw ();
+ FreeTimeTrajectory (const self_t& traj) throw ();
virtual ~FreeTimeTrajectory () throw ();
@@ -90,7 +102,7 @@ namespace roboptim
return 0;
}
- ROBOPTIM_IMPLEMENT_CLONE (FreeTimeTrajectory<DerivabilityOrder>)
+ ROBOPTIM_IMPLEMENT_CLONE (self_t)
/// \brief Display the function on the specified output stream.
///
@@ -104,14 +116,14 @@ namespace roboptim
/// \param index Angles index in parameter array.
virtual void normalizeAngles (size_type index) throw ();
- const Trajectory<DerivabilityOrder>&
+ const fixedTimeTrajectory_t&
getFixedTimeTrajectory () const throw ()
{
assert (trajectory_);
return *trajectory_;
}
- Trajectory<DerivabilityOrder>*
+ self_t*
resize (interval_t timeRange) const throw ()
{
assert (trajectory_);
@@ -126,13 +138,13 @@ namespace roboptim
assert (this->scaleTime (tMin) == tmin);
assert (this->scaleTime (tMax) == tmax);
- Trajectory<DerivabilityOrder>* res =
- new FreeTimeTrajectory<DerivabilityOrder> (*trajectory_, scale);
+ self_t* res =
+ new self_t (*trajectory_, scale);
assert (res->timeRange () == this->timeRange ());
return res;
}
- Trajectory<DerivabilityOrder>*
+ fixedTimeTrajectory_t*
makeFixedTimeTrajectory () const throw ()
{
assert (trajectory_);
@@ -164,7 +176,7 @@ namespace roboptim
const throw ();
private:
/// \brief Input fixed time trajectory.
- Trajectory<DerivabilityOrder>* trajectory_;
+ fixedTimeTrajectory_t* trajectory_;
};
/// Example shows FreeTimeTrajectory use.
diff --git a/include/roboptim/trajectory/free-time-trajectory.hxx b/include/roboptim/trajectory/free-time-trajectory.hxx
index 6aa0394..14e02d3 100644
--- a/include/roboptim/trajectory/free-time-trajectory.hxx
+++ b/include/roboptim/trajectory/free-time-trajectory.hxx
@@ -47,43 +47,43 @@ namespace roboptim
}
} // end of namespace detail
- template <unsigned dorder>
- FreeTimeTrajectory<dorder>::FreeTimeTrajectory
- (const Trajectory<dorder>& traj, value_type s) throw ()
- : Trajectory<dorder> (detail::unscaleInterval (traj, s), traj.outputSize (),
- addScaleToParameters (traj.parameters (), s)),
+ template <typename T>
+ FreeTimeTrajectory<T>::FreeTimeTrajectory
+ (const fixedTimeTrajectory_t& traj, value_type s) throw ()
+ : parent_t (detail::unscaleInterval (traj, s), traj.outputSize (),
+ addScaleToParameters (traj.parameters (), s)),
trajectory_ (traj.clone ())
{
assert (s != 0. && !std::isinf (s) && !std::isnan (s));
}
- template <unsigned dorder>
- FreeTimeTrajectory<dorder>::FreeTimeTrajectory
- (const FreeTimeTrajectory<dorder>& traj)
+ template <typename T>
+ FreeTimeTrajectory<T>::FreeTimeTrajectory
+ (const self_t& traj)
throw ()
- : Trajectory<dorder> (traj.timeRange (), traj.outputSize (),
- traj.parameters ()),
+ : parent_t (traj.timeRange (), traj.outputSize (),
+ traj.parameters ()),
trajectory_ (traj.trajectory_->clone ())
{
}
- template <unsigned dorder>
- FreeTimeTrajectory<dorder>::~FreeTimeTrajectory () throw ()
+ template <typename T>
+ FreeTimeTrajectory<T>::~FreeTimeTrajectory () throw ()
{
delete trajectory_;
}
- template <unsigned dorder>
+ template <typename T>
void
- FreeTimeTrajectory<dorder>::impl_compute (result_t& res , double t)
+ FreeTimeTrajectory<T>::impl_compute (result_t& res , double t)
const throw ()
{
(*trajectory_) (res, this->scaleTime (t));
}
- template <unsigned dorder>
+ template <typename T>
void
- FreeTimeTrajectory<dorder>::impl_derivative (gradient_t& derivative,
+ FreeTimeTrajectory<T>::impl_derivative (gradient_t& derivative,
double t,
size_type order) const throw ()
{
@@ -93,9 +93,9 @@ namespace roboptim
derivative *= std::pow (this->timeScale (), 0. + order);
}
- template <unsigned dorder>
+ template <typename T>
void
- FreeTimeTrajectory<dorder>::impl_derivative (gradient_t& derivative,
+ FreeTimeTrajectory<T>::impl_derivative (gradient_t& derivative,
StableTimePoint stp,
size_type order) const throw ()
{
@@ -104,9 +104,9 @@ namespace roboptim
derivative *= std::pow (this->timeScale (), 0. + order);
}
- template <unsigned dorder>
- typename FreeTimeTrajectory<dorder>::jacobian_t
- FreeTimeTrajectory<dorder>::variationConfigWrtParam (double t) const throw ()
+ template <typename T>
+ typename FreeTimeTrajectory<T>::jacobian_t
+ FreeTimeTrajectory<T>::variationConfigWrtParam (double t) const throw ()
{
using namespace boost::numeric::ublas;
value_type scaled = this->scaleTime (t);
@@ -127,9 +127,9 @@ namespace roboptim
return result;
}
- template <unsigned dorder>
- typename FreeTimeTrajectory<dorder>::jacobian_t
- FreeTimeTrajectory<dorder>::variationDerivWrtParam (double t, size_type order)
+ template <typename T>
+ typename FreeTimeTrajectory<T>::jacobian_t
+ FreeTimeTrajectory<T>::variationDerivWrtParam (double t, size_type order)
const throw ()
{
if (order == 0)
@@ -158,9 +158,9 @@ namespace roboptim
return result;
}
- template <unsigned dorder>
- typename FreeTimeTrajectory<dorder>::jacobian_t
- FreeTimeTrajectory<dorder>::variationConfigWrtParam
+ template <typename T>
+ typename FreeTimeTrajectory<T>::jacobian_t
+ FreeTimeTrajectory<T>::variationConfigWrtParam
(StableTimePoint stp) const throw ()
{
using namespace boost::numeric::ublas;
@@ -180,9 +180,9 @@ namespace roboptim
}
- template <unsigned dorder>
- typename FreeTimeTrajectory<dorder>::jacobian_t
- FreeTimeTrajectory<dorder>::variationDerivWrtParam
+ template <typename T>
+ typename FreeTimeTrajectory<T>::jacobian_t
+ FreeTimeTrajectory<T>::variationDerivWrtParam
(StableTimePoint stp, size_type order) const throw ()
{
if (order == 0)
@@ -205,35 +205,35 @@ namespace roboptim
return result;
}
- template <unsigned dorder>
- typename FreeTimeTrajectory<dorder>::value_type
- FreeTimeTrajectory<dorder>::singularPointAtRank (size_type rank) const
+ template <typename T>
+ typename FreeTimeTrajectory<T>::value_type
+ FreeTimeTrajectory<T>::singularPointAtRank (size_type rank) const
{
double tMin = this->getLowerBound (this->timeRange ());
return tMin + (trajectory_->singularPointAtRank (rank) - tMin)
* this->timeScale ();
}
- template <unsigned dorder>
- typename FreeTimeTrajectory<dorder>::vector_t
- FreeTimeTrajectory<dorder>::derivBeforeSingularPoint (size_type rank,
+ template <typename T>
+ typename FreeTimeTrajectory<T>::vector_t
+ FreeTimeTrajectory<T>::derivBeforeSingularPoint (size_type rank,
size_type order)
const
{
return trajectory_->derivBeforeSingularPoint (rank, order);
}
- template <unsigned dorder>
- typename FreeTimeTrajectory<dorder>::vector_t
- FreeTimeTrajectory<dorder>::derivAfterSingularPoint (size_type rank, size_type order)
+ template <typename T>
+ typename FreeTimeTrajectory<T>::vector_t
+ FreeTimeTrajectory<T>::derivAfterSingularPoint (size_type rank, size_type order)
const
{
return trajectory_->derivAfterSingularPoint (rank, order);
}
- template <unsigned dorder>
+ template <typename T>
void
- FreeTimeTrajectory<dorder>::setParameters (const vector_t& p) throw ()
+ FreeTimeTrajectory<T>::setParameters (const vector_t& p) throw ()
{
//FIXME: is this ok?
vector_t p_ = p;
@@ -246,16 +246,16 @@ namespace roboptim
this->trajectory_->setParameters (removeScaleFromParameters (p_));
}
- template <unsigned dorder>
- typename FreeTimeTrajectory<dorder>::value_type
- FreeTimeTrajectory<dorder>::timeScale () const throw ()
+ template <typename T>
+ typename FreeTimeTrajectory<T>::value_type
+ FreeTimeTrajectory<T>::timeScale () const throw ()
{
return this->parameters_[0];
}
- template <unsigned dorder>
+ template <typename T>
double
- FreeTimeTrajectory<dorder>::scaleTime (double unscaled) const throw ()
+ FreeTimeTrajectory<T>::scaleTime (double unscaled) const throw ()
{
value_type tMin = getLowerBound (this->timeRange ());
value_type tmin = getLowerBound (this->trajectory_->timeRange ());
@@ -273,9 +273,9 @@ namespace roboptim
return res;
}
- template <unsigned dorder>
+ template <typename T>
double
- FreeTimeTrajectory<dorder>::unscaleTime (double scaled) const throw ()
+ FreeTimeTrajectory<T>::unscaleTime (double scaled) const throw ()
{
value_type tMin = getLowerBound (this->timeRange ());
value_type tMax = getUpperBound (this->timeRange ());
@@ -293,17 +293,17 @@ namespace roboptim
return res;
}
- template <unsigned dorder>
+ template <typename T>
std::ostream&
- FreeTimeTrajectory<dorder>::print (std::ostream& o) const throw ()
+ FreeTimeTrajectory<T>::print (std::ostream& o) const throw ()
{
o << "Free time trajectory." << std::endl;
return o;
}
- template <unsigned dorder>
+ template <typename T>
void
- FreeTimeTrajectory<dorder>::normalizeAngles (size_type index) throw ()
+ FreeTimeTrajectory<T>::normalizeAngles (size_type index) throw ()
{
this->normalizeAngles (index, 1.);
}
diff --git a/include/roboptim/trajectory/fwd.hh b/include/roboptim/trajectory/fwd.hh
index f51ae03..16d0280 100644
--- a/include/roboptim/trajectory/fwd.hh
+++ b/include/roboptim/trajectory/fwd.hh
@@ -21,10 +21,13 @@
namespace roboptim
{
+ template <typename T>
+ class FreeTimeTrajectory;
+
template <unsigned dorder>
class Trajectory;
- template <unsigned dorder>
+ template <typename T>
class StateFunction;
template <typename T>
diff --git a/include/roboptim/trajectory/stable-point-state-function.hh b/include/roboptim/trajectory/stable-point-state-function.hh
index 760627f..b79ea7f 100644
--- a/include/roboptim/trajectory/stable-point-state-function.hh
+++ b/include/roboptim/trajectory/stable-point-state-function.hh
@@ -20,6 +20,8 @@
# include <roboptim/trajectory/sys.hh>
# include <boost/shared_ptr.hpp>
+# include <boost/static_assert.hpp>
+# include <boost/type_traits/is_base_of.hpp>
# include <roboptim/trajectory/fwd.hh>
# include <roboptim/core/derivable-function.hh>
@@ -53,9 +55,12 @@ namespace roboptim
template <typename T>
class StablePointStateFunction : public DerivableFunction
{
+ /// Check that T is a trajectory type.
+ BOOST_STATIC_ASSERT((boost::is_base_of
+ <Trajectory<T::derivabilityOrder>, T>::value));
public:
/// \brief Trajectory type.
- typedef FreeTimeTrajectory<T::derivabilityOrder> trajectory_t;
+ typedef T trajectory_t;
/// \brief Constructor.
///
diff --git a/include/roboptim/trajectory/state-function.hh b/include/roboptim/trajectory/state-function.hh
index 72211e1..bd1c436 100644
--- a/include/roboptim/trajectory/state-function.hh
+++ b/include/roboptim/trajectory/state-function.hh
@@ -20,6 +20,8 @@
# include <roboptim/trajectory/sys.hh>
# include <boost/shared_ptr.hpp>
+# include <boost/static_assert.hpp>
+# include <boost/type_traits/is_base_of.hpp>
# include <roboptim/trajectory/fwd.hh>
# include <roboptim/core/derivable-function.hh>
@@ -49,12 +51,15 @@ namespace roboptim
///
/// \tparam T trajectory type
- template <unsigned DerivabilityOrder>
+ template <typename T>
class StateFunction : public DerivableFunction
{
+ /// Check that T is a trajectory type.
+ BOOST_STATIC_ASSERT((boost::is_base_of
+ <Trajectory<T::derivabilityOrder>, T>::value));
public:
/// \brief Trajectory type.
- typedef Trajectory<DerivabilityOrder> trajectory_t;
+ typedef T trajectory_t;
/// \brief Constructor.
///
diff --git a/include/roboptim/trajectory/state-function.hxx b/include/roboptim/trajectory/state-function.hxx
index 732e45c..e6f2a0c 100644
--- a/include/roboptim/trajectory/state-function.hxx
+++ b/include/roboptim/trajectory/state-function.hxx
@@ -21,8 +21,8 @@
namespace roboptim
{
- template <unsigned N>
- StateFunction<N>::StateFunction (const trajectory_t& trajectory,
+ template <typename T>
+ StateFunction<T>::StateFunction (const trajectory_t& trajectory,
boost::shared_ptr<DerivableFunction> function,
const StableTimePoint tpt,
size_type order) throw ()
@@ -38,21 +38,21 @@ namespace roboptim
assert (function_->inputSize () == trajectory_.outputSize () * (order + 1));
}
- template <unsigned N>
- StateFunction<N>::~StateFunction() throw ()
+ template <typename T>
+ StateFunction<T>::~StateFunction() throw ()
{
}
- template <unsigned N>
- typename StateFunction<N>::size_type
- StateFunction<N>::order () const throw ()
+ template <typename T>
+ typename StateFunction<T>::size_type
+ StateFunction<T>::order () const throw ()
{
return order_;
}
- template <unsigned N>
+ template <typename T>
void
- StateFunction<N>::impl_compute (result_t& res,
+ StateFunction<T>::impl_compute (result_t& res,
const argument_t& p) const throw ()
{
static boost::shared_ptr<trajectory_t> updatedTrajectory =
@@ -61,9 +61,9 @@ namespace roboptim
(*function_) (res, updatedTrajectory->state (tpt_, this->order_));
}
- template <unsigned N>
+ template <typename T>
void
- StateFunction<N>::impl_gradient (gradient_t& grad,
+ StateFunction<T>::impl_gradient (gradient_t& grad,
const argument_t& p,
size_type i) const throw ()
{
diff --git a/tests/anthropomorphic-cost-function.cc b/tests/anthropomorphic-cost-function.cc
index 9cfcc5d..4974dd9 100644
--- a/tests/anthropomorphic-cost-function.cc
+++ b/tests/anthropomorphic-cost-function.cc
@@ -51,7 +51,7 @@ using namespace roboptim::visualization::gnuplot;
typedef CFSQPSolver::problem_t::constraints_t constraint_t;
typedef CFSQPSolver solver_t;
-typedef FreeTimeTrajectory<Spline::derivabilityOrder> freeTime_t;
+typedef FreeTimeTrajectory<Spline> freeTime_t;
// Problem parameters.
const unsigned configurationSpaceSize = 3;
@@ -133,12 +133,12 @@ int optimize (double initialX,
(freeTimeTraj, frontalSpeed, 1, problem, vRangeFrontal,
nControlPoints * nConstraintsPerCtrlPts);
- // Orthogonal
- boost::shared_ptr<DerivableFunction> orthogonalSpeed (new OrthogonalSpeed ());
- Function::interval_t vRangeOrthogonal = Function::makeInterval (-vMax, vMax);
- StablePointStateFunction<freeTime_t>::addToProblem
- (freeTimeTraj, orthogonalSpeed, 1, problem, vRangeOrthogonal,
- nControlPoints * nConstraintsPerCtrlPts);
+ // // Orthogonal
+ // boost::shared_ptr<DerivableFunction> orthogonalSpeed (new OrthogonalSpeed ());
+ // Function::interval_t vRangeOrthogonal = Function::makeInterval (-vMax, vMax);
+ // StablePointStateFunction<freeTime_t>::addToProblem
+ // (freeTimeTraj, orthogonalSpeed, 1, problem, vRangeOrthogonal,
+ // nControlPoints * nConstraintsPerCtrlPts);
// Omega (theta dot)
Function::interval_t vRangeOmega = Function::makeInterval (-.5, .5);
@@ -164,8 +164,7 @@ int optimize (double initialX,
solver_t::result_t res = solver.minimum ();
std::cerr << res << std::endl;
- FreeTimeTrajectory<Spline::derivabilityOrder> optimizedTrajectory =
- freeTimeTraj;
+ FreeTimeTrajectory<Spline> optimizedTrajectory = freeTimeTraj;
switch (solver.minimumType ())
{
diff --git a/tests/free-time-trajectory-stable-time-point.cc b/tests/free-time-trajectory-stable-time-point.cc
index 8166be5..040d7ad 100644
--- a/tests/free-time-trajectory-stable-time-point.cc
+++ b/tests/free-time-trajectory-stable-time-point.cc
@@ -39,7 +39,7 @@ using namespace roboptim;
using namespace roboptim::visualization;
-typedef FreeTimeTrajectory<Spline::derivabilityOrder> freeTime_t;
+typedef FreeTimeTrajectory<Spline> freeTime_t;
template <typename T>
bool isAlmostEqual (const T& x, const T& y, const T& epsilon = 1e10-8)
@@ -287,7 +287,7 @@ int run_test ()
// Make trajectories.
Spline::interval_t timeRange = Spline::makeInterval (0., 4.);
Spline spline (timeRange, 1, removeScaleFromParameters (params), "before");
- FreeTimeTrajectory<Spline::derivabilityOrder> freeTimeTraj (spline, 1.);
+ FreeTimeTrajectory<Spline> freeTimeTraj (spline, 1.);
assert (freeTimeTraj.inputSize () == 1);
assert (freeTimeTraj.outputSize () == 1);
diff --git a/tests/free-time-trajectory.cc b/tests/free-time-trajectory.cc
index bfb555d..d634baa 100644
--- a/tests/free-time-trajectory.cc
+++ b/tests/free-time-trajectory.cc
@@ -39,7 +39,7 @@ using namespace roboptim;
using namespace roboptim::visualization;
-typedef FreeTimeTrajectory<Spline::derivabilityOrder> freeTime_t;
+typedef FreeTimeTrajectory<Spline> freeTime_t;
template <typename T>
bool isAlmostEqual (const T& x, const T& y, const T& epsilon = 1e10-8)
@@ -292,7 +292,7 @@ int run_test ()
// Make trajectories.
Spline::interval_t timeRange = Spline::makeInterval (0., 4.);
Spline spline (timeRange, 1, removeScaleFromParameters (params), "before");
- FreeTimeTrajectory<Spline::derivabilityOrder> freeTimeTraj (spline, 1.);
+ FreeTimeTrajectory<Spline> freeTimeTraj (spline, 1.);
assert (freeTimeTraj.inputSize () == 1);
assert (freeTimeTraj.outputSize () == 1);
diff --git a/tests/spline-time-optimization.cc b/tests/spline-time-optimization.cc
index 2e86d25..6fb0e4c 100644
--- a/tests/spline-time-optimization.cc
+++ b/tests/spline-time-optimization.cc
@@ -52,7 +52,7 @@ using namespace roboptim::visualization::gnuplot;
typedef CFSQPSolver::problem_t::constraints_t constraint_t;
typedef CFSQPSolver solver_t;
-typedef FreeTimeTrajectory<Spline::derivabilityOrder> freeTime_t;
+typedef FreeTimeTrajectory<Spline> freeTime_t;
// Problem parameters.
@@ -99,7 +99,7 @@ int run_test ()
makeFreeze (problem) (indices, freeTimeParams);
Function::interval_t vRange = Function::makeUpperInterval (.5 * vMax * vMax);
- LimitSpeed<FreeTimeTrajectory<Spline::derivabilityOrder> >::addToProblem
+ LimitSpeed<FreeTimeTrajectory<Spline> >::addToProblem
(freeTimeTraj, problem, vRange, nControlPoints * nConstraintsPerCtrlPts);
std::ofstream limitSpeedStream ("limit-speed.gp");
@@ -120,7 +120,7 @@ int run_test ()
solver_t::result_t res = solver.minimum ();
std::cerr << res << std::endl;
- FreeTimeTrajectory<Spline::derivabilityOrder> optimizedTrajectory =
+ FreeTimeTrajectory<Spline> optimizedTrajectory =
freeTimeTraj;
switch (solver.minimumType ())
diff --git a/tests/stable-point-state-function.cc b/tests/stable-point-state-function.cc
index d30a219..2770354 100644
--- a/tests/stable-point-state-function.cc
+++ b/tests/stable-point-state-function.cc
@@ -49,7 +49,7 @@ int run_test ()
Spline::interval_t timeRange = Spline::makeInterval (0., 4.);
Spline spline (timeRange, 3, params, "before");
- typedef FreeTimeTrajectory<Spline::derivabilityOrder> freeTimeTraj_t;
+ typedef FreeTimeTrajectory<Spline> freeTimeTraj_t;
freeTimeTraj_t ftt (spline, 2.);
for (unsigned i = 0; i < 10; ++i)
@@ -58,12 +58,12 @@ int run_test ()
const double t = timePoint.getTime (ftt.timeRange ());
boost::shared_ptr<DerivableFunction> frontalSpeed (new FrontalSpeed ());
- StablePointStateFunction<Spline> stateFunction
+ StablePointStateFunction<FreeTimeTrajectory<Spline> > stateFunction
(ftt, frontalSpeed, timePoint, orderMax);
boost::shared_ptr<DerivableFunction> orthogonalSpeed
(new OrthogonalSpeed ());
- StablePointStateFunction<Spline> orthoStateFunction
+ StablePointStateFunction<FreeTimeTrajectory<Spline> > orthoStateFunction
(ftt, orthogonalSpeed, timePoint, orderMax);
std::cout << "State cost evaluation:" << std::endl
diff --git a/tests/state-function.cc b/tests/state-function.cc
index 8a6b61f..4d6a299 100644
--- a/tests/state-function.cc
+++ b/tests/state-function.cc
@@ -52,12 +52,12 @@ int run_test ()
const double t = timePoint.getTime (spline.timeRange ());
boost::shared_ptr<DerivableFunction> frontalSpeed (new FrontalSpeed ());
- StateFunction<Spline::derivabilityOrder> stateFunction
+ StateFunction<Spline> stateFunction
(spline, frontalSpeed, timePoint, orderMax);
boost::shared_ptr<DerivableFunction> orthogonalSpeed
(new OrthogonalSpeed ());
- StateFunction<Spline::derivabilityOrder> orthoStateFunction
+ StateFunction<Spline> orthoStateFunction
(spline, orthogonalSpeed, timePoint, orderMax);
std::cout << "State cost evaluation:" << std::endl
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 17 +++
.../roboptim/trajectory/free-time-trajectory.hh | 36 +++++---
.../roboptim/trajectory/free-time-trajectory.hxx | 104 ++++++++++----------
include/roboptim/trajectory/fwd.hh | 5 +-
.../trajectory/stable-point-state-function.hh | 7 +-
include/roboptim/trajectory/state-function.hh | 9 ++-
include/roboptim/trajectory/state-function.hxx | 22 ++--
tests/anthropomorphic-cost-function.cc | 17 ++--
tests/free-time-trajectory-stable-time-point.cc | 4 +-
tests/free-time-trajectory.cc | 4 +-
tests/spline-time-optimization.cc | 6 +-
tests/stable-point-state-function.cc | 6 +-
tests/state-function.cc | 4 +-
13 files changed, 141 insertions(+), 100 deletions(-)
hooks/post-receive
--
roboptim-trajectory
|
1 message has been excluded from this view by a project administrator.
