roboptim-commit Mailing List for RobOptim (Page 89)
Status: Beta
Brought to you by:
flamiraux
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: Thomas M. <tho...@us...> - 2009-11-02 16:37:58
|
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 298b7dfcb3f689e835930d1baa8302c6b4ed4124 (commit) from b1c03655a33c6a2cd6b25d0bd66f5341f2261b23 (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 298b7dfcb3f689e835930d1baa8302c6b4ed4124 Author: Thomas Moulard <tho...@gm...> Date: Mon Nov 2 17:37:36 2009 +0100 Add ``this->'' in template code to help the compiler. * include/roboptim/core/problem.hxx, * include/roboptim/core/solver.hxx: Here. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index 2ad16af..6b6848d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-11-02 Thomas Moulard <tho...@gm...> + Add ``this->'' in template code to help the compiler. + * include/roboptim/core/problem.hxx, + * include/roboptim/core/solver.hxx: Here. + +2009-11-02 Thomas Moulard <tho...@gm...> + Synchronize. * build-aux: Here. diff --git a/include/roboptim/core/problem.hxx b/include/roboptim/core/problem.hxx index 24594d6..3f8cbaa 100644 --- a/include/roboptim/core/problem.hxx +++ b/include/roboptim/core/problem.hxx @@ -258,18 +258,18 @@ namespace roboptim o << "Problem:" << incendl; // Function. - o << function () << iendl; + o << this->function () << iendl; // Arguments' bounds. - o << "Argument's bounds: " << argumentBounds () << iendl; + o << "Argument's bounds: " << this->argumentBounds () << iendl; // Arguments' scales. - o << "Argument's scales: " << argumentScales () << iendl; + o << "Argument's scales: " << this->argumentScales () << iendl; // Constraints. - if (constraints ().empty ()) + if (this->constraints ().empty ()) o << "No constraints."; else - o << "Number of constraints: " << constraints ().size (); + o << "Number of constraints: " << this->constraints ().size (); for (unsigned i = 0; i < this->constraints ().size (); ++i) { @@ -281,7 +281,8 @@ namespace roboptim if (startingPoint_) { o << iendl << "Starting point: " << *startingPoint_ - << iendl << "Starting value: " << function () (*startingPoint_); + << iendl << "Starting value: " + << this->function () (*startingPoint_); } else o << iendl << "No starting point."; diff --git a/include/roboptim/core/solver.hxx b/include/roboptim/core/solver.hxx index 03f8177..15901b8 100644 --- a/include/roboptim/core/solver.hxx +++ b/include/roboptim/core/solver.hxx @@ -51,7 +51,7 @@ namespace roboptim std::ostream& Solver<F, C>::print (std::ostream& o) const throw () { - return o << problem_; + return o << this->problem_; } } // end of namespace roboptim #endif //! ROBOPTIM_CORE_SOLVER_HH ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 ++++++ include/roboptim/core/problem.hxx | 13 +++++++------ include/roboptim/core/solver.hxx | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) hooks/post-receive -- roboptim-core |
From: Thomas M. <tho...@us...> - 2009-11-02 14:23:07
|
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 b1c03655a33c6a2cd6b25d0bd66f5341f2261b23 (commit) from c53a6d27a4e2549387342a3ea79459bc462e6efd (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 b1c03655a33c6a2cd6b25d0bd66f5341f2261b23 Author: Thomas Moulard <tho...@gm...> Date: Mon Nov 2 15:22:49 2009 +0100 Synchronize. * build-aux: Here. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index a229373..2ad16af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-11-02 Thomas Moulard <tho...@gm...> + Synchronize. + * build-aux: Here. + +2009-11-02 Thomas Moulard <tho...@gm...> + Factorize rules using build-aux. * Makefile.am: Use factorized rules.. * build-aux: Synchronize. diff --git a/build-aux b/build-aux index 36a2378..44b7eea 160000 --- a/build-aux +++ b/build-aux @@ -1 +1 @@ -Subproject commit 36a23786365693b7dadae49fed22e4350b5e694d +Subproject commit 44b7eea6e4c7883cd9f824ca706b737dabf03f96 ----------------------------------------------------------------------- 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-02 14:22: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 44b7eea6e4c7883cd9f824ca706b737dabf03f96 (commit) via 3a119a596a4f910650264948eed008d5b0915306 (commit) from 36a23786365693b7dadae49fed22e4350b5e694d (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 44b7eea6e4c7883cd9f824ca706b737dabf03f96 Author: Thomas Moulard <tho...@gm...> Date: Mon Nov 2 15:22:15 2009 +0100 Fix Doxygen generation rule. * doxygen.mk: Doxygen extra distributed files should be copied in doxygen-html, not Doxygen dependencies! Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index cf95c64..ee470be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-11-02 Thomas Moulard <tho...@gm...> + Fix Doxygen generation rule. + * doxygen.mk: Doxygen extra distributed files should + be copied in doxygen-html, not Doxygen dependencies! + +2009-11-02 Thomas Moulard <tho...@gm...> + Reduce Doxygen documentation dependencies. * doxygen/doxygen-deps.sh: Sort and remove duplicated dependencies. diff --git a/doxygen.mk b/doxygen.mk index 0dcc32e..32d8002 100644 --- a/doxygen.mk +++ b/doxygen.mk @@ -99,13 +99,13 @@ DOXYGEN_EXTRA = doc: html html-local: doxygen-html -@PACKAGE_TARNAME@.doxytag: Doxyfile $(DOXYGEN_DEPS) +@PACKAGE_TARNAME@.doxytag: Doxyfile $(DOXYGEN_DEPS) $(DOXYGEN_EXTRA) @if test -d doxygen-html ; then \ rm -rf doxygen-html/; \ fi @$(DOXYGEN) "$<" - @if ! test "x$(DOXYGEN_DEPS)" = x; then \ - cp -pr $(DOXYGEN_DEPS) doxygen-html; \ + @if ! test "x$(DOXYGEN_EXTRA)" = x; then \ + cp -prf $(DOXYGEN_EXTRA) doxygen-html; \ fi doxygen-html: @PACKAGE_TARNAME@.doxytag @@ -130,7 +130,7 @@ install-doxygen-html: html-local install-doxygen-html-local @if ! test -d "$(DESTDIR)$(htmldir)"; then \ $(mkinstalldirs) "$(DESTDIR)$(htmldir)"; \ fi - @cp -pr doxygen-html/ "$(DESTDIR)$(htmldir)" + @cp -prf doxygen-html/ "$(DESTDIR)$(htmldir)" @$(INSTALL_DATA) $(PACKAGE_TARNAME).doxytag \ "$(DESTDIR)$(doxygendocdir)" commit 3a119a596a4f910650264948eed008d5b0915306 Author: Thomas Moulard <tho...@gm...> Date: Mon Nov 2 15:21:38 2009 +0100 Reduce Doxygen documentation dependencies. * doxygen/doxygen-deps.sh: Sort and remove duplicated dependencies. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index a3cd49f..cf95c64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-11-02 Thomas Moulard <tho...@gm...> + Reduce Doxygen documentation dependencies. + * doxygen/doxygen-deps.sh: Sort and remove duplicated + dependencies. + +2009-11-02 Thomas Moulard <tho...@gm...> + Add rules for Libtool and recursive documentation generation. * doc-recursive.mk: New. * libtool.mk: New. diff --git a/doxygen/doxygen-deps.sh b/doxygen/doxygen-deps.sh index ebfbcb9..fbb529c 100755 --- a/doxygen/doxygen-deps.sh +++ b/doxygen/doxygen-deps.sh @@ -102,4 +102,4 @@ for input in $INPUT; do done # Display result. -echo "$DEPENDENCIES" +echo "$DEPENDENCIES" | sort | uniq ----------------------------------------------------------------------- Summary of changes: ChangeLog | 12 ++++++++++++ doxygen.mk | 8 ++++---- doxygen/doxygen-deps.sh | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) hooks/post-receive -- build-aux |
From: Thomas M. <tho...@us...> - 2009-11-02 12:55:44
|
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 c53a6d27a4e2549387342a3ea79459bc462e6efd (commit) from cfb85a49835935e309155c2bb50bf5830a6e12b2 (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 c53a6d27a4e2549387342a3ea79459bc462e6efd Author: Thomas Moulard <tho...@gm...> Date: Mon Nov 2 13:55:30 2009 +0100 Factorize rules using build-aux. * Makefile.am: Use factorized rules.. * build-aux: Synchronize. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index 56491a3..a229373 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-11-02 Thomas Moulard <tho...@gm...> + Factorize rules using build-aux. + * Makefile.am: Use factorized rules.. + * build-aux: Synchronize. + +2009-11-02 Thomas Moulard <tho...@gm...> + Move common.hh to shared-tests submodule. * .gitmodules: Register submodule. * tests/Makefile.am: Fix common.hh path and add diff --git a/Makefile.am b/Makefile.am index 792c9ba..f56dcc9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,17 +24,8 @@ EXTRA_DIST += msvc # Nothing to do in this directory. all: -# Libtool rules -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck - +# Include various rules... +include $(top_srcdir)/build-aux/doc-recursive.mk +include $(top_srcdir)/build-aux/libtool.mk include $(top_srcdir)/build-aux/pkg-config.mk - -# Generate documentation. -.PHONY: doc html -doc html: - cd doc && $(MAKE) $(AM_MAKEFLAGS) $@ - - include $(top_srcdir)/build-aux/git-version-gen.mk diff --git a/build-aux b/build-aux index e1ee6c2..36a2378 160000 --- a/build-aux +++ b/build-aux @@ -1 +1 @@ -Subproject commit e1ee6c20718744984b2ed4dc91deb0b8f6bd01fd +Subproject commit 36a23786365693b7dadae49fed22e4350b5e694d ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 ++++++ Makefile.am | 15 +++------------ build-aux | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) hooks/post-receive -- roboptim-core |
From: Thomas M. <tho...@us...> - 2009-11-02 12:53:47
|
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 36a23786365693b7dadae49fed22e4350b5e694d (commit) from d9d17105cd9c7405c7b2a438e7b0a185d3d2a8b6 (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 36a23786365693b7dadae49fed22e4350b5e694d Author: Thomas Moulard <tho...@gm...> Date: Mon Nov 2 13:53:36 2009 +0100 Add rules for Libtool and recursive documentation generation. * doc-recursive.mk: New. * libtool.mk: New. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index bfaa8fc..a3cd49f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-11-02 Thomas Moulard <tho...@gm...> + + Add rules for Libtool and recursive documentation generation. + * doc-recursive.mk: New. + * libtool.mk: New. + 2009-10-19 Thomas Moulard <tho...@gm...> Remove useless code. diff --git a/doc-recursive.mk b/doc-recursive.mk new file mode 100644 index 0000000..b3f6152 --- /dev/null +++ b/doc-recursive.mk @@ -0,0 +1,6 @@ +# Make documentation in ``doc'' directory. +# Simulate a recursive rule for doc and html targets. +# This file should be included in your top-level Makefile.am. +.PHONY: doc html +doc html: + cd doc && $(MAKE) $(AM_MAKEFLAGS) $@ diff --git a/libtool.mk b/libtool.mk new file mode 100644 index 0000000..22e9df8 --- /dev/null +++ b/libtool.mk @@ -0,0 +1,5 @@ +# Regenerate libtool if required, should be included by the +# top-level Makefile.am file. +LIBTOOL_DEPS = @LIBTOOL_DEPS@ +libtool: $(LIBTOOL_DEPS) + $(SHELL) ./config.status --recheck \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 ++++++ doc-recursive.mk | 6 ++++++ libtool.mk | 5 +++++ 3 files changed, 17 insertions(+), 0 deletions(-) create mode 100644 doc-recursive.mk create mode 100644 libtool.mk hooks/post-receive -- build-aux |
From: Thomas M. <tho...@us...> - 2009-11-02 12:28:57
|
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 cfb85a49835935e309155c2bb50bf5830a6e12b2 (commit) from 8ca520280a4f085f68554d62e1108942d2fe9746 (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 cfb85a49835935e309155c2bb50bf5830a6e12b2 Author: Thomas Moulard <tho...@gm...> Date: Mon Nov 2 13:28:40 2009 +0100 Move common.hh to shared-tests submodule. * .gitmodules: Register submodule. * tests/Makefile.am: Fix common.hh path and add shared-tests to include path. * tests/common.hh: Remove. * tests/shared-tests: New. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/.gitmodules b/.gitmodules index 1cd103e..dd8c12b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "build-aux"] path = build-aux url = roboptim:build-aux.git +[submodule "tests/shared-tests"] + path = tests/shared-tests + url = roboptim:shared-tests diff --git a/ChangeLog b/ChangeLog index d6fc461..56491a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2009-11-02 Thomas Moulard <tho...@gm...> + Move common.hh to shared-tests submodule. + * .gitmodules: Register submodule. + * tests/Makefile.am: Fix common.hh path and add + shared-tests to include path. + * tests/common.hh: Remove. + * tests/shared-tests: New. + +2009-11-02 Thomas Moulard <tho...@gm...> + Limit output precision when displaying a function. * include/roboptim/core/visualization/gnuplot-function.hh: Limit output precision to two digits. diff --git a/tests/Makefile.am b/tests/Makefile.am index f85879f..2f14961 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,6 +4,9 @@ include $(top_srcdir)/build-aux/autotest.mk # Add available warnings flags. AM_CXXFLAGS += $(WARNING_CXXFLAGS) +# Add shared-tests headers to include path. +AM_CPPFLAGS += -I$(srcdir)/shared-tests + # Package the following files. EXTRA_DIST += package.m4.in @@ -11,7 +14,7 @@ EXTRA_DIST += package.m4.in CLEANFILES += atconfig # Source which are shared by all tests. -COMMON_SOURCES = common.hh +COMMON_SOURCES = shared-tests/common.hh # simple # Link the dummy solver with this test to bypass the plug-in system. diff --git a/tests/common.hh b/tests/common.hh deleted file mode 100644 index 9dc4ea3..0000000 --- a/tests/common.hh +++ /dev/null @@ -1,93 +0,0 @@ -// 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 Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// 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 Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with roboptim. If not, see <http://www.gnu.org/licenses/>. - - -#ifndef OPTIMIZATION_TESTS_COMMON_HH -# define OPTIMIZATION_TESTS_COMMON_HH -# include <roboptim/core/sys.hh> - -# include <fstream> -# include <iostream> -# include <stdexcept> - -# include "config.h" -# include "debug.hh" - -static const int TEST_FAILED = 10; -static const int TEST_SUCCEED = 0; - -int run_test (); -void init (); - - -void init () -{ -#ifdef CWDEBUG - roboptim::debug::init(); -#endif //! CWDEBUG -} - - -# define GENERATE_TEST() \ - int \ - main (int argc, char** argv) \ - { \ - init (); \ - \ - if (argc == 2 \ - && std::string (argv[1]) == "--version") \ - { \ - std::cout << PACKAGE_STRING << std::endl; \ - return 0; \ - } \ - \ - int status = 0; \ - try \ - { \ - status = run_test (); \ - } \ - catch (std::runtime_error& e) \ - { \ - std::cerr << e.what () << std::endl; \ - return 1; \ - } \ - catch (...) \ - { \ - std::cerr << "Unexpected error" << std::endl; \ - return 2; \ - } \ - return status; \ - } - -#define CHECK_FAILURE(EXCEPTION, CMD) \ - { \ - bool failed = true; \ - try \ - { \ - CMD; \ - } \ - catch (EXCEPTION&) \ - { \ - failed = false; \ - } \ - catch (...) \ - {} \ - if (failed) \ - return TEST_FAILED; \ - } - -#endif //! OPTIMIZATION_TESTS_COMMON_HH diff --git a/tests/shared-tests b/tests/shared-tests new file mode 160000 index 0000000..2a2608e --- /dev/null +++ b/tests/shared-tests @@ -0,0 +1 @@ +Subproject commit 2a2608e6bfcbd3103f8eb005d0c674606e7e20ea ----------------------------------------------------------------------- Summary of changes: .gitmodules | 3 ++ ChangeLog | 9 +++++ tests/Makefile.am | 5 ++- tests/common.hh | 93 ---------------------------------------------------- tests/shared-tests | 1 + 5 files changed, 17 insertions(+), 94 deletions(-) delete mode 100644 tests/common.hh create mode 160000 tests/shared-tests hooks/post-receive -- roboptim-core |
From: Thomas M. <tho...@us...> - 2009-11-02 11:39:57
|
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 "shared-tests". The branch, master has been updated via 2a2608e6bfcbd3103f8eb005d0c674606e7e20ea (commit) from 5347806ed7baec473ea5dc9440dadcace3b2442e (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 2a2608e6bfcbd3103f8eb005d0c674606e7e20ea Author: Thomas Moulard <tho...@gm...> Date: Mon Nov 2 12:39:46 2009 +0100 Add Windows specific interactive mode for test cases. * common.hh: Add a pause at program end if ROBOPTIM_INTERACTIVE_TESTSUITE CPP symbol is defined. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index 3109b63..5adc144 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2009-11-02 Thomas Moulard <tho...@gm...> + Add Windows specific interactive mode for test cases. + * common.hh: Add a pause at program end + if ROBOPTIM_INTERACTIVE_TESTSUITE CPP symbol + is defined. + +2009-11-02 Thomas Moulard <tho...@gm...> + Add common.hh. * common.hh: New. diff --git a/common.hh b/common.hh index 9dc4ea3..4d7b068 100644 --- a/common.hh +++ b/common.hh @@ -32,13 +32,24 @@ static const int TEST_SUCCEED = 0; int run_test (); void init (); +void pauseAtExit (); +void pauseAtExit () +{ +#if defined _WIN32 && ROBOPTIM_INTERACTIVE_TESTSUITE +system("PAUSE"); +#endif //! _WIN32 && ROBOPTIM_INTERACTIVE_TESTSUITE +} void init () { #ifdef CWDEBUG roboptim::debug::init(); #endif //! CWDEBUG + +#if defined _WIN32 && ROBOPTIM_INTERACTIVE_TESTSUITE +atexit (pauseAtExit); +#endif //! _WIN32 && ROBOPTIM_INTERACTIVE_TESTSUITE } ----------------------------------------------------------------------- Summary of changes: ChangeLog | 7 +++++++ common.hh | 11 +++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) hooks/post-receive -- shared-tests |
From: Thomas M. <tho...@us...> - 2009-11-02 11:30:20
|
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 "shared-tests". The branch, master has been updated via 5347806ed7baec473ea5dc9440dadcace3b2442e (commit) from a566f94bbf6a9f315e35a982b6b682f91e2b01a1 (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 5347806ed7baec473ea5dc9440dadcace3b2442e Author: Thomas Moulard <tho...@gm...> Date: Mon Nov 2 12:30:07 2009 +0100 Add common.hh. * common.hh: New. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index fa378ed..3109b63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-11-02 Thomas Moulard <tho...@gm...> + + Add common.hh. + * common.hh: New. + 2009-07-01 Thomas Moulard <tho...@gm...> Create separate shared-tests branch. diff --git a/common.hh b/common.hh new file mode 100644 index 0000000..9dc4ea3 --- /dev/null +++ b/common.hh @@ -0,0 +1,93 @@ +// 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 Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// 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 Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with roboptim. If not, see <http://www.gnu.org/licenses/>. + + +#ifndef OPTIMIZATION_TESTS_COMMON_HH +# define OPTIMIZATION_TESTS_COMMON_HH +# include <roboptim/core/sys.hh> + +# include <fstream> +# include <iostream> +# include <stdexcept> + +# include "config.h" +# include "debug.hh" + +static const int TEST_FAILED = 10; +static const int TEST_SUCCEED = 0; + +int run_test (); +void init (); + + +void init () +{ +#ifdef CWDEBUG + roboptim::debug::init(); +#endif //! CWDEBUG +} + + +# define GENERATE_TEST() \ + int \ + main (int argc, char** argv) \ + { \ + init (); \ + \ + if (argc == 2 \ + && std::string (argv[1]) == "--version") \ + { \ + std::cout << PACKAGE_STRING << std::endl; \ + return 0; \ + } \ + \ + int status = 0; \ + try \ + { \ + status = run_test (); \ + } \ + catch (std::runtime_error& e) \ + { \ + std::cerr << e.what () << std::endl; \ + return 1; \ + } \ + catch (...) \ + { \ + std::cerr << "Unexpected error" << std::endl; \ + return 2; \ + } \ + return status; \ + } + +#define CHECK_FAILURE(EXCEPTION, CMD) \ + { \ + bool failed = true; \ + try \ + { \ + CMD; \ + } \ + catch (EXCEPTION&) \ + { \ + failed = false; \ + } \ + catch (...) \ + {} \ + if (failed) \ + return TEST_FAILED; \ + } + +#endif //! OPTIMIZATION_TESTS_COMMON_HH ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++ common.hh | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 0 deletions(-) create mode 100644 common.hh hooks/post-receive -- shared-tests |
From: Thomas M. <tho...@us...> - 2009-11-02 11:27:22
|
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 8ca520280a4f085f68554d62e1108942d2fe9746 (commit) from 2db80e96ebbe178e83d952eddf2fdc5dbb1a784c (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 8ca520280a4f085f68554d62e1108942d2fe9746 Author: Thomas Moulard <tho...@gm...> Date: Mon Nov 2 12:26:59 2009 +0100 Limit output precision when displaying a function. * include/roboptim/core/visualization/gnuplot-function.hh: Limit output precision to two digits. * tests/finite-difference-gradient.stdout, * tests/visualization-gnuplot-function.stdout, * tests/visualization-gnuplot-simple.stdout: Regenerate. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index a06d54c..d6fc461 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2009-11-02 Thomas Moulard <tho...@gm...> + Limit output precision when displaying a function. + * include/roboptim/core/visualization/gnuplot-function.hh: + Limit output precision to two digits. + * tests/finite-difference-gradient.stdout, + * tests/visualization-gnuplot-function.stdout, + * tests/visualization-gnuplot-simple.stdout: Regenerate. + +2009-11-02 Thomas Moulard <tho...@gm...> + Distribute Windows related files. Reported by François Keith. * Makefile.am: Here. diff --git a/include/roboptim/core/visualization/gnuplot-function.hh b/include/roboptim/core/visualization/gnuplot-function.hh index 3353ac3..2c1a2a3 100644 --- a/include/roboptim/core/visualization/gnuplot-function.hh +++ b/include/roboptim/core/visualization/gnuplot-function.hh @@ -79,7 +79,7 @@ namespace roboptim { x[0] = t; Function::vector_t res = f (x); - str += (boost::format ("%1f %2f\n") % t % res [0]).str (); + str += (boost::format ("%1.2f %2.2f\n") % t % res [0]).str (); } str += "e\n"; } @@ -106,7 +106,7 @@ namespace roboptim { x[0] = t; Function::vector_t res = f (x); - str += (boost::format ("%1f %2f\n") % res[0] % res [1]).str (); + str += (boost::format ("%1.2f %2.2f\n") % res[0] % res [1]).str (); } str += "e\n"; diff --git a/tests/finite-difference-gradient.stdout b/tests/finite-difference-gradient.stdout index abf3e7a..92a852c 100644 --- a/tests/finite-difference-gradient.stdout +++ b/tests/finite-difference-gradient.stdout @@ -1439,819 +1439,819 @@ #[2](9,9) #[2](9,9) #!/usr/bin/gnuplot -# Generated by RobOptim core library 0.2 +# Generated by RobOptim core library 0.3.15-2db8 set terminal wxt persist set multiplot layout 2,2 plot '-' title 'x * x' with line --100.000000 10000.000000 --99.000000 9801.000000 --98.000000 9604.000000 --97.000000 9409.000000 --96.000000 9216.000000 --95.000000 9025.000000 --94.000000 8836.000000 --93.000000 8649.000000 --92.000000 8464.000000 --91.000000 8281.000000 --90.000000 8100.000000 --89.000000 7921.000000 --88.000000 7744.000000 --87.000000 7569.000000 --86.000000 7396.000000 --85.000000 7225.000000 --84.000000 7056.000000 --83.000000 6889.000000 --82.000000 6724.000000 --81.000000 6561.000000 --80.000000 6400.000000 --79.000000 6241.000000 --78.000000 6084.000000 --77.000000 5929.000000 --76.000000 5776.000000 --75.000000 5625.000000 --74.000000 5476.000000 --73.000000 5329.000000 --72.000000 5184.000000 --71.000000 5041.000000 --70.000000 4900.000000 --69.000000 4761.000000 --68.000000 4624.000000 --67.000000 4489.000000 --66.000000 4356.000000 --65.000000 4225.000000 --64.000000 4096.000000 --63.000000 3969.000000 --62.000000 3844.000000 --61.000000 3721.000000 --60.000000 3600.000000 --59.000000 3481.000000 --58.000000 3364.000000 --57.000000 3249.000000 --56.000000 3136.000000 --55.000000 3025.000000 --54.000000 2916.000000 --53.000000 2809.000000 --52.000000 2704.000000 --51.000000 2601.000000 --50.000000 2500.000000 --49.000000 2401.000000 --48.000000 2304.000000 --47.000000 2209.000000 --46.000000 2116.000000 --45.000000 2025.000000 --44.000000 1936.000000 --43.000000 1849.000000 --42.000000 1764.000000 --41.000000 1681.000000 --40.000000 1600.000000 --39.000000 1521.000000 --38.000000 1444.000000 --37.000000 1369.000000 --36.000000 1296.000000 --35.000000 1225.000000 --34.000000 1156.000000 --33.000000 1089.000000 --32.000000 1024.000000 --31.000000 961.000000 --30.000000 900.000000 --29.000000 841.000000 --28.000000 784.000000 --27.000000 729.000000 --26.000000 676.000000 --25.000000 625.000000 --24.000000 576.000000 --23.000000 529.000000 --22.000000 484.000000 --21.000000 441.000000 --20.000000 400.000000 --19.000000 361.000000 --18.000000 324.000000 --17.000000 289.000000 --16.000000 256.000000 --15.000000 225.000000 --14.000000 196.000000 --13.000000 169.000000 --12.000000 144.000000 --11.000000 121.000000 --10.000000 100.000000 --9.000000 81.000000 --8.000000 64.000000 --7.000000 49.000000 --6.000000 36.000000 --5.000000 25.000000 --4.000000 16.000000 --3.000000 9.000000 --2.000000 4.000000 --1.000000 1.000000 -0.000000 0.000000 -1.000000 1.000000 -2.000000 4.000000 -3.000000 9.000000 -4.000000 16.000000 -5.000000 25.000000 -6.000000 36.000000 -7.000000 49.000000 -8.000000 64.000000 -9.000000 81.000000 -10.000000 100.000000 -11.000000 121.000000 -12.000000 144.000000 -13.000000 169.000000 -14.000000 196.000000 -15.000000 225.000000 -16.000000 256.000000 -17.000000 289.000000 -18.000000 324.000000 -19.000000 361.000000 -20.000000 400.000000 -21.000000 441.000000 -22.000000 484.000000 -23.000000 529.000000 -24.000000 576.000000 -25.000000 625.000000 -26.000000 676.000000 -27.000000 729.000000 -28.000000 784.000000 -29.000000 841.000000 -30.000000 900.000000 -31.000000 961.000000 -32.000000 1024.000000 -33.000000 1089.000000 -34.000000 1156.000000 -35.000000 1225.000000 -36.000000 1296.000000 -37.000000 1369.000000 -38.000000 1444.000000 -39.000000 1521.000000 -40.000000 1600.000000 -41.000000 1681.000000 -42.000000 1764.000000 -43.000000 1849.000000 -44.000000 1936.000000 -45.000000 2025.000000 -46.000000 2116.000000 -47.000000 2209.000000 -48.000000 2304.000000 -49.000000 2401.000000 -50.000000 2500.000000 -51.000000 2601.000000 -52.000000 2704.000000 -53.000000 2809.000000 -54.000000 2916.000000 -55.000000 3025.000000 -56.000000 3136.000000 -57.000000 3249.000000 -58.000000 3364.000000 -59.000000 3481.000000 -60.000000 3600.000000 -61.000000 3721.000000 -62.000000 3844.000000 -63.000000 3969.000000 -64.000000 4096.000000 -65.000000 4225.000000 -66.000000 4356.000000 -67.000000 4489.000000 -68.000000 4624.000000 -69.000000 4761.000000 -70.000000 4900.000000 -71.000000 5041.000000 -72.000000 5184.000000 -73.000000 5329.000000 -74.000000 5476.000000 -75.000000 5625.000000 -76.000000 5776.000000 -77.000000 5929.000000 -78.000000 6084.000000 -79.000000 6241.000000 -80.000000 6400.000000 -81.000000 6561.000000 -82.000000 6724.000000 -83.000000 6889.000000 -84.000000 7056.000000 -85.000000 7225.000000 -86.000000 7396.000000 -87.000000 7569.000000 -88.000000 7744.000000 -89.000000 7921.000000 -90.000000 8100.000000 -91.000000 8281.000000 -92.000000 8464.000000 -93.000000 8649.000000 -94.000000 8836.000000 -95.000000 9025.000000 -96.000000 9216.000000 -97.000000 9409.000000 -98.000000 9604.000000 -99.000000 9801.000000 +-100.00 10000.00 +-99.00 9801.00 +-98.00 9604.00 +-97.00 9409.00 +-96.00 9216.00 +-95.00 9025.00 +-94.00 8836.00 +-93.00 8649.00 +-92.00 8464.00 +-91.00 8281.00 +-90.00 8100.00 +-89.00 7921.00 +-88.00 7744.00 +-87.00 7569.00 +-86.00 7396.00 +-85.00 7225.00 +-84.00 7056.00 +-83.00 6889.00 +-82.00 6724.00 +-81.00 6561.00 +-80.00 6400.00 +-79.00 6241.00 +-78.00 6084.00 +-77.00 5929.00 +-76.00 5776.00 +-75.00 5625.00 +-74.00 5476.00 +-73.00 5329.00 +-72.00 5184.00 +-71.00 5041.00 +-70.00 4900.00 +-69.00 4761.00 +-68.00 4624.00 +-67.00 4489.00 +-66.00 4356.00 +-65.00 4225.00 +-64.00 4096.00 +-63.00 3969.00 +-62.00 3844.00 +-61.00 3721.00 +-60.00 3600.00 +-59.00 3481.00 +-58.00 3364.00 +-57.00 3249.00 +-56.00 3136.00 +-55.00 3025.00 +-54.00 2916.00 +-53.00 2809.00 +-52.00 2704.00 +-51.00 2601.00 +-50.00 2500.00 +-49.00 2401.00 +-48.00 2304.00 +-47.00 2209.00 +-46.00 2116.00 +-45.00 2025.00 +-44.00 1936.00 +-43.00 1849.00 +-42.00 1764.00 +-41.00 1681.00 +-40.00 1600.00 +-39.00 1521.00 +-38.00 1444.00 +-37.00 1369.00 +-36.00 1296.00 +-35.00 1225.00 +-34.00 1156.00 +-33.00 1089.00 +-32.00 1024.00 +-31.00 961.00 +-30.00 900.00 +-29.00 841.00 +-28.00 784.00 +-27.00 729.00 +-26.00 676.00 +-25.00 625.00 +-24.00 576.00 +-23.00 529.00 +-22.00 484.00 +-21.00 441.00 +-20.00 400.00 +-19.00 361.00 +-18.00 324.00 +-17.00 289.00 +-16.00 256.00 +-15.00 225.00 +-14.00 196.00 +-13.00 169.00 +-12.00 144.00 +-11.00 121.00 +-10.00 100.00 +-9.00 81.00 +-8.00 64.00 +-7.00 49.00 +-6.00 36.00 +-5.00 25.00 +-4.00 16.00 +-3.00 9.00 +-2.00 4.00 +-1.00 1.00 +0.00 0.00 +1.00 1.00 +2.00 4.00 +3.00 9.00 +4.00 16.00 +5.00 25.00 +6.00 36.00 +7.00 49.00 +8.00 64.00 +9.00 81.00 +10.00 100.00 +11.00 121.00 +12.00 144.00 +13.00 169.00 +14.00 196.00 +15.00 225.00 +16.00 256.00 +17.00 289.00 +18.00 324.00 +19.00 361.00 +20.00 400.00 +21.00 441.00 +22.00 484.00 +23.00 529.00 +24.00 576.00 +25.00 625.00 +26.00 676.00 +27.00 729.00 +28.00 784.00 +29.00 841.00 +30.00 900.00 +31.00 961.00 +32.00 1024.00 +33.00 1089.00 +34.00 1156.00 +35.00 1225.00 +36.00 1296.00 +37.00 1369.00 +38.00 1444.00 +39.00 1521.00 +40.00 1600.00 +41.00 1681.00 +42.00 1764.00 +43.00 1849.00 +44.00 1936.00 +45.00 2025.00 +46.00 2116.00 +47.00 2209.00 +48.00 2304.00 +49.00 2401.00 +50.00 2500.00 +51.00 2601.00 +52.00 2704.00 +53.00 2809.00 +54.00 2916.00 +55.00 3025.00 +56.00 3136.00 +57.00 3249.00 +58.00 3364.00 +59.00 3481.00 +60.00 3600.00 +61.00 3721.00 +62.00 3844.00 +63.00 3969.00 +64.00 4096.00 +65.00 4225.00 +66.00 4356.00 +67.00 4489.00 +68.00 4624.00 +69.00 4761.00 +70.00 4900.00 +71.00 5041.00 +72.00 5184.00 +73.00 5329.00 +74.00 5476.00 +75.00 5625.00 +76.00 5776.00 +77.00 5929.00 +78.00 6084.00 +79.00 6241.00 +80.00 6400.00 +81.00 6561.00 +82.00 6724.00 +83.00 6889.00 +84.00 7056.00 +85.00 7225.00 +86.00 7396.00 +87.00 7569.00 +88.00 7744.00 +89.00 7921.00 +90.00 8100.00 +91.00 8281.00 +92.00 8464.00 +93.00 8649.00 +94.00 8836.00 +95.00 9025.00 +96.00 9216.00 +97.00 9409.00 +98.00 9604.00 +99.00 9801.00 e plot '-' title '' with line --100.000000 10000.000000 --99.000000 9801.000000 --98.000000 9604.000000 --97.000000 9409.000000 --96.000000 9216.000000 --95.000000 9025.000000 --94.000000 8836.000000 --93.000000 8649.000000 --92.000000 8464.000000 --91.000000 8281.000000 --90.000000 8100.000000 --89.000000 7921.000000 --88.000000 7744.000000 --87.000000 7569.000000 --86.000000 7396.000000 --85.000000 7225.000000 --84.000000 7056.000000 --83.000000 6889.000000 --82.000000 6724.000000 --81.000000 6561.000000 --80.000000 6400.000000 --79.000000 6241.000000 --78.000000 6084.000000 --77.000000 5929.000000 --76.000000 5776.000000 --75.000000 5625.000000 --74.000000 5476.000000 --73.000000 5329.000000 --72.000000 5184.000000 --71.000000 5041.000000 --70.000000 4900.000000 --69.000000 4761.000000 --68.000000 4624.000000 --67.000000 4489.000000 --66.000000 4356.000000 --65.000000 4225.000000 --64.000000 4096.000000 --63.000000 3969.000000 --62.000000 3844.000000 --61.000000 3721.000000 --60.000000 3600.000000 --59.000000 3481.000000 --58.000000 3364.000000 --57.000000 3249.000000 --56.000000 3136.000000 --55.000000 3025.000000 --54.000000 2916.000000 --53.000000 2809.000000 --52.000000 2704.000000 --51.000000 2601.000000 --50.000000 2500.000000 --49.000000 2401.000000 --48.000000 2304.000000 --47.000000 2209.000000 --46.000000 2116.000000 --45.000000 2025.000000 --44.000000 1936.000000 --43.000000 1849.000000 --42.000000 1764.000000 --41.000000 1681.000000 --40.000000 1600.000000 --39.000000 1521.000000 --38.000000 1444.000000 --37.000000 1369.000000 --36.000000 1296.000000 --35.000000 1225.000000 --34.000000 1156.000000 --33.000000 1089.000000 --32.000000 1024.000000 --31.000000 961.000000 --30.000000 900.000000 --29.000000 841.000000 --28.000000 784.000000 --27.000000 729.000000 --26.000000 676.000000 --25.000000 625.000000 --24.000000 576.000000 --23.000000 529.000000 --22.000000 484.000000 --21.000000 441.000000 --20.000000 400.000000 --19.000000 361.000000 --18.000000 324.000000 --17.000000 289.000000 --16.000000 256.000000 --15.000000 225.000000 --14.000000 196.000000 --13.000000 169.000000 --12.000000 144.000000 --11.000000 121.000000 --10.000000 100.000000 --9.000000 81.000000 --8.000000 64.000000 --7.000000 49.000000 --6.000000 36.000000 --5.000000 25.000000 --4.000000 16.000000 --3.000000 9.000000 --2.000000 4.000000 --1.000000 1.000000 -0.000000 0.000000 -1.000000 1.000000 -2.000000 4.000000 -3.000000 9.000000 -4.000000 16.000000 -5.000000 25.000000 -6.000000 36.000000 -7.000000 49.000000 -8.000000 64.000000 -9.000000 81.000000 -10.000000 100.000000 -11.000000 121.000000 -12.000000 144.000000 -13.000000 169.000000 -14.000000 196.000000 -15.000000 225.000000 -16.000000 256.000000 -17.000000 289.000000 -18.000000 324.000000 -19.000000 361.000000 -20.000000 400.000000 -21.000000 441.000000 -22.000000 484.000000 -23.000000 529.000000 -24.000000 576.000000 -25.000000 625.000000 -26.000000 676.000000 -27.000000 729.000000 -28.000000 784.000000 -29.000000 841.000000 -30.000000 900.000000 -31.000000 961.000000 -32.000000 1024.000000 -33.000000 1089.000000 -34.000000 1156.000000 -35.000000 1225.000000 -36.000000 1296.000000 -37.000000 1369.000000 -38.000000 1444.000000 -39.000000 1521.000000 -40.000000 1600.000000 -41.000000 1681.000000 -42.000000 1764.000000 -43.000000 1849.000000 -44.000000 1936.000000 -45.000000 2025.000000 -46.000000 2116.000000 -47.000000 2209.000000 -48.000000 2304.000000 -49.000000 2401.000000 -50.000000 2500.000000 -51.000000 2601.000000 -52.000000 2704.000000 -53.000000 2809.000000 -54.000000 2916.000000 -55.000000 3025.000000 -56.000000 3136.000000 -57.000000 3249.000000 -58.000000 3364.000000 -59.000000 3481.000000 -60.000000 3600.000000 -61.000000 3721.000000 -62.000000 3844.000000 -63.000000 3969.000000 -64.000000 4096.000000 -65.000000 4225.000000 -66.000000 4356.000000 -67.000000 4489.000000 -68.000000 4624.000000 -69.000000 4761.000000 -70.000000 4900.000000 -71.000000 5041.000000 -72.000000 5184.000000 -73.000000 5329.000000 -74.000000 5476.000000 -75.000000 5625.000000 -76.000000 5776.000000 -77.000000 5929.000000 -78.000000 6084.000000 -79.000000 6241.000000 -80.000000 6400.000000 -81.000000 6561.000000 -82.000000 6724.000000 -83.000000 6889.000000 -84.000000 7056.000000 -85.000000 7225.000000 -86.000000 7396.000000 -87.000000 7569.000000 -88.000000 7744.000000 -89.000000 7921.000000 -90.000000 8100.000000 -91.000000 8281.000000 -92.000000 8464.000000 -93.000000 8649.000000 -94.000000 8836.000000 -95.000000 9025.000000 -96.000000 9216.000000 -97.000000 9409.000000 -98.000000 9604.000000 -99.000000 9801.000000 +-100.00 10000.00 +-99.00 9801.00 +-98.00 9604.00 +-97.00 9409.00 +-96.00 9216.00 +-95.00 9025.00 +-94.00 8836.00 +-93.00 8649.00 +-92.00 8464.00 +-91.00 8281.00 +-90.00 8100.00 +-89.00 7921.00 +-88.00 7744.00 +-87.00 7569.00 +-86.00 7396.00 +-85.00 7225.00 +-84.00 7056.00 +-83.00 6889.00 +-82.00 6724.00 +-81.00 6561.00 +-80.00 6400.00 +-79.00 6241.00 +-78.00 6084.00 +-77.00 5929.00 +-76.00 5776.00 +-75.00 5625.00 +-74.00 5476.00 +-73.00 5329.00 +-72.00 5184.00 +-71.00 5041.00 +-70.00 4900.00 +-69.00 4761.00 +-68.00 4624.00 +-67.00 4489.00 +-66.00 4356.00 +-65.00 4225.00 +-64.00 4096.00 +-63.00 3969.00 +-62.00 3844.00 +-61.00 3721.00 +-60.00 3600.00 +-59.00 3481.00 +-58.00 3364.00 +-57.00 3249.00 +-56.00 3136.00 +-55.00 3025.00 +-54.00 2916.00 +-53.00 2809.00 +-52.00 2704.00 +-51.00 2601.00 +-50.00 2500.00 +-49.00 2401.00 +-48.00 2304.00 +-47.00 2209.00 +-46.00 2116.00 +-45.00 2025.00 +-44.00 1936.00 +-43.00 1849.00 +-42.00 1764.00 +-41.00 1681.00 +-40.00 1600.00 +-39.00 1521.00 +-38.00 1444.00 +-37.00 1369.00 +-36.00 1296.00 +-35.00 1225.00 +-34.00 1156.00 +-33.00 1089.00 +-32.00 1024.00 +-31.00 961.00 +-30.00 900.00 +-29.00 841.00 +-28.00 784.00 +-27.00 729.00 +-26.00 676.00 +-25.00 625.00 +-24.00 576.00 +-23.00 529.00 +-22.00 484.00 +-21.00 441.00 +-20.00 400.00 +-19.00 361.00 +-18.00 324.00 +-17.00 289.00 +-16.00 256.00 +-15.00 225.00 +-14.00 196.00 +-13.00 169.00 +-12.00 144.00 +-11.00 121.00 +-10.00 100.00 +-9.00 81.00 +-8.00 64.00 +-7.00 49.00 +-6.00 36.00 +-5.00 25.00 +-4.00 16.00 +-3.00 9.00 +-2.00 4.00 +-1.00 1.00 +0.00 0.00 +1.00 1.00 +2.00 4.00 +3.00 9.00 +4.00 16.00 +5.00 25.00 +6.00 36.00 +7.00 49.00 +8.00 64.00 +9.00 81.00 +10.00 100.00 +11.00 121.00 +12.00 144.00 +13.00 169.00 +14.00 196.00 +15.00 225.00 +16.00 256.00 +17.00 289.00 +18.00 324.00 +19.00 361.00 +20.00 400.00 +21.00 441.00 +22.00 484.00 +23.00 529.00 +24.00 576.00 +25.00 625.00 +26.00 676.00 +27.00 729.00 +28.00 784.00 +29.00 841.00 +30.00 900.00 +31.00 961.00 +32.00 1024.00 +33.00 1089.00 +34.00 1156.00 +35.00 1225.00 +36.00 1296.00 +37.00 1369.00 +38.00 1444.00 +39.00 1521.00 +40.00 1600.00 +41.00 1681.00 +42.00 1764.00 +43.00 1849.00 +44.00 1936.00 +45.00 2025.00 +46.00 2116.00 +47.00 2209.00 +48.00 2304.00 +49.00 2401.00 +50.00 2500.00 +51.00 2601.00 +52.00 2704.00 +53.00 2809.00 +54.00 2916.00 +55.00 3025.00 +56.00 3136.00 +57.00 3249.00 +58.00 3364.00 +59.00 3481.00 +60.00 3600.00 +61.00 3721.00 +62.00 3844.00 +63.00 3969.00 +64.00 4096.00 +65.00 4225.00 +66.00 4356.00 +67.00 4489.00 +68.00 4624.00 +69.00 4761.00 +70.00 4900.00 +71.00 5041.00 +72.00 5184.00 +73.00 5329.00 +74.00 5476.00 +75.00 5625.00 +76.00 5776.00 +77.00 5929.00 +78.00 6084.00 +79.00 6241.00 +80.00 6400.00 +81.00 6561.00 +82.00 6724.00 +83.00 6889.00 +84.00 7056.00 +85.00 7225.00 +86.00 7396.00 +87.00 7569.00 +88.00 7744.00 +89.00 7921.00 +90.00 8100.00 +91.00 8281.00 +92.00 8464.00 +93.00 8649.00 +94.00 8836.00 +95.00 9025.00 +96.00 9216.00 +97.00 9409.00 +98.00 9604.00 +99.00 9801.00 e plot '-' title '' with line --100.000000 -243295.000000 --99.000000 -238486.000000 --98.000000 -233725.000000 --97.000000 -229012.000000 --96.000000 -224347.000000 --95.000000 -219730.000000 --94.000000 -215161.000000 --93.000000 -210640.000000 --92.000000 -206167.000000 --91.000000 -201742.000000 --90.000000 -197365.000000 --89.000000 -193036.000000 --88.000000 -188755.000000 --87.000000 -184522.000000 --86.000000 -180337.000000 --85.000000 -176200.000000 --84.000000 -172111.000000 --83.000000 -168070.000000 --82.000000 -164077.000000 --81.000000 -160132.000000 --80.000000 -156235.000000 --79.000000 -152386.000000 --78.000000 -148585.000000 --77.000000 -144832.000000 --76.000000 -141127.000000 --75.000000 -137470.000000 --74.000000 -133861.000000 --73.000000 -130300.000000 --72.000000 -126787.000000 --71.000000 -123322.000000 --70.000000 -119905.000000 --69.000000 -116536.000000 --68.000000 -113215.000000 --67.000000 -109942.000000 --66.000000 -106717.000000 --65.000000 -103540.000000 --64.000000 -100411.000000 --63.000000 -97330.000000 --62.000000 -94297.000000 --61.000000 -91312.000000 --60.000000 -88375.000000 --59.000000 -85486.000000 --58.000000 -82645.000000 --57.000000 -79852.000000 --56.000000 -77107.000000 --55.000000 -74410.000000 --54.000000 -71761.000000 --53.000000 -69160.000000 --52.000000 -66607.000000 --51.000000 -64102.000000 --50.000000 -61645.000000 --49.000000 -59236.000000 --48.000000 -56875.000000 --47.000000 -54562.000000 --46.000000 -52297.000000 --45.000000 -50080.000000 --44.000000 -47911.000000 --43.000000 -45790.000000 --42.000000 -43717.000000 --41.000000 -41692.000000 --40.000000 -39715.000000 --39.000000 -37786.000000 --38.000000 -35905.000000 --37.000000 -34072.000000 --36.000000 -32287.000000 --35.000000 -30550.000000 --34.000000 -28861.000000 --33.000000 -27220.000000 --32.000000 -25627.000000 --31.000000 -24082.000000 --30.000000 -22585.000000 --29.000000 -21136.000000 --28.000000 -19735.000000 --27.000000 -18382.000000 --26.000000 -17077.000000 --25.000000 -15820.000000 --24.000000 -14611.000000 --23.000000 -13450.000000 --22.000000 -12337.000000 --21.000000 -11272.000000 --20.000000 -10255.000000 --19.000000 -9286.000000 --18.000000 -8365.000000 --17.000000 -7492.000000 --16.000000 -6667.000000 --15.000000 -5890.000000 --14.000000 -5161.000000 --13.000000 -4480.000000 --12.000000 -3847.000000 --11.000000 -3262.000000 --10.000000 -2725.000000 --9.000000 -2236.000000 --8.000000 -1795.000000 --7.000000 -1402.000000 --6.000000 -1057.000000 --5.000000 -760.000000 --4.000000 -511.000000 --3.000000 -310.000000 --2.000000 -157.000000 --1.000000 -52.000000 -0.000000 5.000000 -1.000000 14.000000 -2.000000 -25.000000 -3.000000 -112.000000 -4.000000 -247.000000 -5.000000 -430.000000 -6.000000 -661.000000 -7.000000 -940.000000 -8.000000 -1267.000000 -9.000000 -1642.000000 -10.000000 -2065.000000 -11.000000 -2536.000000 -12.000000 -3055.000000 -13.000000 -3622.000000 -14.000000 -4237.000000 -15.000000 -4900.000000 -16.000000 -5611.000000 -17.000000 -6370.000000 -18.000000 -7177.000000 -19.000000 -8032.000000 -20.000000 -8935.000000 -21.000000 -9886.000000 -22.000000 -10885.000000 -23.000000 -11932.000000 -24.000000 -13027.000000 -25.000000 -14170.000000 -26.000000 -15361.000000 -27.000000 -16600.000000 -28.000000 -17887.000000 -29.000000 -19222.000000 -30.000000 -20605.000000 -31.000000 -22036.000000 -32.000000 -23515.000000 -33.000000 -25042.000000 -34.000000 -26617.000000 -35.000000 -28240.000000 -36.000000 -29911.000000 -37.000000 -31630.000000 -38.000000 -33397.000000 -39.000000 -35212.000000 -40.000000 -37075.000000 -41.000000 -38986.000000 -42.000000 -40945.000000 -43.000000 -42952.000000 -44.000000 -45007.000000 -45.000000 -47110.000000 -46.000000 -49261.000000 -47.000000 -51460.000000 -48.000000 -53707.000000 -49.000000 -56002.000000 -50.000000 -58345.000000 -51.000000 -60736.000000 -52.000000 -63175.000000 -53.000000 -65662.000000 -54.000000 -68197.000000 -55.000000 -70780.000000 -56.000000 -73411.000000 -57.000000 -76090.000000 -58.000000 -78817.000000 -59.000000 -81592.000000 -60.000000 -84415.000000 -61.000000 -87286.000000 -62.000000 -90205.000000 -63.000000 -93172.000000 -64.000000 -96187.000000 -65.000000 -99250.000000 -66.000000 -102361.000000 -67.000000 -105520.000000 -68.000000 -108727.000000 -69.000000 -111982.000000 -70.000000 -115285.000000 -71.000000 -118636.000000 -72.000000 -122035.000000 -73.000000 -125482.000000 -74.000000 -128977.000000 -75.000000 -132520.000000 -76.000000 -136111.000000 -77.000000 -139750.000000 -78.000000 -143437.000000 -79.000000 -147172.000000 -80.000000 -150955.000000 -81.000000 -154786.000000 -82.000000 -158665.000000 -83.000000 -162592.000000 -84.000000 -166567.000000 -85.000000 -170590.000000 -86.000000 -174661.000000 -87.000000 -178780.000000 -88.000000 -182947.000000 -89.000000 -187162.000000 -90.000000 -191425.000000 -91.000000 -195736.000000 -92.000000 -200095.000000 -93.000000 -204502.000000 -94.000000 -208957.000000 -95.000000 -213460.000000 -96.000000 -218011.000000 -97.000000 -222610.000000 -98.000000 -227257.000000 -99.000000 -231952.000000 +-100.00 -243295.00 +-99.00 -238486.00 +-98.00 -233725.00 +-97.00 -229012.00 +-96.00 -224347.00 +-95.00 -219730.00 +-94.00 -215161.00 +-93.00 -210640.00 +-92.00 -206167.00 +-91.00 -201742.00 +-90.00 -197365.00 +-89.00 -193036.00 +-88.00 -188755.00 +-87.00 -184522.00 +-86.00 -180337.00 +-85.00 -176200.00 +-84.00 -172111.00 +-83.00 -168070.00 +-82.00 -164077.00 +-81.00 -160132.00 +-80.00 -156235.00 +-79.00 -152386.00 +-78.00 -148585.00 +-77.00 -144832.00 +-76.00 -141127.00 +-75.00 -137470.00 +-74.00 -133861.00 +-73.00 -130300.00 +-72.00 -126787.00 +-71.00 -123322.00 +-70.00 -119905.00 +-69.00 -116536.00 +-68.00 -113215.00 +-67.00 -109942.00 +-66.00 -106717.00 +-65.00 -103540.00 +-64.00 -100411.00 +-63.00 -97330.00 +-62.00 -94297.00 +-61.00 -91312.00 +-60.00 -88375.00 +-59.00 -85486.00 +-58.00 -82645.00 +-57.00 -79852.00 +-56.00 -77107.00 +-55.00 -74410.00 +-54.00 -71761.00 +-53.00 -69160.00 +-52.00 -66607.00 +-51.00 -64102.00 +-50.00 -61645.00 +-49.00 -59236.00 +-48.00 -56875.00 +-47.00 -54562.00 +-46.00 -52297.00 +-45.00 -50080.00 +-44.00 -47911.00 +-43.00 -45790.00 +-42.00 -43717.00 +-41.00 -41692.00 +-40.00 -39715.00 +-39.00 -37786.00 +-38.00 -35905.00 +-37.00 -34072.00 +-36.00 -32287.00 +-35.00 -30550.00 +-34.00 -28861.00 +-33.00 -27220.00 +-32.00 -25627.00 +-31.00 -24082.00 +-30.00 -22585.00 +-29.00 -21136.00 +-28.00 -19735.00 +-27.00 -18382.00 +-26.00 -17077.00 +-25.00 -15820.00 +-24.00 -14611.00 +-23.00 -13450.00 +-22.00 -12337.00 +-21.00 -11272.00 +-20.00 -10255.00 +-19.00 -9286.00 +-18.00 -8365.00 +-17.00 -7492.00 +-16.00 -6667.00 +-15.00 -5890.00 +-14.00 -5161.00 +-13.00 -4480.00 +-12.00 -3847.00 +-11.00 -3262.00 +-10.00 -2725.00 +-9.00 -2236.00 +-8.00 -1795.00 +-7.00 -1402.00 +-6.00 -1057.00 +-5.00 -760.00 +-4.00 -511.00 +-3.00 -310.00 +-2.00 -157.00 +-1.00 -52.00 +0.00 5.00 +1.00 14.00 +2.00 -25.00 +3.00 -112.00 +4.00 -247.00 +5.00 -430.00 +6.00 -661.00 +7.00 -940.00 +8.00 -1267.00 +9.00 -1642.00 +10.00 -2065.00 +11.00 -2536.00 +12.00 -3055.00 +13.00 -3622.00 +14.00 -4237.00 +15.00 -4900.00 +16.00 -5611.00 +17.00 -6370.00 +18.00 -7177.00 +19.00 -8032.00 +20.00 -8935.00 +21.00 -9886.00 +22.00 -10885.00 +23.00 -11932.00 +24.00 -13027.00 +25.00 -14170.00 +26.00 -15361.00 +27.00 -16600.00 +28.00 -17887.00 +29.00 -19222.00 +30.00 -20605.00 +31.00 -22036.00 +32.00 -23515.00 +33.00 -25042.00 +34.00 -26617.00 +35.00 -28240.00 +36.00 -29911.00 +37.00 -31630.00 +38.00 -33397.00 +39.00 -35212.00 +40.00 -37075.00 +41.00 -38986.00 +42.00 -40945.00 +43.00 -42952.00 +44.00 -45007.00 +45.00 -47110.00 +46.00 -49261.00 +47.00 -51460.00 +48.00 -53707.00 +49.00 -56002.00 +50.00 -58345.00 +51.00 -60736.00 +52.00 -63175.00 +53.00 -65662.00 +54.00 -68197.00 +55.00 -70780.00 +56.00 -73411.00 +57.00 -76090.00 +58.00 -78817.00 +59.00 -81592.00 +60.00 -84415.00 +61.00 -87286.00 +62.00 -90205.00 +63.00 -93172.00 +64.00 -96187.00 +65.00 -99250.00 +66.00 -102361.00 +67.00 -105520.00 +68.00 -108727.00 +69.00 -111982.00 +70.00 -115285.00 +71.00 -118636.00 +72.00 -122035.00 +73.00 -125482.00 +74.00 -128977.00 +75.00 -132520.00 +76.00 -136111.00 +77.00 -139750.00 +78.00 -143437.00 +79.00 -147172.00 +80.00 -150955.00 +81.00 -154786.00 +82.00 -158665.00 +83.00 -162592.00 +84.00 -166567.00 +85.00 -170590.00 +86.00 -174661.00 +87.00 -178780.00 +88.00 -182947.00 +89.00 -187162.00 +90.00 -191425.00 +91.00 -195736.00 +92.00 -200095.00 +93.00 -204502.00 +94.00 -208957.00 +95.00 -213460.00 +96.00 -218011.00 +97.00 -222610.00 +98.00 -227257.00 +99.00 -231952.00 e plot '-' title '' with line --100.000000 -243295.000000 --99.000000 -238486.000000 --98.000000 -233725.000000 --97.000000 -229012.000000 --96.000000 -224347.000000 --95.000000 -219730.000000 --94.000000 -215161.000000 --93.000000 -210640.000000 --92.000000 -206167.000000 --91.000000 -201742.000000 --90.000000 -197365.000000 --89.000000 -193036.000000 --88.000000 -188755.000000 --87.000000 -184522.000000 --86.000000 -180337.000000 --85.000000 -176200.000000 --84.000000 -172111.000000 --83.000000 -168070.000000 --82.000000 -164077.000000 --81.000000 -160132.000000 --80.000000 -156235.000000 --79.000000 -152386.000000 --78.000000 -148585.000000 --77.000000 -144832.000000 --76.000000 -141127.000000 --75.000000 -137470.000000 --74.000000 -133861.000000 --73.000000 -130300.000000 --72.000000 -126787.000000 --71.000000 -123322.000000 --70.000000 -119905.000000 --69.000000 -116536.000000 --68.000000 -113215.000000 --67.000000 -109942.000000 --66.000000 -106717.000000 --65.000000 -103540.000000 --64.000000 -100411.000000 --63.000000 -97330.000000 --62.000000 -94297.000000 --61.000000 -91312.000000 --60.000000 -88375.000000 --59.000000 -85486.000000 --58.000000 -82645.000000 --57.000000 -79852.000000 --56.000000 -77107.000000 --55.000000 -74410.000000 --54.000000 -71761.000000 --53.000000 -69160.000000 --52.000000 -66607.000000 --51.000000 -64102.000000 --50.000000 -61645.000000 --49.000000 -59236.000000 --48.000000 -56875.000000 --47.000000 -54562.000000 --46.000000 -52297.000000 --45.000000 -50080.000000 --44.000000 -47911.000000 --43.000000 -45790.000000 --42.000000 -43717.000000 --41.000000 -41692.000000 --40.000000 -39715.000000 --39.000000 -37786.000000 --38.000000 -35905.000000 --37.000000 -34072.000000 --36.000000 -32287.000000 --35.000000 -30550.000000 --34.000000 -28861.000000 --33.000000 -27220.000000 --32.000000 -25627.000000 --31.000000 -24082.000000 --30.000000 -22585.000000 --29.000000 -21136.000000 --28.000000 -19735.000000 --27.000000 -18382.000000 --26.000000 -17077.000000 --25.000000 -15820.000000 --24.000000 -14611.000000 --23.000000 -13450.000000 --22.000000 -12337.000000 --21.000000 -11272.000000 --20.000000 -10255.000000 --19.000000 -9286.000000 --18.000000 -8365.000000 --17.000000 -7492.000000 --16.000000 -6667.000000 --15.000000 -5890.000000 --14.000000 -5161.000000 --13.000000 -4480.000000 --12.000000 -3847.000000 --11.000000 -3262.000000 --10.000000 -2725.000000 --9.000000 -2236.000000 --8.000000 -1795.000000 --7.000000 -1402.000000 --6.000000 -1057.000000 --5.000000 -760.000000 --4.000000 -511.000000 --3.000000 -310.000000 --2.000000 -157.000000 --1.000000 -52.000000 -0.000000 5.000000 -1.000000 14.000000 -2.000000 -25.000000 -3.000000 -112.000000 -4.000000 -247.000000 -5.000000 -430.000000 -6.000000 -661.000000 -7.000000 -940.000000 -8.000000 -1267.000000 -9.000000 -1642.000000 -10.000000 -2065.000000 -11.000000 -2536.000000 -12.000000 -3055.000000 -13.000000 -3622.000000 -14.000000 -4237.000000 -15.000000 -4900.000000 -16.000000 -5611.000000 -17.000000 -6370.000000 -18.000000 -7177.000000 -19.000000 -8032.000000 -20.000000 -8935.000000 -21.000000 -9886.000000 -22.000000 -10885.000000 -23.000000 -11932.000000 -24.000000 -13027.000000 -25.000000 -14170.000000 -26.000000 -15361.000000 -27.000000 -16600.000000 -28.000000 -17887.000000 -29.000000 -19222.000000 -30.000000 -20605.000000 -31.000000 -22036.000000 -32.000000 -23515.000000 -33.000000 -25042.000000 -34.000000 -26617.000000 -35.000000 -28240.000000 -36.000000 -29911.000000 -37.000000 -31630.000000 -38.000000 -33397.000000 -39.000000 -35212.000000 -40.000000 -37075.000000 -41.000000 -38986.000000 -42.000000 -40945.000000 -43.000000 -42952.000000 -44.000000 -45007.000000 -45.000000 -47110.000000 -46.000000 -49261.000000 -47.000000 -51460.000000 -48.000000 -53707.000000 -49.000000 -56002.000000 -50.000000 -58345.000000 -51.000000 -60736.000000 -52.000000 -63175.000000 -53.000000 -65662.000000 -54.000000 -68197.000000 -55.000000 -70780.000000 -56.000000 -73411.000000 -57.000000 -76090.000000 -58.000000 -78817.000000 -59.000000 -81592.000000 -60.000000 -84415.000000 -61.000000 -87286.000000 -62.000000 -90205.000000 -63.000000 -93172.000000 -64.000000 -96187.000000 -65.000000 -99250.000000 -66.000000 -102361.000000 -67.000000 -105520.000000 -68.000000 -108727.000000 -69.000000 -111982.000000 -70.000000 -115285.000000 -71.000000 -118636.000000 -72.000000 -122035.000000 -73.000000 -125482.000000 -74.000000 -128977.000000 -75.000000 -132520.000000 -76.000000 -136111.000000 -77.000000 -139750.000000 -78.000000 -143437.000000 -79.000000 -147172.000000 -80.000000 -150955.000000 -81.000000 -154786.000000 -82.000000 -158665.000000 -83.000000 -162592.000000 -84.000000 -166567.000000 -85.000000 -170590.000000 -86.000000 -174661.000000 -87.000000 -178780.000000 -88.000000 -182947.000000 -89.000000 -187162.000000 -90.000000 -191425.000000 -91.000000 -195736.000000 -92.000000 -200095.000000 -93.000000 -204502.000000 -94.000000 -208957.000000 -95.000000 -213460.000000 -96.000000 -218011.000000 -97.000000 -222610.000000 -98.000000 -227257.000000 -99.000000 -231952.000000 +-100.00 -243295.00 +-99.00 -238486.00 +-98.00 -233725.00 +-97.00 -229012.00 +-96.00 -224347.00 +-95.00 -219730.00 +-94.00 -215161.00 +-93.00 -210640.00 +-92.00 -206167.00 +-91.00 -201742.00 +-90.00 -197365.00 +-89.00 -193036.00 +-88.00 -188755.00 +-87.00 -184522.00 +-86.00 -180337.00 +-85.00 -176200.00 +-84.00 -172111.00 +-83.00 -168070.00 +-82.00 -164077.00 +-81.00 -160132.00 +-80.00 -156235.00 +-79.00 -152386.00 +-78.00 -148585.00 +-77.00 -144832.00 +-76.00 -141127.00 +-75.00 -137470.00 +-74.00 -133861.00 +-73.00 -130300.00 +-72.00 -126787.00 +-71.00 -123322.00 +-70.00 -119905.00 +-69.00 -116536.00 +-68.00 -113215.00 +-67.00 -109942.00 +-66.00 -106717.00 +-65.00 -103540.00 +-64.00 -100411.00 +-63.00 -97330.00 +-62.00 -94297.00 +-61.00 -91312.00 +-60.00 -88375.00 +-59.00 -85486.00 +-58.00 -82645.00 +-57.00 -79852.00 +-56.00 -77107.00 +-55.00 -74410.00 +-54.00 -71761.00 +-53.00 -69160.00 +-52.00 -66607.00 +-51.00 -64102.00 +-50.00 -61645.00 +-49.00 -59236.00 +-48.00 -56875.00 +-47.00 -54562.00 +-46.00 -52297.00 +-45.00 -50080.00 +-44.00 -47911.00 +-43.00 -45790.00 +-42.00 -43717.00 +-41.00 -41692.00 +-40.00 -39715.00 +-39.00 -37786.00 +-38.00 -35905.00 +-37.00 -34072.00 +-36.00 -32287.00 +-35.00 -30550.00 +-34.00 -28861.00 +-33.00 -27220.00 +-32.00 -25627.00 +-31.00 -24082.00 +-30.00 -22585.00 +-29.00 -21136.00 +-28.00 -19735.00 +-27.00 -18382.00 +-26.00 -17077.00 +-25.00 -15820.00 +-24.00 -14611.00 +-23.00 -13450.00 +-22.00 -12337.00 +-21.00 -11272.00 +-20.00 -10255.00 +-19.00 -9286.00 +-18.00 -8365.00 +-17.00 -7492.00 +-16.00 -6667.00 +-15.00 -5890.00 +-14.00 -5161.00 +-13.00 -4480.00 +-12.00 -3847.00 +-11.00 -3262.00 +-10.00 -2725.00 +-9.00 -2236.00 +-8.00 -1795.00 +-7.00 -1402.00 +-6.00 -1057.00 +-5.00 -760.00 +-4.00 -511.00 +-3.00 -310.00 +-2.00 -157.00 +-1.00 -52.00 +0.00 5.00 +1.00 14.00 +2.00 -25.00 +3.00 -112.00 +4.00 -247.00 +5.00 -430.00 +6.00 -661.00 +7.00 -940.00 +8.00 -1267.00 +9.00 -1642.00 +10.00 -2065.00 +11.00 -2536.00 +12.00 -3055.00 +13.00 -3622.00 +14.00 -4237.00 +15.00 -4900.00 +16.00 -5611.00 +17.00 -6370.00 +18.00 -7177.00 +19.00 -8032.00 +20.00 -8935.00 +21.00 -9886.00 +22.00 -10885.00 +23.00 -11932.00 +24.00 -13027.00 +25.00 -14170.00 +26.00 -15361.00 +27.00 -16600.00 +28.00 -17887.00 +29.00 -19222.00 +30.00 -20605.00 +31.00 -22036.00 +32.00 -23515.00 +33.00 -25042.00 +34.00 -26617.00 +35.00 -28240.00 +36.00 -29911.00 +37.00 -31630.00 +38.00 -33397.00 +39.00 -35212.00 +40.00 -37075.00 +41.00 -38986.00 +42.00 -40945.00 +43.00 -42952.00 +44.00 -45007.00 +45.00 -47110.00 +46.00 -49261.00 +47.00 -51460.00 +48.00 -53707.00 +49.00 -56002.00 +50.00 -58345.00 +51.00 -60736.00 +52.00 -63175.00 +53.00 -65662.00 +54.00 -68197.00 +55.00 -70780.00 +56.00 -73411.00 +57.00 -76090.00 +58.00 -78817.00 +59.00 -81592.00 +60.00 -84415.00 +61.00 -87286.00 +62.00 -90205.00 +63.00 -93172.00 +64.00 -96187.00 +65.00 -99250.00 +66.00 -102361.00 +67.00 -105520.00 +68.00 -108727.00 +69.00 -111982.00 +70.00 -115285.00 +71.00 -118636.00 +72.00 -122035.00 +73.00 -125482.00 +74.00 -128977.00 +75.00 -132520.00 +76.00 -136111.00 +77.00 -139750.00 +78.00 -143437.00 +79.00 -147172.00 +80.00 -150955.00 +81.00 -154786.00 +82.00 -158665.00 +83.00 -162592.00 +84.00 -166567.00 +85.00 -170590.00 +86.00 -174661.00 +87.00 -178780.00 +88.00 -182947.00 +89.00 -187162.00 +90.00 -191425.00 +91.00 -195736.00 +92.00 -200095.00 +93.00 -204502.00 +94.00 -208957.00 +95.00 -213460.00 +96.00 -218011.00 +97.00 -222610.00 +98.00 -227257.00 +99.00 -231952.00 e unset multiplot diff --git a/tests/visualization-gnuplot-function.stdout b/tests/visualization-gnuplot-function.stdout index 01fa847..3176c85 100644 --- a/tests/visualization-gnuplot-function.stdout +++ b/tests/visualization-gnuplot-function.stdout @@ -1,2642 +1,2642 @@ #!/usr/bin/gnuplot -# Generated by RobOptim core library 0.2 +# Generated by RobOptim core library 0.3.15-2db8 set terminal wxt persist #Hello, world (complex)! set multiplot plot '-' title 'x * x' with line --10.000000 100.000000 --9.990000 99.800100 --9.980000 99.600400 --9.970000 99.400900 --9.960000 99.201600 --9.950000 99.002500 --9.940000 98.803600 --9.930000 98.604900 --9.920000 98.406400 --9.910000 98.208100 --9.900000 98.010000 --9.890000 97.812100 --9.880000 97.614400 --9.870000 97.416900 --9.860000 97.219600 --9.850000 97.022500 --9.840000 96.825600 --9.830000 96.628900 --9.820000 96.432400 --9.810000 96.236100 --9.800000 96.040000 --9.790000 95.844100 --9.780000 95.648400 --9.770000 95.452900 --9.760000 95.257600 --9.750000 95.062500 --9.740000 94.867600 --9.730000 94.672900 --9.720000 94.478400 --9.710000 94.284100 --9.700000 94.090000 --9.690000 93.896100 --9.680000 93.702400 --9.670000 93.508900 --9.660000 93.315600 --9.650000 93.122500 --9.640000 92.929600 --9.630000 92.736900 --9.620000 92.544400 --9.610000 92.352100 --9.600000 92.160000 --9.590000 91.968100 --9.580000 91.776400 --9.570000 91.584900 --9.560000 91.393600 --9.550000 91.202500 --9.540000 91.011600 --9.530000 90.820900 --9.520000 90.630400 --9.510000 90.440100 --9.500000 90.250000 --9.490000 90.060100 --9.480000 89.870400 --9.470000 89.680900 --9.460000 89.491600 --9.450000 89.302500 --9.440000 89.113600 --9.430000 88.924900 --9.420000 88.736400 --9.410000 88.548100 --9.400000 88.360000 --9.390000 88.172100 --9.380000 87.984400 --9.370000 87.796900 --9.360000 87.609600 --9.350000 87.422500 --9.340000 87.235600 --9.330000 87.048900 --9.320000 86.862400 --9.310000 86.676100 --9.300000 86.490000 --9.290000 86.304100 --9.280000 86.118400 --9.270000 85.932900 --9.260000 85.747600 --9.250000 85.562500 --9.240000 85.377600 --9.230000 85.192900 --9.220000 85.008400 --9.210000 84.824100 --9.200000 84.640000 --9.190000 84.456100 --9.180000 84.272400 --9.170000 84.088900 --9.160000 83.905600 --9.150000 83.722500 --9.140000 83.539600 --9.130000 83.356900 --9.120000 83.174400 --9.110000 82.992100 --9.100000 82.810000 --9.090000 82.628100 --9.080000 82.446400 --9.070000 82.264900 --9.060000 82.083600 --9.050000 81.902500 --9.040000 81.721600 --9.030000 81.540900 --9.020000 81.360400 --9.010000 81.180100 --9.000000 81.000000 --8.990000 80.820100 --8.980000 80.640400 --8.970000 80.460900 --8.960000 80.281600 --8.950000 80.102500 --8.940000 79.923600 --8.930000 79.744900 --8.920000 79.566400 --8.910000 79.388100 --8.900000 79.210000 --8.890000 79.032100 --8.880000 78.854400 --8.870000 78.676900 --8.860000 78.499600 --8.850000 78.322500 --8.840000 78.145600 --8.830000 77.968900 --8.820000 77.792400 --8.810000 77.616100 --8.800000 77.440000 --8.790000 77.264100 --8.780000 77.088400 --8.770000 76.912900 --8.760000 76.737600 --8.750000 76.562500 --8.740000 76.387600 --8.730000 76.212900 --8.720000 76.038400 --8.710000 75.864100 --8.700000 75.690000 --8.690000 75.516100 --8.680000 75.342400 --8.670000 75.168900 --8.660000 74.995600 --8.650000 74.822500 --8.640000 74.649600 --8.630000 74.476900 --8.620000 74.304400 --8.610000 74.132100 --8.600000 73.960000 --8.590000 73.788100 --8.580000 73.616400 --8.570000 73.444900 --8.560000 73.273600 --8.550000 73.102500 --8.540000 72.931600 --8.530000 72.760900 --8.520000 72.590400 --8.510000 72.420100 --8.500000 72.250000 --8.490000 72.080100 --8.480000 71.910400 --8.470000 71.740900 --8.460000 71.571600 --8.450000 71.402500 --8.440000 71.233600 --8.430000 71.064900 --8.420000 70.896400 --8.410000 70.728100 --8.400000 70.560000 --8.390000 70.392100 --8.380000 70.224400 --8.370000 70.056900 --8.360000 69.889600 --8.350000 69.722500 --8.340000 69.555600 --8.330000 69.388900 --8.320000 69.222400 --8.310000 69.056100 --8.300000 68.890000 --8.290000 68.724100 --8.280000 68.558400 --8.270000 68.392900 --8.260000 68.227600 --8.250000 68.062500 --8.240000 67.897600 --8.230000 67.732900 --8.220000 67.568400 --8.210000 67.404100 --8.200000 67.240000 --8.190000 67.076100 --8.180000 66.912400 --8.170000 66.748900 --8.160000 66.585600 --8.150000 66.422500 --8.140000 66.259600 --8.130000 66.096900 --8.120000 65.934400 --8.110000 65.772100 --8.100000 65.610000 --8.090000 65.448100 --8.080000 65.286400 --8.070000 65.124900 --8.060000 64.963600 --8.050000 64.802500 --8.040000 64.641600 --8.030000 64.480900 --8.020000 64.320400 --8.010000 64.160100 --8.000000 64.000000 --7.990000 63.840100 --7.980000 63.680400 --7.970000 63.520900 --7.960000 63.361600 --7.950000 63.202500 --7.940000 63.043600 --7.930000 62.884900 --7.920000 62.726400 --7.910000 62.568100 --7.900000 62.410000 --7.890000 62.252100 --7.880000 62.094400 --7.870000 61.936900 --7.860000 61.779600 --7.850000 61.622500 --7.840000 61.465600 --7.830000 61.308900 --7.820000 61.152400 --7.810000 60.996100 --7.800000 60.840000 --7.790000 60.684100 --7.780000 60.528400 --7.770000 60.372900 --7.760000 60.217600 --7.750000 60.062500 --7.740000 59.907600 --7.730000 59.752900 --7.720000 59.598400 --7.710000 59.444100 --7.700000 59.290000 --7.690000 59.136100 --7.680000 58.982400 --7.670000 58.828900 --7.660000 58.675600 --7.650000 58.522500 --7.640000 58.369600 --7.630000 58.216900 --7.620000 58.064400 --7.610000 57.912100 --7.600000 57.760000 --7.590000 57.608100 --7.580000 57.456400 --7.570000 57.304900 --7.560000 57.153600 --7.550000 57.002500 --7.540000 56.851600 --7.530000 56.700900 --7.520000 56.550400 --7.510000 56.400100 --7.500000 56.250000 --7.490000 56.100100 --7.480000 55.950400 --7.470000 55.800900 --7.460000 55.651600 --7.450000 55.502500 --7.440000 55.353600 --7.430000 55.204900 --7.420000 55.056400 --7.410000 54.908100 --7.400000 54.760000 --7.390000 54.612100 --7.380000 54.464400 --7.370000 54.316900 --7.360000 54.169600 --7.350000 54.022500 --7.340000 53.875600 --7.330000 53.728900 --7.320000 53.582400 --7.310000 53.436100 --7.300000 53.290000 --7.290000 53.144100 --7.280000 52.998400 --7.270000 52.852900 --7.260000 52.707600 --7.250000 52.562500 --7.240000 52.417600 --7.230000 52.272900 --7.220000 52.128400 --7.210000 51.984100 --7.200000 51.840000 --7.190000 51.696100 --7.180000 51.552400 --7.170000 51.408900 --7.160000 51.265600 --7.150000 51.122500 --7.140000 50.979600 --7.130000 50.836900 --7.120000 50.694400 --7.110000 50.552100 --7.100000 50.410000 --7.090000 50.268100 --7.080000 50.126400 --7.070000 49.984900 --7.060000 49.843600 --7.050000 49.702500 --7.040000 49.561600 --7.030000 49.420900 --7.020000 49.280400 --7.010000 49.140100 --7.000000 49.000000 --6.990000 48.860100 --6.980000 48.720400 --6.970000 48.580900 --6.960000 48.441600 --6.950000 48.302500 --6.940000 48.163600 --6.930000 48.024900 --6.920000 47.886400 --6.910000 47.748100 --6.900000 47.610000 --6.890000 47.472100 --6.880000 47.334400 --6.870000 47.196900 --6.860000 47.059600 --6.850000 46.922500 --6.840000 46.785600 --6.830000 46.648900 --6.820000 46.512400 --6.810000 46.376100 --6.800000 46.240000 --6.790000 46.104100 --6.780000 45.968400 --6.770000 45.832900 --6.760000 45.697600 --6.750000 45.562500 --6.740000 45.427600 --6.730000 45.292900 --6.720000 45.158400 --6.710000 45.024100 --6.700000 44.890000 --6.690000 44.756100 --6.680000 44.622400 --6.670000 44.488900 --6.660000 44.355600 --6.650000 44.222500 --6.640000 44.089600 --6.630000 43.956900 --6.620000 43.824400 --6.610000 43.692100 --6.600000 43.560000 --6.590000 43.428100 --6.580000 43.296400 --6.570000 43.164900 --6.560000 43.033600 --6.550000 42.902500 --6.540000 42.771600 --6.530000 42.640900 --6.520000 42.510400 --6.510000 42.380100 --6.500000 42.250000 --6.490000 42.120100 --6.480000 41.990400 --6.470000 41.860900 --6.460000 41.731600 --6.450000 41.602500 --6.440000 41.473600 --6.430000 41.344900 --6.420000 41.216400 --6.410000 41.088100 --6.400000 40.960000 --6.390000 40.832100 --6.380000 40.704400 --6.370000 40.576900 --6.360000 40.449600 --6.350000 40.322500 --6.340000 40.195600 --6.330000 40.068900 --6.320000 39.942400 --6.310000 39.816100 --6.300000 39.690000 --6.290000 39.564100 --6.280000 39.438400 --6.270000 39.312900 --6.260000 39.187600 --6.250000 39.062500 --6.240000 38.937600 --6.230000 38.812900 --6.220000 38.688400 --6.210000 38.564100 --6.200000 38.440000 --6.190000 38.316100 --6.180000 38.192400 --6.170000 38.068900 --6.160000 37.945600 --6.150000 37.822500 --6.140000 37.699600 --6.130000 37.576900 --6.120000 37.454400 --6.110000 37.332100 --6.100000 37.210000 --6.090000 37.088100 --6.080000 36.966400 --6.070000 36.844900 --6.060000 36.723600 --6.050000 36.602500 --6.040000 36.481600 --6.030000 36.360900 --6.020000 36.240400 --6.010000 36.120100 --6.000000 36.000000 --5.990000 35.880100 --5.980000 35.760400 --5.970000 35.640900 --5.960000 35.521600 --5.950000 35.402500 --5.940000 35.283600 --5.930000 35.164900 --5.920000 35.046400 --5.910000 34.928100 --5.900000 34.810000 --5.890000 34.692100 --5.880000 34.574400 --5.870000 34.456900 --5.860000 34.339600 --5.850000 34.222500 --5.840000 34.105600 --5.830000 33.988900 --5.820000 33.872400 --5.810000 33.756100 --5.800000 33.640000 --5.790000 33.524100 --5.780000 33.408400 --5.770000 33.292900 --5.760000 33.177600 --5.750000 33.062500 --5.740000 32.947600 --5.730000 32.832900 --5.720000 32.718400 --5.710000 32.604100 --5.700000 32.490000 --5.690000 32.376100 --5.680000 32.262400 --5.670000 32.148900 --5.660000 32.035600 --5.650000 31.922500 --5.640000 31.809600 --5.630000 31.696900 --5.620000 31.584400 --5.610000 31.472100 --5.600000 31.360000 --5.590000 31.248100 --5.580000 31.136400 --5.570000 31.024900 --5.560000 30.913600 --5.550000 30.802500 --5.540000 30.691600 --5.530000 30.580900 --5.520000 30.470400 --5.510000 30.360100 --5.500000 30.250000 --5.490000 30.140100 --5.480000 30.030400 --5.470000 29.920900 --5.460000 29.811600 --5.450000 29.702500 --5.440000 29.593600 --5.430000 29.484900 --5.420000 29.376400 --5.410000 29.268100 --5.400000 29.160000 --5.390000 29.052100 --5.380000 28.944400 --5.370000 28.836900 --5.360000 28.729600 --5.350000 28.622500 --5.340000 28.515600 --5.330000 28.408900 --5.320000 28.302400 --5.310000 28.196100 --5.300000 28.090000 --5.290000 27.984100 --5.280000 27.878400 --5.270000 27.772900 --5.260000 27.667600 --5.250000 27.562500 --5.240000 27.457600 --5.230000 27.352900 --5.220000 27.248400 --5.210000 27.144100 --5.200000 27.040000 --5.190000 26.936100 --5.180000 26.832400 --5.170000 26.728900 --5.160000 26.625600 --5.150000 26.522500 --5.140000 26.419600 --5.130000 26.316900 --5.120000 26.214400 --5.110000 26.112100 --5.100000 26.010000 --5.090000 25.908100 --5.080000 25.806400 --5.070000 25.704900 --5.060000 25.603600 --5.050000 25.502500 --5.040000 25.401600 --5.030000 25.300900 --5.020000 25.200400 --5.010000 25.100100 --5.000000 25.000000 --4.990000 24.900100 --4.980000 24.800400 --4.970000 24.700900 --4.960000 24.601600 --4.950000 24.502500 --4.940000 24.403600 --4.930000 24.304900 --4.920000 24.206400 --4.910000 24.108100 --4.900000 24.010000 --4.890000 23.912100 --4.880000 23.814400 --4.870000 23.716900 --4.860000 23.619600 --4.850000 23.522500 --4.840000 23.425600 --4.830000 23.328900 --4.820000 23.232400 --4.810000 23.136100 --4.800000 23.040000 --4.790000 22.944100 --4.780000 22.848400 --4.770000 22.752900 --4.760000 22.657600 --4.750000 22.562500 --4.740000 22.467600 --4.730000 22.372900 --4.720000 22.278400 --4.710000 22.184100 --4.700000 22.090000 --4.690000 21.996100 --4.680000 21.902400 --4.670000 21.808900 --4.660000 21.715600 --4.650000 21.622500 --4.640000 21.529600 --4.630000 21.436900 --4.620000 21.344400 --4.610000 21.252100 --4.600000 21.160000 --4.590000 21.068100 --4.580000 20.976400 --4.570000 20.884900 --4.560000 20.793600 --4.550000 20.702500 --4.540000 20.611600 --4.530000 20.520900 --4.520000 20.430400 --4.510000 20.340100 --4.500000 20.250000 --4.490000 20.160100 --4.480000 20.070400 --4.470000 19.980900 --4.460000 19.891600 --4.450000 19.802500 --4.440000 19.713600 --4.430000 19.624900 --4.420000 19.536400 --4.410000 19.448100 --4.400000 19.360000 --4.390000 19.272100 --4.380000 19.184400 --4.370000 19.096900 --4.360000 19.009600 --4.350000 18.922500 --4.340000 18.835600 --4.330000 18.748900 --4.320000 18.662400 --4.310000 18.576100 --4.300000 18.490000 --4.290000 18.404100 --4.280000 18.318400 --4.270000 18.232900 --4.260000 18.147600 --4.250000 18.062500 --4.240000 17.977600 --4.230000 17.892900 --4.220000 17.808400 --4.210000 17.724100 --4.200000 17.640000 --4.190000 17.556100 --4.180000 17.472400 --4.170000 17.388900 --4.160000 17.305600 --4.150000 17.222500 --4.140000 17.139600 --4.130000 17.056900 --4.120000 16.974400 --4.110000 16.892100 --4.100000 16.810000 --4.090000 16.728100 --4.080000 16.646400 --4.070000 16.564900 --4.060000 16.483600 --4.050000 16.402500 --4.040000 16.321600 --4.030000 16.240900 --4.020000 16.160400 --4.010000 16.080100 --4.000000 16.000000 --3.990000 15.920100 --3.980000 15.840400 --3.970000 15.760900 --3.960000 15.681600 --3.950000 15.602500 --3.940000 15.523600 --3.930000 15.444900 --3.920000 15.366400 --3.910000 15.288100 --3.900000 15.210000 --3.890000 15.132100 --3.880000 15.054400 --3.870000 14.976900 --3.860000 14.899600 --3.850000 14.822500 --3.840000 14.745600 --3.830000 14.668900 --3.820000 14.592400 --3.810000 14.516100 --3.800000 14.440000 --3.790000 14.364100 --3.780000 14.288400 --3.770000 14.212900 --3.760000 14.137600 --3.750000 14.062500 --3.740000 13.987600 --3.730000 13.912900 --3.720000 13.838400 --3.710000 13.764100 --3.700000 13.690000 --3.690000 13.616100 --3.680000 13.542400 --3.670000 13.468900 --3.660000 13.395600 --3.650000 13.322500 --3.640000 13.249600 --3.630000 13.176900 --3.620000 13.104400 --3.610000 13.032100 --3.600000 12.960000 --3.590000 12.888100 --3.580000 12.816400 --3.570000 12.744900 --3.560000 12.673600 --3.550000 12.602500 --3.540000 12.531600 --3.530000 12.460900 --3.520000 12.390400 --3.510000 12.320100 --3.500000 12.250000 --3.490000 12.180100 --3.480000 12.110400 --3.470000 12.040900 --3.460000 11.971600 --3.450000 11.902500 --3.440000 11.833600 --3.430000 11.764900 --3.420000 11.696400 --3.410000 11.628100 --3.400000 11.560000 --3.390000 11.492100 --3.380000 11.424400 --3.370000 11.356900 --3.360000 11.289600 --3.350000 11.222500 --3.340000 11.155600 --3.330000 11.088900 --3.320000 11.022400 --3.310000 10.956100 --3.300000 10.890000 --3.290000 10.824100 --3.280000 10.758400 --3.270000 10.692900 --3.260000 10.627600 --3.250000 10.562500 --3.240000 10.497600 --3.230000 10.432900 --3.220000 10.368400 --3.210000 10.304100 --3.200000 10.240000 --3.190000 10.176100 --3.180000 10.112400 --3.170000 10.048900 --3.160000 9.985600 --3.150000 9.922500 --3.140000 9.859600 --3.130000 9.796900 --3.120000 9.734400 --3.110000 9.672100 --3.100000 9.610000 --3.090000 9.548100 --3.080000 9.486400 --3.070000 9.424900 --3.060000 9.363600 --3.050000 9.302500 --3.040000 9.241600 --3.030000 9.180900 --3.020000 9.120400 --3.010000 9.060100 --3.000000 9.000000 --2.990000 8.940100 --2.980000 8.880400 --2.970000 8.820900 --2.960000 8.761600 --2.950000 8.702500 --2.940000 8.643600 --2.930000 8.584900 --2.920000 8.526400 --2.910000 8.468100 --2.900000 8.410000 --2.890000 8.352100 --2.880000 8.294400 --2.870000 8.236900 --2.860000 8.179600 --2.850000 8.122500 --2.840000 8.065600 --2.830000 8.008900 --2.820000 7.952400 --2.810000 7.896100 --2.800000 7.840000 --2.790000 7.784100 --2.780000 7.728400 --2.770000 7.672900 --2.760000 7.617600 --2.750000 7.562500 --2.740000 7.507600 --2.730000 7.452900 --2.720000 7.398400 --2.710000 7.344100 --2.700000 7.290000 --2.690000 7.236100 --2.680000 7.182400 --2.670000 7.128900 --2.660000 7.075600 --2.650000 7.022500 --2.640000 6.969600 --2.630000 6.916900 --2.620000 6.864400 --2.610000 6.812100 --2.600000 6.760000 --2.590000 6.708100 --2.580000 6.656400 --2.570000 6.604900 --2.560000 6.553600 --2.550000 6.502500 --2.540000 6.451600 --2.530000 6.400900 --2.520000 6.350400 --2.510000 6.300100 --2.500000 6.250000 --2.490000 6.200100 --2.480000 6.150400 --2.470000 6.100900 --2.460000 6.051600 --2.450000 6.002500 --2.440000 5.953600 --2.430000 5.904900 --2.420000 5.856400 --2.410000 5.808100 --2.400000 5.760000 --2.390000 5.712100 --2.380000 5.664400 --2.370000 5.616900 --2.360000 5.569600 --2.350000 5.522500 --2.340000 5.475600 --2.330000 5.428900 --2.320000 5.382400 --2.310000 5.336100 --2.300000 5.290000 --2.290000 5.244100 --2.280000 5.198400 --2.270000 5.152900 --2.260000 5.107600 --2.250000 5.062500 --2.240000 5.017600 --2.230000 4.972900 --2.220000 4.928400 --2.210000 4.884100 --2.200000 4.840000 --2.190000 4.796100 --2.180000 4.752400 --2.170000 4.708900 --2.160000 4.665600 --2.150000 4.622500 --2.140000 4.579600 --2.130000 4.536900 --2.120000 4.494400 --2.110000 4.452100 --2.100000 4.410000 --2.090000 4.368100 --2.080000 4.326400 --2.070000 4.284900 --2.060000 4.243600 --2.050000 4.202500 --2.040000 4.161600 --2.030000 4.120900 --2.020000 4.080400 --2.010000 4.040100 --2.000000 4.000000 --1.990000 3.960100 --1.980000 3.920400 --1.970000 3.880900 --1.960000 3.841600 --1.950000 3.802500 --1.940000 3.763600 --1.930000 3.724900 --1.920000 3.686400 --1.910000 3.648100 --1.900000 3.610000 --1.890000 3.572100 --1.880000 3.534400 --1.870000 3.496900 --1.860000 3.459600 --1.850000 3.422500 --1.840000 3.385600 --1.830000 3.348900 --1.820000 3.312400 --1.810000 3.276100 --1.800000 3.240000 --1.790000 3.204100 --1.780000 3.168400 --1.770000 3.132900 --1.760000 3.097600 --1.750000 3.062500 --1.740000 3.027600 --1.730000 2.992900 --1.720000 2.958400 --1.710000 2.924100 --1.700000 2.890000 --1.690000 2.856100 --1.680000 2.822400 --1.670000 2.788900 --1.660000 2.755600 --1.650000 2.722500 --1.640000 2.689600 --1.630000 2.656900 --1.620000 2.624400 --1.610000 2.592100 --1.600000 2.560000 --1.590000 2.528100 --1.580000 2.496400 --1.570000 2.464900 --1.560000 2.433600 --1.550000 2.402500 --1.540000 2.371600 --1.530000 2.340900 --1.520000 2.310400 --1.510000 2.280100 --1.500000 2.250000 --1.490000 2.220100 --1.480000 2.190400 --1.470000 2.160900 --1.460000 2.131600 --1.450000 2.102500 --1.440000 2.073600 --1.430000 2.044900 --1.420000 2.016400 --1.410000 1.988100 --1.400000 1.960000 --1.390000 1.932100 --1.380000 1.904400 --1.370000 1.876900 --1.360000 1.849600 --1.350000 1.822500 --1.340000 1.795600 --1.330000 1.768900 --1.320000 1.742400 --1.310000 1.716100 --1.300000 1.690000 --1.290000 1.664100 --1.280000 1.638400 --1.270000 1.612900 --1.260000 1.587600 --1.250000 1.562500 --1.240000 1.537600 --1.230000 1.512900 --1.220000 1.488400 --1.210000 1.464100 --1.200000 1.440000 --1.190000 1.416100 --1.180000 1.392400 --1.170000 1.368900 --1.160000 1.345600 --1.150000 1.322500 --1.140000 1.299600 --1.130000 1.276900 --1.120000 1.254400 --1.110000 1.232100 --1.100000 1.210000 --1.090000 1.188100 --1.080000 1.166400 --1.070000 1.144900 --1.060000 1.123600 --1.050000 1.102500 --1.040000 1.081600 --1.030000 1.060900 --1.020000 1.040400 --1.010000 1.020100 --1.000000 1.000000 --0.990000 0.980100 --0.980000 0.960400 --0.970000 0.940900 --0.960000 0.921600 --0.950000 0.902500 --0.940000 0.883600 --0.930000 0.864900 --0.920000 0.846400 --0.910000 0.828100 --0.900000 0.810000 --0.890000 0.792100 --0.880000 0.774400 --0.870000 0.756900 --0.860000 0.739600 --0.850000 0.722500 --0.840000 0.705600 --0.830000 0.688900 --0.820000 0.672400 --0.810000 0.656100 --0.800000 0.640000 --0.790000 0.624100 --0.780000 0.608400 --0.770000 0.592900 --0.760000 0.577600 --0.750000 0.562500 --0.740000 0.547600 --0.730000 0.532900 --0.720000 0.518400 --0.710000 0.504100 --0.700000 0.490000 --0.690000 0.476100 --0.680000 0.462400 --0.670000 0.448900 --0.660000 0.435600 --0.650000 0.422500 --0.640000 0.409600 --0.630000 0.396900 --0.620000 0.384400 --0.610000 0.372100 --0.600000 0.360000 --0.590000 0.348100 --0.580000 0.336400 --0.570000 0.324900 --0.560000 0.313600 --0.550000 0.302500 --0.540000 0.291600 --0.530000 0.280900 --0.520000 0.270400 --0.510000 0.260100 --0.500000 0.250000 --0.490000 0.240100 --0.480000 0.230400 --0.470000 0.220900 --0.460000 0.211600 --0.450000 0.202500 --0.440000 0.193600 --0.430000 0.184900 --0.420000 0.176400 --0.410000 0.168100 --0.400000 0.160000 --0.390000 0.152100 --0.380000 0.144400 --0.370000 0.136900 --0.360000 0.129600 --0.350000 0.122500 --0.340000 0.115600 --0.330000 0.108900 --0.320000 0.102400 --0.310000 0.096100 --0.300000 0.090000 --0.290000 0.084100 --0.280000 0.078400 --0.270000 0.072900 --0.260000 0.067600 --0.250000 0.062500 --0.240000 0.057600 --0.230000 0.052900 --0.220000 0.048400 --0.210000 0.044100 --0.200000 0.040000 --0.190000 0.036100 --0.180000 0.032400 --0.170000 0.028900 --0.160000 0.025600 --0.150000 0.022500 --0.140000 0.019600 --0.130000 0.016900 --0.120000 0.014400 --0.110000 0.012100 --0.100000 0.010000 --0.090000 0.008100 --0.080000 0.006400 --0.070000 0.004900 --0.060000 0.003600 --0.050000 0.002500 --0.040000 0.001600 --0.030000 0.000900 --0.020000 0.000400 --0.010000 0.000100 --0.000000 0.000000 -0.010000 0.000100 -0.020000 0.000400 -0.030000 0.000900 -0.040000 0.001600 -0.050000 0.002500 -0.060000 0.003600 -0.070000 0.004900 -0.080000 0.006400 -0.090000 0.008100 -0.100000 0.010000 -0.110000 0.012100 -0.120000 0.014400 -0.130000 0.016900 -0.140000 0.019600 -0.150000 0.022500 -0.160000 0.025600 -0.170000 0.028900 -0.180000 0.032400 -0.190000 0.036100 -0.200000 0.040000 -0.210000 0.044100 -0.220000 0.048400 -0.230000 0.052900 -0.240000 0.057600 -0.250000 0.062500 -0.260000 0.067600 -0.270000 0.072900 -0.280000 0.078400 -0.290000 0.084100 -0.300000 0.090000 -0.310000 0.096100 -0.320000 0.102400 -0.330000 0.108900 -0.340000 0.115600 -0.350000 0.122500 -0.360000 0.129600 -0.370000 0.136900 -0.380000 0.144400 -0.390000 0.152100 -0.400000 0.160000 -0.410000 0.168100 -0.420000 0.176400 -0.430000 0.184900 -0.440000 0.193600 -0.450000 0.202500 -0.460000 0.211600 -0.470000 0.220900 -0.480000 0.230400 -0.490000 0.240100 -0.500000 0.250000 -0.510000 0.260100 -0.520000 0.270400 -0.530000 0.280900 -0.540000 0.291600 -0.550000 0.302500 -0.560000 0.313600 -0.570000 0.324900 -0.580000 0.336400 -0.590000 0.348100 -0.600000 0.360000 -0.610000 0.372100 -0.620000 0.384400 -0.630000 0.396900 -0.640000 0.409600 -0.650000 0.422500 -0.660000 0.435600 -0.670000 0.448900 -0.680000 0.462400 -0.690000 0.476100 -0.700000 0.490000 -0.710000 0.504100 -0.720000 0.518400 -0.730000 0.532900 -0.740000 0.547600 -0.750000 0.562500 -0.760000 0.577600 -0.770000 0.592900 -0.780000 0.608400 -0.790000 0.624100 -0.800000 0.640000 -0.810000 0.656100 -0.820000 0.672400 -0.830000 0.688900 -0.840000 0.705600 -0.850000 0.722500 -0.860000 0.739600 -0.870000 0.756900 -0.880000 0.774400 -0.890000 0.792100 -0.900000 0.810000 -0.910000 0.828100 -0.920000 0.846400 -0.930000 0.864900 -0.940000 0.883600 -0.950000 0.902500 -0.960000 0.921600 -0.970000 0.940900 -0.980000 0.960400 -0.990000 0.980100 -1.000000 1.000000 -1.010000 1.020100 -1.020000 1.040400 -1.030000 1.060900 -1.040000 1.081600 -1.050000 1.102500 -1.060000 1.123600 -1.070000 1.144900 -1.080000 1.166400 -1.090000 1.188100 -1.100000 1.210000 -1.110000 1.232100 -1.120000 1.254400 -1.130000 1.276900 -1.140000 1.299600 -1.150000 1.322500 -1.160000 1.345600 -1.170000 1.368900 -1.180000 1.392400 -1.190000 1.416100 -1.200000 1.440000 -1.210000 1.464100 -1.220000 1.488400 -1.230000 1.512900 -1.240000 1.537600 -1.250000 1.562500 -1.260000 1.587600 -1.270000 1.612900 -1.280000 1.638400 -1.290000 1.664100 -1.300000 1.690000 -1.310000 1.716100 -1.320000 1.742400 -1.330000 1.768900 -1.340000 1.795600 -1.350000 1.822500 -1.360000 1.849600 -1.370000 1.876900 -1.380000 1.904400 -1.390000 1.932100 -1.400000 1.960000 -1.410000 1.988100 -1.420000 2.016400 -1.430000 2.044900 -1.440000 2.073600 -1.450000 2.102500 -1.460000 2.131600 -1.470000 2.160900 -1.480000 2.190400 -1.490000 2.220100 -1.500000 2.250000 -1.510000 2.280100 -1.520000 2.310400 -1.530000 2.340900 -1.540000 2.371600 -1.550000 2.402500 -1.560000 2.433600 -1.570000 2.464900 -1.580000 2.496400 -1.590000 2.528100 -1.600000 2.560000 -1.610000 2.592100 -1.620000 2.624400 -1.630000 2.656900 -1.640000 2.689600 -1.650000 2.722500 -1.660000 2.755600 -1.670000 2.788900 -1.680000 2.822400 -1.690000 2.856100 -1.700000 2.890000 -1.710000 2.924100 -1.720000 2.958400 -1.730000 2.992900 -1.740000 3.027600 -1.750000 3.062500 -1.760000 3.097600 -1.770000 3.132900 -1.780000 3.168400 -1.790000 3.204100 -1.800000 3.240000 -1.810000 3.276100 -1.820000 3.312400 -1.830000 3.348900 -1.840000 3.385600 -1.850000 3.422500 -1.860000 3.459600 -1.870000 3.496900 -1.880000 3.534400 -1.890000 3.572100 -1.900000 3.610000 -1.910000 3.648100 -1.920000 3.686400 -1.930000 3.724900 -1.940000 3.763600 -1.950000 3.802500 -1.960000 3.841600 -1.970000 3.880900 -1.980000 3.920400 -1.990000 3.960100 -2.000000 4.000000 -2.010000 4.040100 -2.020000 4.080400 -2.030000 4.120900 -2.040000 4.161600 -2.050000 4.202500 -2.060000 4.243600 -2.070000 4.284900 -2.080000 4.326400 -2.090000 4.368100 -2.100000 4.410000 -2.110000 4.452100 -2.120000 4.494400 -2.130000 4.536900 -2.140000 4.579600 -2.150000 4.6225... [truncated message content] |
From: Thomas M. <tho...@us...> - 2009-11-02 10:20:30
|
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 2db80e96ebbe178e83d952eddf2fdc5dbb1a784c (commit) from 29027bbcdac9cfebc6628c8cc1fb6c1ee7caf840 (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 2db80e96ebbe178e83d952eddf2fdc5dbb1a784c Author: Thomas Moulard <tho...@gm...> Date: Mon Nov 2 11:20:12 2009 +0100 Distribute Windows related files. Reported by François Keith. * Makefile.am: Here. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index 95a2090..a06d54c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-11-02 Thomas Moulard <tho...@gm...> + + Distribute Windows related files. + Reported by François Keith. + * Makefile.am: Here. + 2009-10-23 Thomas Moulard <tho...@gm...> Handle symbol visibility under Linux. diff --git a/Makefile.am b/Makefile.am index 7c5e247..792c9ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,6 +17,9 @@ EXTRA_DIST += bootstrap \ THANKS \ TODO +# Distribute Windows specific files. +EXTRA_DIST += msvc + # Nothing to do in this directory. all: ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 ++++++ Makefile.am | 3 +++ 2 files changed, 9 insertions(+), 0 deletions(-) hooks/post-receive -- roboptim-core |
From: Thomas M. <tho...@us...> - 2009-10-27 16:24:10
|
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 08f45afa8d2b60f05f1bbc3f63ab2ecf3367b6ec (commit) from 60f88e0a2d0900d4c6a6b4856afb749b6dbe30dc (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 08f45afa8d2b60f05f1bbc3f63ab2ecf3367b6ec Author: Thomas Moulard <tho...@gm...> Date: Tue Oct 27 17:23:52 2009 +0100 Fix variationDerivWrtParam check in test suite. * tests/free-time-trajectory.cc: Fix test case. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index 62ff251..75e9c26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-10-27 Thomas Moulard <tho...@gm...> + Fix variationDerivWrtParam check in test suite. + * tests/free-time-trajectory.cc: Fix test case. + +2009-10-27 Thomas Moulard <tho...@gm...> + Check FreeTimeTrajectory::variationDerivWrtParam. * tests/free-time-trajectory.cc: Check combined derivatives of free time trajectories. diff --git a/tests/free-time-trajectory.cc b/tests/free-time-trajectory.cc index 03158ad..0750bf9 100644 --- a/tests/free-time-trajectory.cc +++ b/tests/free-time-trajectory.cc @@ -40,13 +40,11 @@ typedef FreeTimeTrajectory<Spline::derivabilityOrder> freeTime_t; struct ConfigWrtParam : public DerivableFunction { - ConfigWrtParam (const freeTime_t& traj, int order, double t) throw () + ConfigWrtParam (const freeTime_t& traj, double t) throw () : DerivableFunction (traj.parameters ().size (), - (order < 0) - ? traj.outputSize () : traj.parameters ().size (), + traj.outputSize (), "config wrt param"), traj_ (traj), - order_ (order), t_ (t) { } @@ -55,41 +53,58 @@ struct ConfigWrtParam : public DerivableFunction { } - void compute (result_t& res, const argument_t& p, int order) const throw () - { - if (order < 0) - { - boost::scoped_ptr<freeTime_t> updatedTrajectory (traj_.clone ()); - updatedTrajectory->setParameters (p); - res = (*updatedTrajectory) (t_); - } - else - { - boost::scoped_ptr<freeTime_t> updatedTrajectory (traj_.clone ()); - updatedTrajectory->setParameters (p); - matrix_t tmp = updatedTrajectory->variationDerivWrtParam (t_, order); - res = row (tmp, 0); - } - } - void impl_compute (result_t& res, const argument_t& p) const throw () { - compute (res, p, order_); + boost::scoped_ptr<freeTime_t> updatedTrajectory (traj_.clone ()); + updatedTrajectory->setParameters (p); + res = (*updatedTrajectory) (t_); } void impl_gradient (gradient_t& grad, const argument_t& p, size_type i) const throw () { - compute (grad, p, order_ + 1); + boost::scoped_ptr<freeTime_t> updatedTrajectory (traj_.clone ()); + updatedTrajectory->setParameters (p); + matrix_t tmp = updatedTrajectory->variationDerivWrtParam (t_, 0); + grad = row (tmp, 0); } const freeTime_t& traj_; - const int order_; double t_; }; +struct DerivWrtParam : public DerivableFunction +{ + DerivWrtParam (const freeTime_t& traj) throw () + : DerivableFunction (traj.inputSize (), + traj.parameters ().size (), + "config wrt param"), + traj_ (traj.clone ()) + {} + + ~DerivWrtParam () throw () + {} + + void + impl_compute (result_t& res, const argument_t& t) const throw () + { + matrix_t tmp = traj_->variationDerivWrtParam (t[0], 0); + res = row (tmp, 0); + } + + void + impl_gradient (gradient_t& grad, const argument_t& t, size_type i) + const throw () + { + matrix_t tmp = traj_->variationDerivWrtParam (t[0], 1); + grad[0] = row (tmp, 0)[i]; + } + + const boost::scoped_ptr<const freeTime_t> traj_; +}; + void printTable (const Spline& spline, const freeTime_t& freeTimeTraj); @@ -185,7 +200,7 @@ void printTable (const Spline& spline, const freeTime_t& freeTimeTraj) try { - ConfigWrtParam configWrtParam (freeTimeTraj, -1, t); + ConfigWrtParam configWrtParam (freeTimeTraj, t); checkGradientAndThrow (configWrtParam, 0, freeTimeTraj.parameters ()); } @@ -220,9 +235,10 @@ void printTable (const Spline& spline, const freeTime_t& freeTimeTraj) try { - ConfigWrtParam derivWrtParam (freeTimeTraj, 0, t); - checkGradientAndThrow (derivWrtParam, 0, - freeTimeTraj.parameters ()); + Spline::vector_t t_ (1); + t_[0] = t; + DerivWrtParam derivWrtParam (freeTimeTraj); + checkGradientAndThrow (derivWrtParam, 0, t_); } catch (BadGradient& bg) { ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++ tests/free-time-trajectory.cc | 72 +++++++++++++++++++++++++---------------- 2 files changed, 49 insertions(+), 28 deletions(-) hooks/post-receive -- roboptim-trajectory |
From: Thomas M. <tho...@us...> - 2009-10-27 13:50:58
|
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 60f88e0a2d0900d4c6a6b4856afb749b6dbe30dc (commit) from 3663351287ad0b7d91de0464a72e727c4b6e4695 (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 60f88e0a2d0900d4c6a6b4856afb749b6dbe30dc Author: Thomas Moulard <tho...@gm...> Date: Tue Oct 27 14:50:39 2009 +0100 Check FreeTimeTrajectory::variationDerivWrtParam. * tests/free-time-trajectory.cc: Check combined derivatives of free time trajectories. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index b0e8af6..62ff251 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-10-27 Thomas Moulard <tho...@gm...> + + Check FreeTimeTrajectory::variationDerivWrtParam. + * tests/free-time-trajectory.cc: Check combined derivatives + of free time trajectories. + 2009-10-21 Thomas Moulard <tho...@gm...> Synchronize. diff --git a/tests/free-time-trajectory.cc b/tests/free-time-trajectory.cc index 4f8e545..03158ad 100644 --- a/tests/free-time-trajectory.cc +++ b/tests/free-time-trajectory.cc @@ -40,11 +40,13 @@ typedef FreeTimeTrajectory<Spline::derivabilityOrder> freeTime_t; struct ConfigWrtParam : public DerivableFunction { - ConfigWrtParam (const freeTime_t& traj, double t) throw () + ConfigWrtParam (const freeTime_t& traj, int order, double t) throw () : DerivableFunction (traj.parameters ().size (), - traj.outputSize (), + (order < 0) + ? traj.outputSize () : traj.parameters ().size (), "config wrt param"), traj_ (traj), + order_ (order), t_ (t) { } @@ -53,25 +55,38 @@ struct ConfigWrtParam : public DerivableFunction { } + void compute (result_t& res, const argument_t& p, int order) const throw () + { + if (order < 0) + { + boost::scoped_ptr<freeTime_t> updatedTrajectory (traj_.clone ()); + updatedTrajectory->setParameters (p); + res = (*updatedTrajectory) (t_); + } + else + { + boost::scoped_ptr<freeTime_t> updatedTrajectory (traj_.clone ()); + updatedTrajectory->setParameters (p); + matrix_t tmp = updatedTrajectory->variationDerivWrtParam (t_, order); + res = row (tmp, 0); + } + } + void impl_compute (result_t& res, const argument_t& p) const throw () { - boost::scoped_ptr<freeTime_t> updatedTrajectory (traj_.clone ()); - updatedTrajectory->setParameters (p); - res = (*updatedTrajectory) (t_); + compute (res, p, order_); } void impl_gradient (gradient_t& grad, const argument_t& p, size_type i) const throw () { - boost::scoped_ptr<freeTime_t> updatedTrajectory (traj_.clone ()); - updatedTrajectory->setParameters (p); - matrix_t tmp = updatedTrajectory->variationConfigWrtParam (t_); - grad = row (tmp, 0); + compute (grad, p, order_ + 1); } const freeTime_t& traj_; + const int order_; double t_; }; @@ -170,7 +185,7 @@ void printTable (const Spline& spline, const freeTime_t& freeTimeTraj) try { - ConfigWrtParam configWrtParam (freeTimeTraj, t); + ConfigWrtParam configWrtParam (freeTimeTraj, -1, t); checkGradientAndThrow (configWrtParam, 0, freeTimeTraj.parameters ()); } @@ -203,6 +218,17 @@ void printTable (const Spline& spline, const freeTime_t& freeTimeTraj) freeTimeTraj.variationDerivWrtParam (t, 1); fmterDeriv % fttVarDeriv; + try + { + ConfigWrtParam derivWrtParam (freeTimeTraj, 0, t); + checkGradientAndThrow (derivWrtParam, 0, + freeTimeTraj.parameters ()); + } + catch (BadGradient& bg) + { + std::cout << bg << std::endl; + } + std::cout << fmterDeriv << std::endl; } ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 +++++ tests/free-time-trajectory.cc | 46 ++++++++++++++++++++++++++++++++--------- 2 files changed, 42 insertions(+), 10 deletions(-) hooks/post-receive -- roboptim-trajectory |
From: Thomas M. <tho...@us...> - 2009-10-23 15:30:53
|
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 3663351287ad0b7d91de0464a72e727c4b6e4695 (commit) via 790827248fd8d3bb0268909dfeb924015637e279 (commit) from efd5653bec28d517f80f5995f3acf416309f4f56 (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 3663351287ad0b7d91de0464a72e727c4b6e4695 Merge: efd5653 7908272 Author: Thomas Moulard <tho...@gm...> Date: Fri Oct 23 17:30:34 2009 +0200 Merge remote branches 'origin/master' and 'laas/master' Conflicts: ChangeLog diff --cc ChangeLog index 58adda9,7aad1a5..b0e8af6 --- a/ChangeLog +++ b/ChangeLog @@@ -1,8 -1,8 +1,13 @@@ +2009-10-21 Thomas Moulard <tho...@gm...> + + Synchronize. + * build-aux: Synchronize. + + 2009-10-21 Florent Lamiraux <fl...@la...> + + Synchronize. + * build-aux: Use latest version. + 2009-10-19 Thomas Moulard <tho...@gm...> Fix documentation dependencies. commit 790827248fd8d3bb0268909dfeb924015637e279 Author: florent <fl...@la...> Date: Wed Oct 21 14:40:16 2009 +0200 Synchronize. * build-aux: Use latest version. Signed-off-by: florent <fl...@la...> diff --git a/ChangeLog b/ChangeLog index 597f409..7aad1a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-10-21 Florent Lamiraux <fl...@la...> + + Synchronize. + * build-aux: Use latest version. + 2009-10-19 Thomas Moulard <tho...@gm...> Fix documentation dependencies. diff --git a/build-aux b/build-aux index 5f0b945..d9d1710 160000 --- a/build-aux +++ b/build-aux @@ -1 +1 @@ -Subproject commit 5f0b945883a5c35dbd7b13008854b21ee418fb61 +Subproject commit d9d17105cd9c7405c7b2a438e7b0a185d3d2a8b6 ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) hooks/post-receive -- roboptim-trajectory |
From: Thomas M. <tho...@us...> - 2009-10-23 09:01:43
|
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 29027bbcdac9cfebc6628c8cc1fb6c1ee7caf840 (commit) via 2739bd97e7f500bdcbd9d2ae256d0320264182a4 (commit) from 163f99970bb5aa98c94d35d25026851a4cd00762 (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 29027bbcdac9cfebc6628c8cc1fb6c1ee7caf840 Author: Thomas Moulard <tho...@gm...> Date: Fri Oct 23 11:01:19 2009 +0200 Handle symbol visibility under Linux. * include/roboptim/core/portability.hh: Here. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index 04a0fc3..95a2090 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-10-23 Thomas Moulard <tho...@gm...> + Handle symbol visibility under Linux. + * include/roboptim/core/portability.hh: Here. + +2009-10-23 Thomas Moulard <tho...@gm...> + Add missing ROBOPTIM_DLLEXPORT. * include/roboptim/core/visualization/gnuplot-commands.hh, * include/roboptim/core/visualization/gnuplot.hh, diff --git a/include/roboptim/core/portability.hh b/include/roboptim/core/portability.hh index 912f950..de00d87 100644 --- a/include/roboptim/core/portability.hh +++ b/include/roboptim/core/portability.hh @@ -18,6 +18,8 @@ #ifndef ROBOPTIM_CORE_PORTABILITY_HH # define ROBOPTIM_CORE_PORTABILITY_HH + + // Handle portable symbol export. // Defining manually which symbol should be exported is required // under Windows whether MinGW or MSVC is used. @@ -25,18 +27,42 @@ // The headers then have to be able to work in two different modes: // - dllexport when one is building the library, // - dllimport for clients using the library. -# ifdef _WIN32 -# define ROBOPTIM_DLLIMPORT __declspec(dllimport) -# define ROBOPTIM_DLLEXPORT __declspec(dllexport) -# else -# define ROBOPTIM_DLLIMPORT -# define ROBOPTIM_DLLEXPORT -# endif //! WIN32 +// +// On Linux, set the visibility accordingly. If C++ symbol visibility +// is handled by the compiler, see: http://gcc.gnu.org/wiki/Visibility +#if defined _WIN32 || defined __CYGWIN__ +// On Microsoft Windows, use dllimport and dllexport to tag symbols. + #define ROBOPTIM_DLLIMPORT __declspec(dllimport) + #define ROBOPTIM_DLLEXPORT __declspec(dllexport) + #define ROBOPTIM_DLLLOCAL +#else +// On Linux, for GCC >= 4, tag symbols using GCC extension. + #if __GNUC__ >= 4 + #define ROBOPTIM_DLLIMPORT __attribute__ ((visibility("default"))) + #define ROBOPTIM_DLLEXPORT __attribute__ ((visibility("default"))) + #define ROBOPTIM_DLLLOCAL __attribute__ ((visibility("hidden"))) + #else +// Otherwise (GCC < 4 or another compiler is used), export everything. + #define ROBOPTIM_DLLIMPORT + #define ROBOPTIM_DLLEXPORT + #define ROBOPTIM_DLLLOCAL +#endif // __GNUC__ >= 4 +#endif // defined _WIN32 || defined __CYGWIN__ -# ifndef BUILDING_ROBOPTIM -# define ROBOPTIM_DLLAPI ROBOPTIM_DLLIMPORT -# else -# define ROBOPTIM_DLLAPI ROBOPTIM_DLLEXPORT -# endif //! BUILDING_ROBOPTIM_CORE +#ifdef ROBOPTIM_STATIC +// If one is using the library statically, get rid of +// extra information. + #define ROBOPTIM_DLLAPI + #define ROBOPTIM_LOCAL +#else +// Depending on whether one is building or using the +// library define DLLAPI to import or export. + #ifdef BUILDING_ROBOPTIM + #define ROBOPTIM_DLLAPI ROBOPTIM_DLLEXPORT + #else + #define ROBOPTIM_DLLAPI ROBOPTIM_DLLIMPORT + #endif // BUILDING_ROBOPTIM + #define ROBOPTIM_LOCAL ROBOPTIM_DLLLOCAL +#endif // ROBOPTIM_STATIC #endif //! ROBOPTIM_CORE_PORTABILITY_HH commit 2739bd97e7f500bdcbd9d2ae256d0320264182a4 Author: Thomas Moulard <tho...@gm...> Date: Fri Oct 23 11:01:01 2009 +0200 Add missing ROBOPTIM_DLLEXPORT. * include/roboptim/core/visualization/gnuplot-commands.hh, * include/roboptim/core/visualization/gnuplot.hh, * src/roboptim-core-dummy-plugin.cc: Export all symbols properly. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index a73644b..04a0fc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-10-23 Thomas Moulard <tho...@gm...> + + Add missing ROBOPTIM_DLLEXPORT. + * include/roboptim/core/visualization/gnuplot-commands.hh, + * include/roboptim/core/visualization/gnuplot.hh, + * src/roboptim-core-dummy-plugin.cc: Export all symbols properly. + 2009-10-21 Thomas Moulard <tho...@gm...> Enhance error message in solver-factory.hxx. diff --git a/include/roboptim/core/visualization/gnuplot-commands.hh b/include/roboptim/core/visualization/gnuplot-commands.hh index 40081fe..7ce4b1f 100644 --- a/include/roboptim/core/visualization/gnuplot-commands.hh +++ b/include/roboptim/core/visualization/gnuplot-commands.hh @@ -36,7 +36,7 @@ namespace roboptim /// A command represents a Gnuplot command. /// The representation of the command as a string /// can be accessed through the #command() method. - class Command + class ROBOPTIM_DLLAPI Command { public: /// \brief Make a command from a string. @@ -52,7 +52,7 @@ namespace roboptim }; /// \brief Make a Gnuplot comment. - Command comment (const char*) throw (); + ROBOPTIM_DLLAPI Command comment (const char*) throw (); /// \brief Make a Gnuplot set command. @@ -62,71 +62,71 @@ namespace roboptim /// \param var variable that will be set /// \param val new variable value /// \return Gnuplot command - Command set (const char* var, const char* val = "") throw (); + ROBOPTIM_DLLAPI Command set (const char* var, const char* val = "") throw (); /// \brief Make a Gnuplot unset command. /// /// Make a Gnuplot unset command (destroy a variable). /// \param var variable that will be unset /// \return Gnuplot command - Command unset (const char* var) throw (); + ROBOPTIM_DLLAPI Command unset (const char* var) throw (); /// \brief Make a Gnuplot show command. /// /// Make a Gnuplot show command (show a variable value). /// \param var variable that will be shown /// \return Gnuplot command - Command show (const char* var) throw (); + ROBOPTIM_DLLAPI Command show (const char* var) throw (); /// \brief Make a Gnuplot clear command. /// /// Make a Gnuplot clear command (clear the screen). /// \return Gnuplot command - Command clear () throw (); + ROBOPTIM_DLLAPI Command clear () throw (); /// \brief Make a Gnuplot pwdcommand. /// /// Make a Gnuplot pwd command (show the current directory). /// \return Gnuplot command - Command pwd () throw (); + ROBOPTIM_DLLAPI Command pwd () throw (); /// \brief Make a Gnuplot quit command. /// /// Make a Gnuplot quit command (quit Gnuplot). /// \return Gnuplot command - Command quit () throw (); + ROBOPTIM_DLLAPI Command quit () throw (); /// \brief Make a Gnuplot replot command. /// /// Make a Gnuplot replot command (redraw previously defined curves). /// \return Gnuplot command - Command replot () throw (); + ROBOPTIM_DLLAPI Command replot () throw (); /// \brief Make a Gnuplot reread command. /// /// Make a Gnuplot reread command (reread data files). /// \return Gnuplot command - Command reread () throw (); + ROBOPTIM_DLLAPI Command reread () throw (); /// \brief Make a Gnuplot reset command. /// /// Make a Gnuplot replot command (reset Gnuplot state). /// \return Gnuplot command - Command reset () throw (); + ROBOPTIM_DLLAPI Command reset () throw (); /// \brief Make a Gnuplot cd command. /// /// Make a Gnuplot cd command (change current directory). /// \param dir new directory /// \return Gnuplot command - Command cd (const char* dir) throw (); + ROBOPTIM_DLLAPI Command cd (const char* dir) throw (); /// \brief Make a Gnuplot help command. /// /// Make a Gnuplot help command (display Gnuplot help). /// \param topic help topic /// \return Gnuplot command - Command help (const char* topic = "") throw (); + ROBOPTIM_DLLAPI Command help (const char* topic = "") throw (); /// @} diff --git a/include/roboptim/core/visualization/gnuplot.hh b/include/roboptim/core/visualization/gnuplot.hh index 9673154..838b4c1 100644 --- a/include/roboptim/core/visualization/gnuplot.hh +++ b/include/roboptim/core/visualization/gnuplot.hh @@ -40,7 +40,7 @@ namespace roboptim /// this object through the \c << operator /// and this object can be put into an output stream /// using the \c << operator. - class Gnuplot + class ROBOPTIM_DLLAPI Gnuplot { public: ~Gnuplot () throw (); @@ -114,7 +114,7 @@ namespace roboptim /// \param o output stream used for display /// \param gp Gnuplot script to be displayed /// \return output stream - std::ostream& operator<< (std::ostream&, const Gnuplot& gp); + ROBOPTIM_DLLAPI std::ostream& operator<< (std::ostream&, const Gnuplot& gp); } // end of namespace visualization. } // end of namespace roboptim. diff --git a/src/roboptim-core-dummy-plugin.cc b/src/roboptim-core-dummy-plugin.cc index 56a4aed..44289dc 100644 --- a/src/roboptim-core-dummy-plugin.cc +++ b/src/roboptim-core-dummy-plugin.cc @@ -45,21 +45,21 @@ extern "C" using namespace roboptim; typedef DummySolver::parent_t solver_t; - unsigned getSizeOfProblem (); - solver_t* create (const DummySolver::problem_t& pb); - void destroy (solver_t* p); + ROBOPTIM_DLLEXPORT unsigned getSizeOfProblem (); + ROBOPTIM_DLLEXPORT solver_t* create (const DummySolver::problem_t& pb); + ROBOPTIM_DLLEXPORT void destroy (solver_t* p); - unsigned getSizeOfProblem () + ROBOPTIM_DLLEXPORT unsigned getSizeOfProblem () { return sizeof (solver_t::problem_t); } - solver_t* create (const DummySolver::problem_t& pb) + ROBOPTIM_DLLEXPORT solver_t* create (const DummySolver::problem_t& pb) { return new DummySolver (pb); } - void destroy (solver_t* p) + ROBOPTIM_DLLEXPORT void destroy (solver_t* p) { delete p; } ----------------------------------------------------------------------- Summary of changes: ChangeLog | 12 +++++ include/roboptim/core/portability.hh | 50 +++++++++++++++----- .../core/visualization/gnuplot-commands.hh | 26 +++++----- include/roboptim/core/visualization/gnuplot.hh | 4 +- src/roboptim-core-dummy-plugin.cc | 12 ++-- 5 files changed, 71 insertions(+), 33 deletions(-) hooks/post-receive -- roboptim-core |
From: Thomas M. <tho...@us...> - 2009-10-21 16:27:45
|
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 efd5653bec28d517f80f5995f3acf416309f4f56 (commit) from 19d676db62607daf8c5ba5090e0a29fc74275523 (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 efd5653bec28d517f80f5995f3acf416309f4f56 Author: Thomas Moulard <tho...@gm...> Date: Wed Oct 21 18:27:30 2009 +0200 Synchronize. * build-aux: Synchronize. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index 597f409..58adda9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-10-21 Thomas Moulard <tho...@gm...> + + Synchronize. + * build-aux: Synchronize. + 2009-10-19 Thomas Moulard <tho...@gm...> Fix documentation dependencies. diff --git a/build-aux b/build-aux index 5f0b945..d9d1710 160000 --- a/build-aux +++ b/build-aux @@ -1 +1 @@ -Subproject commit 5f0b945883a5c35dbd7b13008854b21ee418fb61 +Subproject commit d9d17105cd9c7405c7b2a438e7b0a185d3d2a8b6 ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++++ build-aux | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) hooks/post-receive -- roboptim-trajectory |
From: Thomas M. <tho...@us...> - 2009-10-21 11:23:22
|
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 163f99970bb5aa98c94d35d25026851a4cd00762 (commit) from 5e6ea542bdb86be8d8590b728cf950f19cc30ea3 (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 163f99970bb5aa98c94d35d25026851a4cd00762 Author: Thomas Moulard <tho...@gm...> Date: Wed Oct 21 13:23:07 2009 +0200 Enhance error message in solver-factory.hxx. * include/roboptim/core/solver-factory.hxx: Enhance error message. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index 2d60c07..a73644b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-10-21 Thomas Moulard <tho...@gm...> + Enhance error message in solver-factory.hxx. + * include/roboptim/core/solver-factory.hxx: + Enhance error message. + +2009-10-21 Thomas Moulard <tho...@gm...> + Make plug-in loading more robust. * include/roboptim/core/solver-factory.hxx: Check problem size when loading a plug-in. diff --git a/include/roboptim/core/solver-factory.hxx b/include/roboptim/core/solver-factory.hxx index 06b5fdb..8ab8c53 100644 --- a/include/roboptim/core/solver-factory.hxx +++ b/include/roboptim/core/solver-factory.hxx @@ -63,10 +63,11 @@ namespace roboptim if (sizeOfProblem != sizeof (typename solver_t::problem_t)) { std::stringstream sserror; - sserror << "Application and plug-in problem type does not match" - << "(size is " << sizeOfProblem - << " byte(s) but " << sizeof (typename solver_t::problem_t) - << " byte(s) was expected by application)"; + sserror + << "``Problem'' type size does not match in application and plug-in" + << " (size is " << sizeOfProblem + << " byte(s) but " << sizeof (typename solver_t::problem_t) + << " byte(s) was expected by application)"; lt_dlclose (handle_); lt_dlexit (); ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 ++++++ include/roboptim/core/solver-factory.hxx | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) hooks/post-receive -- roboptim-core |
From: Thomas M. <tho...@us...> - 2009-10-21 11:13:46
|
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 5e6ea542bdb86be8d8590b728cf950f19cc30ea3 (commit) via d5d63ffc0a37b0d1f3b0cf029ae708747d032114 (commit) from 48b0ab36253c3de6b38e706686c6ea5961b683eb (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 5e6ea542bdb86be8d8590b728cf950f19cc30ea3 Author: Thomas Moulard <tho...@gm...> Date: Wed Oct 21 13:13:28 2009 +0200 Make plug-in loading more robust. * include/roboptim/core/solver-factory.hxx: Check problem size when loading a plug-in. * src/roboptim-core-dummy-plugin.cc: Add getSizeOfProblem function. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index bff4430..2d60c07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2009-10-21 Thomas Moulard <tho...@gm...> + Make plug-in loading more robust. + * include/roboptim/core/solver-factory.hxx: Check problem size + when loading a plug-in. + * src/roboptim-core-dummy-plugin.cc: Add getSizeOfProblem function. + +2009-10-21 Thomas Moulard <tho...@gm...> + Reorganize configure.ac. * configure.ac: Change macro order to enhance consistency. diff --git a/include/roboptim/core/solver-factory.hxx b/include/roboptim/core/solver-factory.hxx index 13c72ba..06b5fdb 100644 --- a/include/roboptim/core/solver-factory.hxx +++ b/include/roboptim/core/solver-factory.hxx @@ -27,6 +27,7 @@ namespace roboptim : handle_ (), solver_ () { + typedef unsigned getsizeofproblem_t (); typedef solver_t* create_t (const problem_t&); if (lt_dlinit () > 0) @@ -44,6 +45,35 @@ namespace roboptim throw std::runtime_error (sserror.str ().c_str ()); } + getsizeofproblem_t* getSizeOfProblem = + reinterpret_cast<getsizeofproblem_t*> + (lt_dlsym (handle_, "getSizeOfProblem")); + if (!getSizeOfProblem) + { + std::stringstream sserror; + sserror << "libltdl failed to find symbol ``getSizeOfProblem'': " + << lt_dlerror (); + + lt_dlclose (handle_); + lt_dlexit (); + throw std::runtime_error (sserror.str ().c_str ()); + } + + unsigned sizeOfProblem = getSizeOfProblem (); + if (sizeOfProblem != sizeof (typename solver_t::problem_t)) + { + std::stringstream sserror; + sserror << "Application and plug-in problem type does not match" + << "(size is " << sizeOfProblem + << " byte(s) but " << sizeof (typename solver_t::problem_t) + << " byte(s) was expected by application)"; + + lt_dlclose (handle_); + lt_dlexit (); + throw std::runtime_error (sserror.str ().c_str ()); + } + + create_t* c = reinterpret_cast<create_t*> (lt_dlsym (handle_, "create")); if (!c) @@ -56,6 +86,7 @@ namespace roboptim lt_dlexit (); throw std::runtime_error (sserror.str ().c_str ()); } + solver_ = c (pb); if (!solver_) diff --git a/src/roboptim-core-dummy-plugin.cc b/src/roboptim-core-dummy-plugin.cc index 297827f..56a4aed 100644 --- a/src/roboptim-core-dummy-plugin.cc +++ b/src/roboptim-core-dummy-plugin.cc @@ -45,9 +45,15 @@ extern "C" using namespace roboptim; typedef DummySolver::parent_t solver_t; + unsigned getSizeOfProblem (); solver_t* create (const DummySolver::problem_t& pb); void destroy (solver_t* p); + unsigned getSizeOfProblem () + { + return sizeof (solver_t::problem_t); + } + solver_t* create (const DummySolver::problem_t& pb) { return new DummySolver (pb); commit d5d63ffc0a37b0d1f3b0cf029ae708747d032114 Author: Thomas Moulard <tho...@gm...> Date: Wed Oct 21 13:11:56 2009 +0200 Reorganize configure.ac. * configure.ac: Change macro order to enhance consistency. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index 2de270c..bff4430 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-10-21 Thomas Moulard <tho...@gm...> + + Reorganize configure.ac. + * configure.ac: Change macro order to enhance consistency. + 2009-10-07 Thomas Moulard <tho...@gm...> Synchronize. diff --git a/configure.ac b/configure.ac index efe3e17..3b73c0a 100644 --- a/configure.ac +++ b/configure.ac @@ -14,6 +14,9 @@ AC_INIT([RobOptim core library], # Auxiliary files. AC_CONFIG_AUX_DIR([build-aux]) +# Macros are stored in build-aux. +AC_CONFIG_MACRO_DIR([build-aux]) + # Automake. AM_INIT_AUTOMAKE([1.9.6 dist-bzip2 -Wall nostdinc]) @@ -43,9 +46,6 @@ JRL_CXX_WARNINGS([[-Wall], [-Wmissing-declarations], [-Wnested-externs]]) -# Macros are stored in build-aux. -AC_CONFIG_MACRO_DIR([build-aux]) - ## ------------------- ## ## Additionnal tools. ## ## ------------------- ## ----------------------------------------------------------------------- Summary of changes: ChangeLog | 12 +++++++++++ configure.ac | 6 ++-- include/roboptim/core/solver-factory.hxx | 31 ++++++++++++++++++++++++++++++ src/roboptim-core-dummy-plugin.cc | 6 +++++ 4 files changed, 52 insertions(+), 3 deletions(-) hooks/post-receive -- roboptim-core |
From: Thomas M. <tho...@us...> - 2009-10-19 14:35:22
|
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 d9d17105cd9c7405c7b2a438e7b0a185d3d2a8b6 (commit) from 5f0b945883a5c35dbd7b13008854b21ee418fb61 (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 d9d17105cd9c7405c7b2a438e7b0a185d3d2a8b6 Author: Thomas Moulard <tho...@gm...> Date: Mon Oct 19 16:35:02 2009 +0200 Remove useless code. * pkg-config.mk: Here. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index b9895fe..bfaa8fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-10-19 Thomas Moulard <tho...@gm...> + + Remove useless code. + * pkg-config.mk: Here. + 2009-10-15 Thomas Moulard <tho...@gm...> Add hooks to allow the copy of additional files in Doxygen directory. diff --git a/pkg-config.mk b/pkg-config.mk index c138112..e7fe0e1 100644 --- a/pkg-config.mk +++ b/pkg-config.mk @@ -45,15 +45,6 @@ pkg_config_file = '@PACKAGE_TARNAME@.pc' pkgdir = "$(DESTDIR)$(libdir)/pkgconfig/" -edit = $(SED) -e "s|@prefix\@|$(prefix)|" \ - -e 's,@exec_prefix\@,$(exec_prefix),g' \ - -e 's,@libdir\@,$(libdir),g' \ - -e 's,@includedir\@,$(includedir),g' \ - -e 's,@datarootdir\@,$(datarootdir),g' \ - -e 's,@PACKAGE\@,$(PACKAGE),g' \ - -e 's,@PACKAGE_TARNAME\@,$(PACKAGE_TARNAME),g' \ - -e 's,@VERSION\@,$(PACKAGE_VERSION),g' - EXTRA_DIST += build-aux/pkg-config.pc.in CLEANFILES += $(pkg_config_file) ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++++ pkg-config.mk | 9 --------- 2 files changed, 5 insertions(+), 9 deletions(-) hooks/post-receive -- build-aux |
From: Thomas M. <tho...@us...> - 2009-10-19 13:10:02
|
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 19d676db62607daf8c5ba5090e0a29fc74275523 (commit) from addfc481e96b37e1be1cb81446a809bb3e475042 (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 19d676db62607daf8c5ba5090e0a29fc74275523 Author: Thomas Moulard <tho...@gm...> Date: Mon Oct 19 15:09:39 2009 +0200 Fix documentation dependencies. * build-aux: Synchronize. * doc/Doxyfile.extra.in: Fix documentation dependencies. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index 6e9b6cd..597f409 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-10-19 Thomas Moulard <tho...@gm...> + + Fix documentation dependencies. + * build-aux: Synchronize. + * doc/Doxyfile.extra.in: Fix documentation + dependencies. + 2009-10-07 Thomas Moulard <tho...@gm...> Remove doc submodule and add updated doc directory. diff --git a/build-aux b/build-aux index d9d268a..5f0b945 160000 --- a/build-aux +++ b/build-aux @@ -1 +1 @@ -Subproject commit d9d268a28e832830c76467d499e5be9a8ce6e72f +Subproject commit 5f0b945883a5c35dbd7b13008854b21ee418fb61 diff --git a/doc/Doxyfile.extra.in b/doc/Doxyfile.extra.in index 6a138b7..28e5d11 100644 --- a/doc/Doxyfile.extra.in +++ b/doc/Doxyfile.extra.in @@ -1 +1 @@ -TAGFILES = "roboptim-core.doxytag = @ROBOPTIMCORE_DOXYGENDOCDIR@" +TAGFILES = "@ROBOPTIMCORE_DOXYGENDOCDIR@/roboptim-core.doxytag = @ROBOPTIMCORE_DOXYGENDOCDIR@" ----------------------------------------------------------------------- Summary of changes: ChangeLog | 7 +++++++ build-aux | 2 +- doc/Doxyfile.extra.in | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) hooks/post-receive -- roboptim-trajectory |
From: Thomas M. <tho...@us...> - 2009-10-15 13:31:16
|
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 addfc481e96b37e1be1cb81446a809bb3e475042 (commit) from 6d2f137e3a6e32fe32d10c4018c948f1897d526e (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 addfc481e96b37e1be1cb81446a809bb3e475042 Author: florent <fl...@fl...> Date: Thu Oct 15 13:53:16 2009 +0200 Set m=0.5 instead of m=2.0 and bound control points. diff --git a/tests/spline-bicycle-optim.cc b/tests/spline-bicycle-optim.cc index fcc79d6..3e4a31b 100644 --- a/tests/spline-bicycle-optim.cc +++ b/tests/spline-bicycle-optim.cc @@ -53,7 +53,8 @@ typedef TrajectorySumCost<Spline>::discreteStableTimePointInterval_t discreteSta /* Parameter of the cost function */ -static double m=2.0; +//#define BICYCLE_COST_FUNCTION +static double m=.5; class PositiveCostVar : public DerivableFunction { @@ -69,7 +70,7 @@ public: double y0 = x[1]; double x1 = x[2]; double y1 = x[3]; - double v = m*y0; + double v = 1+m*y0; res[0] = .5*v*(x1*x1+y1*y1); #endif }; @@ -91,7 +92,7 @@ public: double y0 = x[1]; double x1 = x[2]; double y1 = x[3]; - double v = m*y0; + double v = 1+m*y0; grad[1] = .5*m*(x1*x1+y1*y1); grad[2] = v*x1; @@ -108,27 +109,33 @@ int run_test () // Initial position. params[0] = 0., params[1] = 0.; // Control point . - params[2] = .1, params[3] = .01; + params[2] = .1, params[3] = -2.0; // Control point . - params[4] = .2, params[5] = .02; + params[4] = .2, params[5] = -2.0; // Control point . - params[6] = .3, params[7] = .03; + params[6] = .3, params[7] = -2.0; // Control point . - params[8] = .4, params[9] = .04; + params[8] = .4, params[9] = -2.0; // Control point . - params[10] = .5, params[11] = .05; + params[10] = .5, params[11] = -2.0; // Control point . - params[12] = .6, params[13] = .06; + params[12] = .6, params[13] = -2.0; // Control point . - params[14] = .7, params[15] = .07; + params[14] = .7, params[15] = -2.0; // Control point . - params[16] = .8, params[17] = .08; + params[16] = .8, params[17] = -2.0; // Control point . - params[18] = .9, params[19] = .09; + params[18] = .9, params[19] = -2.0; // Final position. params[20] = 1., params[21] = .1; Spline::interval_t timeRange = Spline::makeInterval (0., 1.); + std::vector<roboptim::Function::interval_t> defDomain; + + for (unsigned int i=0; i<11; i++) { + defDomain.push_back(Function::makeInterval(0.0, 1.0)); + defDomain.push_back(Function::makeInterval(-2.0, 10.0)); + } Spline spline (timeRange, 2, params, "before"); discreteStableTimePointInterval_t interval @@ -159,11 +166,12 @@ int run_test () catch (BadGradient& bg) { std::cout << bg << std::endl; - return 1; + // return 1; } solver_t::problem_t problem (sumCost); problem.startingPoint () = params; + problem.argumentBounds() = defDomain; std::vector<Function::size_type> indices; indices.push_back (0); @@ -226,7 +234,6 @@ int run_test () catch (BadGradient& bg) { std::cout << bg << std::endl; - return 1; } std::cout << (gnuplot << unset ("multiplot")); ----------------------------------------------------------------------- Summary of changes: tests/spline-bicycle-optim.cc | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) hooks/post-receive -- roboptim-trajectory |
From: Thomas M. <tho...@us...> - 2009-10-15 12:40:19
|
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 5f0b945883a5c35dbd7b13008854b21ee418fb61 (commit) from bd8a4f27d10402c3a4ae1529dde91b62248c54bd (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 5f0b945883a5c35dbd7b13008854b21ee418fb61 Author: Thomas Moulard <tho...@gm...> Date: Thu Oct 15 14:40:08 2009 +0200 Add hooks to allow the copy of additional files in Doxygen directory. * doxygen.mk: Here. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index e25766b..b9895fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-10-15 Thomas Moulard <tho...@gm...> + Add hooks to allow the copy of additional files in Doxygen directory. + * doxygen.mk: Here. + +2009-10-15 Thomas Moulard <tho...@gm...> + Fix doxygen.mk to avoid disallowing valid patterns. * doxygen.m4: Only forbid ``^JRL_'' and not ``^JRL''. diff --git a/doxygen.mk b/doxygen.mk index 7dad5cb..0dcc32e 100644 --- a/doxygen.mk +++ b/doxygen.mk @@ -52,9 +52,11 @@ # automatically and it would be trivial to handle dependencies. # # P.S.: this is a general idea and not a perfect implementation, one problem -# is that doxygen.dep file will have to contain absolute paths and not relative as -# it is usually the case in Automake. +# is that doxygen.dep file will have to contain absolute paths +# and not relative as it is usually the case in Automake. +# Define Doxygen directory. +doxygendocdir = $(htmldir)/doxygen-html # Distributed files. EXTRA_DIST += \ @@ -82,21 +84,29 @@ CLEANFILES += \ DOXYGEN_DEPS = $(shell \ $(top_srcdir)/build-aux/doxygen/doxygen-deps.sh Doxyfile) +# Additional files that will be copied into doxygendocdir. +DOXYGEN_EXTRA = + # Targets rebuilt unconditionally. .PHONY: doc \ html \ install-doxygen-html \ - uninstall-doxygen-html + uninstall-doxygen-html \ + install-doxygen-html-local \ + uninstall-doxygen-html-local # Rules. doc: html html-local: doxygen-html @PACKAGE_TARNAME@.doxytag: Doxyfile $(DOXYGEN_DEPS) - @if test -d doxygen-html ; then \ - rm -rf doxygen-html/; \ + @if test -d doxygen-html ; then \ + rm -rf doxygen-html/; \ fi @$(DOXYGEN) "$<" + @if ! test "x$(DOXYGEN_DEPS)" = x; then \ + cp -pr $(DOXYGEN_DEPS) doxygen-html; \ + fi doxygen-html: @PACKAGE_TARNAME@.doxytag @@ -116,15 +126,15 @@ clean-local: # Install rules. install-data-local: install-doxygen-html -install-doxygen-html: html-local +install-doxygen-html: html-local install-doxygen-html-local @if ! test -d "$(DESTDIR)$(htmldir)"; then \ $(mkinstalldirs) "$(DESTDIR)$(htmldir)"; \ fi @cp -pr doxygen-html/ "$(DESTDIR)$(htmldir)" @$(INSTALL_DATA) $(PACKAGE_TARNAME).doxytag \ - "$(DESTDIR)$(htmldir)/doxygen-html" + "$(DESTDIR)$(doxygendocdir)" # Uninstall rules. uninstall-local: uninstall-doxygen-html -uninstall-doxygen-html: +uninstall-doxygen-html: uninstall-doxygen-html-local rm -rf "$(DESTDIR)$(htmldir)" ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++++ doxygen.mk | 26 ++++++++++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) hooks/post-receive -- build-aux |
From: Thomas M. <tho...@us...> - 2009-10-15 09:57:05
|
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.1 has been created at cdfbfd5f2fe373476f0d064161f394d98df0b7e4 (tag) tagging 6d2f137e3a6e32fe32d10c4018c948f1897d526e (commit) tagged by Thomas Moulard on Sun May 3 23:33:38 2009 +0200 - Log ----------------------------------------------------------------- Release v0.2.1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABECAAYFAkrW8cQACgkQ2c3AurFAup6+2QCaAo65zN3n5dz27tIZDg893/i/ gsEAoKngtDv7dtN/p56U9YVccPbJAuqo =qEBR -----END PGP SIGNATURE----- Moulard (3): Replace MKDIR_P by mkdir_p. Fix pkg-config file. Regenerate test suite output on 32-bits machine. Thomas Moulard (164): 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. Check parameters update. Fix Spline and TrajectorySumCost implementation. Fix Spline class. Implement LengthCost in spline optimization test. Merge branch 'master' of git+ssh://tmo...@gi.../git/jrl/roboptim/trajectory Add start/end constraint while optimizing the spline. Factorize code in Spline class. Check Spline gradient. Remove bugs and improve display in Spline class. Enhance Spline gradient test case. Debug Spline optimization test case. Debug Spline test cases. Check parameters size when creating a Spline. Debug gradient's constraint. Distribute missing stdout files. Debug gradient. Debug tests. Clean tests cases. Use new function interface. Distribute pkg.m4. Make pkg-config depends on configure. Clean building chain. Make Libtool support more robust. Remove pkg.m4. Implement SplineLength. Use Freeze constraint in test suite. Add tests to Doxygen EXAMPLE_PATH. Update to new interface and document. Synchronize with share. Synchronize. Fix build-chain when headers are in non-standard directories. Implement Freeze class. Fix buildchain. Synchonize with share. Do not use boost::make_shared. Add titles to functions. Use foreach for iterating. Use submodule to factorize code. Handle submodules and check git. Add Gnuplot command for trajectory display. Make checks on displayed trajectories less stricts. Allow small overrun of time limits in Spline class. Use fixed-point display in Gnuplot. Make use of function's names in trajectory classes. Debug free-time-trajectory. Add stable time point class. Debug time optimization. Add missing include. Add TimeStablePoint interface into FreeTimeTrajectory. Debug free time trajectory and add stable time point. Debug free time trajectory. Debug free time trajectory. Fix computation error in free time trajectory. Move time stable point gradient interface into Trajectory class. Remove tests that was tagged as XFAIL. Fix typo. Remove orphan stdout file and distribute the right one. Fix naming clash in inclusion guards. Add isValidTime method. Add missing ``inline'' in header. Add missing ``inline''. Force range when displaying speed limit in Gnuplot. Enhance LimitSpeed class. Make plot_limitSpeed display vMax optionally. Enhance SplineLength. Check gradient in spline-gradient test. Be more strict in gradient checking in spline-optimization. Fix vMax display in plot_limitSpeed. Enhance time optimization. Fix tests. Clean test. Use new io.hh roboptim-core header. Fix speed limit vmax computation and output. Use argument bounds to force a positive scale. Use argument bounds to freeze parameters. Re-implement free-time-trajectory. Rewrite variationDerivWrtParam in freeTimeTrajectory. Check variationConfigWrtParam in FreeTimeTrajectory class. Use constraint type from cfsqp.hh. Precise derivation order explicitly. Do not add constraints on trajectory bounds as gradient is null. Fix free time optimization test case. Remove useless constraints. Update test case output. Implement frontal-speed. Add orthogonal speed. Add missing newline. Add new test case. Fix computation error in frontal speed. Make time input argument of frontal/orthogonal speed. Fix test case. Fix frontal/orthogonal speed computation. Update test case. Add constraint function for frontal/orthogonal speed. Use stable time point when displaying trajectory. Add LimitOmega class. Add complex-cost-function test case cost function into a class. Add plot_xytheta visualization function. Add speed visualization. Regenerate. Split test case. Fix integral computation. Use foreach variant. Use new foreach variant. Fix test case. Fix gradient checking. Regenerate test case. Add analytical gradient for LimitOmega. Optimize. Optimize. Make regular constraint add more robust. Fix orthogonal speed function name and clean code. Implement StateCost. Reimplement speed limits using StateCost. Use boost::shared_ptr to store function in StateCost. Fix limit-omega. Update submodules to new SourceForge URLs. Update to new interface. Predeclare function. Merge branch 'master' of git+ssh://git.laas.fr/git/jrl/roboptim/trajectory Implement normalizeAngle in Trajectory and FreeTimeTrajectory. Add sys.hh to avoid problem with libcwd. Include ``sys.hh'' first in all headers. Include ``sys.hh'' first. Distribute ``sys.hh''. Change test description. Update doc rules, version number management and test suite rules. Synchronize. Synchronize. Synchronize. Synchronize. Implement DiscreteStableTimePointInterval_t. Fix errors in Doxygen documentation. Synchronize. Remove doc submodule and add updated doc directory. florent (6): If roboptim-core is not found, trigger pkg-config. Document state cost. Add declaration before definition to remove warning. Fix comment. Rewrite TrajectorySumCost to fit StateCost interface. Add a test: minimization of positive height variation along a spline. ----------------------------------------------------------------------- hooks/post-receive -- roboptim-trajectory |
From: Thomas M. <tho...@us...> - 2009-10-15 09:57:01
|
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 has been created at 5eb36f10ffadf90506aa188099e73eee9a4e793b (tag) tagging 6d2f137e3a6e32fe32d10c4018c948f1897d526e (commit) tagged by Thomas Moulard on Sun May 3 23:02:32 2009 +0200 - Log ----------------------------------------------------------------- Release v0.2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABECAAYFAkrW8ZsACgkQ2c3AurFAup6lSACfSuYk9p6hApdeGhsm1igiBBxo Rg0Amwezk0dTkuo4NounVdlAu0o7gTBj =4lMa -----END PGP SIGNATURE----- Moulard (3): Replace MKDIR_P by mkdir_p. Fix pkg-config file. Regenerate test suite output on 32-bits machine. Thomas Moulard (164): 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. Check parameters update. Fix Spline and TrajectorySumCost implementation. Fix Spline class. Implement LengthCost in spline optimization test. Merge branch 'master' of git+ssh://tmo...@gi.../git/jrl/roboptim/trajectory Add start/end constraint while optimizing the spline. Factorize code in Spline class. Check Spline gradient. Remove bugs and improve display in Spline class. Enhance Spline gradient test case. Debug Spline optimization test case. Debug Spline test cases. Check parameters size when creating a Spline. Debug gradient's constraint. Distribute missing stdout files. Debug gradient. Debug tests. Clean tests cases. Use new function interface. Distribute pkg.m4. Make pkg-config depends on configure. Clean building chain. Make Libtool support more robust. Remove pkg.m4. Implement SplineLength. Use Freeze constraint in test suite. Add tests to Doxygen EXAMPLE_PATH. Update to new interface and document. Synchronize with share. Synchronize. Fix build-chain when headers are in non-standard directories. Implement Freeze class. Fix buildchain. Synchonize with share. Do not use boost::make_shared. Add titles to functions. Use foreach for iterating. Use submodule to factorize code. Handle submodules and check git. Add Gnuplot command for trajectory display. Make checks on displayed trajectories less stricts. Allow small overrun of time limits in Spline class. Use fixed-point display in Gnuplot. Make use of function's names in trajectory classes. Debug free-time-trajectory. Add stable time point class. Debug time optimization. Add missing include. Add TimeStablePoint interface into FreeTimeTrajectory. Debug free time trajectory and add stable time point. Debug free time trajectory. Debug free time trajectory. Fix computation error in free time trajectory. Move time stable point gradient interface into Trajectory class. Remove tests that was tagged as XFAIL. Fix typo. Remove orphan stdout file and distribute the right one. Fix naming clash in inclusion guards. Add isValidTime method. Add missing ``inline'' in header. Add missing ``inline''. Force range when displaying speed limit in Gnuplot. Enhance LimitSpeed class. Make plot_limitSpeed display vMax optionally. Enhance SplineLength. Check gradient in spline-gradient test. Be more strict in gradient checking in spline-optimization. Fix vMax display in plot_limitSpeed. Enhance time optimization. Fix tests. Clean test. Use new io.hh roboptim-core header. Fix speed limit vmax computation and output. Use argument bounds to force a positive scale. Use argument bounds to freeze parameters. Re-implement free-time-trajectory. Rewrite variationDerivWrtParam in freeTimeTrajectory. Check variationConfigWrtParam in FreeTimeTrajectory class. Use constraint type from cfsqp.hh. Precise derivation order explicitly. Do not add constraints on trajectory bounds as gradient is null. Fix free time optimization test case. Remove useless constraints. Update test case output. Implement frontal-speed. Add orthogonal speed. Add missing newline. Add new test case. Fix computation error in frontal speed. Make time input argument of frontal/orthogonal speed. Fix test case. Fix frontal/orthogonal speed computation. Update test case. Add constraint function for frontal/orthogonal speed. Use stable time point when displaying trajectory. Add LimitOmega class. Add complex-cost-function test case cost function into a class. Add plot_xytheta visualization function. Add speed visualization. Regenerate. Split test case. Fix integral computation. Use foreach variant. Use new foreach variant. Fix test case. Fix gradient checking. Regenerate test case. Add analytical gradient for LimitOmega. Optimize. Optimize. Make regular constraint add more robust. Fix orthogonal speed function name and clean code. Implement StateCost. Reimplement speed limits using StateCost. Use boost::shared_ptr to store function in StateCost. Fix limit-omega. Update submodules to new SourceForge URLs. Update to new interface. Predeclare function. Merge branch 'master' of git+ssh://git.laas.fr/git/jrl/roboptim/trajectory Implement normalizeAngle in Trajectory and FreeTimeTrajectory. Add sys.hh to avoid problem with libcwd. Include ``sys.hh'' first in all headers. Include ``sys.hh'' first. Distribute ``sys.hh''. Change test description. Update doc rules, version number management and test suite rules. Synchronize. Synchronize. Synchronize. Synchronize. Implement DiscreteStableTimePointInterval_t. Fix errors in Doxygen documentation. Synchronize. Remove doc submodule and add updated doc directory. florent (6): If roboptim-core is not found, trigger pkg-config. Document state cost. Add declaration before definition to remove warning. Fix comment. Rewrite TrajectorySumCost to fit StateCost interface. Add a test: minimization of positive height variation along a spline. ----------------------------------------------------------------------- hooks/post-receive -- roboptim-trajectory |
From: Thomas M. <tho...@us...> - 2009-10-15 08:52:30
|
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 bd8a4f27d10402c3a4ae1529dde91b62248c54bd (commit) from ad91f6ffe8dfa3d3977acd0f43f34f0be6407263 (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 bd8a4f27d10402c3a4ae1529dde91b62248c54bd Author: Thomas Moulard <tho...@gm...> Date: Thu Oct 15 10:52:18 2009 +0200 Fix doxygen.mk to avoid disallowing valid patterns. * doxygen.m4: Only forbid ``^JRL_'' and not ``^JRL''. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index a1e623f..e25766b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-10-15 Thomas Moulard <tho...@gm...> + Fix doxygen.mk to avoid disallowing valid patterns. + * doxygen.m4: Only forbid ``^JRL_'' and not ``^JRL''. + +2009-10-15 Thomas Moulard <tho...@gm...> + Add JRL dependency management m4 macro. * jrl-pkg-config.m4: New. diff --git a/doxygen.m4 b/doxygen.m4 index 950d953..580b97d 100644 --- a/doxygen.m4 +++ b/doxygen.m4 @@ -30,7 +30,7 @@ # This m4 file can be used to search for Doxygen and its dependencies. -m4_pattern_forbid([^JRL]) +m4_pattern_forbid([^JRL_]) # JRL_PROG_DOXYGEN([REQUIRED_VERSION]) # -------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++++ doxygen.m4 | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) hooks/post-receive -- build-aux |
From: Thomas M. <tho...@us...> - 2009-10-15 08:30:14
|
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 ad91f6ffe8dfa3d3977acd0f43f34f0be6407263 (commit) from 0d6c2926a6b111a14f6871d6e635cf833ce77cdd (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 ad91f6ffe8dfa3d3977acd0f43f34f0be6407263 Author: Thomas Moulard <tho...@gm...> Date: Thu Oct 15 10:29:56 2009 +0200 Add JRL dependency management m4 macro. * jrl-pkg-config.m4: New. Signed-off-by: Thomas Moulard <tho...@gm...> diff --git a/ChangeLog b/ChangeLog index 437b0c5..a1e623f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-10-15 Thomas Moulard <tho...@gm...> + Add JRL dependency management m4 macro. + * jrl-pkg-config.m4: New. + +2009-10-15 Thomas Moulard <tho...@gm...> + Add Kineo Makefile rules. * kineo.mk: New. diff --git a/jrl-pkg-config.m4 b/jrl-pkg-config.m4 new file mode 100644 index 0000000..6df337a --- /dev/null +++ b/jrl-pkg-config.m4 @@ -0,0 +1,57 @@ +# -*-Autoconf-*- +# jrl-pkg-config.m4: detect dependencies using pkg-config. +# Copyright (C) 2009 by Thomas Moulard, AIST, CNRS, INRIA. +# +# This program 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. +# +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. + +# serial 1 + +# ------ # +# README # +# ------ # + +# This m4 file can be used to search for JRL package easily. + +# Search for pkg-config dependencies. +m4_pattern_forbid([^JRL_]) + +# JRL_PKGCONFIGCHECK([VARIABLE_PREFIX], [PACKAGE_NAME]) +# ----------------------------------------------------- +# Check that a package is available and define a set of +# Autoconf variables. +AC_DEFUN([JRL_PKGCONFIGCHECK], +[PKGNAME=`echo "$2 " | cut -d' ' -f1` + + PKG_CHECK_MODULES([$1], [$2]) + AC_SUBST([$1_REQUIRED], ["$2"]) + AC_SUBST([$1_CFLAGS]) + AC_SUBST([$1_LIBS]) + AC_SUBST([$1_PREFIX], [`$PKG_CONFIG $PKGNAME --variable=prefix`]) + AC_SUBST([$1_DOCDIR], [`$PKG_CONFIG $PKGNAME --variable=docdir`]) +]) + +# JRL_PKGCONFIGCHECK_ADDDEP([VARIABLE_PREFIX], [PACKAGE_NAME]) +# ------------------------------------------------------------ +# Call JRL_PKGCONFIGCHECK and add package to pkg-config dependencies. +AC_DEFUN([JRL_PKGCONFIGCHECK_ADDDEP], +[JRL_PKGCONFIGCHECK([$1], [$2]) + PKGCONFIG_REQUIRES="$2, $PKGCONFIG_REQUIRES" +]) ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 ++++ jrl-pkg-config.m4 | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) create mode 100644 jrl-pkg-config.m4 hooks/post-receive -- build-aux |