diff --git a/.github/workflows/dockercentos.yml b/.github/workflows/dockercentos.yml index e81b929ac..71b2da456 100644 --- a/.github/workflows/dockercentos.yml +++ b/.github/workflows/dockercentos.yml @@ -22,7 +22,7 @@ jobs: - { img: 'lebarsfa/manylinux_2_28_aarch64-for-codac', os: ubuntu-24.04-arm, shell: bash, arch: aarch64, bitness: 64, runtime: manylinux_2_28, docker_flags: '--platform linux/arm64', desc: 'CentOS manylinux_2_28 aarch64' } name: ${{ matrix.cfg.desc }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: submodules: true fetch-depth: 0 diff --git a/.github/workflows/dockermatrix.yml b/.github/workflows/dockermatrix.yml index bf9ccccad..7660553b3 100644 --- a/.github/workflows/dockermatrix.yml +++ b/.github/workflows/dockermatrix.yml @@ -29,7 +29,7 @@ jobs: #- { img: 'lebarsfa/pi-64:focal-for-codac' , os: ubuntu-24.04-arm, shell: bash, arch: arm64 , bitness: 64, runtime: focal , cmake_flags: '-fPIC', deb: true, desc: 'Ubuntu 20.04 arm64' } - { img: 'lebarsfa/amd64:trixie-for-codac' , os: ubuntu-latest , shell: bash, arch: amd64 , bitness: 64, runtime: trixie , cmake_flags: '-fPIC', deb: true, desc: 'Debian Trixie amd64' } - { img: 'lebarsfa/pi-64:trixie-for-codac' , os: ubuntu-24.04-arm, shell: bash, arch: arm64 , bitness: 64, runtime: trixie , cmake_flags: '-fPIC', deb: true, desc: 'Debian Trixie arm64' } - #- { img: 'lebarsfa/pi:trixie-for-codac' , os: ubuntu-24.04-arm, shell: bash, arch: armhf , bitness: 32, runtime: trixie , cmake_flags: '-fPIC', deb: true, desc: 'Raspbian Trixie armv6hf' } # No base image available... + - { img: 'lebarsfa/pi:trixie-for-codac' , os: ubuntu-24.04-arm, shell: bash, arch: armhf , bitness: 32, runtime: trixie , cmake_flags: '-fPIC', deb: true, desc: 'Raspbian Trixie armv6hf' } - { img: 'lebarsfa/amd64:bookworm-for-codac' , os: ubuntu-latest , shell: bash, arch: amd64 , bitness: 64, runtime: bookworm , cmake_flags: '-fPIC', deb: true, desc: 'Debian Bookworm amd64' } - { img: 'lebarsfa/pi-64:bookworm-for-codac' , os: ubuntu-24.04-arm, shell: bash, arch: arm64 , bitness: 64, runtime: bookworm , cmake_flags: '-fPIC', deb: true, desc: 'Debian Bookworm arm64' } - { img: 'lebarsfa/pi:bookworm-for-codac' , os: ubuntu-24.04-arm, shell: bash, arch: armhf , bitness: 32, runtime: bookworm , cmake_flags: '-fPIC', deb: true, desc: 'Raspbian Bookworm armv6hf' } @@ -42,7 +42,7 @@ jobs: #- { img: 'lebarsfa/pi:buster-for-codac' , os: ubuntu-24.04-arm, shell: bash, arch: armhf , bitness: 32, runtime: buster , cmake_flags: '-fPIC', deb: true, desc: 'Raspbian Buster armv6hf' } name: ${{ matrix.cfg.desc }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: submodules: true fetch-depth: 0 diff --git a/.github/workflows/macosmatrix.yml b/.github/workflows/macosmatrix.yml index da66789bb..683f9c234 100644 --- a/.github/workflows/macosmatrix.yml +++ b/.github/workflows/macosmatrix.yml @@ -34,7 +34,7 @@ jobs: - { os: macos-15-intel , shell: bash, arch: x86_64 , runtime: sequoia , cmake_flags: '-fPIC', trgt: '10.16', cpcfg: '-macosx_10_16_x86_64', py_v_maj: 3, py_v_min: 8 , desc: 'macOS Sequoia Python 3.8 x86_64' } name: ${{ matrix.cfg.desc }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: submodules: true fetch-depth: 0 @@ -54,7 +54,7 @@ jobs: # if: runner.os=='macOS' - run: brew install catch2 # Issues with binary packages when cross-compiling... if: (runner.os=='macOS')&&(matrix.cfg.cross!=true) - - run: brew install graphviz ; brew install --formula doxygen ; python -m pip install --upgrade pip ; pip install --upgrade wheel setuptools sphinx breathe sphinx_rtd_theme sphinx-tabs sphinx-issues sphinx-reredirects furo sphinx-math-dollar sympy + - run: brew install graphviz ; brew install --formula doxygen ; python -m pip install --upgrade pip ; pip install --upgrade wheel setuptools sphinx breathe sphinx_rtd_theme sphinx-tabs sphinx-issues sphinx-reredirects furo sphinx-math-dollar sphinx_togglebutton sympy if: runner.os=='macOS' - run: | wget https://github.com/lebarsfa/ibex-lib/releases/download/ibex-2.8.9.20250626/ibex_${{ matrix.cfg.arch }}_${{ matrix.cfg.runtime }}.zip --no-check-certificate -nv diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d85e07323..7d5cfe493 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,7 +20,7 @@ jobs: - { os: ubuntu-22.04 , gcc_v: 11, py_v_maj: 3, py_v_min: 10, with_capd: ON , desc: 'Ubuntu 22.04 GCC 11 Python 3.10 CAPD tests' } name: ${{ matrix.cfg.desc }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: submodules: true fetch-depth: 0 diff --git a/.github/workflows/unixmatrix.yml b/.github/workflows/unixmatrix.yml index 8750353d1..988e2f176 100644 --- a/.github/workflows/unixmatrix.yml +++ b/.github/workflows/unixmatrix.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest if: (github.event_name!='pull_request')&&((github.ref_name=='codac1')||(github.ref_name=='codac2')||(github.ref_name=='codac2_codac4matlab')) steps: - - uses: softprops/action-gh-release@v2 + - uses: softprops/action-gh-release@v3 id: create_release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -68,7 +68,7 @@ jobs: - { os: macos-14 , shell: bash, arch: x86_64 , bitness: 64, runtime: sonoma , cmake_params: '-D CMAKE_SYSTEM_NAME=Darwin -D CMAKE_OSX_ARCHITECTURES=x86_64 -D CMAKE_OSX_DEPLOYMENT_TARGET=14.0', cmake_flags: '-fPIC', cross: true, desc: 'macOS Sonoma x86_64 (cross)' } name: ${{ matrix.cfg.desc }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: submodules: true fetch-depth: 0 diff --git a/.github/workflows/vcmatrix.yml b/.github/workflows/vcmatrix.yml index 62b58767f..3039da799 100644 --- a/.github/workflows/vcmatrix.yml +++ b/.github/workflows/vcmatrix.yml @@ -35,7 +35,7 @@ jobs: - { os: windows-2022 , shell: cmd , arch: x64 , runtime: vc17 , cmake_params: '-G "Visual Studio 17" -T v143 -A x64' , cpcfg: '-win_amd64', py_v_maj: 3, py_v_min: 8 , desc: 'Windows Visual Studio 2022 x64 Python 3.8' } name: ${{ matrix.cfg.desc }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: submodules: true fetch-depth: 0 @@ -56,7 +56,7 @@ jobs: if: runner.os=='Windows' #- run: choco install -y -r --no-progress eigen --version=3.4.0.20240224 ${{ matrix.cfg.choco_flags }} # if: runner.os=='Windows' - - run: choco install -y -r --no-progress graphviz doxygen.install & python -m pip install --upgrade pip & pip install --upgrade wheel setuptools sphinx breathe sphinx-issues sphinx-tabs sphinx_rtd_theme sphinx-reredirects furo sphinx-math-dollar sympy + - run: choco install -y -r --no-progress graphviz doxygen.install & python -m pip install --upgrade pip & pip install --upgrade wheel setuptools sphinx breathe sphinx-issues sphinx-tabs sphinx_rtd_theme sphinx-reredirects furo sphinx-math-dollar sphinx_togglebutton sympy if: runner.os=='Windows' - run: | wget https://github.com/lebarsfa/ibex-lib/releases/download/ibex-2.8.9.20250626/ibex.2.8.9.20250626.nupkg --no-check-certificate -nv diff --git a/README.md b/README.md index f6e21a60f..b6c20bc7a 100644 --- a/README.md +++ b/README.md @@ -81,8 +81,8 @@ This list is in alphabetical order by surname. - [Peter Franek](http://www.cs.cas.cz/~franek) - [Maël Godard](https://godardma.github.io) - [Nuwan Herath M.](https://members.loria.fr/NHerathMudiyanselage) -- [Luc Jaulin](https://www.ensta-bretagne.fr/jaulin) -- [Fabrice Le Bars](https://www.ensta-bretagne.fr/lebars) +- [Luc Jaulin](https://webperso.ensta.fr/jaulin) +- [Fabrice Le Bars](https://webperso.ensta.fr/lebars) - [Morgan Louédec](https://morgan-louedec.fr) - [Damien Massé](https://lab-sticc.univ-brest.fr/~dmasse) - [Bertrand Neveu](http://imagine.enpc.fr/~neveub) @@ -91,7 +91,7 @@ This list is in alphabetical order by surname. - [Simon Rohou](http://simon-rohou.fr/research) - [Joris Tillet](https://perso.ensta-paris.fr/~tillet/) - [Gilles Trombettoni](https://www.lirmm.fr/~trombetton) -- [Christophe Viel](https://www.ensta-bretagne.fr/viel/) +- [Christophe Viel](https://webperso.ensta.fr/viel/) - [Raphael Voges](https://raphael-voges.de) We appreciate all contributions, whether they are code, documentation, bug reports, or suggestions. If you believe you should be listed here and are not, please contact us to update the list. diff --git a/doc/manual/development/info_dev.rst b/doc/manual/development/info_dev.rst index 0b55724d2..e99bf5a24 100644 --- a/doc/manual/development/info_dev.rst +++ b/doc/manual/development/info_dev.rst @@ -8,10 +8,11 @@ Building the Manual with Sphinx To build this manual using Sphinx, follow these steps: -1. **Requirements**: Install `Sphinx `_ together with the extensions used by Codac, if they are not already installed. +1. **Requirements**: Install `Sphinx `_ together with the extensions used by Codac, if they are not already installed. You will need also the ``dot`` command from `Graphviz `_. .. code-block:: bash + sudo apt-get install sphinx-common graphviz pip install sphinx sphinx_rtd_theme furo sphinx-math-dollar sphinx_tabs breathe sphinx_togglebutton 2. **Building the manual**: After configuring the CMake project, the manual can be build with: @@ -41,8 +42,8 @@ If you simply want to use the latest Codac release in Python, you can download t sudo apt-get install -y g++ gcc cmake git flex bison - - a supported version of Python (>=3.6). - - a recent `Doxygen `_ version (for instance, release 1.13.0 or newest). On Linux systems, latest releases are not available as Debian packages, so we advice to install Doxygen from the sources: + - a supported version of Python (>=3.8). + - a recent `Doxygen `_ version (for instance, release 1.16.1 or newest). On Linux systems, latest releases are not available as Debian packages, so we advise to install Doxygen from the sources: .. code-block:: bash @@ -95,12 +96,12 @@ If you simply want to use the latest Codac release in Python, you can download t Note that you will then have to ``import codac2`` instead of ``import codac`` in your Python scripts. - In addition to the ``-fPIC`` options, you will have to configure ``WITH_PYTHON=ON`` and ``PYBIND11_FINDPYTHON=OFF``. Note that CMake will automatically get the `pybind11 `_ files required for the binding. + In addition to the ``-fPIC`` options, you will have to configure ``WITH_PYTHON=ON`` and ``PYBIND11_FINDPYTHON=OFF``. Note that CMake will automatically get the `pybind11 `_ files required for the binding. Also, you will have to configure ``BUILD_TESTS=ON`` if you want to run the unit tests. .. code-block:: bash mkdir build ; cd build - cmake -DCMAKE_CXX_FLAGS="-fPIC" -DCMAKE_C_FLAGS="-fPIC" -DWITH_PYTHON=ON -DPYBIND11_FINDPYTHON=OFF -DCMAKE_INSTALL_PREFIX=$HOME/codac/build_install -DCMAKE_PREFIX_PATH="$HOME/ibex-lib/build_install;$HOME/doxygen/build_install" -DCMAKE_BUILD_TYPE=Release .. + cmake -DCMAKE_CXX_FLAGS="-fPIC" -DCMAKE_C_FLAGS="-fPIC" -DWITH_PYTHON=ON -DPYBIND11_FINDPYTHON=OFF -DBUILD_TESTS=ON -DCMAKE_INSTALL_PREFIX=$HOME/codac/build_install -DCMAKE_PREFIX_PATH="$HOME/ibex-lib/build_install;$HOME/doxygen/build_install" -DCMAKE_BUILD_TYPE=Release .. make ; make install 4. **Configure your Python environment**: @@ -135,7 +136,7 @@ If you simply want to use the latest Codac release in Python, you can download t cd $HOME/codac/examples/03_sivia python main.py - Note that before executing the example, you will have to launch the VIBes viewer. + Note that before executing the example, you will have to launch the `VIBes viewer <../visualization/vibes.html>`_. You should obtain a graphical output corresponding to a set inversion. diff --git a/doc/manual/manual/installation/cpp.rst b/doc/manual/manual/installation/cpp.rst index 9f0399474..4bf0ae41d 100644 --- a/doc/manual/manual/installation/cpp.rst +++ b/doc/manual/manual/installation/cpp.rst @@ -14,6 +14,10 @@ This page describes how to install the C++ library on Linux, Windows, and macOS. Linux Installation ------------------ +.. admonition:: Linux distributions + + Ubuntu or Debian-like systems are implied in most of the instructions (especially the ``sudo apt`` commands to install packages). + .. Install from packages (latest release) .. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -68,7 +72,7 @@ Steps These prerequisites can be installed directly with the command:: - sudo apt-get install -y g++ gcc cmake git + sudo apt-get install -y build-essential cmake git 2. **Install the IBEX dependency**: @@ -145,7 +149,7 @@ Steps cmake .. make - Before executing the example, you will have to launch the VIBes viewer. Then, + Before executing the example, you will have to launch the `VIBes viewer <../visualization/vibes.html>`_. Then, .. code-block:: bash @@ -163,7 +167,11 @@ Install from packages (latest release) Using MinGW ~~~~~~~~~~~ -Check https://community.chocolatey.org/packages/codac. +.. Check https://community.chocolatey.org/packages/codac. + +Install `Chocolatey package manager `_, run `choco install -y ibex cmake make qtcreator` in PowerShell and then download and extract *e.g.* ``codac_standalone_x64_mingw13.zip`` (for MinGW 13) from https://github.com/codac-team/codac/releases/latest, launch Qt Creator and choose Open Project, open ``example\CMakelists.txt``, ensure Desktop is selected and click Configure Project (might be hidden behind notifications at the bottom-right), wait 10 s then click on the big bottom-left green Run button, and finally check that the graphical output appears. + +Note that in order to obtain graphical outputs, you will have to download and run https://github.com/ENSTABretagneRobotics/VIBES/releases/latest/download/VIBes-viewer_x86.exe before running the project. Using Visual Studio @@ -171,7 +179,7 @@ Using Visual Studio Download and extract *e.g.* ``codac_standalone_x64_vc17.zip`` (for Visual Studio 2022) from https://github.com/codac-team/codac/releases/latest, open ``example\CMakelists.txt``, choose ``x64-Release`` configuration in Visual Studio (instead of ``x64-Debug``), double-click on ``main.cpp`` in the Solution Explorer and then click on the green Start button, and finally check that the graphical output appears. -Note that in order to obtain graphical outputs, you will have to download and run https://github.com/ENSTABretagneRobotics/VIBES/releases/download/0.2.3/VIBes-0.2.3-win32.exe before running the project. +Note that in order to obtain graphical outputs, you will have to download and run https://github.com/ENSTABretagneRobotics/VIBES/releases/latest/download/VIBes-viewer_x86.exe before running the project. Install from the sources (latest developments) @@ -190,15 +198,16 @@ Optionally, for Python binding (*e.g.* ``choco install python --version=3.10.4`` .. code-block:: bash - choco install doxygen.install --version=1.16 + choco install doxygen.install --version=1.16.1 choco install graphviz python -m pip install --upgrade pip pip install --upgrade wheel setuptools sphinx sphinx_rtd_theme furo sphinx-math-dollar sphinx_tabs breathe sphinx_togglebutton -The logic to follow will then be similar to Linux (note that for Visual Studio, commands such as ``make install`` need to be replaced with something similar to: +The logic to follow will then be similar to Linux. You might want to right-click in your desired folder and choose ``Git Bash Here`` to run the commands related to Git and compilation. Note that for Visual Studio, commands such as ``make`` and ``make install`` need to be replaced with something similar to: .. code-block:: bash + cmake --build . --config Release cmake --build . --config Release --target install .. warning:: @@ -221,7 +230,7 @@ Install `Homebrew package manager `_ and then build tools: brew install wget autoconf automake libtool brew install --cask cmake -Download and extract *e.g.* ``codac_standalone_arm64_monterey.zip`` from ``_, then in ``example`` folder run: +Download and extract *e.g.* ``codac_standalone_arm64_sonoma.zip`` from https://github.com/codac-team/codac/releases/latest, then in ``example`` folder run: .. code-block:: bash @@ -229,12 +238,12 @@ Download and extract *e.g.* ``codac_standalone_arm64_monterey.zip`` from ``_. +One of the graphical outputs supported in Codac is the `VIBes viewer <../visualization/vibes.html>`_. VIBes uses a client/server architecture and reads its configuration from the ``.vibes.json`` file located in your home directory (typically ``$HOME``). This file is automatically generated. If you launch MATLAB with ``sudo``, the ``HOME`` variable points to ``/root``, and VIBes will not find the ``.vibes.json`` file, causing the display to fail. diff --git a/doc/manual/manual/installation/python.rst b/doc/manual/manual/installation/python.rst index 0cdcfeb2c..f9df54ed4 100644 --- a/doc/manual/manual/installation/python.rst +++ b/doc/manual/manual/installation/python.rst @@ -8,7 +8,19 @@ Python installation In case you want to use Codac only with Python, then the installation procedure is simply: 1. **Dependencies**: Ensure you have a supported version of Python (>=3.8). -2. **Install via pip**: Use the following command to install Codac: +2. **Install pip**: For Ubuntu or Debian-like systems: + + .. code-block:: bash + + sudo apt install python3-pip + + For other systems, you can usually install pip with something similar to: + + .. code-block:: bash + + python -m pip install pip + +3. **Install via pip**: Use the following command to install Codac: .. code-block:: bash @@ -26,6 +38,7 @@ You can also update and test your Codac Python package: * **Testing the installation**: In order to verify that your installation is working properly in Python, you can run: .. code-block:: bash + pip install numpy sympy python -m unittest discover codac.tests @@ -34,7 +47,11 @@ Troubleshooting Depending on your configuration, you may encounter difficulties when installing the Codac Python package. Here are a few tips to help you. -.. admonition:: Debian Bookworm and possibly other configurations +.. admonition:: ``python`` vs ``python3``, ``pip`` vs ``pip3`` commands + + | You may need to use ``python3`` instead of ``python`` command depending on your configuration. Same applies to the ``pip`` command, which may be ``pip3`` in some cases. + +.. admonition:: Debian Bookworm, Ubuntu 24.04 and possibly other configurations | ``pip install ...`` or ``pip3 install ...`` commands may only work inside `virtual environments `_ or with ``--break-system-packages`` parameter, *e.g.*: @@ -42,6 +59,10 @@ Depending on your configuration, you may encounter difficulties when installing pip3 install --break-system-packages codac +.. admonition:: Python package dependencies for Ubuntu or Debian-like systems + + | If available, prefer ``sudo apt install python3-mypackage`` instead of ``pip install mypackage`` commands to install Python package dependencies for Ubuntu or Debian-like systems, to avoid breaking the system packages. However, not all the packages are available with ``apt``. + .. admonition:: macOS Big Sur and later (x86_64) | Python wheels provided for Catalina or earlier `may need to be installed with something similar to `_: diff --git a/packages/choco/codac/codac.nuspec b/packages/choco/codac/codac.nuspec index 4dcf8ecec..b4d71e6bd 100644 --- a/packages/choco/codac/codac.nuspec +++ b/packages/choco/codac/codac.nuspec @@ -18,8 +18,8 @@ Codac is a library providing tools for constraint programming over reals, trajectories and sets. ## Quick start -- After [installing Chocolatey](https://chocolatey.org/install), run `choco install -y codac cmake make qtcreator` in PowerShell and then launch Qt Creator and choose Open Project, open `test_codac\CMakelists.txt` (get the folder from https://www.ensta-bretagne.fr/lebars/Share/test_codac.zip), ensure Desktop is selected and click Configure Project, wait 10 s then click on the big bottom green Run button, finally check that "My first tube:Tube [0, 10]" appears. -- Optionally, download and run https://github.com/ENSTABretagneRobotics/VIBES/releases/download/0.2.3/VIBes-0.2.3-win32.exe before running the project, and check that a tube appears in VIBes window. +- After [installing Chocolatey](https://chocolatey.org/install), run `choco install -y codac cmake make qtcreator` in PowerShell and then launch Qt Creator and choose Open Project, open `test_codac\CMakelists.txt` (get the folder from https://www.ensta-bretagne.fr/lebars/Share/test_codac.zip), ensure Desktop is selected and click Configure Project (might be hidden behind notifications at the bottom-right), wait 10 s then click on the big bottom-left green Run button, finally check that "Computation time: XXXs, XXX boxes" appears. +- Download and run https://github.com/ENSTABretagneRobotics/VIBES/releases/latest/download/VIBes-viewer_x86.exe before running the project, and check that the graphical output appears. ## Troubleshooting - Check that all the packages and their dependencies were installed, if one failed (e.g. due to network-related errors) try to reinstall it using `--force` or try a previous version... diff --git a/tests/test_codac/CMakeLists.txt b/tests/test_codac/CMakeLists.txt index 6303b8f72..0f4479bc9 100644 --- a/tests/test_codac/CMakeLists.txt +++ b/tests/test_codac/CMakeLists.txt @@ -31,7 +31,12 @@ # Compilation + if(FAST_RELEASE) + add_compile_definitions(FAST_RELEASE) + message(STATUS "You are running Codac in fast release mode. (option -DCMAKE_BUILD_TYPE=Release is required)") + endif() + add_executable(${PROJECT_NAME} main.cpp) target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex) \ No newline at end of file + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex) diff --git a/tests/test_codac/main.cpp b/tests/test_codac/main.cpp index de7865754..4004eaf16 100644 --- a/tests/test_codac/main.cpp +++ b/tests/test_codac/main.cpp @@ -1,18 +1,23 @@ + +// Download and run https://github.com/ENSTABretagneRobotics/VIBES/releases/latest +// before to be able to see the figure in VIBes window... + #include +using namespace std; using namespace codac2; -// Download and run https://github.com/ENSTABretagneRobotics/VIBES/releases -// before to be able to see the tube in VIBes window... - int main() { VectorVar x(3); - AnalyticFunction f({x}, vec( - -sqr(x[2])+2*x[2]*sin(x[2]*x[0])+cos(x[2]*x[1]), - 2*x[2]*cos(x[2]*x[0])-sin(x[2]*x[1]) - )); + AnalyticFunction f { {x}, + { + -sqr(x[2])+2*x[2]*sin(x[2]*x[0])+cos(x[2]*x[1]), + 2*x[2]*cos(x[2]*x[0])-sin(x[2]*x[1]) + } + }; - CtcInverse ctc(f, {0.,0.}); - DefaultFigure::pave(IntervalVector({{0,2},{2,4},{0,10}}), ctc, 0.01); -} \ No newline at end of file + CtcInverse ctc(f, {0,0}); + DefaultFigure::pave({{0,2},{2,4},{0,10}}, ctc, 0.004); + return 0; +}