From a98cd947e9f5b0823d88eda9abc8c4b71bfb16fe Mon Sep 17 00:00:00 2001 From: SimonRohou Date: Tue, 26 Jan 2021 17:22:20 +0100 Subject: [PATCH] [all] Tubex -> Codac --- .gitignore | 2 +- .travis.yml | 90 ++--- CHANGELOG | 66 ++-- CMakeLists.txt | 24 +- README.md | 16 +- doc/CMakeLists.txt | 2 +- doc/doc/conf.py.in | 12 +- doc/doc/dev/info_dev.rst | 12 +- doc/doc/faq.rst | 26 +- doc/doc/index.rst | 48 +-- .../install/01-installation-full-linux.rst | 28 +- .../install/01-installation-full-macos.rst | 2 +- .../install/01-installation-full-windows.rst | 4 +- doc/doc/install/01-installation-python.rst | 18 +- doc/doc/install/01-installation.rst | 18 +- doc/doc/install/02-py-project-online.rst | 6 +- doc/doc/install/02-start-py-project.rst | 6 +- doc/doc/install/03-start-cpp-project.rst | 30 +- doc/doc/manual/01-introduction/index.rst | 18 +- .../intro_constraint_programming.rst | 10 +- .../manual/02-variables/02-var-dynamic.rst | 6 +- doc/doc/manual/02-variables/index.rst | 2 +- .../manual/03-domains/01-dom-intervals.rst | 4 +- doc/doc/manual/03-domains/02-dom-tubes.rst | 18 +- .../04-static-contractors/01-ctc-function.rst | 8 +- .../04-static-contractors/02-ctc-dist.rst | 8 +- .../04-static-contractors/03-ctc-polar.rst | 6 +- .../04-static-contractors/04-ctc-constell.rst | 8 +- .../05-dynamic-contractors/01-ctc-deriv.rst | 12 +- .../05-dynamic-contractors/02-ctc-eval.rst | 18 +- .../05-dynamic-contractors/03-ctc-lohner.rst | 2 +- .../05-dynamic-contractors/03-ctc-picard.rst | 4 +- .../05-dynamic-contractors/04-ctc-picard.rst | 4 +- .../06-contractor-network/01-cn-solver.rst | 2 +- .../06-contractor-network/02-cn-realtime.rst | 2 +- .../06-contractor-network/03-cn-graphics.rst | 2 +- .../manual/06-contractor-network/index.rst | 2 +- doc/doc/manual/07-graphics/01-vibes.rst | 6 +- doc/doc/manual/07-graphics/02-figtube.rst | 2 +- doc/doc/manual/07-graphics/03-figmap.rst | 2 +- doc/doc/manual/07-graphics/04-colormaps.rst | 2 +- .../08-going-further/01-serialization.rst | 2 +- .../manual/08-going-further/02-bisections.rst | 2 +- .../manual/08-going-further/03-pavings.rst | 2 +- .../04-tubes-implementation.rst | 2 +- .../manual/08-going-further/05-functions.rst | 6 +- doc/doc/manual/08-going-further/index.rst | 2 +- doc/doc/manual/09-extensions/01-ode.rst | 18 +- doc/doc/manual/09-extensions/index.rst | 4 +- doc/doc/toctree.rst | 4 +- doc/doc/tutorial/00-getting-started/index.rst | 4 +- doc/doc/tutorial/01-basics/index.rst | 16 +- .../tutorial/02-static-rangeonly/index.rst | 6 +- .../tutorial/03-static-rangebearing/index.rst | 2 +- .../03-static-rangebearing/src/solution_c.cpp | 4 +- .../03-static-rangebearing/src/solution_c.py | 2 +- .../tutorial/04-own-contractor/solution.py | 2 +- doc/doc/tutorial/05-tubes/solution.py | 2 +- doc/doc/tutorial/06-dyn-rangeonly/index.rst | 2 +- doc/doc/tutorial/06-dyn-rangeonly/solution.py | 2 +- .../tutorial/07-data-association/solution.py | 4 +- doc/doc/tutorial/08-rangeonly-slam/index.rst | 2 +- .../tutorial/08-rangeonly-slam/solution.py | 2 +- doc/doc/tutorial/index.rst | 30 +- doc/doc/tutorial/nonpublic.rst | 12 +- examples/CMakeLists.txt | 74 ++-- examples/basics/01_arithmetic/CMakeLists.txt | 20 +- examples/basics/01_arithmetic/build.sh | 2 +- examples/basics/01_arithmetic/main.cpp | 8 +- examples/basics/02_simple_ctc/CMakeLists.txt | 20 +- examples/basics/02_simple_ctc/build.sh | 2 +- examples/basics/02_simple_ctc/main.cpp | 8 +- examples/basics/03_ivp_msinx/CMakeLists.txt | 20 +- examples/basics/03_ivp_msinx/build.sh | 2 +- examples/basics/03_ivp_msinx/main.cpp | 8 +- examples/basics/04_simple_eval/CMakeLists.txt | 20 +- examples/basics/04_simple_eval/build.sh | 2 +- examples/basics/04_simple_eval/main.cpp | 8 +- examples/basics/05_graphics/CMakeLists.txt | 20 +- examples/basics/05_graphics/build.sh | 2 +- examples/basics/05_graphics/main.cpp | 8 +- .../basics/06_ctc_comparisons/CMakeLists.txt | 20 +- examples/basics/06_ctc_comparisons/build.sh | 2 +- examples/basics/06_ctc_comparisons/main.cpp | 10 +- examples/basics/06_ctc_comparisons/main.py | 8 +- .../basics/07_temporal_ctc/07_temporal_ctc.py | 4 +- .../basics/07_temporal_ctc/CMakeLists.txt | 20 +- examples/basics/07_temporal_ctc/build.sh | 2 +- examples/basics/07_temporal_ctc/main.cpp | 8 +- examples/brunovsky/CMakeLists.txt | 18 +- examples/brunovsky/build.sh | 2 +- examples/brunovsky/main.cpp | 10 +- examples/lie_group/05_loc/CMakeLists.txt | 20 +- examples/lie_group/05_loc/build.sh | 2 +- examples/lie_group/05_loc/main.cpp | 10 +- examples/linobs/01_paper/CMakeLists.txt | 22 +- examples/linobs/01_paper/build.sh | 2 +- examples/linobs/01_paper/main.cpp | 10 +- examples/linobs/01_paper/main_foreach_dt.cpp | 10 +- .../robotics/01_causal_chain/CMakeLists.txt | 20 +- examples/robotics/01_causal_chain/build.sh | 2 +- examples/robotics/01_causal_chain/main.cpp | 12 +- .../robotics/03_drifting_clock/CMakeLists.txt | 20 +- examples/robotics/03_drifting_clock/build.sh | 2 +- examples/robotics/03_drifting_clock/main.cpp | 10 +- .../robotics/04_redermor_traj/CMakeLists.txt | 20 +- examples/robotics/04_redermor_traj/build.sh | 2 +- examples/robotics/04_redermor_traj/main.cpp | 10 +- .../robotics/05_loops_detec/CMakeLists.txt | 20 +- examples/robotics/05_loops_detec/build.sh | 2 +- examples/robotics/05_loops_detec/main.cpp | 10 +- .../robotics/06_loops_proofs/CMakeLists.txt | 20 +- examples/robotics/06_loops_proofs/build.sh | 2 +- examples/robotics/06_loops_proofs/main.cpp | 10 +- examples/robotics/07_dynloc/CMakeLists.txt | 20 +- examples/robotics/07_dynloc/build.sh | 2 +- examples/robotics/07_dynloc/main.cpp | 10 +- .../robotics/08_tubepaving/CMakeLists.txt | 20 +- examples/robotics/08_tubepaving/build.sh | 2 +- examples/robotics/08_tubepaving/main.cpp | 10 +- examples/robotics/09_lissajous/CMakeLists.txt | 20 +- examples/robotics/09_lissajous/build.sh | 2 +- examples/robotics/09_lissajous/main.cpp | 10 +- examples/robotics/10_datasso/CMakeLists.txt | 20 +- examples/robotics/10_datasso/build.sh | 2 +- examples/robotics/10_datasso/datasso.py | 4 +- examples/robotics/10_datasso/main.cpp | 12 +- .../old_ex_02_lowcost_beacons/CMakeLists.txt | 20 +- .../old_ex_02_lowcost_beacons/build.sh | 2 +- .../old_ex_02_lowcost_beacons/main.cpp | 20 +- .../01_getting_started/01_getting_started.cpp | 12 +- .../01_getting_started/01_getting_started.py | 4 +- .../tuto/01_getting_started/CMakeLists.txt | 18 +- examples/tuto/01_getting_started/build.sh | 2 +- .../02_static_rangeonly.cpp | 10 +- .../02_static_rangeonly.py | 4 +- .../tuto/02_static_rangeonly/CMakeLists.txt | 18 +- examples/tuto/02_static_rangeonly/build.sh | 2 +- .../03_static_rangebearing.cpp | 12 +- .../03_static_rangebearing.py | 4 +- .../03_static_rangebearing/CMakeLists.txt | 18 +- examples/tuto/03_static_rangebearing/build.sh | 2 +- .../04_dyn_rangeonly/04_dyn_rangeonly.cpp | 10 +- .../tuto/04_dyn_rangeonly/04_dyn_rangeonly.py | 4 +- examples/tuto/04_dyn_rangeonly/CMakeLists.txt | 18 +- examples/tuto/04_dyn_rangeonly/build.sh | 2 +- .../05_dyn_rangebearing.cpp | 12 +- .../05_dyn_rangebearing.py | 4 +- .../tuto/05_dyn_rangebearing/CMakeLists.txt | 18 +- examples/tuto/05_dyn_rangebearing/build.sh | 2 +- make.sh | 6 +- python/CMakeLists.txt | 84 ++--- python/{tubex_lib => codac}/__init__.py | 2 +- python/{tubex_lib => codac}/tests/__init__.py | 2 +- .../tests/test_arithmetic.py | 2 +- python/{tubex_lib => codac}/tests/test_cn.py | 4 +- .../tests/test_ctc_constell.py | 4 +- .../tests/test_ctcdelay.py | 2 +- .../tests/test_ctceval.py | 2 +- .../tests/test_definition.py | 8 +- .../tests/test_function.py | 4 +- .../tests/test_multi_arithmetic.py | 16 +- python/{tubex_py.cpp => codac_py.cpp} | 18 +- python/setup.py.in | 2 +- ...arithmetic.cpp => codac_py_arithmetic.cpp} | 8 +- ...ork.cpp => codac_py_ContractorNetwork.cpp} | 34 +- ..._py_CtcDelay.cpp => codac_py_CtcDelay.cpp} | 8 +- ..._py_CtcDeriv.cpp => codac_py_CtcDeriv.cpp} | 10 +- ...ex_py_CtcEval.cpp => codac_py_CtcEval.cpp} | 10 +- ...y_CtcLohner.cpp => codac_py_CtcLohner.cpp} | 10 +- ...y_CtcPicard.cpp => codac_py_CtcPicard.cpp} | 10 +- ...ubex_py_DynCtc.cpp => codac_py_DynCtc.cpp} | 8 +- .../{tubex_py_DynCtc.h => codac_py_DynCtc.h} | 12 +- ...cConstell.cpp => codac_py_CtcConstell.cpp} | 8 +- ...ex_py_CtcDist.cpp => codac_py_CtcDist.cpp} | 8 +- ...cFunction.cpp => codac_py_CtcFunction.cpp} | 8 +- ...{tubex_py_Slice.cpp => codac_py_Slice.cpp} | 8 +- ...ectory.cpp => codac_py_RandTrajectory.cpp} | 8 +- ...Trajectory.cpp => codac_py_Trajectory.cpp} | 8 +- ...ctor.cpp => codac_py_TrajectoryVector.cpp} | 8 +- .../{tubex_py_Tube.cpp => codac_py_Tube.cpp} | 8 +- ...TubeVector.cpp => codac_py_TubeVector.cpp} | 8 +- .../{tubex_py_TFnc.cpp => codac_py_TFnc.cpp} | 8 +- .../{tubex_py_TFnc.h => codac_py_TFnc.h} | 14 +- ...y_TFunction.cpp => codac_py_TFunction.cpp} | 12 +- ..._py_ColorMap.cpp => codac_py_ColorMap.cpp} | 8 +- ...ubex_py_Figure.cpp => codac_py_Figure.cpp} | 8 +- ..._py_VIBesFig.cpp => codac_py_VIBesFig.cpp} | 8 +- ...BesFigMap.cpp => codac_py_VIBesFigMap.cpp} | 8 +- ...sFigTube.cpp => codac_py_VIBesFigTube.cpp} | 8 +- ...or.cpp => codac_py_VIBesFigTubeVector.cpp} | 8 +- ..._py_graphics.cpp => codac_py_graphics.cpp} | 2 +- ...DataLoader.cpp => codac_py_DataLoader.cpp} | 8 +- scripts/docker/build_pybinding.sh | 4 +- scripts/pybind/doxygen2docstring.py | 12 +- scripts/pybind/pybind11gen.py | 14 +- src/3rd/CMakeLists.txt | 2 +- src/3rd/capd/CMakeLists.txt | 48 +-- ...apd_helpers.cpp => codac_capd_helpers.cpp} | 4 +- ...ex_capd_helpers.h => codac_capd_helpers.h} | 8 +- ...ateODE.cpp => codac_capd_integrateODE.cpp} | 14 +- ...tegrateODE.h => codac_capd_integrateODE.h} | 12 +- src/3rd/pyibex/CMakeLists.txt | 40 +-- src/3rd/pyibex/pyibex_predef_contractors.cpp | 4 +- src/3rd/pyibex/pyibex_predef_contractors.h | 4 +- src/CMakeLists.txt | 78 ++--- src/core/CMakeLists.txt | 324 +++++++++--------- ...metic.cpp => codac_polygon_arithmetic.cpp} | 6 +- ...rithmetic.h => codac_polygon_arithmetic.h} | 10 +- ..._predef_values.h => codac_predef_values.h} | 8 +- ...j_arithmetic.h => codac_traj_arithmetic.h} | 12 +- ...r.cpp => codac_traj_arithmetic_scalar.cpp} | 6 +- ...r.cpp => codac_traj_arithmetic_vector.cpp} | 12 +- ...e_arithmetic.h => codac_tube_arithmetic.h} | 12 +- ...r.cpp => codac_tube_arithmetic_scalar.cpp} | 8 +- ...r.cpp => codac_tube_arithmetic_vector.cpp} | 18 +- ...ex_Contractor.cpp => codac_Contractor.cpp} | 28 +- ...{tubex_Contractor.h => codac_Contractor.h} | 20 +- ...etwork.cpp => codac_ContractorNetwork.cpp} | 12 +- ...torNetwork.h => codac_ContractorNetwork.h} | 18 +- ....cpp => codac_ContractorNetwork_solve.cpp} | 8 +- ...u.cpp => codac_ContractorNetwork_visu.cpp} | 12 +- .../cn/{tubex_Domain.cpp => codac_Domain.cpp} | 12 +- .../cn/{tubex_Domain.h => codac_Domain.h} | 22 +- ...{tubex_Hashcode.cpp => codac_Hashcode.cpp} | 14 +- .../cn/{tubex_Hashcode.h => codac_Hashcode.h} | 12 +- ...ctors.cpp => codac_predef_contractors.cpp} | 6 +- ...ntractors.h => codac_predef_contractors.h} | 16 +- ...{tubex_CtcChain.cpp => codac_CtcChain.cpp} | 10 +- .../{tubex_CtcChain.h => codac_CtcChain.h} | 10 +- ...{tubex_CtcDelay.cpp => codac_CtcDelay.cpp} | 10 +- .../{tubex_CtcDelay.h => codac_CtcDelay.h} | 10 +- ...{tubex_CtcDeriv.cpp => codac_CtcDeriv.cpp} | 12 +- .../{tubex_CtcDeriv.h => codac_CtcDeriv.h} | 12 +- .../{tubex_CtcEval.cpp => codac_CtcEval.cpp} | 14 +- .../dyn/{tubex_CtcEval.h => codac_CtcEval.h} | 10 +- ...ubex_CtcLinobs.cpp => codac_CtcLinobs.cpp} | 12 +- .../{tubex_CtcLinobs.h => codac_CtcLinobs.h} | 12 +- ...ubex_CtcLohner.cpp => codac_CtcLohner.cpp} | 20 +- .../{tubex_CtcLohner.h => codac_CtcLohner.h} | 24 +- ...ubex_CtcPicard.cpp => codac_CtcPicard.cpp} | 8 +- .../{tubex_CtcPicard.h => codac_CtcPicard.h} | 14 +- ...ubex_CtcStatic.cpp => codac_CtcStatic.cpp} | 8 +- .../{tubex_CtcStatic.h => codac_CtcStatic.h} | 12 +- .../{tubex_DynCtc.cpp => codac_DynCtc.cpp} | 6 +- .../dyn/{tubex_DynCtc.h => codac_DynCtc.h} | 12 +- .../{tubex_CtcDist.cpp => codac_CtcDist.cpp} | 6 +- .../{tubex_CtcDist.h => codac_CtcDist.h} | 8 +- ..._CtcFunction.cpp => codac_CtcFunction.cpp} | 6 +- ...ubex_CtcFunction.h => codac_CtcFunction.h} | 10 +- ...amicalItem.cpp => codac_DynamicalItem.cpp} | 6 +- ..._DynamicalItem.h => codac_DynamicalItem.h} | 8 +- .../{tubex_Slice.cpp => codac_Slice.cpp} | 8 +- .../slice/{tubex_Slice.h => codac_Slice.h} | 18 +- ...perators.cpp => codac_Slice_operators.cpp} | 6 +- ...ce_polygon.cpp => codac_Slice_polygon.cpp} | 6 +- ...rajectory.cpp => codac_RandTrajectory.cpp} | 8 +- ...andTrajectory.h => codac_RandTrajectory.h} | 10 +- ...ex_Trajectory.cpp => codac_Trajectory.cpp} | 6 +- ...{tubex_Trajectory.h => codac_Trajectory.h} | 14 +- ...yVector.cpp => codac_TrajectoryVector.cpp} | 6 +- ...ctoryVector.h => codac_TrajectoryVector.h} | 16 +- ...p => codac_TrajectoryVector_operators.cpp} | 8 +- ...ors.cpp => codac_Trajectory_operators.cpp} | 6 +- .../tube/{tubex_Tube.cpp => codac_Tube.cpp} | 14 +- .../tube/{tubex_Tube.h => codac_Tube.h} | 22 +- ...thesis.cpp => codac_TubeTreeSynthesis.cpp} | 6 +- ...eSynthesis.h => codac_TubeTreeSynthesis.h} | 10 +- ...ex_TubeVector.cpp => codac_TubeVector.cpp} | 14 +- ...{tubex_TubeVector.h => codac_TubeVector.h} | 16 +- ...ors.cpp => codac_TubeVector_operators.cpp} | 10 +- ...operators.cpp => codac_Tube_operators.cpp} | 8 +- ...ion.cpp => codac_DomainsSizeException.cpp} | 6 +- ...ception.h => codac_DomainsSizeException.h} | 12 +- ...ion.cpp => codac_DomainsTypeException.cpp} | 6 +- ...ception.h => codac_DomainsTypeException.h} | 12 +- ...ubex_Exception.cpp => codac_Exception.cpp} | 6 +- .../{tubex_Exception.h => codac_Exception.h} | 10 +- ...TFunction.cpp => codac_DelayTFunction.cpp} | 8 +- ...elayTFunction.h => codac_DelayTFunction.h} | 10 +- .../{tubex_TFnc.cpp => codac_TFnc.cpp} | 12 +- .../functions/{tubex_TFnc.h => codac_TFnc.h} | 8 +- ...ubex_TFunction.cpp => codac_TFunction.cpp} | 10 +- .../{tubex_TFunction.h => codac_TFunction.h} | 14 +- ...vexPolygon.cpp => codac_ConvexPolygon.cpp} | 10 +- ..._ConvexPolygon.h => codac_ConvexPolygon.h} | 10 +- .../{tubex_Edge.cpp => codac_Edge.cpp} | 6 +- .../geometry/{tubex_Edge.h => codac_Edge.h} | 10 +- ...ex_GrahamScan.cpp => codac_GrahamScan.cpp} | 6 +- ...{tubex_GrahamScan.h => codac_GrahamScan.h} | 12 +- .../{tubex_Point.cpp => codac_Point.cpp} | 6 +- .../geometry/{tubex_Point.h => codac_Point.h} | 8 +- .../{tubex_Polygon.cpp => codac_Polygon.cpp} | 10 +- .../{tubex_Polygon.h => codac_Polygon.h} | 12 +- ...{tubex_ColorMap.cpp => codac_ColorMap.cpp} | 10 +- .../{tubex_ColorMap.h => codac_ColorMap.h} | 12 +- .../{tubex_Figure.cpp => codac_Figure.cpp} | 6 +- .../{tubex_Figure.h => codac_Figure.h} | 8 +- ...{tubex_VIBesFig.cpp => codac_VIBesFig.cpp} | 6 +- .../{tubex_VIBesFig.h => codac_VIBesFig.h} | 18 +- ...FigPaving.cpp => codac_VIBesFigPaving.cpp} | 6 +- ...IBesFigPaving.h => codac_VIBesFigPaving.h} | 12 +- ...IBesFigTube.cpp => codac_VIBesFigTube.cpp} | 12 +- ...ex_VIBesFigTube.h => codac_VIBesFigTube.h} | 16 +- ...ector.cpp => codac_VIBesFigTubeVector.cpp} | 8 +- ...ubeVector.h => codac_VIBesFigTubeVector.h} | 14 +- .../{tubex_colors.cpp => codac_colors.cpp} | 6 +- .../{tubex_colors.h => codac_colors.h} | 8 +- ...edSubset.cpp => codac_ConnectedSubset.cpp} | 8 +- ...nectedSubset.h => codac_ConnectedSubset.h} | 10 +- ...e.cpp => codac_ConnectedSubset_degree.cpp} | 8 +- .../{tubex_Paving.cpp => codac_Paving.cpp} | 6 +- .../paving/{tubex_Paving.h => codac_Paving.h} | 12 +- ..._SIVIAPaving.cpp => codac_SIVIAPaving.cpp} | 6 +- ...ubex_SIVIAPaving.h => codac_SIVIAPaving.h} | 10 +- .../paving/{tubex_Set.cpp => codac_Set.cpp} | 6 +- src/core/paving/{tubex_Set.h => codac_Set.h} | 8 +- ...ex_TubePaving.cpp => codac_TubePaving.cpp} | 6 +- ...{tubex_TubePaving.h => codac_TubePaving.h} | 12 +- ...vals.cpp => codac_serialize_intervals.cpp} | 8 +- ...ntervals.h => codac_serialize_intervals.h} | 8 +- ...s.cpp => codac_serialize_trajectories.cpp} | 8 +- ...ories.h => codac_serialize_trajectories.h} | 14 +- ...ze_tubes.cpp => codac_serialize_tubes.cpp} | 16 +- ...ialize_tubes.h => codac_serialize_tubes.h} | 8 +- .../{tubex_Eigen.cpp => codac_Eigen.cpp} | 4 +- .../tools/{tubex_Eigen.h => codac_Eigen.h} | 8 +- .../{tubex_Tools.cpp => codac_Tools.cpp} | 6 +- .../tools/{tubex_Tools.h => codac_Tools.h} | 8 +- src/robotics/CMakeLists.txt | 68 ++-- ..._CtcConstell.cpp => codac_CtcConstell.cpp} | 6 +- ...ubex_CtcConstell.h => codac_CtcConstell.h} | 8 +- ...ex_DataLoader.cpp => codac_DataLoader.cpp} | 12 +- ...{tubex_DataLoader.h => codac_DataLoader.h} | 14 +- ...jous.cpp => codac_DataLoaderLissajous.cpp} | 10 +- ...issajous.h => codac_DataLoaderLissajous.h} | 12 +- ...ermor.cpp => codac_DataLoaderRedermor.cpp} | 12 +- ...rRedermor.h => codac_DataLoaderRedermor.h} | 12 +- ..._VIBesFigMap.cpp => codac_VIBesFigMap.cpp} | 14 +- ...ubex_VIBesFigMap.h => codac_VIBesFigMap.h} | 18 +- .../{tubex_TPlane.cpp => codac_TPlane.cpp} | 6 +- .../loops/{tubex_TPlane.h => codac_TPlane.h} | 14 +- .../{tubex_Beacon.cpp => codac_Beacon.cpp} | 6 +- .../{tubex_Beacon.h => codac_Beacon.h} | 8 +- tests/3rd/CMakeLists.txt | 2 +- tests/3rd/capd/CMakeLists.txt | 12 +- tests/3rd/capd/tests_ode.cpp | 8 +- tests/CMakeLists.txt | 2 +- tests/catch/catch_interval.hpp | 76 ++-- tests/core/CMakeLists.txt | 12 +- tests/core/tests_arithmetic.cpp | 6 +- tests/core/tests_cn.cpp | 10 +- tests/core/tests_ctc_delay.cpp | 6 +- tests/core/tests_ctc_deriv.cpp | 6 +- tests/core/tests_ctc_eval.cpp | 10 +- tests/core/tests_ctc_lohner.cpp | 6 +- tests/core/tests_ctc_picard.cpp | 6 +- tests/core/tests_definition.cpp | 4 +- tests/core/tests_functions.cpp | 6 +- tests/core/tests_geometry.cpp | 8 +- tests/core/tests_integration.cpp | 2 +- tests/core/tests_operators.cpp | 4 +- tests/core/tests_polygons.cpp | 10 +- tests/core/tests_predefined_tubes.cpp | 2 +- tests/core/tests_predefined_tubes.h | 14 +- tests/core/tests_serialization.cpp | 8 +- tests/core/tests_slices_structure.cpp | 2 +- tests/core/tests_trajectory.cpp | 2 +- tests/core/tests_values.cpp | 10 +- 369 files changed, 2166 insertions(+), 2166 deletions(-) rename python/{tubex_lib => codac}/__init__.py (91%) rename python/{tubex_lib => codac}/tests/__init__.py (60%) rename python/{tubex_lib => codac}/tests/test_arithmetic.py (99%) rename python/{tubex_lib => codac}/tests/test_cn.py (99%) rename python/{tubex_lib => codac}/tests/test_ctc_constell.py (98%) rename python/{tubex_lib => codac}/tests/test_ctcdelay.py (98%) rename python/{tubex_lib => codac}/tests/test_ctceval.py (99%) rename python/{tubex_lib => codac}/tests/test_definition.py (98%) rename python/{tubex_lib => codac}/tests/test_function.py (94%) rename python/{tubex_lib => codac}/tests/test_multi_arithmetic.py (87%) rename python/{tubex_py.cpp => codac_py.cpp} (88%) rename python/src/core/arithmetic/{tubex_py_arithmetic.cpp => codac_py_arithmetic.cpp} (97%) rename python/src/core/cn/{tubex_py_ContractorNetwork.cpp => codac_py_ContractorNetwork.cpp} (91%) rename python/src/core/contractors/dyn/{tubex_py_CtcDelay.cpp => codac_py_CtcDelay.cpp} (91%) rename python/src/core/contractors/dyn/{tubex_py_CtcDeriv.cpp => codac_py_CtcDeriv.cpp} (91%) rename python/src/core/contractors/dyn/{tubex_py_CtcEval.cpp => codac_py_CtcEval.cpp} (93%) rename python/src/core/contractors/dyn/{tubex_py_CtcLohner.cpp => codac_py_CtcLohner.cpp} (87%) rename python/src/core/contractors/dyn/{tubex_py_CtcPicard.cpp => codac_py_CtcPicard.cpp} (90%) rename python/src/core/contractors/dyn/{tubex_py_DynCtc.cpp => codac_py_DynCtc.cpp} (91%) rename python/src/core/contractors/dyn/{tubex_py_DynCtc.h => codac_py_DynCtc.h} (82%) rename python/src/core/contractors/static/{tubex_py_CtcConstell.cpp => codac_py_CtcConstell.cpp} (89%) rename python/src/core/contractors/static/{tubex_py_CtcDist.cpp => codac_py_CtcDist.cpp} (92%) rename python/src/core/contractors/static/{tubex_py_CtcFunction.cpp => codac_py_CtcFunction.cpp} (95%) rename python/src/core/dynamics/slice/{tubex_py_Slice.cpp => codac_py_Slice.cpp} (98%) rename python/src/core/dynamics/trajectory/{tubex_py_RandTrajectory.cpp => codac_py_RandTrajectory.cpp} (87%) rename python/src/core/dynamics/trajectory/{tubex_py_Trajectory.cpp => codac_py_Trajectory.cpp} (97%) rename python/src/core/dynamics/trajectory/{tubex_py_TrajectoryVector.cpp => codac_py_TrajectoryVector.cpp} (98%) rename python/src/core/dynamics/tube/{tubex_py_Tube.cpp => codac_py_Tube.cpp} (99%) rename python/src/core/dynamics/tube/{tubex_py_TubeVector.cpp => codac_py_TubeVector.cpp} (99%) rename python/src/core/functions/{tubex_py_TFnc.cpp => codac_py_TFnc.cpp} (89%) rename python/src/core/functions/{tubex_py_TFnc.h => codac_py_TFnc.h} (90%) rename python/src/core/functions/{tubex_py_TFunction.cpp => codac_py_TFunction.cpp} (96%) rename python/src/core/graphics/{tubex_py_ColorMap.cpp => codac_py_ColorMap.cpp} (86%) rename python/src/core/graphics/{tubex_py_Figure.cpp => codac_py_Figure.cpp} (86%) rename python/src/core/graphics/{tubex_py_VIBesFig.cpp => codac_py_VIBesFig.cpp} (96%) rename python/src/core/graphics/{tubex_py_VIBesFigMap.cpp => codac_py_VIBesFigMap.cpp} (98%) rename python/src/core/graphics/{tubex_py_VIBesFigTube.cpp => codac_py_VIBesFigTube.cpp} (97%) rename python/src/core/graphics/{tubex_py_VIBesFigTubeVector.cpp => codac_py_VIBesFigTubeVector.cpp} (97%) rename python/src/core/graphics/{tubex_py_graphics.cpp => codac_py_graphics.cpp} (94%) rename python/src/robotics/{tubex_py_DataLoader.cpp => codac_py_DataLoader.cpp} (93%) rename src/3rd/capd/{tubex_capd_helpers.cpp => codac_capd_helpers.cpp} (96%) rename src/3rd/capd/{tubex_capd_helpers.h => codac_capd_helpers.h} (81%) rename src/3rd/capd/{tubex_capd_integrateODE.cpp => codac_capd_integrateODE.cpp} (93%) rename src/3rd/capd/{tubex_capd_integrateODE.h => codac_capd_integrateODE.h} (91%) rename src/core/arithmetic/{tubex_polygon_arithmetic.cpp => codac_polygon_arithmetic.cpp} (97%) rename src/core/arithmetic/{tubex_polygon_arithmetic.h => codac_polygon_arithmetic.h} (87%) rename src/core/arithmetic/{tubex_predef_values.h => codac_predef_values.h} (75%) rename src/core/arithmetic/{tubex_traj_arithmetic.h => codac_traj_arithmetic.h} (98%) rename src/core/arithmetic/{tubex_traj_arithmetic_scalar.cpp => codac_traj_arithmetic_scalar.cpp} (98%) rename src/core/arithmetic/{tubex_traj_arithmetic_vector.cpp => codac_traj_arithmetic_vector.cpp} (94%) rename src/core/arithmetic/{tubex_tube_arithmetic.h => codac_tube_arithmetic.h} (98%) rename src/core/arithmetic/{tubex_tube_arithmetic_scalar.cpp => codac_tube_arithmetic_scalar.cpp} (98%) rename src/core/arithmetic/{tubex_tube_arithmetic_vector.cpp => codac_tube_arithmetic_vector.cpp} (92%) rename src/core/cn/{tubex_Contractor.cpp => codac_Contractor.cpp} (95%) rename src/core/cn/{tubex_Contractor.h => codac_Contractor.h} (83%) rename src/core/cn/{tubex_ContractorNetwork.cpp => codac_ContractorNetwork.cpp} (98%) rename src/core/cn/{tubex_ContractorNetwork.h => codac_ContractorNetwork.h} (98%) rename src/core/cn/{tubex_ContractorNetwork_solve.cpp => codac_ContractorNetwork_solve.cpp} (96%) rename src/core/cn/{tubex_ContractorNetwork_visu.cpp => codac_ContractorNetwork_visu.cpp} (96%) rename src/core/cn/{tubex_Domain.cpp => codac_Domain.cpp} (99%) rename src/core/cn/{tubex_Domain.h => codac_Domain.h} (94%) rename src/core/cn/{tubex_Hashcode.cpp => codac_Hashcode.cpp} (93%) rename src/core/cn/{tubex_Hashcode.h => codac_Hashcode.h} (82%) rename src/core/contractors/{tubex_predef_contractors.cpp => codac_predef_contractors.cpp} (81%) rename src/core/contractors/{tubex_predef_contractors.h => codac_predef_contractors.h} (72%) rename src/core/contractors/dyn/{tubex_CtcChain.cpp => codac_CtcChain.cpp} (91%) rename src/core/contractors/dyn/{tubex_CtcChain.h => codac_CtcChain.h} (86%) rename src/core/contractors/dyn/{tubex_CtcDelay.cpp => codac_CtcDelay.cpp} (97%) rename src/core/contractors/dyn/{tubex_CtcDelay.h => codac_CtcDelay.h} (94%) rename src/core/contractors/dyn/{tubex_CtcDeriv.cpp => codac_CtcDeriv.cpp} (97%) rename src/core/contractors/dyn/{tubex_CtcDeriv.h => codac_CtcDeriv.h} (96%) rename src/core/contractors/dyn/{tubex_CtcEval.cpp => codac_CtcEval.cpp} (98%) rename src/core/contractors/dyn/{tubex_CtcEval.h => codac_CtcEval.h} (97%) rename src/core/contractors/dyn/{tubex_CtcLinobs.cpp => codac_CtcLinobs.cpp} (97%) rename src/core/contractors/dyn/{tubex_CtcLinobs.h => codac_CtcLinobs.h} (94%) rename src/core/contractors/dyn/{tubex_CtcLohner.cpp => codac_CtcLohner.cpp} (95%) rename src/core/contractors/dyn/{tubex_CtcLohner.h => codac_CtcLohner.h} (83%) rename src/core/contractors/dyn/{tubex_CtcPicard.cpp => codac_CtcPicard.cpp} (98%) rename src/core/contractors/dyn/{tubex_CtcPicard.h => codac_CtcPicard.h} (87%) rename src/core/contractors/dyn/{tubex_CtcStatic.cpp => codac_CtcStatic.cpp} (98%) rename src/core/contractors/dyn/{tubex_CtcStatic.h => codac_CtcStatic.h} (96%) rename src/core/contractors/dyn/{tubex_DynCtc.cpp => codac_DynCtc.cpp} (90%) rename src/core/contractors/dyn/{tubex_DynCtc.h => codac_DynCtc.h} (95%) rename src/core/contractors/static/{tubex_CtcDist.cpp => codac_CtcDist.cpp} (93%) rename src/core/contractors/static/{tubex_CtcDist.h => codac_CtcDist.h} (93%) rename src/core/contractors/static/{tubex_CtcFunction.cpp => codac_CtcFunction.cpp} (98%) rename src/core/contractors/static/{tubex_CtcFunction.h => codac_CtcFunction.h} (98%) rename src/core/dynamics/{tubex_DynamicalItem.cpp => codac_DynamicalItem.cpp} (85%) rename src/core/dynamics/{tubex_DynamicalItem.h => codac_DynamicalItem.h} (93%) rename src/core/dynamics/slice/{tubex_Slice.cpp => codac_Slice.cpp} (99%) rename src/core/dynamics/slice/{tubex_Slice.h => codac_Slice.h} (98%) rename src/core/dynamics/slice/{tubex_Slice_operators.cpp => codac_Slice_operators.cpp} (95%) rename src/core/dynamics/slice/{tubex_Slice_polygon.cpp => codac_Slice_polygon.cpp} (98%) rename src/core/dynamics/trajectory/{tubex_RandTrajectory.cpp => codac_RandTrajectory.cpp} (89%) rename src/core/dynamics/trajectory/{tubex_RandTrajectory.h => codac_RandTrajectory.h} (85%) rename src/core/dynamics/trajectory/{tubex_Trajectory.cpp => codac_Trajectory.cpp} (99%) rename src/core/dynamics/trajectory/{tubex_Trajectory.h => codac_Trajectory.h} (98%) rename src/core/dynamics/trajectory/{tubex_TrajectoryVector.cpp => codac_TrajectoryVector.cpp} (98%) rename src/core/dynamics/trajectory/{tubex_TrajectoryVector.h => codac_TrajectoryVector.h} (98%) rename src/core/dynamics/trajectory/{tubex_TrajectoryVector_operators.cpp => codac_TrajectoryVector_operators.cpp} (92%) rename src/core/dynamics/trajectory/{tubex_Trajectory_operators.cpp => codac_Trajectory_operators.cpp} (94%) rename src/core/dynamics/tube/{tubex_Tube.cpp => codac_Tube.cpp} (99%) rename src/core/dynamics/tube/{tubex_Tube.h => codac_Tube.h} (99%) rename src/core/dynamics/tube/{tubex_TubeTreeSynthesis.cpp => codac_TubeTreeSynthesis.cpp} (99%) rename src/core/dynamics/tube/{tubex_TubeTreeSynthesis.h => codac_TubeTreeSynthesis.h} (92%) rename src/core/dynamics/tube/{tubex_TubeVector.cpp => codac_TubeVector.cpp} (99%) rename src/core/dynamics/tube/{tubex_TubeVector.h => codac_TubeVector.h} (99%) rename src/core/dynamics/tube/{tubex_TubeVector_operators.cpp => codac_TubeVector_operators.cpp} (93%) rename src/core/dynamics/tube/{tubex_Tube_operators.cpp => codac_Tube_operators.cpp} (96%) rename src/core/exceptions/{tubex_DomainsSizeException.cpp => codac_DomainsSizeException.cpp} (84%) rename src/core/exceptions/{tubex_DomainsSizeException.h => codac_DomainsSizeException.h} (80%) rename src/core/exceptions/{tubex_DomainsTypeException.cpp => codac_DomainsTypeException.cpp} (95%) rename src/core/exceptions/{tubex_DomainsTypeException.h => codac_DomainsTypeException.h} (93%) rename src/core/exceptions/{tubex_Exception.cpp => codac_Exception.cpp} (88%) rename src/core/exceptions/{tubex_Exception.h => codac_Exception.h} (89%) rename src/core/functions/{tubex_DelayTFunction.cpp => codac_DelayTFunction.cpp} (87%) rename src/core/functions/{tubex_DelayTFunction.h => codac_DelayTFunction.h} (84%) rename src/core/functions/{tubex_TFnc.cpp => codac_TFnc.cpp} (93%) rename src/core/functions/{tubex_TFnc.h => codac_TFnc.h} (93%) rename src/core/functions/{tubex_TFunction.cpp => codac_TFunction.cpp} (98%) rename src/core/functions/{tubex_TFunction.h => codac_TFunction.h} (93%) rename src/core/geometry/{tubex_ConvexPolygon.cpp => codac_ConvexPolygon.cpp} (98%) rename src/core/geometry/{tubex_ConvexPolygon.h => codac_ConvexPolygon.h} (89%) rename src/core/geometry/{tubex_Edge.cpp => codac_Edge.cpp} (98%) rename src/core/geometry/{tubex_Edge.h => codac_Edge.h} (93%) rename src/core/geometry/{tubex_GrahamScan.cpp => codac_GrahamScan.cpp} (98%) rename src/core/geometry/{tubex_GrahamScan.h => codac_GrahamScan.h} (89%) rename src/core/geometry/{tubex_Point.cpp => codac_Point.cpp} (98%) rename src/core/geometry/{tubex_Point.h => codac_Point.h} (96%) rename src/core/geometry/{tubex_Polygon.cpp => codac_Polygon.cpp} (96%) rename src/core/geometry/{tubex_Polygon.h => codac_Polygon.h} (90%) rename src/core/graphics/{tubex_ColorMap.cpp => codac_ColorMap.cpp} (98%) rename src/core/graphics/{tubex_ColorMap.h => codac_ColorMap.h} (95%) rename src/core/graphics/{tubex_Figure.cpp => codac_Figure.cpp} (95%) rename src/core/graphics/{tubex_Figure.h => codac_Figure.h} (97%) rename src/core/graphics/{tubex_VIBesFig.cpp => codac_VIBesFig.cpp} (99%) rename src/core/graphics/{tubex_VIBesFig.h => codac_VIBesFig.h} (98%) rename src/core/graphics/{tubex_VIBesFigPaving.cpp => codac_VIBesFigPaving.cpp} (95%) rename src/core/graphics/{tubex_VIBesFigPaving.h => codac_VIBesFigPaving.h} (90%) rename src/core/graphics/{tubex_VIBesFigTube.cpp => codac_VIBesFigTube.cpp} (98%) rename src/core/graphics/{tubex_VIBesFigTube.h => codac_VIBesFigTube.h} (98%) rename src/core/graphics/{tubex_VIBesFigTubeVector.cpp => codac_VIBesFigTubeVector.cpp} (98%) rename src/core/graphics/{tubex_VIBesFigTubeVector.h => codac_VIBesFigTubeVector.h} (97%) rename src/core/graphics/{tubex_colors.cpp => codac_colors.cpp} (98%) rename src/core/graphics/{tubex_colors.h => codac_colors.h} (96%) rename src/core/paving/{tubex_ConnectedSubset.cpp => codac_ConnectedSubset.cpp} (95%) rename src/core/paving/{tubex_ConnectedSubset.h => codac_ConnectedSubset.h} (98%) rename src/core/paving/{tubex_ConnectedSubset_degree.cpp => codac_ConnectedSubset_degree.cpp} (98%) rename src/core/paving/{tubex_Paving.cpp => codac_Paving.cpp} (98%) rename src/core/paving/{tubex_Paving.h => codac_Paving.h} (97%) rename src/core/paving/{tubex_SIVIAPaving.cpp => codac_SIVIAPaving.cpp} (92%) rename src/core/paving/{tubex_SIVIAPaving.h => codac_SIVIAPaving.h} (89%) rename src/core/paving/{tubex_Set.cpp => codac_Set.cpp} (89%) rename src/core/paving/{tubex_Set.h => codac_Set.h} (96%) rename src/core/paving/{tubex_TubePaving.cpp => codac_TubePaving.cpp} (94%) rename src/core/paving/{tubex_TubePaving.h => codac_TubePaving.h} (85%) rename src/core/serialize/{tubex_serialize_intervals.cpp => codac_serialize_intervals.cpp} (95%) rename src/core/serialize/{tubex_serialize_intervals.h => codac_serialize_intervals.h} (94%) rename src/core/serialize/{tubex_serialize_trajectories.cpp => codac_serialize_trajectories.cpp} (96%) rename src/core/serialize/{tubex_serialize_trajectories.h => codac_serialize_trajectories.h} (90%) rename src/core/serialize/{tubex_serialize_tubes.cpp => codac_serialize_tubes.cpp} (95%) rename src/core/serialize/{tubex_serialize_tubes.h => codac_serialize_tubes.h} (95%) rename src/core/tools/{tubex_Eigen.cpp => codac_Eigen.cpp} (93%) rename src/core/tools/{tubex_Eigen.h => codac_Eigen.h} (70%) rename src/core/tools/{tubex_Tools.cpp => codac_Tools.cpp} (92%) rename src/core/tools/{tubex_Tools.h => codac_Tools.h} (91%) rename src/robotics/contractors/{tubex_CtcConstell.cpp => codac_CtcConstell.cpp} (91%) rename src/robotics/contractors/{tubex_CtcConstell.h => codac_CtcConstell.h} (85%) rename src/robotics/data/{tubex_DataLoader.cpp => codac_DataLoader.cpp} (97%) rename src/robotics/data/{tubex_DataLoader.h => codac_DataLoader.h} (94%) rename src/robotics/data/{tubex_DataLoaderLissajous.cpp => codac_DataLoaderLissajous.cpp} (95%) rename src/robotics/data/{tubex_DataLoaderLissajous.h => codac_DataLoaderLissajous.h} (86%) rename src/robotics/data/{tubex_DataLoaderRedermor.cpp => codac_DataLoaderRedermor.cpp} (96%) rename src/robotics/data/{tubex_DataLoaderRedermor.h => codac_DataLoaderRedermor.h} (80%) rename src/robotics/graphics/{tubex_VIBesFigMap.cpp => codac_VIBesFigMap.cpp} (99%) rename src/robotics/graphics/{tubex_VIBesFigMap.h => codac_VIBesFigMap.h} (98%) rename src/robotics/loops/{tubex_TPlane.cpp => codac_TPlane.cpp} (98%) rename src/robotics/loops/{tubex_TPlane.h => codac_TPlane.h} (96%) rename src/robotics/objects/{tubex_Beacon.cpp => codac_Beacon.cpp} (92%) rename src/robotics/objects/{tubex_Beacon.h => codac_Beacon.h} (87%) diff --git a/.gitignore b/.gitignore index c910ed7d..d2dd138b 100644 --- a/.gitignore +++ b/.gitignore @@ -46,7 +46,7 @@ CMakeLists.txt.user __pycache__ # Tubes serialization files -*.tubex +*.codac # Documentation files doc/doxygen/html/* diff --git a/.travis.yml b/.travis.yml index ac10cbed..c403f6d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - travis test script +# Codac - travis test script # ================================================================== language: c++ @@ -31,13 +31,13 @@ _vs_specific: &vs_specific script: - if [ ! -e "ibex/include/ibex.h" ]; then ( git clone https://github.com/ibex-team/ibex-lib.git ; cd ibex-lib ; mkdir build ; cd build ; cmake -G "${CMAKE_PARAM_G}" -A ${CMAKE_PARAM_A} -D CMAKE_CXX_FLAGS=" /D WIN32 /EHsc /D _CRT_SECURE_NO_WARNINGS /wd4267 /wd4244 /wd4305" -D CMAKE_C_FLAGS=" /D WIN32 /EHsc /D _CRT_SECURE_NO_WARNINGS /wd4267 /wd4244 /wd4305" -D CMAKE_INSTALL_PREFIX="../../ibex" -D INTERVAL_LIB=filib .. ; cmake --build . --config Release --target install ; cd ../.. ) else echo "Using cached directory." ; fi - mkdir build ; cd build - - cmake -G "${CMAKE_PARAM_G}" -A ${CMAKE_PARAM_A} -D CMAKE_CXX_FLAGS=" /D WIN32 /EHsc /D _CRT_SECURE_NO_WARNINGS /wd4267 /wd4244 /wd4305" -D CMAKE_C_FLAGS=" /D WIN32 /EHsc /D _CRT_SECURE_NO_WARNINGS /wd4267 /wd4244 /wd4305" -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../tubex" -D WITH_PYTHON=${WITH_PYTHON} .. + - cmake -G "${CMAKE_PARAM_G}" -A ${CMAKE_PARAM_A} -D CMAKE_CXX_FLAGS=" /D WIN32 /EHsc /D _CRT_SECURE_NO_WARNINGS /wd4267 /wd4244 /wd4305" -D CMAKE_C_FLAGS=" /D WIN32 /EHsc /D _CRT_SECURE_NO_WARNINGS /wd4267 /wd4244 /wd4305" -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../codac" -D WITH_PYTHON=${WITH_PYTHON} .. - if [ "${WITH_PYTHON}" = "ON" ]; then cmake --build . --config Debug --target api ; fi - - if [ "${WITH_PYTHON}" = "ON" ]; then cmake -G "${CMAKE_PARAM_G}" -A ${CMAKE_PARAM_A} -D CMAKE_CXX_FLAGS=" /D WIN32 /EHsc /D _CRT_SECURE_NO_WARNINGS /wd4267 /wd4244 /wd4305" -D CMAKE_C_FLAGS=" /D WIN32 /EHsc /D _CRT_SECURE_NO_WARNINGS /wd4267 /wd4244 /wd4305" -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../tubex" -D WITH_PYTHON=${WITH_PYTHON} .. ; fi + - if [ "${WITH_PYTHON}" = "ON" ]; then cmake -G "${CMAKE_PARAM_G}" -A ${CMAKE_PARAM_A} -D CMAKE_CXX_FLAGS=" /D WIN32 /EHsc /D _CRT_SECURE_NO_WARNINGS /wd4267 /wd4244 /wd4305" -D CMAKE_C_FLAGS=" /D WIN32 /EHsc /D _CRT_SECURE_NO_WARNINGS /wd4267 /wd4244 /wd4305" -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../codac" -D WITH_PYTHON=${WITH_PYTHON} .. ; fi - cmake --build . --config Debug --target install - if [ "${WITH_PYTHON}" = "ON" ]; then cmake --build . --config Debug --target pip_package ; cp `ls *.whl` ../`ls *.whl | sed "s/py3-none-any/cp${PY_V_MM}-cp${PY_V_MM}${CPCFG}/"` ; pip install ../*.whl ; python -c "import sys; print(sys.version)" ; python ../examples/tuto/01_getting_started/01_getting_started.py ; fi - cd .. - - if [ "${WITH_CPP_BUNDLE}" = "ON" ]; then wget http://www.ensta-bretagne.fr/lebars/Share/tubex_test_win.zip --no-check-certificate -nv ; 7z x tubex_test_win.zip -y ; rm -Rf tubex_test_win.zip ; cd tubex_test_win; rm -Rf ibex tubex ; cp -Rf ../ibex . ; cp -Rf ../tubex .; cd .. ; 7z a -y tubex_test_${CFG}.zip tubex_test_win ; cd tubex_test_win/test ; cmake -G "${CMAKE_PARAM_G}" -A ${CMAKE_PARAM_A} . ; cmake --build . --config Release ; cmd //c "Release\my_project.exe" ; cd ../.. ; fi + - if [ "${WITH_CPP_BUNDLE}" = "ON" ]; then wget http://www.ensta-bretagne.fr/lebars/Share/codac_test_win.zip --no-check-certificate -nv ; 7z x codac_test_win.zip -y ; rm -Rf codac_test_win.zip ; cd codac_test_win; rm -Rf ibex codac ; cp -Rf ../ibex . ; cp -Rf ../codac .; cd .. ; 7z a -y codac_test_${CFG}.zip codac_test_win ; cd codac_test_win/test ; cmake -G "${CMAKE_PARAM_G}" -A ${CMAKE_PARAM_A} . ; cmake --build . --config Release ; cmd //c "Release\my_project.exe" ; cd ../.. ; fi matrix: include: @@ -95,17 +95,17 @@ matrix: script: - if [ ! -e "ibex/include/ibex.h" ]; then ( git clone https://github.com/ibex-team/ibex-lib.git ; cd ibex-lib ; mkdir build ; cd build ; cmake -D CMAKE_INSTALL_PREFIX="../../ibex" -D CMAKE_CXX_FLAGS="-fPIC" -D CMAKE_C_FLAGS="-fPIC" .. ; cmake --build . --target install ; cd ../.. ) else echo "Using cached directory." ; fi - mkdir build ; cd build - - cmake -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../tubex" .. + - cmake -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../codac" .. - cmake --build . --target install - cd .. # Test C++ program and bundle... - - wget http://www.ensta-bretagne.fr/lebars/Share/tubex_test_win.zip -nv - - unzip -q -o tubex_test_win.zip - - rm -Rf tubex_test_win.zip - - cd tubex_test_win + - wget http://www.ensta-bretagne.fr/lebars/Share/codac_test_win.zip -nv + - unzip -q -o codac_test_win.zip + - rm -Rf codac_test_win.zip + - cd codac_test_win - mv test .. - cd ../test - - rm -Rf ../tubex_test_win + - rm -Rf ../codac_test_win - cmake . - cmake --build . - ./my_project @@ -148,9 +148,9 @@ matrix: # script: # - if [ ! -e "ibex/include/ibex.h" ]; then ( git clone https://github.com/ibex-team/ibex-lib.git ; cd ibex-lib ; mkdir build ; cd build ; cmake -D CMAKE_INSTALL_PREFIX="../../ibex" -D CMAKE_CXX_FLAGS="-fPIC" -D CMAKE_C_FLAGS="-fPIC" .. ; cmake --build . --target install ; cd ../.. ) else echo "Using cached directory." ; fi # - mkdir build ; cd build -# - cmake -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../tubex" -D CMAKE_BUILD_TYPE=Debug -D WITH_PYTHON=ON -D CMAKE_CXX_FLAGS="-fPIC" .. +# - cmake -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../codac" -D CMAKE_BUILD_TYPE=Debug -D WITH_PYTHON=ON -D CMAKE_CXX_FLAGS="-fPIC" .. # - cmake --build . --target api -# - cmake -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../tubex" -D CMAKE_BUILD_TYPE=Debug -D WITH_PYTHON=ON -D CMAKE_CXX_FLAGS="-fPIC" .. +# - cmake -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../codac" -D CMAKE_BUILD_TYPE=Debug -D WITH_PYTHON=ON -D CMAKE_CXX_FLAGS="-fPIC" .. # - cmake --build . --target install # - cmake --build . --target pip_package # # Test python program and wheel... @@ -162,13 +162,13 @@ matrix: # - python ../examples/tuto/01_getting_started/01_getting_started.py # - cd .. # # Test C++ program and bundle... -# - wget http://www.ensta-bretagne.fr/lebars/Share/tubex_test_win.zip -nv -# - unzip -q -o tubex_test_win.zip -# - rm -Rf tubex_test_win.zip -# - cd tubex_test_win +# - wget http://www.ensta-bretagne.fr/lebars/Share/codac_test_win.zip -nv +# - unzip -q -o codac_test_win.zip +# - rm -Rf codac_test_win.zip +# - cd codac_test_win # - mv test .. # - cd ../test -# - rm -Rf ../tubex_test_win +# - rm -Rf ../codac_test_win # - cmake . # - cmake --build . # - ./my_project @@ -184,7 +184,7 @@ matrix: cache: install: script: - - "docker run -i -v \"${PWD}/..:${PWD}/..\" lebarsfa/pi:buster-ibex /bin/bash -c \"uname -a && cat /etc/os-release && cd ${PWD} && lsb_release -a && sudo apt-get -q update ; sudo apt-get -y install libeigen3-dev ; mkdir build ; cd build && cmake -D CMAKE_PREFIX_PATH=../ibex -D CMAKE_INSTALL_PREFIX=../../tubex .. && cmake --build . --target install && cd ../.. && wget http://www.ensta-bretagne.fr/lebars/Share/tubex_test_win.zip -nv && unzip -q -o tubex_test_win.zip && rm -Rf tubex_test_win.zip && cd tubex_test_win && mv test .. && cd ../test && rm -Rf ../tubex_test_win && cmake . && cmake --build . && ./my_project \"" + - "docker run -i -v \"${PWD}/..:${PWD}/..\" lebarsfa/pi:buster-ibex /bin/bash -c \"uname -a && cat /etc/os-release && cd ${PWD} && lsb_release -a && sudo apt-get -q update ; sudo apt-get -y install libeigen3-dev ; mkdir build ; cd build && cmake -D CMAKE_PREFIX_PATH=../ibex -D CMAKE_INSTALL_PREFIX=../../codac .. && cmake --build . --target install && cd ../.. && wget http://www.ensta-bretagne.fr/lebars/Share/codac_test_win.zip -nv && unzip -q -o codac_test_win.zip && rm -Rf codac_test_win.zip && cd codac_test_win && mv test .. && cd ../test && rm -Rf ../codac_test_win && cmake . && cmake --build . && ./my_project \"" - name: "Mac OS Xcode 10.1" os: osx @@ -195,17 +195,17 @@ matrix: script: - if [ ! -e "ibex/include/ibex.h" ]; then ( git clone https://github.com/ibex-team/ibex-lib.git ; cd ibex-lib ; mkdir build ; cd build ; cmake -D CMAKE_INSTALL_PREFIX="../../ibex" -D CMAKE_CXX_FLAGS="-fPIC -Wno-everything" -D CMAKE_C_FLAGS="-fPIC -Wno-everything" .. ; cmake --build . --target install ; cd ../.. ) else echo "Using cached directory." ; fi - mkdir build ; cd build - - cmake -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../tubex" .. + - cmake -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../codac" .. - cmake --build . --target install - cd .. # Test C++ program and bundle... - - wget http://www.ensta-bretagne.fr/lebars/Share/tubex_test_win.zip -nv - - unzip -q -o tubex_test_win.zip - - rm -Rf tubex_test_win.zip - - cd tubex_test_win + - wget http://www.ensta-bretagne.fr/lebars/Share/codac_test_win.zip -nv + - unzip -q -o codac_test_win.zip + - rm -Rf codac_test_win.zip + - cd codac_test_win - mv test .. - cd ../test - - rm -Rf ../tubex_test_win + - rm -Rf ../codac_test_win - cmake . - cmake --build . - ./my_project @@ -306,15 +306,15 @@ matrix: script: - if [ ! -e "ibex/include/ibex.h" ]; then ( git clone https://github.com/ibex-team/ibex-lib.git ; cd ibex-lib ; mkdir build ; cd build ; cmake -G "${CMAKE_PARAM_G}" -D CMAKE_INSTALL_PREFIX="../../ibex" -D CMAKE_CXX_FLAGS="-fPIC" -D CMAKE_C_FLAGS="-fPIC" -D INTERVAL_LIB=filib .. ; cmake --build . --target install ; cd ../.. ) else echo "Using cached directory." ; fi - mkdir build ; cd build - - cmake -G "MSYS Makefiles" -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../tubex" .. + - cmake -G "MSYS Makefiles" -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../codac" .. - cmake --build . --target install - cd .. # Test C++ program and bundle... - - wget http://www.ensta-bretagne.fr/lebars/Share/tubex_test_win.zip --no-check-certificate -nv - - 7z x tubex_test_win.zip -y - - rm -Rf tubex_test_win.zip ; cd tubex_test_win; rm -Rf ibex tubex ; cp -Rf ../ibex . ; cp -Rf ../tubex .; cd .. - - 7z a -y tubex_test_${CFG}.zip tubex_test_win - - cd tubex_test_win/test + - wget http://www.ensta-bretagne.fr/lebars/Share/codac_test_win.zip --no-check-certificate -nv + - 7z x codac_test_win.zip -y + - rm -Rf codac_test_win.zip ; cd codac_test_win; rm -Rf ibex codac ; cp -Rf ../ibex . ; cp -Rf ../codac .; cd .. + - 7z a -y codac_test_${CFG}.zip codac_test_win + - cd codac_test_win/test - cmake -G "${CMAKE_PARAM_G}" . - cmake --build . - ./my_project.exe @@ -333,15 +333,15 @@ matrix: script: - if [ ! -e "ibex/include/ibex.h" ]; then ( git clone https://github.com/ibex-team/ibex-lib.git ; cd ibex-lib ; mkdir build ; cd build ; cmake -G "${CMAKE_PARAM_G}" -D CMAKE_INSTALL_PREFIX="../../ibex" -D CMAKE_CXX_FLAGS="-fPIC" -D CMAKE_C_FLAGS="-fPIC" -D INTERVAL_LIB=filib .. ; cmake --build . --target install ; cd ../.. ) else echo "Using cached directory." ; fi - mkdir build ; cd build - - cmake -G "MSYS Makefiles" -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../tubex" .. + - cmake -G "MSYS Makefiles" -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../codac" .. - cmake --build . --target install - cd .. # Test C++ program and bundle... - - wget http://www.ensta-bretagne.fr/lebars/Share/tubex_test_win.zip --no-check-certificate -nv - - 7z x tubex_test_win.zip -y - - rm -Rf tubex_test_win.zip ; cd tubex_test_win; rm -Rf ibex tubex ; cp -Rf ../ibex . ; cp -Rf ../tubex .; cd .. - - 7z a -y tubex_test_${CFG}.zip tubex_test_win - - cd tubex_test_win/test + - wget http://www.ensta-bretagne.fr/lebars/Share/codac_test_win.zip --no-check-certificate -nv + - 7z x codac_test_win.zip -y + - rm -Rf codac_test_win.zip ; cd codac_test_win; rm -Rf ibex codac ; cp -Rf ../ibex . ; cp -Rf ../codac .; cd .. + - 7z a -y codac_test_${CFG}.zip codac_test_win + - cd codac_test_win/test - cmake -G "${CMAKE_PARAM_G}" . - cmake --build . - ./my_project.exe @@ -388,7 +388,7 @@ install: - bash scripts/dependencies/install_capd.sh # Environment variables - - export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$HOME/tubex-lib/build_install + - export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$HOME/codac/build_install - export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$HOME/ibex-lib/build_install - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib @@ -407,7 +407,7 @@ script: # Without synthesis tree # Building lib + tests - - cmake -DCMAKE_INSTALL_PREFIX=$HOME/tubex-lib/build_install + - cmake -DCMAKE_INSTALL_PREFIX=$HOME/codac/build_install -DCMAKE_PREFIX_PATH=$HOME/ibex-lib/build_install -DWITH_PYTHON=OFF -DBUILD_TESTS=ON @@ -416,7 +416,7 @@ script: -DTEST_EXAMPLES=ON .. - make api # Again for doxygen2docstring - - cmake -DCMAKE_INSTALL_PREFIX=$HOME/tubex-lib/build_install + - cmake -DCMAKE_INSTALL_PREFIX=$HOME/codac/build_install -DCMAKE_PREFIX_PATH=$HOME/ibex-lib/build_install -DWITH_PYTHON=OFF -DBUILD_TESTS=ON @@ -429,7 +429,7 @@ script: - make install #- cd python/python_package #- /usr/bin/python3.5 setup.py develop --user - #- /usr/bin/python3.5 pytubex/tests/test_arithmetic.py + #- /usr/bin/python3.5 pycodac/tests/test_arithmetic.py #- cd ../../ # Building the examples @@ -458,7 +458,7 @@ script: # With synthesis tree for all created tubes # Building lib + tests - - cmake -DCMAKE_INSTALL_PREFIX=$HOME/tubex-lib/build_install + - cmake -DCMAKE_INSTALL_PREFIX=$HOME/codac/build_install -DCMAKE_PREFIX_PATH=$HOME/ibex-lib/build_install -DWITH_PYTHON=OFF -DBUILD_TESTS=ON @@ -467,7 +467,7 @@ script: -DTEST_EXAMPLES=ON .. - make api # Again for doxygen2docstring - - cmake -DCMAKE_INSTALL_PREFIX=$HOME/tubex-lib/build_install + - cmake -DCMAKE_INSTALL_PREFIX=$HOME/codac/build_install -DCMAKE_PREFIX_PATH=$HOME/ibex-lib/build_install -DWITH_PYTHON=OFF -DBUILD_TESTS=ON @@ -480,7 +480,7 @@ script: - make install #- cd python/python_package #- /usr/bin/python3.5 setup.py develop --user - #- /usr/bin/python3.5 pytubex/tests/test_arithmetic.py + #- /usr/bin/python3.5 pycodac/tests/test_arithmetic.py #- cd ../../ # Building the examples @@ -511,7 +511,7 @@ deploy: api_key: secure: ILyVRxUJHYAYHY6aGeY0QSVpwRF/Nm5piue7jkOArZXvwwjavPT8Gm/ZpXeor5rOQV/7rY4ACoOgMyhcFFKrL7BnKmzJUPPGyLez6aZz5ZT0I7YsQIG9CPPko0nIihSOircAjii8XaYwTntFAL9AqCgQk2PQ9HajzhbQrur4RPXFIwhJd9DDSCf8gO1WRyqRkL3gZSaq3GjQP++ZGFR9S5YlpCWVaG88Vq+ygrR9894tQ2on8FnOeE4bS768I36yT/w8IzES2o3oDh1bVECI2oEkwb2IYL5J5si1b0Wo6ZQdKNLu/50mohHbtKYzGfWiliRMXikXVwSXA/Y5G8ou1SCNLb7fM1s2E8KpjeOBHJJzC6syYaQzRZ611Srt3DpdlFa+s4aivgaKQ+AK+gromXwinE61FLEpUMglu7+3jFs6sMNNeYLgpGLjpnquyClljHmms79gm3T7dCm8C5ZFsyCDJq3ETEGDfIxN256dqLE6nu/oWuU6koQ3aMlVytMKG/veMb+jJY/J+f7upkUIBDtw0RKxk08gKX84wnl2brcHOOWAkSxcRINe/KUVDoR/7B3LAiarOyglazdEfRAmTE2o+te82/T0Wv0LoBn5/zXHZvtlpJYDuXndJ8HB8NWQl7sLOiqh4KbYkoyjPt9bn5XHvbQM/E7LLYIzpiOWPT4= on: - repo: lebarsfa/tubex-lib + repo: lebarsfa/codac all_branches: true skip_cleanup: true overwrite: true @@ -526,7 +526,7 @@ deploy: api_key: secure: Y+ZO/wvqZp29/cSnAqJKOAybSGlu8ALDsPS63zQXPtUSiUejfnoDLi77ANlHxUF7MhXlo38VanwYR/jGnXeCUPtX1Seg8W2v1mXFNaUKCki/bkEeLtK2uXAD5flxoBULPYcdspNbGlyzohxOZgr7VFNk0TkIg7jSlUkGuSAlJy81qh6ctVFtKhTsLDwi8ZKenwFFmlBNzw3dXR5c9AloBSCLRfWlwq2INYeEfgkItBMIe+7jh7RaacXoNrV/JkUQNcp4W5wA/zgMkOXqXSf7LPRIXd80zCgCmZ+ODqKTVHx5gXZxUPvW3cAtsm7RU4VNwpXiC2ckNRpLcCF8/dav3XG2hZrddUzvEXbrePnONrNQHrdszVokkQoJBYPFsZuUR4lDqV25aGVEvsn5tnBfIH6Rf2abF+pUkuKnWFqCO71kfwPBY5wKHi2SdaKVcZm06jD1tp87OuOt4T0DPBs4/SyQ7925eXk4Ol0MwCsGj1Pml+R90khq74xFe48KOxXLIYxHOqBO600HL3dYVrpQTZ/3rDpiTKlyGn8he+K7gCHFlJ85uBgp89cQei8aUOACLKhecT/rZqPIoZNsDe28AtDrj5LeLYeGSQDlukjukYfKcZF10itcSF8UusgNfexuLUPz5BUf2xrNF0cCFOAzP0auhgxRLC9VPGdEzvY0N1c= on: - repo: SimonRohou/tubex-lib + repo: codac-team/codac all_branches: true skip_cleanup: true overwrite: true diff --git a/CHANGELOG b/CHANGELOG index 1d40d234..587ef6de 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -22,10 +22,10 @@ Unreleased yet (in development) ----------------------------------------------------------------- -Release 3.1.1 (released `Jan 12, 2021 `_) +Release 3.1.1 (released `Jan 12, 2021 `_) ======================================================================================================= -`Commits since previous release 3.1.0 `_ +`Commits since previous release 3.1.0 `_ Changes ------- @@ -40,10 +40,10 @@ Bugs fixed ----------------------------------------------------------------- -Release 3.1.0 (released `Dec 17, 2020 `_) +Release 3.1.0 (released `Dec 17, 2020 `_) ======================================================================================================= -`Commits since previous release 3.0.13 `_ +`Commits since previous release 3.0.13 `_ Features added -------------- @@ -61,15 +61,15 @@ Dependencies ------------ * :commit:`c18cdad6f1aa5c229ad31928eaadf76b81d428bf`: added CAPD - IBEX conversion functions -* Eigen is now a dependency of Tubex +* Eigen is now a dependency of Codac ----------------------------------------------------------------- -Release 3.0.13 (released `Dec 5, 2020 `_) +Release 3.0.13 (released `Dec 5, 2020 `_) ======================================================================================================= -`Commits since previous release 3.0.12 `_ +`Commits since previous release 3.0.12 `_ Features added -------------- @@ -96,10 +96,10 @@ Deprecated ----------------------------------------------------------------- -Release 3.0.12 (released `Nov 26, 2020 `_) +Release 3.0.12 (released `Nov 26, 2020 `_) ======================================================================================================== -`Commits since previous release 3.0.11 `_ +`Commits since previous release 3.0.11 `_ Features added -------------- @@ -116,10 +116,10 @@ Changes ----------------------------------------------------------------- -Release 3.0.11 (released `Nov 15, 2020 `_) +Release 3.0.11 (released `Nov 15, 2020 `_) ======================================================================================================== -`Commits since previous release 3.0.10 `_ +`Commits since previous release 3.0.10 `_ Changes ------- @@ -134,10 +134,10 @@ Documentation ----------------------------------------------------------------- -Release 3.0.10 (released `Oct 31, 2020 `_) +Release 3.0.10 (released `Oct 31, 2020 `_) ======================================================================================================== -`Commits since previous release 3.0.9 `_ +`Commits since previous release 3.0.9 `_ Features added -------------- @@ -161,10 +161,10 @@ Dependencies ----------------------------------------------------------------- -Release 3.0.9 (released `Jun 28, 2020 `_) +Release 3.0.9 (released `Jun 28, 2020 `_) ====================================================================================================== -`Commits since previous release 3.0.8 `_ +`Commits since previous release 3.0.8 `_ Bugs fixed ---------- @@ -180,10 +180,10 @@ Documentation ----------------------------------------------------------------- -Releases 3.0.6 -- 3.0.8 (released `Jun 23, 2020 `_) +Releases 3.0.6 -- 3.0.8 (released `Jun 23, 2020 `_) ================================================================================================================ -`Commits since previous release 3.0.5 `_ +`Commits since previous release 3.0.5 `_ Features added -------------- @@ -218,10 +218,10 @@ Documentation ----------------------------------------------------------------- -Release 3.0.5 (released `Jun 14, 2020 `_) +Release 3.0.5 (released `Jun 14, 2020 `_) ====================================================================================================== -`Commits since previous release 3.0.4 `_ +`Commits since previous release 3.0.4 `_ Changes ------- @@ -247,10 +247,10 @@ Documentation ----------------------------------------------------------------- -Release 3.0.4 (released `Jun 10, 2020 `_) +Release 3.0.4 (released `Jun 10, 2020 `_) ====================================================================================================== -`Commits since previous release 3.0.3 `_ +`Commits since previous release 3.0.3 `_ Features added -------------- @@ -266,10 +266,10 @@ Documentation ----------------------------------------------------------------- -Release 3.0.3 (released `Jun 7, 2020 `_) +Release 3.0.3 (released `Jun 7, 2020 `_) ====================================================================================================== -`Commits since previous release 3.0.2 `_ +`Commits since previous release 3.0.2 `_ Changes ------- @@ -284,10 +284,10 @@ Bugs fixed ----------------------------------------------------------------- -Release 3.0.2 (released `Jun 6, 2020 `_) +Release 3.0.2 (released `Jun 6, 2020 `_) ====================================================================================================== -`Commits since previous release 3.0.1 `_ +`Commits since previous release 3.0.1 `_ Changes ------- @@ -305,16 +305,16 @@ Documentation ----------------------------------------------------------------- -Release 3.0.1 (released `Jun 5, 2020 `_) +Release 3.0.1 (released `Jun 5, 2020 `_) ====================================================================================================== -`Commits since previous release 3.0.0 `_ +`Commits since previous release 3.0.0 `_ Features added -------------- -* :commit:`16408f9`: shortcut ``oo`` available in tubex module -* :commit:`67b1709`: Tubex available online with Python +* :commit:`16408f9`: shortcut ``oo`` available in codac module +* :commit:`67b1709`: Codac available online with Python Dependencies ------------ @@ -339,8 +339,8 @@ Documentation Previous versions ================= -The changelog for versions before 3.0.1 can be found `on GitHub history `_. +The changelog for versions before 3.0.1 can be found `on GitHub history `_. -* **v3.0** (released `Jun 3, 2020 `_) -* **v2.0** (released `Aug 12, 2019 `_) -* **v1.0** (released `May 5, 2017 `_) \ No newline at end of file +* **v3.0** (released `Jun 3, 2020 `_) +* **v2.0** (released `Aug 12, 2019 `_) +* **v1.0** (released `May 5, 2017 `_) \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 3543f3f9..363e0248 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - cmake configuration file +# Codac - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) @@ -12,7 +12,7 @@ #set(CMAKE_C_COMPILER "gcc-7") #set(CMAKE_CXX_COMPILER "/usr/bin/g++-7") - project(tubex-lib VERSION ${VERSION} LANGUAGES CXX) + project(codac VERSION ${VERSION} LANGUAGES CXX) if(NOT VERSION_ID) set(PROJECT_VERSION_FULL ${PROJECT_VERSION}) @@ -22,10 +22,10 @@ message(STATUS "Full project version is ${PROJECT_VERSION_FULL}") set(PROJECT_DESCRIPTION - "Tubex is a library providing tools for constraint programming over reals and trajectories.") + "Codac is a library providing tools for constraint programming over reals and trajectories.") set(PROJECT_LONG_DESCRIPTION "${PROJECT_DESCRIPTION}") - set(PROJECT_HOMEPAGE_URL "http://simon-rohou.fr/research/tubex-lib") + set(PROJECT_HOMEPAGE_URL "http://simon-rohou.fr/research/codac") message(STATUS "Configuring build for ${PROJECT_NAME} ${PROJECT_VERSION}") if(NOT CMAKE_BUILD_TYPE) @@ -43,7 +43,7 @@ set(CMAKE_INSTALL_LIBDIR "lib" CACHE PATH "object code libraries (lib)") set(CMAKE_INSTALL_BINDIR "bin" CACHE PATH "user executables (bin)") set(CMAKE_INSTALL_PKGCONFIG "share/pkgconfig" CACHE PATH "pkg files (share/pkgconfig)") - set(CMAKE_INSTALL_CMAKE "share/tubex/cmake" CACHE PATH "cmake files (share/tubex/cmake)") + set(CMAKE_INSTALL_CMAKE "share/codac/cmake" CACHE PATH "cmake files (share/codac/cmake)") ################################################################################ @@ -57,7 +57,7 @@ # if(COMPILER_SUPPORTS_CXX17) # add_compile_options(-std=c++17) # else() -# message(FATAL_ERROR "Tubex needs a compiler with C++17 support") +# message(FATAL_ERROR "Codac needs a compiler with C++17 support") # endif() # if(WIN32) @@ -118,8 +118,8 @@ include(FindPkgConfig) pkg_search_module(PKG_CAPD REQUIRED capd capd-gui mpcapd mpcapd-gui) include_directories(${PKG_CAPD_INCLUDE_DIRS}) - #message(STATUS "[capd2tubex] PKG_CAPD_INCLUDE_DIRS = ${PKG_CAPD_INCLUDE_DIRS}") - #message(STATUS "[capd2tubex] PKG_CAPD_LDFLAGS = ${PKG_CAPD_LDFLAGS}") + #message(STATUS "[capd2codac] PKG_CAPD_INCLUDE_DIRS = ${PKG_CAPD_INCLUDE_DIRS}") + #message(STATUS "[capd2codac] PKG_CAPD_LDFLAGS = ${PKG_CAPD_LDFLAGS}") endif() @@ -134,7 +134,7 @@ include(CTest) add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure $(ARGS) - DEPENDS tubex COMMENT "Running the tests") + DEPENDS codac COMMENT "Running the tests") add_subdirectory(tests) endif() @@ -166,14 +166,14 @@ set(CPACK_GENERATOR "TGZ" "ZIP" "DEB") string(TOLOWER "${CMAKE_PROJECT_NAME}" CPACK_PACKAGE_NAME) - set(CPACK_PACKAGE_VENDOR "TubexTeam") - set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${TUBEX_DESCRIPTION}) + set(CPACK_PACKAGE_VENDOR "CodacTeam") + set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${CODAC_DESCRIPTION}) set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Maintainer ") - set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${TUBEX_URL}) + set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CODAC_URL}) # todo: finish deb package include(CPack) \ No newline at end of file diff --git a/README.md b/README.md index c639fa22..3a091a08 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ -# [Tubex library](http://simon-rohou.fr/research/tubex-lib) [![Build Status](https://api.travis-ci.org/SimonRohou/tubex-lib.svg?branch=master)](https://travis-ci.org/SimonRohou/tubex-lib) +# [Codac library](http://simon-rohou.fr/research/codac) [![Build Status](https://api.travis-ci.org/codac-team/codac.svg?branch=master)](https://travis-ci.org/codac-team/codac) -Tubex is a library providing tools for **constraint programming** over reals and trajectories. It has many applications in **state estimation** or **robot localization**. +Codac is a library providing tools for **constraint programming** over reals and trajectories. It has many applications in **state estimation** or **robot localization**. | **What is constraint programming?** | In this paradigm, users concentrate on the properties of a solution to be found (*e.g.* the pose of a robot, the location of a landmark) by stating **constraints on the variables**. Then, a solver performs constraint propagation on the variables and provides a **reliable** set of feasible solutions corresponding to the considered problem. In this approach, the user concentrates on *what* is the problem instead of *how* to solve it, thus leaving the computer dealing with the *how*. The strength of this declarative paradigm lies in its **simpleness**, as it allows one to describe a complex problem without requiring the knowledge of resolution tools coming with specific parameters to choose. | **What about mobile robotics?** -| In the field of robotics, complex problems such as **non-linear state estimation**, **delays**, **SLAM** or **kidnapped robot problems** can be solved in a very few steps by using constraint programming. Even though the Tubex library is not meant to target only robotics problems, the design of its interface has been largely influenced by the needs of the above class of applications. Tubex provides solutions to deal with these problems, that are usually hardly solvable by conventional methods such as particle approaches or Kalman filters. +| In the field of robotics, complex problems such as **non-linear state estimation**, **delays**, **SLAM** or **kidnapped robot problems** can be solved in a very few steps by using constraint programming. Even though the Codac library is not meant to target only robotics problems, the design of its interface has been largely influenced by the needs of the above class of applications. Codac provides solutions to deal with these problems, that are usually hardly solvable by conventional methods such as particle approaches or Kalman filters. -In a nutshell, Tubex is a high-level **constraint programming framework** providing tools to easily solve a wide range of robotic problems. +In a nutshell, Codac is a high-level **constraint programming framework** providing tools to easily solve a wide range of robotic problems. -**See the [official page](http://simon-rohou.fr/research/tubex-lib)**. +**See the [official page](http://simon-rohou.fr/research/codac)**. -![Image of Tube](https://cdn.rawgit.com/SimonRohou/tubex-lib/master/doc/user_manual/img/tube_slices_small.png) +![Image of Tube](https://cdn.rawgit.com/codac-team/codac/master/doc/user_manual/img/tube_slices_small.png) Related publications @@ -30,8 +30,8 @@ Related publications Documentation ------------- -* [User guide](http://simon-rohou.fr/research/tubex-lib) -* [API technical documentation](http://simon-rohou.fr/research/tubex-lib/doxygen/html/annotated.html) +* [User guide](http://simon-rohou.fr/research/codac) +* [API technical documentation](http://simon-rohou.fr/research/codac/doxygen/html/annotated.html) License and development diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 871a6ac4..816e78cd 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - cmake configuration file +# Codac - cmake configuration file # ================================================================== file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/mathjax_stmaryrd.js DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/doc/doc/conf.py.in b/doc/doc/conf.py.in index d0c7d57f..cd89e9b5 100644 --- a/doc/doc/conf.py.in +++ b/doc/doc/conf.py.in @@ -43,7 +43,7 @@ extensions = [ ] breathe_projects = { - "tubex-lib":"../api/xml", + "codac":"../api/xml", } # For defining roles in all files @@ -53,12 +53,12 @@ rst_prolog = """ """ # GitHub repo -issues_github_path = "SimonRohou/tubex-lib" +issues_github_path = "codac-team/codac" # equivalent to -issues_uri = "https://github.com/SimonRohou/tubex-lib/issues/{issue}" -issues_pr_uri = "https://github.com/SimonRohou/tubex-lib/pull/{pr}" -issues_commit_uri = "https://github.com/SimonRohou/tubex-lib/commit/{commit}" +issues_uri = "https://github.com/codac-team/codac/issues/{issue}" +issues_pr_uri = "https://github.com/codac-team/codac/pull/{pr}" +issues_commit_uri = "https://github.com/codac-team/codac/commit/{commit}" numfig = True @@ -83,7 +83,7 @@ master_doc = 'toctree' # General information about the project. project = u'${PROJECT_NAME}' -copyright = u'2020, Tubex Team' +copyright = u'2020, Codac Team' author = u'Simon Rohou' # The version info for the project you're documenting, acts as replacement for diff --git a/doc/doc/dev/info_dev.rst b/doc/doc/dev/info_dev.rst index d87581be..6d16a363 100644 --- a/doc/doc/dev/info_dev.rst +++ b/doc/doc/dev/info_dev.rst @@ -9,7 +9,7 @@ Information for developers ########################## -In case you are willing to contribute to Tubex, here are some information that may be useful. +In case you are willing to contribute to Codac, here are some information that may be useful. .. rubric:: Definition @@ -131,7 +131,7 @@ One shortcut to build all the examples (including 3rd parties) is given by: .. code-block:: bash - # From Tubex root + # From Codac root ./make.sh examples Note that the :file:`build` folders of each example is removed before the build. @@ -140,14 +140,14 @@ One shortcut to build the tests is given by: .. code-block:: bash - # From Tubex root + # From Codac root ./make.sh tests One shortcut to build both the examples and tests is: .. code-block:: bash - # From Tubex root + # From Codac root ./make.sh all @@ -217,11 +217,11 @@ Copy the :file:`pybind11gen.py` script in the sources folder. Then, for instance .. code-block:: bash - python3 pybind11gen.py module_name=RandTrajectory tubex_RandTrajectory.h + python3 pybind11gen.py module_name=RandTrajectory codac_RandTrajectory.h # get the files in /tmp -.. rubric:: [For admins] Upload Python binding on PyPi (`see Tubex repo `_) +.. rubric:: [For admins] Upload Python binding on PyPi (`see Codac repo `_) Tag the current version: diff --git a/doc/doc/faq.rst b/doc/doc/faq.rst index 57b1fbe7..17f68f95 100644 --- a/doc/doc/faq.rst +++ b/doc/doc/faq.rst @@ -101,11 +101,11 @@ Example of error (using Python): TypeError: cos(): incompatible function arguments. The following argument types are supported: 1. (arg0: float) -> float 2. (arg0: pyibex.pyibex.Interval) -> pyibex.pyibex.Interval - 3. (arg0: tubex::Tube) -> tubex::Tube - 4. (arg0: tubex::Trajectory) -> tubex::Trajectory + 3. (arg0: codac::Tube) -> codac::Tube + 4. (arg0: codac::Trajectory) -> codac::Trajectory .. from pyibex import * -.. from tubex_lib import * +.. from codac import * .. import math .. .. x = IntervalVector(2) @@ -317,15 +317,15 @@ Do not forget to initialize :ref:`the VIBes Viewer` before any Python related questions ======================== -How can I get the last Python version of Tubex? +How can I get the last Python version of Codac? ----------------------------------------------- .. code-block:: bash - pip3 install tubex-lib --upgrade + pip3 install codac --upgrade -ValueError: unable to convert the ``py::object`` into a valid ``tubex::Domain`` +ValueError: unable to convert the ``py::object`` into a valid ``codac::Domain`` ------------------------------------------------------------------------------- In Python, if you are defining a box with: @@ -353,31 +353,31 @@ Example of error (using Python): 1. (arg0: pyibex.pyibex.Interval) -> pyibex.pyibex.Interval Invoked with: TubeVector -.. from tubex_lib import * +.. from codac import * .. from pyibex import * .. import math .. .. x = TubeVector(Interval(0,10),0.01,2) -You probably imported the ``tubex_lib`` module before the ``pyibex`` module. Here is the correct import order: +You probably imported the ``codac`` module before the ``pyibex`` module. Here is the correct import order: .. code:: py from pyibex import * - from tubex_lib import * + from codac import * -TypeError: must be real number, not tubex_lib.tube.Trajectory +TypeError: must be real number, not codac.tube.Trajectory ------------------------------------------------------------- -The problem may appear when you import the ``math`` module after the ``tubex_lib``. +The problem may appear when you import the ``math`` module after the ``codac``. The following import order works: .. code:: py from math import * - from tubex_lib import * + from codac import * ------------------------------------------------------------------ @@ -401,6 +401,6 @@ No matching function for call to ``VIBesFigMap::add_trajectory...`` .. code:: - error: no matching function for call to ‘tubex::VIBesFigMap::add_trajectory(tubex::TrajectoryVector&, const char [3], int, int)’ + error: no matching function for call to ‘codac::VIBesFigMap::add_trajectory(codac::TrajectoryVector&, const char [3], int, int)’ The function needs a pointer to the trajectory. \ No newline at end of file diff --git a/doc/doc/index.rst b/doc/doc/index.rst index 7d668353..94dea16a 100644 --- a/doc/doc/index.rst +++ b/doc/doc/index.rst @@ -1,6 +1,6 @@ .. _home-page: -.. tubex-lib documentation master file +.. codac documentation master file .. # with overline, for parts .. * with overline, for chapters @@ -10,10 +10,10 @@ .. ", for paragraphs ########################################## -Tubex: constraint-programming for robotics +Codac: constraint-programming for robotics ########################################## -Tubex is a C++/Python library providing tools for **constraint programming** over reals and trajectories. It has many applications in **state estimation** or **robot localization**. +Codac is a C++/Python library providing tools for **constraint programming** over reals and trajectories. It has many applications in **state estimation** or **robot localization**. | **What is constraint programming?** | In this paradigm, users concentrate on the properties of a solution to be found (*e.g.* the pose of a robot, the location of a landmark) by stating **constraints on the variables**. Then, a solver performs constraint propagation on the variables and provides a reliable set of **feasible solutions** corresponding to the problem. In this approach, the user concentrates on *what* is the problem instead of *how* to solve it, thus leaving the computer dealing with the *how*. @@ -21,9 +21,9 @@ Tubex is a C++/Python library providing tools for **constraint programming** ove .. The strength of this declarative paradigm lies in its **simpleness**, as it allows one to describe a complex problem without requiring the knowledge of resolution tools coming with specific parameters to choose. | **What about mobile robotics?** -| In the field of robotics, complex problems such as **non-linear state estimation**, **delays**, **SLAM** or **kidnapped robot problems** can be solved in a very few steps by using constraint programming. Even though the Tubex library is not meant to target only robotics problems, the design of its interface has been largely influenced by the needs of the above class of applications. Tubex provides solutions to deal with these problems, that are usually hardly solvable by conventional methods such as particle approaches or Kalman filters. +| In the field of robotics, complex problems such as **non-linear state estimation**, **delays**, **SLAM** or **kidnapped robot problems** can be solved in a very few steps by using constraint programming. Even though the Codac library is not meant to target only robotics problems, the design of its interface has been largely influenced by the needs of the above class of applications. Codac provides solutions to deal with these problems, that are usually hardly solvable by conventional methods such as particle approaches or Kalman filters. -In a nutshell, Tubex is a high-level **constraint programming framework** providing tools to easily solve a wide range of robotic problems. +In a nutshell, Codac is a high-level **constraint programming framework** providing tools to easily solve a wide range of robotic problems. .. contents:: Contents of this page @@ -49,25 +49,25 @@ In a nutshell, Tubex is a high-level **constraint programming framework** provid .. It is available in C++ and Python. -.. Tubex is a C++ library providing tools for computations over sets of trajectories. +.. Codac is a C++ library providing tools for computations over sets of trajectories. .. It has been designed to deal with **dynamical systems** defined by **non-linear differential equations** and involving constraints such as trajectory evaluations, time uncertainties or **delays**. -.. These constraints are commonly encountered in mobile robotics: Tubex provides solutions to deal with problems that are usually hardly solvable by conventional methods such as particle approaches or Kalman filters. +.. These constraints are commonly encountered in mobile robotics: Codac provides solutions to deal with problems that are usually hardly solvable by conventional methods such as particle approaches or Kalman filters. .. The building blocks of this library are *tubes*, that represent domains for **trajectory** variables (*e.g.* signals evolving with time). When a trajectory :math:`x(\cdot)` comes with uncertainties (due to numerical approximations or errors coming from sensors), a reliable enclosure of it can be made thanks to a tube :math:`[x](\cdot)`. .. A tube is defined as an interval of two trajectories. Its bounds delineate the **uncertainties** of a dynamical system, thus defining a solution set. .. Then, any operation related to :math:`x(\cdot)` will be made on its reliable enclosure :math:`[x](\cdot)`, which allows **guaranteed outputs**. These computations stand on interval analysis, a well suited tool that reliably propagates uncertainties. -.. **Mobile robotics** has been the initial motivation of this project: the mathematical tools provided in Tubex come together with robotic applications. +.. **Mobile robotics** has been the initial motivation of this project: the mathematical tools provided in Codac come together with robotic applications. .. Computations stands on the `IBEX library `_ that provides reliable tools for static systems. -Getting started: 2 minutes to Tubex +Getting started: 2 minutes to Codac =================================== We only have to define **domains** for our variables and a set of **contractors** to implement our constraints. -The core of Tubex stands on a **Contractor Network** representing a solver. +The core of Codac stands on a **Contractor Network** representing a solver. In a few steps, a problem is solved by @@ -227,7 +227,7 @@ The distance function :math:`g(\mathbf{x},\mathbf{b})` between the robot and a l .. figure:: img/rangeonly-nox0.png | *You just solved a non-linear state-estimation without knowledge about initial condition.* -| See the full example on Github: `in C++ `_ or `in Python `_. +| See the full example on Github: `in C++ `_ or `in Python `_. In the tutorial and in the examples folder of this library, you will find more advanced problems such as Simultaneous Localization And Mapping (SLAM), data association problems or delayed systems. @@ -235,7 +235,7 @@ In the tutorial and in the examples folder of this library, you will find more a User manual =========== -*Want to use Tubex?* The first thing to do is to install the library, or try it online: +*Want to use Codac?* The first thing to do is to install the library, or try it online: .. toctree:: :maxdepth: 1 @@ -245,7 +245,7 @@ User manual /install/02-start-py-project /install/03-start-cpp-project -Then you have two options: read the details about the features of Tubex (domains, tubes, contractors, slices, and so on) or jump to the standalone tutorial about how to :ref:`use Tubex for mobile robotics `, with telling examples. +Then you have two options: read the details about the features of Codac (domains, tubes, contractors, slices, and so on) or jump to the standalone tutorial about how to :ref:`use Codac for mobile robotics `, with telling examples. .. sidebar:: Dependencies @@ -254,7 +254,7 @@ Then you have two options: read the details about the features of Tubex (domains .. Figure:: img/logo_ibex.jpg :align: center - | Note that Tubex stands on the `IBEX library `_ for interval analysis computations and static contractors on boxes. + | Note that Codac stands on the `IBEX library `_ for interval analysis computations and static contractors on boxes. | `Read the IBEX documentation. `_ .. rubric:: pyIbex @@ -262,7 +262,7 @@ Then you have two options: read the details about the features of Tubex (domains .. Figure:: img/logo_pyibex.jpg :align: center - | The Python API of Tubex is available thanks to the `pyIbex library `_ providing Python access to the IBEX library. + | The Python API of Codac is available thanks to the `pyIbex library `_ providing Python access to the IBEX library. | `Read the pyIbex documentation. `_ @@ -305,7 +305,7 @@ Then you have two options: read the details about the features of Tubex (domains Tutorial for mobile robotics ============================ -The :ref:`following tutorial ` is standalone and tells about how to use Tubex for mobile robotic applications, with telling examples: +The :ref:`following tutorial ` is standalone and tells about how to use Codac for mobile robotic applications, with telling examples: .. toctree:: :maxdepth: 1 @@ -332,8 +332,8 @@ License and support This software is under `GNU Lesser General Public License `_. -For recent improvements and activities, see the `Tubex Github repository `_. -You can post bug reports and feature requests on the `Issues page `_. +For recent improvements and activities, see the `Codac Github repository `_. +You can post bug reports and feature requests on the `Issues page `_. Contributors @@ -417,13 +417,13 @@ Main related publications How to cite this project? ========================= -We suggest the following BibTeX template to cite Tubex in scientific discourse: +We suggest the following BibTeX template to cite Codac in scientific discourse: .. code-block:: none - @misc{tubex, - author = {Simon Rohou and others}, - year = {2017}, - note = {http://simon-rohou.fr/research/tubex-lib/}, - title = {The {Tubex} library -- {C}onstraint-programming for robotics} + @misc{codac, + author = {Simon Rohou and Benoit Desrochers and others}, + year = {2021}, + note = {http://simon-rohou.fr/research/codac/}, + title = {The {Codac} library -- {C}onstraint-programming for robotics} } \ No newline at end of file diff --git a/doc/doc/install/01-installation-full-linux.rst b/doc/doc/install/01-installation-full-linux.rst index 624b2f00..9c71694b 100644 --- a/doc/doc/install/01-installation-full-linux.rst +++ b/doc/doc/install/01-installation-full-linux.rst @@ -3,18 +3,18 @@ .. _sec-installation-full-linux: ##################################### -Installing Tubex on Linux for C++ use +Installing Codac on Linux for C++ use ##################################### Requirements and dependencies (IBEX) ------------------------------------ -Tubex uses several features of the `IBEX library `_ that you have to install first. The last version of IBEX is available on `the official development repository `_: +Codac uses several features of the `IBEX library `_ that you have to install first. The last version of IBEX is available on `the official development repository `_: .. code-block:: bash - # Requirements to compile IBEX and Tubex + # Requirements to compile IBEX and Codac sudo apt-get install -y g++ gcc flex bison cmake git libeigen3-dev # Download IBEX sources from Github @@ -43,19 +43,19 @@ For further CMake options, please refer to the IBEX documentation. cmake -DCMAKE_BUILD_TYPE=Debug .. -Building the Tubex library +Building the Codac library -------------------------- -The last sources are available on `the official Tubex development repository `_. You can download the files and compile the sources with: +The last sources are available on `the official Codac development repository `_. You can download the files and compile the sources with: .. code-block:: bash - git clone https://github.com/SimonRohou/tubex-lib # download the sources from GitHub - cd tubex-lib # move to the Tubex directory + git clone https://github.com/codac-team/codac # download the sources from GitHub + cd codac # move to the Codac directory git submodule init ; git submodule update # get pybind11 submodule mkdir build ; cd build ; cmake .. ; make # build the sources sudo make install # install the library - cd .. # back to the root of Tubex + cd .. # back to the root of Codac Compiling the examples @@ -68,7 +68,7 @@ For instance: cd examples/basics/ex_01_arithmetic # moving to the example directory mkdir build -p ; cd build ; cmake .. ; make # cmake compilation - ./tubex_basics_01 # running example + ./codac_basics_01 # running example Do not forget to launch the VIBes viewer before running your program. @@ -91,7 +91,7 @@ Do not forget to launch the VIBes viewer before running your program. .. code-block:: bash - cmake -DCMAKE_INSTALL_PREFIX=$HOME/tubex-lib/build_install .. + cmake -DCMAKE_INSTALL_PREFIX=$HOME/codac/build_install .. .. warning:: @@ -109,7 +109,7 @@ Do not forget to launch the VIBes viewer before running your program. as access violations. It is highly recommended for your developments. You can otherwise use the :code:`-DCMAKE_BUILD_TYPE=Release` option. Note also that O3 optimizations are always activated. - Once Tubex has been compiled with this option, you should also compile your executable + Once Codac has been compiled with this option, you should also compile your executable in debug mode. CMAKE_PREFIX_PATH | If IBEX has been installed in a local folder, say :file:`~/ibex-lib/build_install`, you need @@ -122,11 +122,11 @@ Do not forget to launch the VIBes viewer before running your program. ====================== ====================================================================================== -.. admonition:: Custom install directory of IBEX and Tubex +.. admonition:: Custom install directory of IBEX and Codac - A convenient way to refer to custom install directories for IBEX and/or Tubex is to export the ``CMAKE_PREFIX_PATH`` environment variable. For instance: + A convenient way to refer to custom install directories for IBEX and/or Codac is to export the ``CMAKE_PREFIX_PATH`` environment variable. For instance: .. code-block:: bash export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$HOME/ibex-lib/build_install - export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$HOME/tubex-lib/build_install \ No newline at end of file + export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$HOME/codac/build_install \ No newline at end of file diff --git a/doc/doc/install/01-installation-full-macos.rst b/doc/doc/install/01-installation-full-macos.rst index 58c3f6bd..c1e4f442 100644 --- a/doc/doc/install/01-installation-full-macos.rst +++ b/doc/doc/install/01-installation-full-macos.rst @@ -3,7 +3,7 @@ .. _sec-installation-full-macos: ##################################### -Installing Tubex on macOS for C++ use +Installing Codac on macOS for C++ use ##################################### Not yet available. \ No newline at end of file diff --git a/doc/doc/install/01-installation-full-windows.rst b/doc/doc/install/01-installation-full-windows.rst index f19a9017..b03b4254 100644 --- a/doc/doc/install/01-installation-full-windows.rst +++ b/doc/doc/install/01-installation-full-windows.rst @@ -3,12 +3,12 @@ .. _sec-installation-full-windows: ####################################### -Installing Tubex on Windows for C++ use +Installing Codac on Windows for C++ use ####################################### Not yet available. .. note:: - | (5th June) We are currently working on making Tubex available on Windows in C++. + | (5th June) We are currently working on making Codac available on Windows in C++. | Any help is welcome. \ No newline at end of file diff --git a/doc/doc/install/01-installation-python.rst b/doc/doc/install/01-installation-python.rst index a204148b..351dd0da 100644 --- a/doc/doc/install/01-installation-python.rst +++ b/doc/doc/install/01-installation-python.rst @@ -3,24 +3,24 @@ .. _sec-installation-py: ############################### -Installing Tubex for Python use +Installing Codac for Python use ############################### .. note:: For the moment, the Python version is only available for Linux, Windows, :ref:`or online `. -Install the Tubex Python package +Install the Codac Python package -------------------------------- -In case you want to use Tubex only with Python, then the installation procedure is simply: +In case you want to use Codac only with Python, then the installation procedure is simply: .. code-block:: bash pip3 install --upgrade pip # you may have to upgrade pip (19.0.0 required at least) - pip3 install "pyibex>=1.9.2" tubex-lib + pip3 install "pyibex>=1.9.2" codac -where `pyIbex `_ is the Python wrapper of the `IBEX library `_ on which Tubex is based. Note that Tubex requires pyIbex 1.9.2 at least. +where `pyIbex `_ is the Python wrapper of the `IBEX library `_ on which Codac is based. Note that Codac requires pyIbex 1.9.2 at least. .. role:: gbg @@ -51,14 +51,14 @@ The :gbg:`✓` configurations are officially supported at the moment: |Python 3.9 |:gbg:`✓` | |:gbg:`✓` |-- | | +---------------+----------------+-----------------+-----------------+----------------+----------------+ -If your configuration is missing in this table, please `contact us `_. We may be able to make it available for Tubex. +If your configuration is missing in this table, please `contact us `_. We may be able to make it available for Codac. -Update your Tubex Python package +Update your Codac Python package -------------------------------- -For updating your already installed version of Tubex, the procedure is: +For updating your already installed version of Codac, the procedure is: .. code-block:: bash - pip3 install tubex-lib --upgrade \ No newline at end of file + pip3 install codac --upgrade \ No newline at end of file diff --git a/doc/doc/install/01-installation.rst b/doc/doc/install/01-installation.rst index 5d18006a..635498e6 100644 --- a/doc/doc/install/01-installation.rst +++ b/doc/doc/install/01-installation.rst @@ -1,14 +1,14 @@ .. _sec-installation: ############################ -Installing the Tubex library +Installing the Codac library ############################ -Tubex is available in both C++ and Python3. +Codac is available in both C++ and Python3. -It is fully supported on Linux systems (both languages). Tubex has been recently made available on Windows too (both languages). We are working on its availability for macOS. +It is fully supported on Linux systems (both languages). Codac has been recently made available on Windows too (both languages). We are working on its availability for macOS. Any help is more than welcome. -Note that you can also :ref:`use Tubex online in Python `, without having to install the library on your machine. +Note that you can also :ref:`use Codac online in Python `, without having to install the library on your machine. .. role:: gbg @@ -31,7 +31,7 @@ Note that you can also :ref:`use Tubex online in Python ` .. _online-py: 02-py-project-online.html .. |win-cpp| replace:: in progress (#21) -.. _win-cpp: https://github.com/SimonRohou/tubex-lib/issues/21 +.. _win-cpp: https://github.com/codac-team/codac/issues/21 The :gbg:`✓` configurations are officially supported at the moment: @@ -54,9 +54,9 @@ The :gbg:`✓` configurations are officially supported at the moment: +---------------+----------------+-----------------+-----------------+----------------+----------------+ | **Click on the links in the table to access the related installation procedures.** -| If your configuration is missing in this table, please `contact us `_. We may be able to make it available for Tubex. +| If your configuration is missing in this table, please `contact us `_. We may be able to make it available for Codac. -Note that if you want to contribute to Tubex, you have to make the full C++ installation. +Note that if you want to contribute to Codac, you have to make the full C++ installation. @@ -65,10 +65,10 @@ Note that if you want to contribute to Tubex, you have to make the full C++ inst Graphical tools ^^^^^^^^^^^^^^^ -For using Tubex with graphical outputs, you will need the VIBes viewer. +For using Codac with graphical outputs, you will need the VIBes viewer. `VIBes `_ is a visualization system that aims at providing people working with intervals a way to display results (boxes, pavings), without worrying about GUI programming. -Some methods have been implemented in Tubex in order to extend VIBes' features to tubes purposes. +Some methods have been implemented in Codac in order to extend VIBes' features to tubes purposes. You can `download the VIBes viewer directly from the official page `_ (click on the *Last Release* link). diff --git a/doc/doc/install/02-py-project-online.rst b/doc/doc/install/02-py-project-online.rst index a55d294b..6be192c3 100644 --- a/doc/doc/install/02-py-project-online.rst +++ b/doc/doc/install/02-py-project-online.rst @@ -1,10 +1,10 @@ .. _sec-py-project-online: ############################ -Try Tubex online with Python +Try Codac online with Python ############################ -| You can try Tubex without installing it. +| You can try Codac without installing it. | This will be done with the Repl.it platform, that allows to write code from a browser. @@ -32,7 +32,7 @@ Try Tubex online with Python #. | Select the tab |github_button| in the new window. | -#. Paste ``SimonRohou/tubex-replit`` in the text bar and click on |import_button|. +#. Paste ``codac-team/codac-replit`` in the text bar and click on |import_button|. .. image:: img/replit_2.png :width: 400px diff --git a/doc/doc/install/02-start-py-project.rst b/doc/doc/install/02-start-py-project.rst index 8b49a765..e3f5fdb7 100644 --- a/doc/doc/install/02-start-py-project.rst +++ b/doc/doc/install/02-start-py-project.rst @@ -8,13 +8,13 @@ Start a Python project | You are using C++? | :ref:`sec-start-cpp-project` -| Tubex is ready to be used on your computer. -| You can now import the ``tubex_lib`` package and start using it: +| Codac is ready to be used on your computer. +| You can now import the ``codac`` package and start using it: .. code-block:: py from pyibex import * - from tubex_lib import * + from codac import * x = Tube(Interval(0,10), 0.01, TFunction("cos(t)+abs(t-5)*[-0.1,0.1]")) diff --git a/doc/doc/install/03-start-cpp-project.rst b/doc/doc/install/03-start-cpp-project.rst index 725e5769..4ac52996 100644 --- a/doc/doc/install/03-start-cpp-project.rst +++ b/doc/doc/install/03-start-cpp-project.rst @@ -8,15 +8,15 @@ Start a C++ project | You are using Python? | :ref:`sec-start-py-project` -| Tubex is ready to be used on your computer. +| Codac is ready to be used on your computer. | You can now copy-paste the following example code in a file named :file:`main.cpp`: .. code-block:: c++ - #include + #include using namespace std; - using namespace tubex; + using namespace codac; int main() { @@ -55,21 +55,21 @@ For the compilation of your project, you can use CMake with the following file : find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") - # Adding Tubex + # Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES} Ibex::ibex) + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES} Ibex::ibex) The files :file:`main.cpp` and :file:`CMakeLists.txt` appear in the same directory: @@ -82,12 +82,12 @@ The files :file:`main.cpp` and :file:`CMakeLists.txt` appear in the same directo .. note:: - Since Tubex 3.1, `Eigen `_ becomes a dependency of the library. + Since Codac 3.1, `Eigen `_ becomes a dependency of the library. -.. admonition:: Custom install directory of IBEX and Tubex +.. admonition:: Custom install directory of IBEX and Codac - If you installed IBEX and/or Tubex in a custom directory (instead of the file system such as :file:`/usr/local/` under Linux), + If you installed IBEX and/or Codac in a custom directory (instead of the file system such as :file:`/usr/local/` under Linux), then you need to specify the ``CMAKE_PREFIX_PATH`` option, as indicated in the above :file:`CMakeLists.txt` file. Another way is to export the ``CMAKE_PREFIX_PATH`` environment variable. For instance: @@ -95,7 +95,7 @@ The files :file:`main.cpp` and :file:`CMakeLists.txt` appear in the same directo .. code-block:: bash export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$HOME/ibex-lib/build_install - export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$HOME/tubex-lib/build_install + export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$HOME/codac/build_install The compilation of your project is made by the following command line: diff --git a/doc/doc/manual/01-introduction/index.rst b/doc/doc/manual/01-introduction/index.rst index b987fb40..26403905 100644 --- a/doc/doc/manual/01-introduction/index.rst +++ b/doc/doc/manual/01-introduction/index.rst @@ -4,7 +4,7 @@ Introduction ############ -Tubex is a library providing tools for constraint programming over reals and trajectories. +Codac is a library providing tools for constraint programming over reals and trajectories. It has many applications in state estimation or robot localization. .. contents:: @@ -15,10 +15,10 @@ It has many applications in state estimation or robot localization. ***************** -The Tubex library +The Codac library ***************** -The API of Tubex can be broken down into three layers: +The API of Codac can be broken down into three layers: - an extended tube calculator - a catalog of contractors for dynamical systems and mobile robotics @@ -27,9 +27,9 @@ The API of Tubex can be broken down into three layers: Each usage corresponds to a different layer and each layer is built on top of the previous one. This structure is similar to the one of IBEX, but dedicated to dynamical systems and robotic applications. | Note that the last layer is the result of very recent developments around networks of contractors. It aims at simplifying the use of the library while increasing the performances of the contractions. -| Another parallel work is conducted on a complementary approach. See `the Contredo project `_. +| Another parallel work is conducted on a complementary approach. See `the Contredo project `_. -Tubex has been designed by robotic researchers but provides a generic solver that has broader applications in guaranteed integration or parameter estimation. +Codac has been designed by robotic researchers but provides a generic solver that has broader applications in guaranteed integration or parameter estimation. ------------------------------------------------------ @@ -42,13 +42,13 @@ What about the IBEX library? :align: left The `IBEX library `_ is a C++ software for constraint processing over real numbers. -As for Tubex, it stands on Constraint Programming but focuses on static contexts, providing reliable algorithms for handling non-linear constraints. +As for Codac, it stands on Constraint Programming but focuses on static contexts, providing reliable algorithms for handling non-linear constraints. It also proposes various tools such as the *IbexSolve* and *IbexOpt* plugins that are dedicated to system solving and optimization, and come both with a default black-box solver and global optimizer for immediate usage. -Tubex is built upon IBEX and uses the elementary components of this library such as interval objects, arithmetic implementations, or contractors for static constraints. More precisely, Tubex extends the *contractor programming* framework of IBEX to the dynamical case, introduces trajectories and tubes objects, and provides another kind of solver for heterogeneous systems made of both static and dynamical constraints. +Codac is built upon IBEX and uses the elementary components of this library such as interval objects, arithmetic implementations, or contractors for static constraints. More precisely, Codac extends the *contractor programming* framework of IBEX to the dynamical case, introduces trajectories and tubes objects, and provides another kind of solver for heterogeneous systems made of both static and dynamical constraints. -If the use of IBEX is transparent in several robotic applications presented in this manual, it is still possible to build complex static contractors with IBEX and use them in Tubex. Hence, IBEX can be used as a **powerful contractor factory** for static systems. +If the use of IBEX is transparent in several robotic applications presented in this manual, it is still possible to build complex static contractors with IBEX and use them in Codac. Hence, IBEX can be used as a **powerful contractor factory** for static systems. ------------------------------------------------------ @@ -63,4 +63,4 @@ Using IBEX in Python with pyIbex A python API has been developed for IBEX: the `pyIbex library `_. It makes available in Python many C++ functionalities of IBEX that are used in robotic applications such as contractors and separators. It aims at combining the flexibility of Python with the speed of C++ algorithms. -Tubex is available in both C++ and Python. It stands on pyIbex for the use of IBEX objects such as intervals and static contractors. \ No newline at end of file +Codac is available in both C++ and Python. It stands on pyIbex for the use of IBEX objects such as intervals and static contractors. \ No newline at end of file diff --git a/doc/doc/manual/01-introduction/intro_constraint_programming.rst b/doc/doc/manual/01-introduction/intro_constraint_programming.rst index 50490bb0..d48b67d6 100644 --- a/doc/doc/manual/01-introduction/intro_constraint_programming.rst +++ b/doc/doc/manual/01-introduction/intro_constraint_programming.rst @@ -2,7 +2,7 @@ Constraint programming ********************** -Tubex is designed to deal with static and dynamical systems that are usually encountered in robotics. +Codac is designed to deal with static and dynamical systems that are usually encountered in robotics. It stands on constraint programming: a paradigm in which the properties of a solution to be found (*e.g.* the pose of a robot, the location of a landmark) are stated by constraints coming from the equations of the problem. Then, a solver performs **constraint propagation** on the variables and provides a reliable set of feasible solutions corresponding to the considered problem. In this approach, the user concentrates on *what* is the problem instead of *how* to solve it, thus leaving the computer dealing with the *how*. The strength of this declarative paradigm lies in its simpleness, as it allows one to describe a complex problem without requiring the knowledge of resolution tools coming with specific parameters to choose. @@ -33,7 +33,7 @@ Domains ------- As depicted in the figure, a variable is known to be enclosed in some domain :math:`\mathbb{X}` on which we will apply constraints. -In Tubex, the domains are represented by the following sets: +In Codac, the domains are represented by the following sets: - for reals :math:`x`, domains are intervals :math:`[x]`; - for vectors :math:`\mathbf{x}`, we define boxes :math:`[\mathbf{x}]`; @@ -52,20 +52,20 @@ In mobile robotics, we usually have to deal with: - time uncertainties: :math:`x(t)=y`, with :math:`t\in[t]` - *etc.* -The aim of Tubex is to easily deal with these constraints in order to eventually characterize sets of variables compliant with the defined rules. +The aim of Codac is to easily deal with these constraints in order to eventually characterize sets of variables compliant with the defined rules. Each constraint comes from equations or measurements. And each constraint will be applied by means of an operator called **contractor**. Contractors ----------- -Contractors are operators designed to reduce domains without losing any solution consistent with the related constraint. In Tubex, the contractors act on intervals, boxes and tubes. +Contractors are operators designed to reduce domains without losing any solution consistent with the related constraint. In Codac, the contractors act on intervals, boxes and tubes. .. Figure:: /manual/01-introduction/img/ctc.png Implementation of the constraints :math:`\mathcal{L}_1` and :math:`\mathcal{L}_2` of the previous figure by means of respective contractors :math:`\mathcal{C}_1` and :math:`\mathcal{C}_2`. On this theoretical example, the domain :math:`\mathbb{X}` is now a subset of a box :math:`[\mathbf{x}]`, easily representable and contractible. -Tubex already provides a catalog a contractors that one can use to deal with many applications. New contractors can also be designed and embedded in this framework without difficulty. +Codac already provides a catalog a contractors that one can use to deal with many applications. New contractors can also be designed and embedded in this framework without difficulty. .. admonition:: Constraint programming *vs* probabilistic methods diff --git a/doc/doc/manual/02-variables/02-var-dynamic.rst b/doc/doc/manual/02-variables/02-var-dynamic.rst index 183ce55f..a12e2f7d 100644 --- a/doc/doc/manual/02-variables/02-var-dynamic.rst +++ b/doc/doc/manual/02-variables/02-var-dynamic.rst @@ -448,12 +448,12 @@ Next pages will present several methods to use *tubes* that are envelopes of tra .. rubric:: Footnotes -.. [#f1] In Tubex, a ``tubex::TFunction`` is the extension of IBEX's ``ibex::Function`` objects, for the dynamical case (see more `about IBEX's functions `_). +.. [#f1] In Codac, a ``codac::TFunction`` is the extension of IBEX's ``ibex::Function`` objects, for the dynamical case (see more `about IBEX's functions `_). .. admonition:: Technical documentation See the C++ API documentation of this class: - * `Trajectory <../../../api/html/classtubex_1_1_trajectory.html>`_ - * `TrajectoryVector <../../../api/html/classtubex_1_1_trajectory_vector.html>`_ \ No newline at end of file + * `Trajectory <../../../api/html/classcodac_1_1_trajectory.html>`_ + * `TrajectoryVector <../../../api/html/classcodac_1_1_trajectory_vector.html>`_ \ No newline at end of file diff --git a/doc/doc/manual/02-variables/index.rst b/doc/doc/manual/02-variables/index.rst index e216fc08..65d73692 100644 --- a/doc/doc/manual/02-variables/index.rst +++ b/doc/doc/manual/02-variables/index.rst @@ -4,7 +4,7 @@ Basic structures for real values ################################ -Tubex provides basic structures to handle real values such as vectors :math:`\mathbf{x}`, matrices :math:`\mathbf{X}` and trajectories :math:`x(\cdot)`. They can for instance represent variables we are looking for in our Constraint Networks, as well as measurements or parameters. The may also represent the bounds of our domains. +Codac provides basic structures to handle real values such as vectors :math:`\mathbf{x}`, matrices :math:`\mathbf{X}` and trajectories :math:`x(\cdot)`. They can for instance represent variables we are looking for in our Constraint Networks, as well as measurements or parameters. The may also represent the bounds of our domains. Note that they are subject to uncertainties related to the approximation of real numbers by floating-point values. In the case of trajectories, uncertainties may also be related to time discretization. diff --git a/doc/doc/manual/03-domains/01-dom-intervals.rst b/doc/doc/manual/03-domains/01-dom-intervals.rst index dfaabb4d..a2ebd45b 100644 --- a/doc/doc/manual/03-domains/01-dom-intervals.rst +++ b/doc/doc/manual/03-domains/01-dom-intervals.rst @@ -169,7 +169,7 @@ Intervals, boxes and interval matrices The empty set ------------- -In mathematics, the empty set is the unique set having no elements; it corresponds to one entity while in Tubex (as in IBEX/pyIbex) there exists one empty set representation for each class of domain. +In mathematics, the empty set is the unique set having no elements; it corresponds to one entity while in Codac (as in IBEX/pyIbex) there exists one empty set representation for each class of domain. .. note:: @@ -295,7 +295,7 @@ Dealing with closed intervals, most of the operations can rely on their bounds. ~ & = & \varnothing \textrm{ otherwise}. \end{eqnarray} -Low-level libraries upon which Tubex has been built provide functionalities for computing arithmetic on intervals, involving basic operations as well as non-linear functions. The following functions can be used: +Low-level libraries upon which Codac has been built provide functionalities for computing arithmetic on intervals, involving basic operations as well as non-linear functions. The following functions can be used: ========================= ================================================================== Code Meaning diff --git a/doc/doc/manual/03-domains/02-dom-tubes.rst b/doc/doc/manual/03-domains/02-dom-tubes.rst index 600668ed..64dce02b 100644 --- a/doc/doc/manual/03-domains/02-dom-tubes.rst +++ b/doc/doc/manual/03-domains/02-dom-tubes.rst @@ -30,7 +30,7 @@ A trajectory :math:`x(\cdot)` belongs to the tube :math:`\left[x\right](\cdot)` Slices ------ -| In Tubex, tubes are implemented as lists of slices. +| In Codac, tubes are implemented as lists of slices. | More precisely, a tube :math:`[x](\cdot)` with a sampling time :math:`\delta>0` is implemented as a box-valued function which is constant for all :math:`t` inside intervals :math:`[k\delta,k\delta+\delta]`, :math:`k\in\mathbb{N}`. The box :math:`[k\delta,k\delta+\delta]\times\left[x\right]\left(t_{k}\right)`, with :math:`t_{k}\in[k\delta,k\delta+\delta]`, is called the :math:`k`-th slice of the tube :math:`[x](\cdot)` and is denoted by :math:`[\![x]\!]^{(k)}`. @@ -122,10 +122,10 @@ As tubes are intervals of trajectories, a ``Tube`` can be defined from ``Traject Result of tubes :math:`[x_8](t)=[\sin(t),\sin(t)]`, :math:`[x_9](t)=[\cos(t),\cos(t)+\frac{t}{10}]`, made of 100 slices. -.. #include +.. #include .. .. using namespace std; -.. using namespace tubex; +.. using namespace codac; .. .. int main() .. { @@ -221,10 +221,10 @@ produces (each dimension displayed on the same figure): .. figure:: img/02_tubevectors.png -.. #include +.. #include .. .. using namespace std; -.. using namespace tubex; +.. using namespace codac; .. .. int main() .. { @@ -632,10 +632,10 @@ Next pages will present reliable operators to reduce the range of the presented -.. #include +.. #include .. .. using namespace std; -.. using namespace tubex; +.. using namespace codac; .. .. int main() .. { @@ -670,5 +670,5 @@ Next pages will present reliable operators to reduce the range of the presented See the C++ API documentation of this class: - * `Tube <../../../api/html/classtubex_1_1_tube.html>`_ - * `TubeVector <../../../api/html/classtubex_1_1_tube_vector.html>`_ \ No newline at end of file + * `Tube <../../../api/html/classcodac_1_1_tube.html>`_ + * `TubeVector <../../../api/html/classcodac_1_1_tube_vector.html>`_ \ No newline at end of file diff --git a/doc/doc/manual/04-static-contractors/01-ctc-function.rst b/doc/doc/manual/04-static-contractors/01-ctc-function.rst index 79a9f965..dc34ae80 100644 --- a/doc/doc/manual/04-static-contractors/01-ctc-function.rst +++ b/doc/doc/manual/04-static-contractors/01-ctc-function.rst @@ -146,14 +146,14 @@ The boxes are contracted in order to remove some vectors that are not consistent Illustration of several contracted boxes with the above ``ctc_f`` contractor. -.. #include -.. #include +.. #include +.. #include .. #include "ibex_CtcHC4.h" .. #include "ibex_SystemFactory.h" .. #include "ibex_Ctc3BCid.h" .. .. using namespace std; -.. using namespace tubex; +.. using namespace codac; .. using namespace ibex; .. .. int main() @@ -203,4 +203,4 @@ The IBEX contractor behind ``CtcFunction`` is a ``ibex::CtcFwdBwd`` coupled with .. admonition:: Technical documentation - See the `C++ API documentation of this class <../../../api/html/classtubex_1_1_ctc_function.html>`_. \ No newline at end of file + See the `C++ API documentation of this class <../../../api/html/classcodac_1_1_ctc_function.html>`_. \ No newline at end of file diff --git a/doc/doc/manual/04-static-contractors/02-ctc-dist.rst b/doc/doc/manual/04-static-contractors/02-ctc-dist.rst index 16a7430f..5809853a 100644 --- a/doc/doc/manual/04-static-contractors/02-ctc-dist.rst +++ b/doc/doc/manual/04-static-contractors/02-ctc-dist.rst @@ -101,11 +101,11 @@ Several calls to :math:`\mathcal{C}_{\textrm{dist}}` will allow the contraction Illustration of several contracted boxes with the above ``ctc_dist`` contractor. The blue boxes have been contracted as well as the ring. -.. #include -.. #include +.. #include +.. #include .. .. using namespace std; -.. using namespace tubex; +.. using namespace codac; .. using namespace ibex; .. .. int main() @@ -151,4 +151,4 @@ Several calls to :math:`\mathcal{C}_{\textrm{dist}}` will allow the contraction .. admonition:: Technical documentation - See the `C++ API documentation of this class <../../../api/html/classtubex_1_1_ctc_dist.html>`_. \ No newline at end of file + See the `C++ API documentation of this class <../../../api/html/classcodac_1_1_ctc_dist.html>`_. \ No newline at end of file diff --git a/doc/doc/manual/04-static-contractors/03-ctc-polar.rst b/doc/doc/manual/04-static-contractors/03-ctc-polar.rst index 4bfbbb58..f23ace5b 100644 --- a/doc/doc/manual/04-static-contractors/03-ctc-polar.rst +++ b/doc/doc/manual/04-static-contractors/03-ctc-polar.rst @@ -33,7 +33,7 @@ Definition .. code-tab:: c++ - #include + #include ctc::polar.contract(x, y, rho, theta); @@ -99,7 +99,7 @@ Calls to :math:`\mathcal{C}_{\textrm{polar}}` will allow the contraction of the .. code-tab:: c++ - #include + #include // ... @@ -129,7 +129,7 @@ Calls to :math:`\mathcal{C}_{\textrm{polar}}` will allow the contraction of the .. from pyibex import * -.. from tubex_lib import * +.. from codac import * .. .. x = IntervalVector(2,Interval(0.)) .. diff --git a/doc/doc/manual/04-static-contractors/04-ctc-constell.rst b/doc/doc/manual/04-static-contractors/04-ctc-constell.rst index a4eb228d..ae070118 100644 --- a/doc/doc/manual/04-static-contractors/04-ctc-constell.rst +++ b/doc/doc/manual/04-static-contractors/04-ctc-constell.rst @@ -48,7 +48,7 @@ where :math:`\bigsqcup`, called *squared union*, returns the smallest box enclos .. code-tab:: c++ - #include + #include CtcConstell ctc_constell(v_b); // with v_b, the vector defining // the constellation of points @@ -74,7 +74,7 @@ The :math:`\mathcal{C}_\textrm{constell}` can be instantiated with .. code-tab:: c++ - #include + #include // ... @@ -119,7 +119,7 @@ we can use the :math:`\mathcal{C}_\textrm{constell}` to contract them according Filled boxes are the :math:`[\mathbf{x}]` after contraction. .. from pyibex import * -.. from tubex_lib import * +.. from codac import * .. .. v_x = [ IntervalVector([[1.25,3],[1.6,2.75]]), .. IntervalVector([[2.,3.5],[0.6,1.2]]), @@ -180,4 +180,4 @@ Related content .. admonition:: Technical documentation - See the `C++ API documentation of this class <../../../api/html/classtubex_1_1_ctc_constell.html>`_. \ No newline at end of file + See the `C++ API documentation of this class <../../../api/html/classcodac_1_1_ctc_constell.html>`_. \ No newline at end of file diff --git a/doc/doc/manual/05-dynamic-contractors/01-ctc-deriv.rst b/doc/doc/manual/05-dynamic-contractors/01-ctc-deriv.rst index 1073faaa..12c66a01 100644 --- a/doc/doc/manual/05-dynamic-contractors/01-ctc-deriv.rst +++ b/doc/doc/manual/05-dynamic-contractors/01-ctc-deriv.rst @@ -88,10 +88,10 @@ The following images depict the tubes. The dark gray parts are the obtained tube Only :math:`[x](\cdot)` is contracted (it can be theoretically proved that :math:`[v](\cdot)` cannot be contracted when :math:`[x](\cdot)` is not a degenerate tube). Note that all the feasible derivatives in :math:`[v](\cdot)` are negative over :math:`[0,1]` and so the contraction of :math:`[x](\cdot)` preserves decreasing trajectories over this part of the domain. Similarly, :math:`[v](\cdot)` is positive over :math:`[2,3]` which corresponds to increasing trajectories kept in :math:`[x](\cdot)` after contraction. -.. #include +.. #include .. .. using namespace std; -.. using namespace tubex; +.. using namespace codac; .. .. int main() .. { @@ -209,11 +209,11 @@ Which leads to: .. figure:: img/cderiv_lissajous.png -.. #include -.. #include +.. #include +.. #include .. .. using namespace std; -.. using namespace tubex; +.. using namespace codac; .. .. int main() .. { @@ -285,4 +285,4 @@ Related content .. admonition:: Technical documentation - See the `C++ API documentation of this class <../../../api/html/classtubex_1_1_ctc_deriv.html>`_. \ No newline at end of file + See the `C++ API documentation of this class <../../../api/html/classcodac_1_1_ctc_deriv.html>`_. \ No newline at end of file diff --git a/doc/doc/manual/05-dynamic-contractors/02-ctc-eval.rst b/doc/doc/manual/05-dynamic-contractors/02-ctc-eval.rst index 615d7e8b..e2a740b3 100644 --- a/doc/doc/manual/05-dynamic-contractors/02-ctc-eval.rst +++ b/doc/doc/manual/05-dynamic-contractors/02-ctc-eval.rst @@ -142,10 +142,10 @@ The following animation presents the results before and after the :math:`\mathca .. figure:: img/ceval_multi.gif -.. #include +.. #include .. .. using namespace std; -.. using namespace tubex; +.. using namespace codac; .. .. int main() .. { @@ -272,11 +272,11 @@ The obtained tube is blue painted on the figure, the contraction to keep the tra .. figure:: img/ceval_lissajous_tube.png -.. #include -.. #include +.. #include +.. #include .. .. using namespace std; -.. using namespace tubex; +.. using namespace codac; .. .. int main() .. { @@ -362,11 +362,11 @@ The :math:`\mathcal{C}_{\textrm{eval}}` can be used to evaluate the position tim // [b] contracted to ([-1, -0.29] ; [0.4, 0.95]) (red on the figure) -.. #include -.. #include +.. #include +.. #include .. .. using namespace std; -.. using namespace tubex; +.. using namespace codac; .. .. int main() .. { @@ -417,4 +417,4 @@ Related content .. admonition:: Technical documentation - See the `C++ API documentation of this class <../../../api/html/classtubex_1_1_ctc_eval.html>`_. \ No newline at end of file + See the `C++ API documentation of this class <../../../api/html/classcodac_1_1_ctc_eval.html>`_. \ No newline at end of file diff --git a/doc/doc/manual/05-dynamic-contractors/03-ctc-lohner.rst b/doc/doc/manual/05-dynamic-contractors/03-ctc-lohner.rst index 08afde69..24f261e6 100644 --- a/doc/doc/manual/05-dynamic-contractors/03-ctc-lohner.rst +++ b/doc/doc/manual/05-dynamic-contractors/03-ctc-lohner.rst @@ -62,4 +62,4 @@ Related content .. admonition:: Technical documentation - See the `C++ API documentation of this class <../../../api/html/classtubex_1_1_ctc_lohner.html>`_. + See the `C++ API documentation of this class <../../../api/html/classcodac_1_1_ctc_lohner.html>`_. diff --git a/doc/doc/manual/05-dynamic-contractors/03-ctc-picard.rst b/doc/doc/manual/05-dynamic-contractors/03-ctc-picard.rst index ced9a789..d688a990 100644 --- a/doc/doc/manual/05-dynamic-contractors/03-ctc-picard.rst +++ b/doc/doc/manual/05-dynamic-contractors/03-ctc-picard.rst @@ -3,7 +3,7 @@ .. warning:: The writing of this page is in progress. Several changes are currently performed on the library. - A new stable version of Tubex will be released in the coming weeks. + A new stable version of Codac will be released in the coming weeks. ********************************************* CtcPicard: :math:`\dot{x}(t)=f\big(x(t)\big)` @@ -36,4 +36,4 @@ Definition .. admonition:: Technical documentation - See the `C++ API documentation of this class <../../../api/html/classtubex_1_1_ctc_picard.html>`_. \ No newline at end of file + See the `C++ API documentation of this class <../../../api/html/classcodac_1_1_ctc_picard.html>`_. \ No newline at end of file diff --git a/doc/doc/manual/05-dynamic-contractors/04-ctc-picard.rst b/doc/doc/manual/05-dynamic-contractors/04-ctc-picard.rst index 85ee177d..0fd12b94 100644 --- a/doc/doc/manual/05-dynamic-contractors/04-ctc-picard.rst +++ b/doc/doc/manual/05-dynamic-contractors/04-ctc-picard.rst @@ -3,7 +3,7 @@ .. warning:: The writing of this page is in progress. Several changes are currently performed on the library. - A new stable version of Tubex will be released in the coming weeks. + A new stable version of Codac will be released in the coming weeks. ************************************************************************ CtcPicard: :math:`\dot{\mathbf{x}}(t)=\mathbf{f}\big(\mathbf{x}(t)\big)` @@ -36,4 +36,4 @@ Definition .. admonition:: Technical documentation - See the `C++ API documentation of this class <../../../api/html/classtubex_1_1_ctc_picard.html>`_. \ No newline at end of file + See the `C++ API documentation of this class <../../../api/html/classcodac_1_1_ctc_picard.html>`_. \ No newline at end of file diff --git a/doc/doc/manual/06-contractor-network/01-cn-solver.rst b/doc/doc/manual/06-contractor-network/01-cn-solver.rst index 0c0d1692..6e5650f5 100644 --- a/doc/doc/manual/06-contractor-network/01-cn-solver.rst +++ b/doc/doc/manual/06-contractor-network/01-cn-solver.rst @@ -3,7 +3,7 @@ .. warning:: This part of the documentation is deprecated. Several changes are currently performed on the library. - A new stable version of Tubex will be released in the coming weeks. + A new stable version of Codac will be released in the coming weeks. ***************** Building a solver diff --git a/doc/doc/manual/06-contractor-network/02-cn-realtime.rst b/doc/doc/manual/06-contractor-network/02-cn-realtime.rst index 9d828b63..550809ed 100644 --- a/doc/doc/manual/06-contractor-network/02-cn-realtime.rst +++ b/doc/doc/manual/06-contractor-network/02-cn-realtime.rst @@ -3,7 +3,7 @@ .. warning:: This part of the documentation is deprecated. Several changes are currently performed on the library. - A new stable version of Tubex will be released in the coming weeks. + A new stable version of Codac will be released in the coming weeks. ************************************* Using a CN for real time applications diff --git a/doc/doc/manual/06-contractor-network/03-cn-graphics.rst b/doc/doc/manual/06-contractor-network/03-cn-graphics.rst index fe8e4450..e4c31016 100644 --- a/doc/doc/manual/06-contractor-network/03-cn-graphics.rst +++ b/doc/doc/manual/06-contractor-network/03-cn-graphics.rst @@ -3,7 +3,7 @@ .. warning:: This part of the documentation is deprecated. Several changes are currently performed on the library. - A new stable version of Tubex will be released in the coming weeks. + A new stable version of Codac will be released in the coming weeks. ******************************** Visualize a graph of contractors diff --git a/doc/doc/manual/06-contractor-network/index.rst b/doc/doc/manual/06-contractor-network/index.rst index 52d8f544..8a4be0a5 100644 --- a/doc/doc/manual/06-contractor-network/index.rst +++ b/doc/doc/manual/06-contractor-network/index.rst @@ -3,7 +3,7 @@ .. warning:: This part of the documentation is deprecated. Several changes are currently performed on the library. - A new stable version of Tubex will be released in the coming weeks. + A new stable version of Codac will be released in the coming weeks. ################### Contractor Networks diff --git a/doc/doc/manual/07-graphics/01-vibes.rst b/doc/doc/manual/07-graphics/01-vibes.rst index fb086c10..a8328524 100644 --- a/doc/doc/manual/07-graphics/01-vibes.rst +++ b/doc/doc/manual/07-graphics/01-vibes.rst @@ -4,8 +4,8 @@ The VIBes viewer **************** -The graphical classes provided in Tubex are based on `the VIBes viewer `_: a visualization system that aims at providing people working with intervals a way to display results (boxes, pavings), without worrying about GUI programming. -Some methods have been implemented in Tubex in order to extend VIBes' features to tubes purposes. +The graphical classes provided in Codac are based on `the VIBes viewer `_: a visualization system that aims at providing people working with intervals a way to display results (boxes, pavings), without worrying about GUI programming. +Some methods have been implemented in Codac in order to extend VIBes' features to tubes purposes. .. contents:: @@ -58,7 +58,7 @@ The VIBes API is available for both C++ and Python: * `C++ API `_ * `Python API `_ -Tubex provides custom classes to extend VIBes' features to appropriate drawings of tubes: +Codac provides custom classes to extend VIBes' features to appropriate drawings of tubes: * ``VIBesFig``: parent class * ``VIBesFigTube``: view for 1d tubes and/or trajectories diff --git a/doc/doc/manual/07-graphics/02-figtube.rst b/doc/doc/manual/07-graphics/02-figtube.rst index 24b44b29..a4789efc 100644 --- a/doc/doc/manual/07-graphics/02-figtube.rst +++ b/doc/doc/manual/07-graphics/02-figtube.rst @@ -172,7 +172,7 @@ produces: See the C++ API documentation of this class: - * `VIBesFigTube <../../../api/html/classtubex_1_1_v_i_bes_fig_tube.html>`_ + * `VIBesFigTube <../../../api/html/classcodac_1_1_v_i_bes_fig_tube.html>`_ The class ``VIBesFigTubeVector`` diff --git a/doc/doc/manual/07-graphics/03-figmap.rst b/doc/doc/manual/07-graphics/03-figmap.rst index 319bb2a0..391f8bf5 100644 --- a/doc/doc/manual/07-graphics/03-figmap.rst +++ b/doc/doc/manual/07-graphics/03-figmap.rst @@ -3,7 +3,7 @@ .. warning:: This part of the documentation is deprecated. Several changes are currently performed on the library. - A new stable version of Tubex will be released in the coming weeks. + A new stable version of Codac will be released in the coming weeks. ****** FigMap diff --git a/doc/doc/manual/07-graphics/04-colormaps.rst b/doc/doc/manual/07-graphics/04-colormaps.rst index 5eb48a84..6399752d 100644 --- a/doc/doc/manual/07-graphics/04-colormaps.rst +++ b/doc/doc/manual/07-graphics/04-colormaps.rst @@ -3,7 +3,7 @@ .. warning:: This part of the documentation is deprecated. Several changes are currently performed on the library. - A new stable version of Tubex will be released in the coming weeks. + A new stable version of Codac will be released in the coming weeks. ********** Color maps diff --git a/doc/doc/manual/08-going-further/01-serialization.rst b/doc/doc/manual/08-going-further/01-serialization.rst index 71d8cc30..ea0a52c4 100644 --- a/doc/doc/manual/08-going-further/01-serialization.rst +++ b/doc/doc/manual/08-going-further/01-serialization.rst @@ -3,7 +3,7 @@ .. warning:: This part of the documentation is deprecated. Several changes are currently performed on the library. - A new stable version of Tubex will be released in the coming weeks. + A new stable version of Codac will be released in the coming weeks. ******************* Serialization tools diff --git a/doc/doc/manual/08-going-further/02-bisections.rst b/doc/doc/manual/08-going-further/02-bisections.rst index 5f7b3d29..d066d731 100644 --- a/doc/doc/manual/08-going-further/02-bisections.rst +++ b/doc/doc/manual/08-going-further/02-bisections.rst @@ -3,7 +3,7 @@ .. warning:: This part of the documentation is deprecated. Several changes are currently performed on the library. - A new stable version of Tubex will be released in the coming weeks. + A new stable version of Codac will be released in the coming weeks. ********************* Bisections of domains diff --git a/doc/doc/manual/08-going-further/03-pavings.rst b/doc/doc/manual/08-going-further/03-pavings.rst index 82fbafce..93639d27 100644 --- a/doc/doc/manual/08-going-further/03-pavings.rst +++ b/doc/doc/manual/08-going-further/03-pavings.rst @@ -3,7 +3,7 @@ .. warning:: This part of the documentation is deprecated. Several changes are currently performed on the library. - A new stable version of Tubex will be released in the coming weeks. + A new stable version of Codac will be released in the coming weeks. ******* Pavings diff --git a/doc/doc/manual/08-going-further/04-tubes-implementation.rst b/doc/doc/manual/08-going-further/04-tubes-implementation.rst index 82b949b8..2585885c 100644 --- a/doc/doc/manual/08-going-further/04-tubes-implementation.rst +++ b/doc/doc/manual/08-going-further/04-tubes-implementation.rst @@ -3,7 +3,7 @@ .. warning:: This part of the documentation is deprecated. Several changes are currently performed on the library. - A new stable version of Tubex will be released in the coming weeks. + A new stable version of Codac will be released in the coming weeks. ******************** Tubes implementation diff --git a/doc/doc/manual/08-going-further/05-functions.rst b/doc/doc/manual/08-going-further/05-functions.rst index b337d1d7..78bc52d6 100644 --- a/doc/doc/manual/08-going-further/05-functions.rst +++ b/doc/doc/manual/08-going-further/05-functions.rst @@ -3,7 +3,7 @@ .. warning:: This part of the documentation is deprecated. Several changes are currently performed on the library. - A new stable version of Tubex will be released in the coming weeks. + A new stable version of Codac will be released in the coming weeks. ********* Functions @@ -17,7 +17,7 @@ Mathematical functions (that are not related to programming functions) are defin An extended interval calculator ------------------------------- -Tubex allows you to declare symbolically a function and to perform interval computations with it. For example: +Codac allows you to declare symbolically a function and to perform interval computations with it. For example: .. tabs:: @@ -32,7 +32,7 @@ Tubex allows you to declare symbolically a function and to perform interval comp defines the mathematical object :math:`\left(\begin{array}{c}x(t)\\y(t)\end{array}\right) \mapsto \sin\big(x(t)\big)+\exp\big(t\cdot y(t)\big)`. -In Tubex we distinct two kinds of functions: +In Codac we distinct two kinds of functions: * *static* functions, such as :math:`\mathbf{x}\mapsto\sin(x_1)+\cos(\exp(x_2))`, implemented by ``Function`` objects; * *temporal* functions that are time related. These *t*-functions are made for inter-temporal evaluations such as integral computations, delays, time uncertainties, and so on. The system variable :math:`t` is a predefined variable of ``TFunction`` objects. diff --git a/doc/doc/manual/08-going-further/index.rst b/doc/doc/manual/08-going-further/index.rst index 4f4612aa..0666fdcb 100644 --- a/doc/doc/manual/08-going-further/index.rst +++ b/doc/doc/manual/08-going-further/index.rst @@ -3,7 +3,7 @@ .. warning:: This part of the documentation is deprecated. Several changes are currently performed on the library. - A new stable version of Tubex will be released in the coming weeks. + A new stable version of Codac will be released in the coming weeks. ############# Going further diff --git a/doc/doc/manual/09-extensions/01-ode.rst b/doc/doc/manual/09-extensions/01-ode.rst index c99bba2f..20a8abdc 100644 --- a/doc/doc/manual/09-extensions/01-ode.rst +++ b/doc/doc/manual/09-extensions/01-ode.rst @@ -3,7 +3,7 @@ .. warning:: This part of the documentation is deprecated. Several changes are currently performed on the library. - A new stable version of Tubex will be released in the coming weeks. + A new stable version of Codac will be released in the coming weeks. ******************************************* Using external integration methods for ODEs @@ -15,7 +15,7 @@ Using external integration methods for ODEs Installing CAPD --------------- -It is now possible to use CAPD to compute a guaranteed integration of an ODE. The result is enclosed in a ``TubeVector`` object of Tubex. +It is now possible to use CAPD to compute a guaranteed integration of an ODE. The result is enclosed in a ``TubeVector`` object of Codac. To do so, you need to have CAPD and its DynSys module installed. You may need to install the following packages in order to compile CAPD: @@ -57,7 +57,7 @@ Then you can proceed to the compilation of the sources of CAPD: For additional options on CAPD compilation and integration please visit the `CAPD official documentation `_. -Finally, you need to compile Tubex again: +Finally, you need to compile Codac again: .. code-block:: bash @@ -76,15 +76,15 @@ To use the module you need to add at the beginning of your code: .. code-block:: c++ - #include + #include Here is an example of use: .. code-block:: c++ - #include - #include + #include + #include int main() { @@ -103,14 +103,14 @@ Here is an example of use: "initial_coordinates": [[0.5,0.5],[0,0]], "output_file": "reference_output.txt", - "tubex_output": "tube.tube" + "codac_output": "tube.tube" } } )"_json; vector ibex_curve = capd2ibex(j); // list of IBEX format IntervalVector // or - TubeVector output = capd2tubex(j); // one tube of Tubex format + TubeVector output = capd2codac(j); // one tube of Codac format } @@ -124,4 +124,4 @@ Note that you can also define the configuration in a separated file with: json j; i >> j; -You can then use any Tubex operator on this new generated tube. \ No newline at end of file +You can then use any Codac operator on this new generated tube. \ No newline at end of file diff --git a/doc/doc/manual/09-extensions/index.rst b/doc/doc/manual/09-extensions/index.rst index d278a50f..60f36bae 100644 --- a/doc/doc/manual/09-extensions/index.rst +++ b/doc/doc/manual/09-extensions/index.rst @@ -3,10 +3,10 @@ .. warning:: This part of the documentation is deprecated. Several changes are currently performed on the library. - A new stable version of Tubex will be released in the coming weeks. + A new stable version of Codac will be released in the coming weeks. ################### -Extensions of Tubex +Extensions of Codac ################### diff --git a/doc/doc/toctree.rst b/doc/doc/toctree.rst index 0a9317a4..67229a11 100644 --- a/doc/doc/toctree.rst +++ b/doc/doc/toctree.rst @@ -1,14 +1,14 @@ .. _sec-toctree: ########################################## -Tubex: constraint-programming for robotics +Codac: constraint-programming for robotics ########################################## .. toctree:: :maxdepth: 1 :titlesonly: - Tubex main page + Codac main page /install/02-py-project-online /install/01-installation /install/02-start-py-project diff --git a/doc/doc/tutorial/00-getting-started/index.rst b/doc/doc/tutorial/00-getting-started/index.rst index 0d59902a..b5c9e72c 100644 --- a/doc/doc/tutorial/00-getting-started/index.rst +++ b/doc/doc/tutorial/00-getting-started/index.rst @@ -4,7 +4,7 @@ Introduction to the concepts of CP and IA ========================================= | Welcome to this tutorial! -| This first page aims at giving you a first glimpse of the philosophy of this tutorial based on Tubex. +| This first page aims at giving you a first glimpse of the philosophy of this tutorial based on Codac. .. include:: /manual/01-introduction/intro_constraint_programming.rst @@ -13,7 +13,7 @@ Introduction to the concepts of CP and IA Getting started --------------- -Now, to get ready for the tutorial, you need to install the Tubex library on your computer. +Now, to get ready for the tutorial, you need to install the Codac library on your computer. Please follow the related page of the manual to see how to do it: .. toctree:: diff --git a/doc/doc/tutorial/01-basics/index.rst b/doc/doc/tutorial/01-basics/index.rst index da7ec372..4b042a49 100644 --- a/doc/doc/tutorial/01-basics/index.rst +++ b/doc/doc/tutorial/01-basics/index.rst @@ -3,7 +3,7 @@ Lesson A: Getting started with intervals and contractors ======================================================== -Now that Tubex has been installed on your computer or usable online, we will get used to intervals, constraints and networks of contractors. +Now that Codac has been installed on your computer or usable online, we will get used to intervals, constraints and networks of contractors. This will allow use to perform the state estimation of a static robot between some landmarks by the end of :ref:`Lesson B `. .. contents:: Content of this lesson @@ -42,16 +42,16 @@ Start a new project as explained in :ref:`sec-start-py-project` or :ref:`sec-sta .. code-tab:: py from pyibex import * - from tubex_lib import * + from codac import * # .. next questions will be here .. code-tab:: c++ - #include + #include using namespace std; - using namespace tubex; + using namespace codac; int main() { @@ -87,7 +87,7 @@ The asset of reliability coming with interval analysis will help us to estimate Hello Interval Analysis! ------------------------ -Tubex is using C++/Python objects to represent intervals and boxes [#f1]_: +Codac is using C++/Python objects to represent intervals and boxes [#f1]_: * ``Interval(lb, ub)`` will be used to create an interval :math:`[x]=[\textrm{lb},\textrm{ub}]`. There exists predefined values for intervals. Here are some examples of ``Interval`` objects: @@ -254,7 +254,7 @@ We can also define vector input variables and access their components in the fun Graphics -------- -The graphical tool `VIBes `_ has been created to Visualize Intervals and BoxES. It is compatible with simple objects such as ``Interval`` and ``IntervalVector``. Its features have been extended in the Tubex library with objects such as ``VIBesFigMap``. +The graphical tool `VIBes `_ has been created to Visualize Intervals and BoxES. It is compatible with simple objects such as ``Interval`` and ``IntervalVector``. Its features have been extended in the Codac library with objects such as ``VIBesFigMap``. .. admonition:: Exercise @@ -297,7 +297,7 @@ The graphical tool `VIBes `_ has .. from pyibex import * -.. from tubex_lib import * +.. from codac import * .. .. x = IntervalVector([[0,0],[0,0]]) .. b = IntervalVector([[3,4],[2,3]]) @@ -349,7 +349,7 @@ Now, we want to apply the constraints in order to solve our problem. In the Cons We will use **contractors** to implement constraints on sets. They are mathematical operators used to *contract* (reduce) a set, for instance a box, without losing any feasible solution. This way, contractors can be applied safely any time we want on our domains. -In Tubex, the contractors are also defined by C++/Python objects and are prefixed with ``Ctc``. For this lesson, we will use the ``CtcFunction`` class to define a contractor according to a function :math:`f`. Note that the resulting contractor will aim at solving a constraint in the form :math:`f(\mathbf{x})=0`. This contractor has to be instantiated from a ``Function`` object defining the constraint. For instance, the simple constraint :math:`(x+y=a)` is expressed as :math:`f(x,y,a)=x+y-a=0`, and can be implemented as a contractor :math:`\mathcal{C}_+` with: +In Codac, the contractors are also defined by C++/Python objects and are prefixed with ``Ctc``. For this lesson, we will use the ``CtcFunction`` class to define a contractor according to a function :math:`f`. Note that the resulting contractor will aim at solving a constraint in the form :math:`f(\mathbf{x})=0`. This contractor has to be instantiated from a ``Function`` object defining the constraint. For instance, the simple constraint :math:`(x+y=a)` is expressed as :math:`f(x,y,a)=x+y-a=0`, and can be implemented as a contractor :math:`\mathcal{C}_+` with: .. tabs:: diff --git a/doc/doc/tutorial/02-static-rangeonly/index.rst b/doc/doc/tutorial/02-static-rangeonly/index.rst index def6e31f..cb3b5fdf 100644 --- a/doc/doc/tutorial/02-static-rangeonly/index.rst +++ b/doc/doc/tutorial/02-static-rangeonly/index.rst @@ -51,7 +51,7 @@ The following code provides a simulation of random landmarks and related range-o .. code-tab:: py - from tubex_lib import * + from codac import * from pyibex import * import math @@ -78,10 +78,10 @@ The following code provides a simulation of random landmarks and related range-o .. code-tab:: c++ - #include + #include using namespace std; - using namespace tubex; + using namespace codac; int main() { diff --git a/doc/doc/tutorial/03-static-rangebearing/index.rst b/doc/doc/tutorial/03-static-rangebearing/index.rst index 5b599259..c2d48bc7 100644 --- a/doc/doc/tutorial/03-static-rangebearing/index.rst +++ b/doc/doc/tutorial/03-static-rangebearing/index.rst @@ -144,7 +144,7 @@ This simple and elementary constraint is expressed by: \end{array}\right), | where :math:`\rho` and :math:`\theta` are respectively the radial and angular coordinates. -| It is *elementary* in the sense that it cannot be decomposed anymore without losing its optimality. In addition, a dedicated contractor already exists to deal with it: the ``CtcPolar`` (provided by `the pyIbex library `_ and usable in Tubex). +| It is *elementary* in the sense that it cannot be decomposed anymore without losing its optimality. In addition, a dedicated contractor already exists to deal with it: the ``CtcPolar`` (provided by `the pyIbex library `_ and usable in Codac). .. admonition:: Technical documentation diff --git a/doc/doc/tutorial/03-static-rangebearing/src/solution_c.cpp b/doc/doc/tutorial/03-static-rangebearing/src/solution_c.cpp index 5988b0f6..d75bc623 100644 --- a/doc/doc/tutorial/03-static-rangebearing/src/solution_c.cpp +++ b/doc/doc/tutorial/03-static-rangebearing/src/solution_c.cpp @@ -1,8 +1,8 @@ -#include +#include using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; int main() { diff --git a/doc/doc/tutorial/03-static-rangebearing/src/solution_c.py b/doc/doc/tutorial/03-static-rangebearing/src/solution_c.py index 05afee3f..1141c287 100644 --- a/doc/doc/tutorial/03-static-rangebearing/src/solution_c.py +++ b/doc/doc/tutorial/03-static-rangebearing/src/solution_c.py @@ -1,5 +1,5 @@ from pyibex import * -from tubex_lib import * +from codac import * import math x_truth = (2,1,math.pi/6) # actual state vector (pose) diff --git a/doc/doc/tutorial/04-own-contractor/solution.py b/doc/doc/tutorial/04-own-contractor/solution.py index 58ea5eab..faf39357 100644 --- a/doc/doc/tutorial/04-own-contractor/solution.py +++ b/doc/doc/tutorial/04-own-contractor/solution.py @@ -1,5 +1,5 @@ from pyibex import * -from tubex_lib import * +from codac import * import math diff --git a/doc/doc/tutorial/05-tubes/solution.py b/doc/doc/tutorial/05-tubes/solution.py index 757d7f10..0ffb7546 100644 --- a/doc/doc/tutorial/05-tubes/solution.py +++ b/doc/doc/tutorial/05-tubes/solution.py @@ -1,5 +1,5 @@ from pyibex import * -from tubex_lib import * +from codac import * import math # E.1. diff --git a/doc/doc/tutorial/06-dyn-rangeonly/index.rst b/doc/doc/tutorial/06-dyn-rangeonly/index.rst index 3194f12f..7d09a4ce 100644 --- a/doc/doc/tutorial/06-dyn-rangeonly/index.rst +++ b/doc/doc/tutorial/06-dyn-rangeonly/index.rst @@ -35,7 +35,7 @@ As one can see, this constraint involves heterogeneous variables: a real :math:` The presence of the derivative in this constraint is due to the variable :math:`t_i` that may be uncertain: :math:`t_i\in[t_i]`. In this case, the derivative :math:`w(\cdot)` is required in order to depict the evolution of :math:`z(\cdot)` along the time interval :math:`[t_i]`. -Tubex provides a contractor :math:`\mathcal{C}_{\textrm{eval}}\big([t_i],[y_i],[z](\cdot),[w](\cdot)\big)` to deal with this constraint on intervals and tubes. +Codac provides a contractor :math:`\mathcal{C}_{\textrm{eval}}\big([t_i],[y_i],[z](\cdot),[w](\cdot)\big)` to deal with this constraint on intervals and tubes. Contract a tube at a given time diff --git a/doc/doc/tutorial/06-dyn-rangeonly/solution.py b/doc/doc/tutorial/06-dyn-rangeonly/solution.py index 0f9dcd03..f86082f2 100644 --- a/doc/doc/tutorial/06-dyn-rangeonly/solution.py +++ b/doc/doc/tutorial/06-dyn-rangeonly/solution.py @@ -1,5 +1,5 @@ from pyibex import * -from tubex_lib import * +from codac import * import math # F.1. diff --git a/doc/doc/tutorial/07-data-association/solution.py b/doc/doc/tutorial/07-data-association/solution.py index ce16438a..2c86b668 100644 --- a/doc/doc/tutorial/07-data-association/solution.py +++ b/doc/doc/tutorial/07-data-association/solution.py @@ -1,4 +1,4 @@ -# tubex-lib - Examples +# Codac - Examples # Set-membership state estimation by solving data association # ---------------------------------------------------------------------------- # Example from the paper "Set-membership state estimation by solving data association" @@ -6,7 +6,7 @@ # ICRA 2020, Paris from pyibex import * -from tubex_lib import * +from codac import * import math import sys # only for checking if this example still works diff --git a/doc/doc/tutorial/08-rangeonly-slam/index.rst b/doc/doc/tutorial/08-rangeonly-slam/index.rst index c7184969..cac04f86 100644 --- a/doc/doc/tutorial/08-rangeonly-slam/index.rst +++ b/doc/doc/tutorial/08-rangeonly-slam/index.rst @@ -63,7 +63,7 @@ The term *simulation* often refers to the integration of one dynamical system fr **H.1.** Simulate the system. We will use :math:`\delta` = ``dt`` = :math:`0.05` for implementing the trajectories. - The simulation can be done with a classical temporal loop and an Euler integration method. With Tubex, we can also compute the system at the trajectory level (applying operators on entire trajectories), without temporal loop. For this, we will define the input of the system as a trajectory, and apply operations on it (from function :math:`\mathbf{f}`) and integrations. + The simulation can be done with a classical temporal loop and an Euler integration method. With Codac, we can also compute the system at the trajectory level (applying operators on entire trajectories), without temporal loop. For this, we will define the input of the system as a trajectory, and apply operations on it (from function :math:`\mathbf{f}`) and integrations. The following code computes :math:`\mathbf{x}^*(\cdot)`: diff --git a/doc/doc/tutorial/08-rangeonly-slam/solution.py b/doc/doc/tutorial/08-rangeonly-slam/solution.py index 69f2cafa..d4cf7800 100644 --- a/doc/doc/tutorial/08-rangeonly-slam/solution.py +++ b/doc/doc/tutorial/08-rangeonly-slam/solution.py @@ -1,5 +1,5 @@ from pyibex import * -from tubex_lib import * +from codac import * import math import random import time diff --git a/doc/doc/tutorial/index.rst b/doc/doc/tutorial/index.rst index 14ada7db..70a81e44 100644 --- a/doc/doc/tutorial/index.rst +++ b/doc/doc/tutorial/index.rst @@ -96,7 +96,7 @@ Raphael Voges (co-organizer) provides an overview of the tutorial in the followi We will be happy to discuss with you about it, and we propose three ways of communication: * A forum available on the `MOOC platform `_. You may find answers to your questions in previous topics - * A `Slack workspace `_ for fast interactive exchanges, do not hesitate to use it! + * A `Slack workspace `_ for fast interactive exchanges, do not hesitate to use it! * Eventually, individual conversations with the organizers are possible. In this case, you can contact us by private message and we will schedule a slot for some Skype conversation We do hope that this tutorial brings you a motivating introduction to intervals coupled with CP for robotics! @@ -113,7 +113,7 @@ There are several ways to deal with **state estimation** in mobile robotics. The Efforts have been done to propose operators and **solvers** to apply these constraints. The goal of this tutorial is to learn how to use them and understand the efficiency of the approach on realistic robotic applications. We will see that some problems that are difficult to solve with conventional methods (Kalman filters, particle approaches) can be easily dealt with by constraint programming. This is for instance the case of poor observation measurements, time uncertainties, delays, or when the initial conditions of the system are not known. -The tutorial will stand on :ref:`the Tubex library `, that provides tools for computations over sets of reals and trajectories. It has been designed to deal with dynamical systems defined by non-linear differential equations and involving constraints such as trajectory evaluations, time uncertainties or delays. These computations stand on **interval analysis**, a well suited tool that reliably **propagates uncertainties**. +The tutorial will stand on :ref:`the Codac library `, that provides tools for computations over sets of reals and trajectories. It has been designed to deal with dynamical systems defined by non-linear differential equations and involving constraints such as trajectory evaluations, time uncertainties or delays. These computations stand on **interval analysis**, a well suited tool that reliably **propagates uncertainties**. Requirements @@ -124,8 +124,8 @@ Prerequisite for attending the tutorial are: * basic knowledge of **Python or C++** (the exercises are available in both languages); * although the tutorial is about state estimation, you do not need skills in Kalman or particle filters. -| Tubex is fully supported on Linux systems (C++ and Python3) and Windows (Python3). -| We are currently working on making Tubex available for macOS (any help is welcome!). Meanwhile, we propose :ref:`a Tubex-online solution `: this will allow you to use Tubex in Python without having to install the library on your machine. +| Codac is fully supported on Linux systems (C++ and Python3) and Windows (Python3). +| We are currently working on making Codac available for macOS (any help is welcome!). Meanwhile, we propose :ref:`a Codac-online solution `: this will allow you to use Codac in Python without having to install the library on your machine. Contact and registration @@ -134,15 +134,15 @@ Contact and registration | **For registration, please fill in this questionnaire:** | https://docs.google.com/forms/d/1nuZ6lxMJ8SmoUeDJzVIjiMUdD5PmX7h72v_N9NtvGq4 -Once you are registered, the organizers will be able to send you a link to the `Slack workspace of the tutorial `_ (please note that this is not automatic, we will do our best to send you the link as soon as possible). +Once you are registered, the organizers will be able to send you a link to the `Slack workspace of the tutorial `_ (please note that this is not automatic, we will do our best to send you the link as soon as possible). The tutorial involves three platforms: -* the `Tubex website `_ (here you are!) +* the `Codac website `_ (here you are!) * the `MOOC platform `_ where you can send your work and get the tutorial diploma -* the `Slack communication workspace (tubex-tutorial.slack.com) `_ for fast interactive meetings +* the `Slack communication workspace (codac-tutorial.slack.com) `_ for fast interactive meetings -This tutorial is proposed to the participants of `the IROS conference `_. All the exercises are available on this Tubex website. The registration to `the MOOC platform `_ is not mandatory, except if you want to share with the organizers your progression and difficulties, and to obtain the diploma. +This tutorial is proposed to the participants of `the IROS conference `_. All the exercises are available on this Codac website. The registration to `the MOOC platform `_ is not mandatory, except if you want to share with the organizers your progression and difficulties, and to obtain the diploma. |logo_youtube| See `the video for registration on the MOOC platform `_. @@ -151,7 +151,7 @@ Diploma ------- | To get the diploma, you need to send valid exercises to the organizers. A participant who gets a minimum total of 12 points will receive a diploma corresponding to this tutorial. This diploma can be used by students to obtain the corresponding credits for their PhD courses (equivalent to 40 hours of lessons), or to comply with any other requests from their home university. -| `Here is an example of the diploma you can obtain `_. +| `Here is an example of the diploma you can obtain `_. Duration and meeting sessions @@ -159,7 +159,7 @@ Duration and meeting sessions The tutorial will be held **from 26th of October**. More information about dates and interactive sessions are coming soon. -Interactive sessions are possible (each Tuesday afternoon, preferably). Just let us know by private message (via `Slack `_ or the `MOOC platform `_) if you need to communicate directly with us (discussions can be made via Slack or Skype, let us know your choice). +Interactive sessions are possible (each Tuesday afternoon, preferably). Just let us know by private message (via `Slack `_ or the `MOOC platform `_) if you need to communicate directly with us (discussions can be made via Slack or Skype, let us know your choice). .. .. hlist:: .. :columns: 4 @@ -188,14 +188,14 @@ Before starting the tutorial, you can read some words about the concepts of Cons /tutorial/00-getting-started/index -To get ready, you need to install the Tubex library on your computer. +To get ready, you need to install the Codac library on your computer. Please follow the related page of the manual to see how to do it: .. toctree:: :maxdepth: 1 /install/01-installation - [video] For C++, we advice to use the Qt Creator IDE, see how to use it for Tubex + [video] For C++, we advice to use the Qt Creator IDE, see how to use it for Codac Then, depending on your preference between C++ or Python, you can run some *Hello World!* program to be sure everything is working well so far: @@ -210,10 +210,10 @@ Then, depending on your preference between C++ or Python, you can run some *Hell .. Figure:: img/logos/logo_replit.png :align: right - In case you encounter difficulties to install Tubex on your computer, an alternative solution is to **try Tubex online** with Repl.it. You will find more information on the following page: + In case you encounter difficulties to install Codac on your computer, an alternative solution is to **try Codac online** with Repl.it. You will find more information on the following page: * :ref:`sec-py-project-online` - * |logo_youtube| See `the video for using Tubex online `_. + * |logo_youtube| See `the video for using Codac online `_. ------------------------------------------------------ @@ -288,7 +288,7 @@ Now, we will make the robot move and see how we can handle **uncertainties on tr * :ref:`sec-tuto-08` | We will use the tubes to solve the problem `Set-membership state estimation by solving data association `_, that has been presented during the ICRA 2020 conference (see |logo_youtube_small| `the video presenting the paper `_. -| We will end this tutorial with a **range-only SLAM** problem and see how Tubex can be used for **online missions**. +| We will end this tutorial with a **range-only SLAM** problem and see how Codac can be used for **online missions**. | **Exercise to finish:** | -- the data association and the range-only SLAM, to post on `the MOOC platform `_. diff --git a/doc/doc/tutorial/nonpublic.rst b/doc/doc/tutorial/nonpublic.rst index b80cf524..b1d630c8 100644 --- a/doc/doc/tutorial/nonpublic.rst +++ b/doc/doc/tutorial/nonpublic.rst @@ -17,7 +17,7 @@ Exercises in progress... Corrections: -* `tubex-lib/examples/tuto/02_static_rangeonly/ `_ +* `codac/examples/tuto/02_static_rangeonly/ `_ ------------------------------------------------------ @@ -29,7 +29,7 @@ Corrections: Corrections: * for Lesson C, solutions are provided at the end of the lesson -* `tubex-lib/blob/tuto/doc/doc/tutorial/04-own-contractor/solution.py `_ +* `codac/blob/tuto/doc/doc/tutorial/04-own-contractor/solution.py `_ ------------------------------------------------------ @@ -40,8 +40,8 @@ Corrections: Corrections: -* `tubex-lib/doc/doc/tutorial/05-tubes/solution.py `_ -* `tubex-lib/doc/doc/tutorial/06-dyn-rangeonly/solution.py `_ +* `codac/doc/doc/tutorial/05-tubes/solution.py `_ +* `codac/doc/doc/tutorial/06-dyn-rangeonly/solution.py `_ ------------------------------------------------------ @@ -52,5 +52,5 @@ Corrections: Corrections: -* `tubex-lib/doc/doc/tutorial/07-data-association/solution.py `_ -* `tubex-lib/doc/doc/tutorial/08-rangeonly-slam/solution.py `_ \ No newline at end of file +* `codac/doc/doc/tutorial/07-data-association/solution.py `_ +* `codac/doc/doc/tutorial/08-rangeonly-slam/solution.py `_ \ No newline at end of file diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index c68602be..f9f54a6f 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - cmake configuration file +# Codac - cmake configuration file # ================================================================== # Testing examples: @@ -10,23 +10,23 @@ if(BUILD_TESTS AND TEST_EXAMPLES) # include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) # -# list(APPEND CMAKE_ARGS "-DTUBEX_DIR=${CMAKE_CURRENT_SOURCE_DIR}/../src/") -# list(APPEND CMAKE_ARGS "-DTUBEX_LIBRARY=${CMAKE_CURRENT_SOURCE_DIR}/../src/core/libtubex.a") -# list(APPEND CMAKE_ARGS "-DTUBEX_ROB_LIBRARY=${CMAKE_CURRENT_SOURCE_DIR}/../src/robotics/libtubex-rob.a") -# list(APPEND CMAKE_ARGS "-DTUBEX_ODE_LIBRARY=${CMAKE_CURRENT_SOURCE_DIR}/../src/3rd/ode/libtubex-ode.a") -# list(APPEND CMAKE_ARGS "-DTUBEX_PYIBEX_LIBRARY=${CMAKE_CURRENT_SOURCE_DIR}/../src/3rd/pyibex/libtubex-pyibex.a") -# list(APPEND CMAKE_ARGS "-DTUBEX_INCLUDE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/../include/") -# list(APPEND CMAKE_ARGS "-DTUBEX_ROB_INCLUDE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/../include/") -# list(APPEND CMAKE_ARGS "-DTUBEX_ODE_INCLUDE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/../include/") -# list(APPEND CMAKE_ARGS "-DTUBEX_PYIBEX_INCLUDE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/../include/") +# list(APPEND CMAKE_ARGS "-DCODAC_DIR=${CMAKE_CURRENT_SOURCE_DIR}/../src/") +# list(APPEND CMAKE_ARGS "-DCODAC_LIBRARY=${CMAKE_CURRENT_SOURCE_DIR}/../src/core/libcodac.a") +# list(APPEND CMAKE_ARGS "-DCODAC_ROB_LIBRARY=${CMAKE_CURRENT_SOURCE_DIR}/../src/robotics/libcodac-rob.a") +# list(APPEND CMAKE_ARGS "-DCODAC_ODE_LIBRARY=${CMAKE_CURRENT_SOURCE_DIR}/../src/3rd/ode/libcodac-ode.a") +# list(APPEND CMAKE_ARGS "-DCODAC_PYIBEX_LIBRARY=${CMAKE_CURRENT_SOURCE_DIR}/../src/3rd/pyibex/libcodac-pyibex.a") +# list(APPEND CMAKE_ARGS "-DCODAC_INCLUDE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/../include/") +# list(APPEND CMAKE_ARGS "-DCODAC_ROB_INCLUDE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/../include/") +# list(APPEND CMAKE_ARGS "-DCODAC_ODE_INCLUDE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/../include/") +# list(APPEND CMAKE_ARGS "-DCODAC_PYIBEX_INCLUDE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/../include/") # -# list(APPEND TUBEX_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/../src/core/libtubex.a") -# list(APPEND TUBEX_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/../src/robotics/libtubex-rob.a") -# list(APPEND TUBEX_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/../src/3rd/ode/libtubex-ode.a") -# list(APPEND TUBEX_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/../src/3rd/pyibex/libtubex-pyibex.a") +# list(APPEND CODAC_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/../src/core/libcodac.a") +# list(APPEND CODAC_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/../src/robotics/libcodac-rob.a") +# list(APPEND CODAC_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/../src/3rd/ode/libcodac-ode.a") +# list(APPEND CODAC_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/../src/3rd/pyibex/libcodac-pyibex.a") # -# list(APPEND CMAKE_ARGS "-DTUBEX_INCLUDE_DIRS=${CMAKE_CURRENT_SOURCE_DIR}/../include") -# list(APPEND CMAKE_ARGS "-DTUBEX_LIBRARIES=${TUBEX_LIBRARIES}") +# list(APPEND CMAKE_ARGS "-DCODAC_INCLUDE_DIRS=${CMAKE_CURRENT_SOURCE_DIR}/../include") +# list(APPEND CMAKE_ARGS "-DCODAC_LIBRARIES=${CODAC_LIBRARIES}") # # ExternalProject_Add(basics_01 # SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/basics/01_arithmetic @@ -72,17 +72,17 @@ if(BUILD_TESTS AND TEST_EXAMPLES) # Basics #add_test(NAME basics_01 - # COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/basics/01_arithmetic/build/tubex_basics_01 0) + # COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/basics/01_arithmetic/build/codac_basics_01 0) add_test(NAME basics_02 - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/basics/02_simple_ctc/build/tubex_basics_02 0) + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/basics/02_simple_ctc/build/codac_basics_02 0) add_test(NAME basics_03 - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/basics/03_ivp_msinx/build/tubex_basics_03 0) + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/basics/03_ivp_msinx/build/codac_basics_03 0) add_test(NAME basics_04 - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/basics/04_simple_eval/build/tubex_basics_04 0) + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/basics/04_simple_eval/build/codac_basics_04 0) add_test(NAME basics_05 - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/basics/05_graphics/build/tubex_basics_05 0) + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/basics/05_graphics/build/codac_basics_05 0) add_test(NAME basics_07 - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/basics/07_temporal_ctc/build/tubex_basics_07 0) + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/basics/07_temporal_ctc/build/codac_basics_07 0) if(WITH_PYTHON) add_test(NAME basics_07_py COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/basics/07_temporal_ctc/07_temporal_ctc.py 0) @@ -90,39 +90,39 @@ if(BUILD_TESTS AND TEST_EXAMPLES) # Robotics add_test(NAME rob_01 - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/01_causal_chain/build/tubex_rob_01 0) + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/01_causal_chain/build/codac_rob_01 0) #add_test(NAME rob_02 - # COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/02_lowcost_beacons/build/tubex_rob_02 0) + # COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/02_lowcost_beacons/build/codac_rob_02 0) add_test(NAME rob_03 - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/03_drifting_clock/build/tubex_rob_03 0) + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/03_drifting_clock/build/codac_rob_03 0) add_test(NAME rob_04 - COMMAND sh -c "rm -f ${CMAKE_CURRENT_SOURCE_DIR}/../data/redermor/gesmi.txt.tubex ; - ${CMAKE_CURRENT_SOURCE_DIR}/robotics/04_redermor_traj/build/tubex_rob_04 ${CMAKE_CURRENT_SOURCE_DIR}/../data/redermor/gesmi.txt 0") + COMMAND sh -c "rm -f ${CMAKE_CURRENT_SOURCE_DIR}/../data/redermor/gesmi.txt.codac ; + ${CMAKE_CURRENT_SOURCE_DIR}/robotics/04_redermor_traj/build/codac_rob_04 ${CMAKE_CURRENT_SOURCE_DIR}/../data/redermor/gesmi.txt 0") add_test(NAME rob_04_with_serialize - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/04_redermor_traj/build/tubex_rob_04 ${CMAKE_CURRENT_SOURCE_DIR}/../data/redermor/gesmi.txt 0) + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/04_redermor_traj/build/codac_rob_04 ${CMAKE_CURRENT_SOURCE_DIR}/../data/redermor/gesmi.txt 0) add_test(NAME rob_05 - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/05_loops_detec/build/tubex_rob_05 ${CMAKE_CURRENT_SOURCE_DIR}/../data/redermor/gesmi.txt 0) + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/05_loops_detec/build/codac_rob_05 ${CMAKE_CURRENT_SOURCE_DIR}/../data/redermor/gesmi.txt 0) add_test(NAME rob_06 - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/06_loops_proofs/build/tubex_rob_06 0) + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/06_loops_proofs/build/codac_rob_06 0) add_test(NAME rob_07 - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/07_dynloc/build/tubex_rob_07 0) + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/07_dynloc/build/codac_rob_07 0) add_test(NAME rob_08 - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/08_tubepaving/build/tubex_rob_08 0) + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/08_tubepaving/build/codac_rob_08 0) add_test(NAME rob_09 - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/09_lissajous/build/tubex_rob_09 0) + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/09_lissajous/build/codac_rob_09 0) add_test(NAME rob_10 - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/10_datasso/build/tubex_rob_10 0) + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/robotics/10_datasso/build/codac_rob_10 0) # Linobs add_test(NAME linobs - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/linobs/01_paper/build/tubex_linobs 0) + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/linobs/01_paper/build/codac_linobs 0) add_test(NAME linobs_foreach_dt - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/linobs/01_paper/build/tubex_linobs_foreach_dt 0) + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/linobs/01_paper/build/codac_linobs_foreach_dt 0) if(WITH_CAPD) # Lie group add_test(NAME lie_05 - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lie_group/05_loc/build/tubex_lie_05 0) + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lie_group/05_loc/build/codac_lie_05 0) endif() endif() \ No newline at end of file diff --git a/examples/basics/01_arithmetic/CMakeLists.txt b/examples/basics/01_arithmetic/CMakeLists.txt index 5de127a1..1891afbb 100644 --- a/examples/basics/01_arithmetic/CMakeLists.txt +++ b/examples/basics/01_arithmetic/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / basics example - cmake configuration file +# codac / basics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_basics_01 LANGUAGES CXX) + project(codac_basics_01 LANGUAGES CXX) # Adding IBEX @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/basics/01_arithmetic/build.sh b/examples/basics/01_arithmetic/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/basics/01_arithmetic/build.sh +++ b/examples/basics/01_arithmetic/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/basics/01_arithmetic/main.cpp b/examples/basics/01_arithmetic/main.cpp index 6166e59a..3e5afb44 100644 --- a/examples/basics/01_arithmetic/main.cpp +++ b/examples/basics/01_arithmetic/main.cpp @@ -1,5 +1,5 @@ /** - * tubex-lib - Examples + * Codac - Examples * Arithmetic on tubes: simple example * ---------------------------------------------------------------------------- * @@ -8,15 +8,15 @@ * * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include +#include using namespace std; -using namespace tubex; +using namespace codac; int main() { diff --git a/examples/basics/02_simple_ctc/CMakeLists.txt b/examples/basics/02_simple_ctc/CMakeLists.txt index dde27405..6c9f32d3 100644 --- a/examples/basics/02_simple_ctc/CMakeLists.txt +++ b/examples/basics/02_simple_ctc/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / basics example - cmake configuration file +# codac / basics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_basics_02 LANGUAGES CXX) + project(codac_basics_02 LANGUAGES CXX) # Adding IBEX @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/basics/02_simple_ctc/build.sh b/examples/basics/02_simple_ctc/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/basics/02_simple_ctc/build.sh +++ b/examples/basics/02_simple_ctc/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/basics/02_simple_ctc/main.cpp b/examples/basics/02_simple_ctc/main.cpp index 18e0d55c..8538d761 100644 --- a/examples/basics/02_simple_ctc/main.cpp +++ b/examples/basics/02_simple_ctc/main.cpp @@ -1,5 +1,5 @@ /** - * tubex-lib - Examples + * Codac - Examples * Contractors on tubes: simple example * ---------------------------------------------------------------------------- * @@ -8,15 +8,15 @@ * * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include +#include using namespace std; -using namespace tubex; +using namespace codac; void contract(TubeVector& x) { diff --git a/examples/basics/03_ivp_msinx/CMakeLists.txt b/examples/basics/03_ivp_msinx/CMakeLists.txt index 5801943c..f4d63550 100644 --- a/examples/basics/03_ivp_msinx/CMakeLists.txt +++ b/examples/basics/03_ivp_msinx/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / basics example - cmake configuration file +# codac / basics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_basics_03 LANGUAGES CXX) + project(codac_basics_03 LANGUAGES CXX) # Adding IBEX @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/basics/03_ivp_msinx/build.sh b/examples/basics/03_ivp_msinx/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/basics/03_ivp_msinx/build.sh +++ b/examples/basics/03_ivp_msinx/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/basics/03_ivp_msinx/main.cpp b/examples/basics/03_ivp_msinx/main.cpp index 17e7ea77..612196c1 100644 --- a/examples/basics/03_ivp_msinx/main.cpp +++ b/examples/basics/03_ivp_msinx/main.cpp @@ -1,5 +1,5 @@ /** - * tubex-lib - Examples + * Codac - Examples * Guaranteed integration: xdot = -sin(x), x(0)=1 * ---------------------------------------------------------------------------- * @@ -12,15 +12,15 @@ * * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include +#include using namespace std; -using namespace tubex; +using namespace codac; int main(int argc, char *argv[]) { diff --git a/examples/basics/04_simple_eval/CMakeLists.txt b/examples/basics/04_simple_eval/CMakeLists.txt index 7cf7838a..189540e7 100644 --- a/examples/basics/04_simple_eval/CMakeLists.txt +++ b/examples/basics/04_simple_eval/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / basics example - cmake configuration file +# codac / basics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_basics_04 LANGUAGES CXX) + project(codac_basics_04 LANGUAGES CXX) # Adding IBEX @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/basics/04_simple_eval/build.sh b/examples/basics/04_simple_eval/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/basics/04_simple_eval/build.sh +++ b/examples/basics/04_simple_eval/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/basics/04_simple_eval/main.cpp b/examples/basics/04_simple_eval/main.cpp index 73fcc0f3..cd496cf7 100644 --- a/examples/basics/04_simple_eval/main.cpp +++ b/examples/basics/04_simple_eval/main.cpp @@ -1,19 +1,19 @@ /** - * tubex-lib - Examples + * Codac - Examples * A simple tube evaluation * ---------------------------------------------------------------------------- * * \date 2019 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include +#include using namespace std; -using namespace tubex; +using namespace codac; int main() { diff --git a/examples/basics/05_graphics/CMakeLists.txt b/examples/basics/05_graphics/CMakeLists.txt index ebe4a7c2..b03a3066 100644 --- a/examples/basics/05_graphics/CMakeLists.txt +++ b/examples/basics/05_graphics/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / basics example - cmake configuration file +# codac / basics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_basics_05 LANGUAGES CXX) + project(codac_basics_05 LANGUAGES CXX) # Adding IBEX @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/basics/05_graphics/build.sh b/examples/basics/05_graphics/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/basics/05_graphics/build.sh +++ b/examples/basics/05_graphics/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/basics/05_graphics/main.cpp b/examples/basics/05_graphics/main.cpp index 3bb71c66..04ad60f7 100644 --- a/examples/basics/05_graphics/main.cpp +++ b/examples/basics/05_graphics/main.cpp @@ -1,19 +1,19 @@ /** - * tubex-lib - Examples + * Codac - Examples * Graphics features * ---------------------------------------------------------------------------- * * \date 2019 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include +#include using namespace std; -using namespace tubex; +using namespace codac; int main() { diff --git a/examples/basics/06_ctc_comparisons/CMakeLists.txt b/examples/basics/06_ctc_comparisons/CMakeLists.txt index 73c0a3b3..885a8e84 100644 --- a/examples/basics/06_ctc_comparisons/CMakeLists.txt +++ b/examples/basics/06_ctc_comparisons/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / basics example - cmake configuration file +# codac / basics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_basics_06 LANGUAGES CXX) + project(codac_basics_06 LANGUAGES CXX) # Adding IBEX @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/basics/06_ctc_comparisons/build.sh b/examples/basics/06_ctc_comparisons/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/basics/06_ctc_comparisons/build.sh +++ b/examples/basics/06_ctc_comparisons/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/basics/06_ctc_comparisons/main.cpp b/examples/basics/06_ctc_comparisons/main.cpp index c9c1a2d7..6c95ec10 100644 --- a/examples/basics/06_ctc_comparisons/main.cpp +++ b/examples/basics/06_ctc_comparisons/main.cpp @@ -1,19 +1,19 @@ /** - * tubex-lib - Examples + * Codac - Examples * Comparisons of two distance contractors * ---------------------------------------------------------------------------- * * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include +#include using namespace std; -using namespace tubex; +using namespace codac; int main() { @@ -27,7 +27,7 @@ int main() for(int i = 0 ; i < 100000 ; i++) { IntervalVector x({{2,2.5},{0,0.5},{1.5,2.5},{4,11},{7,8}}); - ctc::dist.contract(x); // contractor from Tubex + ctc::dist.contract(x); // contractor from Codac } printf("[ Manual ctc ] Time: %.3f\n", (double)(clock() - t_start)/CLOCKS_PER_SEC); diff --git a/examples/basics/06_ctc_comparisons/main.py b/examples/basics/06_ctc_comparisons/main.py index 24c80cbd..c95dc8ca 100644 --- a/examples/basics/06_ctc_comparisons/main.py +++ b/examples/basics/06_ctc_comparisons/main.py @@ -1,6 +1,6 @@ -import tubex_lib -print('Tubex version: ', tubex_lib.__version__) -from tubex_lib import * +import codac +print('Codac version: ', codac.__version__) +from codac import * import timeit # Comparisons of two distance contractors @@ -12,7 +12,7 @@ for i in range(0, 100000): x = IntervalVector([[2,2.5],[0,0.5],[1.5,2.5],[4,11],[7,8]]) start = timeit.default_timer() - ctc.dist.contract(x) # contractor from Tubex + ctc.dist.contract(x) # contractor from Codac time_sum += timeit.default_timer() - start #if i == 0: print(x) diff --git a/examples/basics/07_temporal_ctc/07_temporal_ctc.py b/examples/basics/07_temporal_ctc/07_temporal_ctc.py index e994dd7e..52f167f8 100644 --- a/examples/basics/07_temporal_ctc/07_temporal_ctc.py +++ b/examples/basics/07_temporal_ctc/07_temporal_ctc.py @@ -1,4 +1,4 @@ -# tubex-lib - Examples +# Codac - Examples # Contractors on tubes: temporal contractors # Comparison between the Lohner & Picard temporal contractors # ---------------------------------------------------------------------------- @@ -6,7 +6,7 @@ from pyibex import * -from tubex_lib import * +from codac import * import sys # only for checking if this example still works diff --git a/examples/basics/07_temporal_ctc/CMakeLists.txt b/examples/basics/07_temporal_ctc/CMakeLists.txt index bbb3e2bd..acfb11f3 100644 --- a/examples/basics/07_temporal_ctc/CMakeLists.txt +++ b/examples/basics/07_temporal_ctc/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / basics example - cmake configuration file +# codac / basics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_basics_07 LANGUAGES CXX) + project(codac_basics_07 LANGUAGES CXX) # Adding IBEX @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/basics/07_temporal_ctc/build.sh b/examples/basics/07_temporal_ctc/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/basics/07_temporal_ctc/build.sh +++ b/examples/basics/07_temporal_ctc/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/basics/07_temporal_ctc/main.cpp b/examples/basics/07_temporal_ctc/main.cpp index d346feb0..db120e43 100644 --- a/examples/basics/07_temporal_ctc/main.cpp +++ b/examples/basics/07_temporal_ctc/main.cpp @@ -1,5 +1,5 @@ /** - * tubex-lib - Examples + * Codac - Examples * Contractors on tubes: temporal contractors * ---------------------------------------------------------------------------- * @@ -7,15 +7,15 @@ * * \date 2020 * \author Auguste Bourgois - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include +#include using namespace std; -using namespace tubex; +using namespace codac; int main() // testcase { diff --git a/examples/brunovsky/CMakeLists.txt b/examples/brunovsky/CMakeLists.txt index 4c6ffc7b..e1508272 100755 --- a/examples/brunovsky/CMakeLists.txt +++ b/examples/brunovsky/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / basics example - cmake configuration file +# codac / basics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_brunov LANGUAGES CXX) + project(codac_brunov LANGUAGES CXX) # Compilation options @@ -30,17 +30,17 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/brunovsky/build.sh b/examples/brunovsky/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/brunovsky/build.sh +++ b/examples/brunovsky/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/brunovsky/main.cpp b/examples/brunovsky/main.cpp index f1205d96..8d3c1d92 100755 --- a/examples/brunovsky/main.cpp +++ b/examples/brunovsky/main.cpp @@ -1,5 +1,5 @@ /** - * tubex-lib - Examples + * Codac - Examples * Bounded-error continuous time linear observer * ---------------------------------------------------------------------------- * @@ -8,19 +8,19 @@ * * \date 2020 * \author Simon Rohou, Luc Jaulin - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ // sudo apt install libeigen3-dev -#include -#include +#include +#include #include // for computing e^At using namespace std; -using namespace tubex; +using namespace codac; IntervalMatrix exp(const Matrix& A, const Interval& intv_t) // computes e^At { diff --git a/examples/lie_group/05_loc/CMakeLists.txt b/examples/lie_group/05_loc/CMakeLists.txt index 0cbf56fe..2be59bfb 100644 --- a/examples/lie_group/05_loc/CMakeLists.txt +++ b/examples/lie_group/05_loc/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / robotics example - cmake configuration file +# codac / robotics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_lie_05 LANGUAGES CXX) + project(codac_lie_05 LANGUAGES CXX) # Adding IBEX @@ -24,14 +24,14 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Adding CAPD @@ -41,6 +41,6 @@ # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS} ${PKG_CAPD_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES} ${PKG_CAPD_LDFLAGS}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS} ${PKG_CAPD_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES} ${PKG_CAPD_LDFLAGS}) \ No newline at end of file diff --git a/examples/lie_group/05_loc/build.sh b/examples/lie_group/05_loc/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/lie_group/05_loc/build.sh +++ b/examples/lie_group/05_loc/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/lie_group/05_loc/main.cpp b/examples/lie_group/05_loc/main.cpp index c45ba8b8..84ef6508 100644 --- a/examples/lie_group/05_loc/main.cpp +++ b/examples/lie_group/05_loc/main.cpp @@ -1,5 +1,5 @@ /** - * tubex-lib - Examples + * Codac - Examples * Lie symmetries examples * ---------------------------------------------------------------------------- * @@ -11,12 +11,12 @@ * the GNU Lesser General Public License (LGPL). */ -#include -#include -#include +#include +#include +#include using namespace std; -using namespace tubex; +using namespace codac; using namespace vibes; int main() diff --git a/examples/linobs/01_paper/CMakeLists.txt b/examples/linobs/01_paper/CMakeLists.txt index d1f1add9..93eb5daa 100644 --- a/examples/linobs/01_paper/CMakeLists.txt +++ b/examples/linobs/01_paper/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / basics example - cmake configuration file +# codac / basics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_linobs LANGUAGES CXX) + project(codac_linobs LANGUAGES CXX) # Compilation options @@ -30,14 +30,14 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Adding Eigen @@ -48,10 +48,10 @@ # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) set(PROJECT_NAME ${PROJECT_NAME}_foreach_dt) add_executable(${PROJECT_NAME} main_foreach_dt.cpp) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/linobs/01_paper/build.sh b/examples/linobs/01_paper/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/linobs/01_paper/build.sh +++ b/examples/linobs/01_paper/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/linobs/01_paper/main.cpp b/examples/linobs/01_paper/main.cpp index 48bdaf31..b018593f 100644 --- a/examples/linobs/01_paper/main.cpp +++ b/examples/linobs/01_paper/main.cpp @@ -1,5 +1,5 @@ /** - * tubex-lib - Examples + * Codac - Examples * Bounded-error continuous time linear observer * ---------------------------------------------------------------------------- * @@ -8,17 +8,17 @@ * * \date 2020 * \author Simon Rohou, Luc Jaulin - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include -#include +#include +#include #include // for computing e^At using namespace std; -using namespace tubex; +using namespace codac; IntervalMatrix exp(const Matrix& A, const Interval& intv_t) // computes e^At { diff --git a/examples/linobs/01_paper/main_foreach_dt.cpp b/examples/linobs/01_paper/main_foreach_dt.cpp index 5222b589..6a7db835 100644 --- a/examples/linobs/01_paper/main_foreach_dt.cpp +++ b/examples/linobs/01_paper/main_foreach_dt.cpp @@ -1,5 +1,5 @@ /** - * tubex-lib - Examples + * Codac - Examples * Bounded-error continuous time linear observer * ---------------------------------------------------------------------------- * @@ -8,17 +8,17 @@ * * \date 2020 * \author Simon Rohou, Luc Jaulin - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include -#include +#include +#include #include // for computing e^At using namespace std; -using namespace tubex; +using namespace codac; IntervalMatrix exp(const Matrix& A, const Interval& intv_t) // computes e^At { diff --git a/examples/robotics/01_causal_chain/CMakeLists.txt b/examples/robotics/01_causal_chain/CMakeLists.txt index 416dc3dd..5bc663c2 100644 --- a/examples/robotics/01_causal_chain/CMakeLists.txt +++ b/examples/robotics/01_causal_chain/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / robotics example - cmake configuration file +# codac / robotics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_rob_01 LANGUAGES CXX) + project(codac_rob_01 LANGUAGES CXX) # Adding IBEX @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/robotics/01_causal_chain/build.sh b/examples/robotics/01_causal_chain/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/robotics/01_causal_chain/build.sh +++ b/examples/robotics/01_causal_chain/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/robotics/01_causal_chain/main.cpp b/examples/robotics/01_causal_chain/main.cpp index b40ebec2..48c8beb2 100644 --- a/examples/robotics/01_causal_chain/main.cpp +++ b/examples/robotics/01_causal_chain/main.cpp @@ -1,5 +1,5 @@ /** - * tubex-lib - Examples + * Codac - Examples * Robot evolution equations: causal chain * ---------------------------------------------------------------------------- * @@ -8,16 +8,16 @@ * * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include -#include +#include +#include using namespace std; -using namespace tubex; +using namespace codac; #define FINAL_CONDITION 0 @@ -86,7 +86,7 @@ int main() if(!FINAL_CONDITION) { - // Tubex result + // Codac result fig_map.draw_box(x(x.tdomain().ub()).subvector(0,1), "#008000"); // CAPD result diff --git a/examples/robotics/03_drifting_clock/CMakeLists.txt b/examples/robotics/03_drifting_clock/CMakeLists.txt index 8c416687..547b492f 100644 --- a/examples/robotics/03_drifting_clock/CMakeLists.txt +++ b/examples/robotics/03_drifting_clock/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / robotics example - cmake configuration file +# codac / robotics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_rob_03 LANGUAGES CXX) + project(codac_rob_03 LANGUAGES CXX) # Adding IBEX @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/robotics/03_drifting_clock/build.sh b/examples/robotics/03_drifting_clock/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/robotics/03_drifting_clock/build.sh +++ b/examples/robotics/03_drifting_clock/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/robotics/03_drifting_clock/main.cpp b/examples/robotics/03_drifting_clock/main.cpp index f1b7a68c..eb3b489d 100644 --- a/examples/robotics/03_drifting_clock/main.cpp +++ b/examples/robotics/03_drifting_clock/main.cpp @@ -1,5 +1,5 @@ /** - * tubex-lib - Examples + * Codac - Examples * Driftint clock * ---------------------------------------------------------------------------- * @@ -8,16 +8,16 @@ * * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include -#include +#include +#include using namespace std; -using namespace tubex; +using namespace codac; int main() { diff --git a/examples/robotics/04_redermor_traj/CMakeLists.txt b/examples/robotics/04_redermor_traj/CMakeLists.txt index 52993f96..48564d05 100644 --- a/examples/robotics/04_redermor_traj/CMakeLists.txt +++ b/examples/robotics/04_redermor_traj/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / robotics example - cmake configuration file +# codac / robotics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_rob_04 LANGUAGES CXX) + project(codac_rob_04 LANGUAGES CXX) # Adding IBEX @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/robotics/04_redermor_traj/build.sh b/examples/robotics/04_redermor_traj/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/robotics/04_redermor_traj/build.sh +++ b/examples/robotics/04_redermor_traj/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/robotics/04_redermor_traj/main.cpp b/examples/robotics/04_redermor_traj/main.cpp index 81523fe7..d50b0aca 100644 --- a/examples/robotics/04_redermor_traj/main.cpp +++ b/examples/robotics/04_redermor_traj/main.cpp @@ -1,20 +1,20 @@ /** - * tubex-lib - Examples + * Codac - Examples * Localization of the Autonomous Underwater Vehicle (AUV) Redermor * ---------------------------------------------------------------------------- * * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include -#include +#include +#include using namespace std; -using namespace tubex; +using namespace codac; int main(int argc, char** argv) { diff --git a/examples/robotics/05_loops_detec/CMakeLists.txt b/examples/robotics/05_loops_detec/CMakeLists.txt index 6fdf45c6..e87c167a 100644 --- a/examples/robotics/05_loops_detec/CMakeLists.txt +++ b/examples/robotics/05_loops_detec/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / robotics example - cmake configuration file +# codac / robotics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_rob_05 LANGUAGES CXX) + project(codac_rob_05 LANGUAGES CXX) # Adding IBEX @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/robotics/05_loops_detec/build.sh b/examples/robotics/05_loops_detec/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/robotics/05_loops_detec/build.sh +++ b/examples/robotics/05_loops_detec/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/robotics/05_loops_detec/main.cpp b/examples/robotics/05_loops_detec/main.cpp index 070e14cc..a4cf35e4 100644 --- a/examples/robotics/05_loops_detec/main.cpp +++ b/examples/robotics/05_loops_detec/main.cpp @@ -1,5 +1,5 @@ /** - * tubex-lib - Examples + * Codac - Examples * Reliable loop detection of a mobile robot * ---------------------------------------------------------------------------- * @@ -12,16 +12,16 @@ * * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include -#include +#include +#include using namespace std; -using namespace tubex; +using namespace codac; int main(int argc, char** argv) { diff --git a/examples/robotics/06_loops_proofs/CMakeLists.txt b/examples/robotics/06_loops_proofs/CMakeLists.txt index 589920a6..a96881fb 100644 --- a/examples/robotics/06_loops_proofs/CMakeLists.txt +++ b/examples/robotics/06_loops_proofs/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / robotics example - cmake configuration file +# codac / robotics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_rob_06 LANGUAGES CXX) + project(codac_rob_06 LANGUAGES CXX) # Adding IBEX @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/robotics/06_loops_proofs/build.sh b/examples/robotics/06_loops_proofs/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/robotics/06_loops_proofs/build.sh +++ b/examples/robotics/06_loops_proofs/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/robotics/06_loops_proofs/main.cpp b/examples/robotics/06_loops_proofs/main.cpp index cb4ef615..eb3254d3 100644 --- a/examples/robotics/06_loops_proofs/main.cpp +++ b/examples/robotics/06_loops_proofs/main.cpp @@ -1,5 +1,5 @@ /** - * tubex-lib - Examples + * Codac - Examples * Proving the existence of loops in robot trajectories * ---------------------------------------------------------------------------- * @@ -9,16 +9,16 @@ * * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include -#include +#include +#include using namespace std; -using namespace tubex; +using namespace codac; TubeVector *x, *v; diff --git a/examples/robotics/07_dynloc/CMakeLists.txt b/examples/robotics/07_dynloc/CMakeLists.txt index e4855c13..93be85b8 100644 --- a/examples/robotics/07_dynloc/CMakeLists.txt +++ b/examples/robotics/07_dynloc/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / robotics example - cmake configuration file +# codac / robotics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_rob_07 LANGUAGES CXX) + project(codac_rob_07 LANGUAGES CXX) # Adding IBEX @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/robotics/07_dynloc/build.sh b/examples/robotics/07_dynloc/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/robotics/07_dynloc/build.sh +++ b/examples/robotics/07_dynloc/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/robotics/07_dynloc/main.cpp b/examples/robotics/07_dynloc/main.cpp index 09200ee8..73fe19e8 100644 --- a/examples/robotics/07_dynloc/main.cpp +++ b/examples/robotics/07_dynloc/main.cpp @@ -1,21 +1,21 @@ /** - * tubex-lib - Examples + * Codac - Examples * Simple asynchronous dynamic localization * ---------------------------------------------------------------------------- * * \brief Simple example * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include -#include +#include +#include using namespace std; -using namespace tubex; +using namespace codac; double dist(const TrajectoryVector& x, const Beacon& b, double t) { diff --git a/examples/robotics/08_tubepaving/CMakeLists.txt b/examples/robotics/08_tubepaving/CMakeLists.txt index 69d13edf..68bb93c1 100644 --- a/examples/robotics/08_tubepaving/CMakeLists.txt +++ b/examples/robotics/08_tubepaving/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / robotics example - cmake configuration file +# codac / robotics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_rob_08 LANGUAGES CXX) + project(codac_rob_08 LANGUAGES CXX) # Adding IBEX @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/robotics/08_tubepaving/build.sh b/examples/robotics/08_tubepaving/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/robotics/08_tubepaving/build.sh +++ b/examples/robotics/08_tubepaving/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/robotics/08_tubepaving/main.cpp b/examples/robotics/08_tubepaving/main.cpp index de30b033..d2cd7c3c 100644 --- a/examples/robotics/08_tubepaving/main.cpp +++ b/examples/robotics/08_tubepaving/main.cpp @@ -1,21 +1,21 @@ /** - * tubex-lib - Examples + * Codac - Examples * How to compute a paving from a tube * ---------------------------------------------------------------------------- * * \brief Simple example * \date 2019 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include -#include +#include +#include using namespace std; -using namespace tubex; +using namespace codac; int main() diff --git a/examples/robotics/09_lissajous/CMakeLists.txt b/examples/robotics/09_lissajous/CMakeLists.txt index 3f32e96c..58cee6e1 100644 --- a/examples/robotics/09_lissajous/CMakeLists.txt +++ b/examples/robotics/09_lissajous/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / robotics example - cmake configuration file +# codac / robotics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_rob_09 LANGUAGES CXX) + project(codac_rob_09 LANGUAGES CXX) # Adding IBEX @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/robotics/09_lissajous/build.sh b/examples/robotics/09_lissajous/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/robotics/09_lissajous/build.sh +++ b/examples/robotics/09_lissajous/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/robotics/09_lissajous/main.cpp b/examples/robotics/09_lissajous/main.cpp index 8a1a7211..cc480c92 100644 --- a/examples/robotics/09_lissajous/main.cpp +++ b/examples/robotics/09_lissajous/main.cpp @@ -1,5 +1,5 @@ /** - * tubex-lib - Examples + * Codac - Examples * A robot following a Lissajous trajectory * ---------------------------------------------------------------------------- * @@ -8,16 +8,16 @@ * * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include -#include +#include +#include using namespace std; -using namespace tubex; +using namespace codac; int main() { diff --git a/examples/robotics/10_datasso/CMakeLists.txt b/examples/robotics/10_datasso/CMakeLists.txt index 5de2c514..94196110 100644 --- a/examples/robotics/10_datasso/CMakeLists.txt +++ b/examples/robotics/10_datasso/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / robotics example - cmake configuration file +# codac / robotics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_rob_10 LANGUAGES CXX) + project(codac_rob_10 LANGUAGES CXX) # Adding IBEX @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/robotics/10_datasso/build.sh b/examples/robotics/10_datasso/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/robotics/10_datasso/build.sh +++ b/examples/robotics/10_datasso/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/robotics/10_datasso/datasso.py b/examples/robotics/10_datasso/datasso.py index 9c4d96d0..4b6dbac6 100644 --- a/examples/robotics/10_datasso/datasso.py +++ b/examples/robotics/10_datasso/datasso.py @@ -1,4 +1,4 @@ -# tubex-lib - Examples +# Codac - Examples # Set-membership state estimation by solving data association # ---------------------------------------------------------------------------- # Example from the paper "Set-membership state estimation by solving data association" @@ -6,7 +6,7 @@ # ICRA 2020, Paris from pyibex import * -from tubex_lib import * +from codac import * import math import sys # only for checking if this example still works diff --git a/examples/robotics/10_datasso/main.cpp b/examples/robotics/10_datasso/main.cpp index 3814b1c9..47f2edf7 100644 --- a/examples/robotics/10_datasso/main.cpp +++ b/examples/robotics/10_datasso/main.cpp @@ -1,5 +1,5 @@ /** - * tubex-lib - Examples + * Codac - Examples * Set-membership state estimation by solving data association * ---------------------------------------------------------------------------- * @@ -9,17 +9,17 @@ * * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include -#include -#include +#include +#include +#include using namespace std; -using namespace tubex; +using namespace codac; int main() diff --git a/examples/robotics/old_ex_02_lowcost_beacons/CMakeLists.txt b/examples/robotics/old_ex_02_lowcost_beacons/CMakeLists.txt index 09a2554f..15e033f3 100644 --- a/examples/robotics/old_ex_02_lowcost_beacons/CMakeLists.txt +++ b/examples/robotics/old_ex_02_lowcost_beacons/CMakeLists.txt @@ -1,9 +1,9 @@ # ================================================================== -# tubex-lib / robotics example - cmake configuration file +# codac / robotics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) - project(tubex_rob_02 LANGUAGES CXX) + project(codac_rob_02 LANGUAGES CXX) # Adding IBEX @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} main.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/robotics/old_ex_02_lowcost_beacons/build.sh b/examples/robotics/old_ex_02_lowcost_beacons/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/robotics/old_ex_02_lowcost_beacons/build.sh +++ b/examples/robotics/old_ex_02_lowcost_beacons/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/robotics/old_ex_02_lowcost_beacons/main.cpp b/examples/robotics/old_ex_02_lowcost_beacons/main.cpp index b3752742..7f5e5ebe 100644 --- a/examples/robotics/old_ex_02_lowcost_beacons/main.cpp +++ b/examples/robotics/old_ex_02_lowcost_beacons/main.cpp @@ -1,5 +1,5 @@ /** - * tubex-lib - Examples + * Codac - Examples * Mobile robot localization evolving among range-only beacons * ---------------------------------------------------------------------------- * @@ -8,16 +8,16 @@ * * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include -#include +#include +#include using namespace std; -using namespace tubex; +using namespace codac; int main() { @@ -43,8 +43,8 @@ int main() x.set(ix0, 0.); // tube state vector with initial condition on v, phi // Computing an approximation of the actual state trajectory - Trajectory traj_vdot(tdomain, tubex::Function("0.1 + sin(0.25*t)"), dt); - Trajectory traj_phidot(tdomain, tubex::Function("-0.45 * cos(0.2*t)"), dt); + Trajectory traj_vdot(tdomain, codac::Function("0.1 + sin(0.25*t)"), dt); + Trajectory traj_phidot(tdomain, codac::Function("-0.45 * cos(0.2*t)"), dt); TrajectoryVector traj_state(4); // state equations traj_state[2] = traj_phidot.primitive(x0[2]); @@ -89,15 +89,15 @@ int main() xdyn[4] = "bx"; xdyn[5] = "by"; xdyn[6] = "g"; xdyn[7] = "gdot"; - tubex::Function f_obs(8, xdyn, "(sqrt((x-bx)^2+(y-by)^2) - g ; \ + codac::Function f_obs(8, xdyn, "(sqrt((x-bx)^2+(y-by)^2) - g ; \ v*cos(phi)*sign(x-bx)/sqrt(1+((y-by)^2)/((x-bx)^2)) \ + v*sin(phi)*sign(y-by)/sqrt(1+((x-bx)^2)/((y-by)^2)) - gdot)"); - tubex::Function f_evol(8, xdyn, "(v*cos(phi) ; \ + codac::Function f_evol(8, xdyn, "(v*cos(phi) ; \ v*sin(phi) ; \ -0.45 * cos(0.2*t) + [-0.001,0.001] ; \ 0.1 + sin(0.25*t) + [-0.001,0.001])"); - tubex::CtcFwdBwd ctc_obs_fwdbwd(f_obs); + codac::CtcFwdBwd ctc_obs_fwdbwd(f_obs); map m_x; for(size_t i = 0 ; i < v_beacons.size() ; i++) diff --git a/examples/tuto/01_getting_started/01_getting_started.cpp b/examples/tuto/01_getting_started/01_getting_started.cpp index 60b70c00..2fe407b7 100644 --- a/examples/tuto/01_getting_started/01_getting_started.cpp +++ b/examples/tuto/01_getting_started/01_getting_started.cpp @@ -1,20 +1,20 @@ /** - * tubex-lib - Examples - * Getting started: 2 minutes to Tubex + * Codac - Examples + * Getting started: 2 minutes to Codac * ---------------------------------------------------------------------------- * * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include -#include +#include +#include using namespace std; -using namespace tubex; +using namespace codac; int main() { diff --git a/examples/tuto/01_getting_started/01_getting_started.py b/examples/tuto/01_getting_started/01_getting_started.py index 33a9077e..8c75f834 100644 --- a/examples/tuto/01_getting_started/01_getting_started.py +++ b/examples/tuto/01_getting_started/01_getting_started.py @@ -1,9 +1,9 @@ -# tubex-lib - Examples +# Codac - Examples # Dynamic range-only localization # ---------------------------------------------------------------------------- from pyibex import * -from tubex_lib import * +from codac import * import sys # only for checking if this example still works diff --git a/examples/tuto/01_getting_started/CMakeLists.txt b/examples/tuto/01_getting_started/CMakeLists.txt index 22a3edd1..e4c08cf5 100644 --- a/examples/tuto/01_getting_started/CMakeLists.txt +++ b/examples/tuto/01_getting_started/CMakeLists.txt @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib / basics example - cmake configuration file +# codac / basics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/tuto/01_getting_started/build.sh b/examples/tuto/01_getting_started/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/tuto/01_getting_started/build.sh +++ b/examples/tuto/01_getting_started/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/tuto/02_static_rangeonly/02_static_rangeonly.cpp b/examples/tuto/02_static_rangeonly/02_static_rangeonly.cpp index bb9ce7e6..eb65a0c2 100644 --- a/examples/tuto/02_static_rangeonly/02_static_rangeonly.cpp +++ b/examples/tuto/02_static_rangeonly/02_static_rangeonly.cpp @@ -1,20 +1,20 @@ /** - * tubex-lib - Examples + * Codac - Examples * Static range-only localization * ---------------------------------------------------------------------------- * * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include -#include +#include +#include using namespace std; -using namespace tubex; +using namespace codac; int main() { diff --git a/examples/tuto/02_static_rangeonly/02_static_rangeonly.py b/examples/tuto/02_static_rangeonly/02_static_rangeonly.py index af48c95a..4bdf11c6 100644 --- a/examples/tuto/02_static_rangeonly/02_static_rangeonly.py +++ b/examples/tuto/02_static_rangeonly/02_static_rangeonly.py @@ -1,9 +1,9 @@ -# tubex-lib - Examples +# Codac - Examples # Static range-only localization # ---------------------------------------------------------------------------- from pyibex import * -from tubex_lib import * +from codac import * import math import sys # only for checking if this example still works diff --git a/examples/tuto/02_static_rangeonly/CMakeLists.txt b/examples/tuto/02_static_rangeonly/CMakeLists.txt index 70bd1c3f..da0ba5d9 100644 --- a/examples/tuto/02_static_rangeonly/CMakeLists.txt +++ b/examples/tuto/02_static_rangeonly/CMakeLists.txt @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib / basics example - cmake configuration file +# codac / basics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/tuto/02_static_rangeonly/build.sh b/examples/tuto/02_static_rangeonly/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/tuto/02_static_rangeonly/build.sh +++ b/examples/tuto/02_static_rangeonly/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/tuto/03_static_rangebearing/03_static_rangebearing.cpp b/examples/tuto/03_static_rangebearing/03_static_rangebearing.cpp index 6864a985..3cc1caf8 100644 --- a/examples/tuto/03_static_rangebearing/03_static_rangebearing.cpp +++ b/examples/tuto/03_static_rangebearing/03_static_rangebearing.cpp @@ -1,21 +1,21 @@ /** - * tubex-lib - Examples + * Codac - Examples * Static range-bearing localization * ---------------------------------------------------------------------------- * * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include -#include -#include +#include +#include +#include using namespace std; -using namespace tubex; +using namespace codac; int main() { diff --git a/examples/tuto/03_static_rangebearing/03_static_rangebearing.py b/examples/tuto/03_static_rangebearing/03_static_rangebearing.py index e2f04b68..42e1aa18 100644 --- a/examples/tuto/03_static_rangebearing/03_static_rangebearing.py +++ b/examples/tuto/03_static_rangebearing/03_static_rangebearing.py @@ -1,9 +1,9 @@ -# tubex-lib - Examples +# Codac - Examples # Static range-bearing localization # ---------------------------------------------------------------------------- from pyibex import * -from tubex_lib import * +from codac import * import math import sys # only for checking if this example still works diff --git a/examples/tuto/03_static_rangebearing/CMakeLists.txt b/examples/tuto/03_static_rangebearing/CMakeLists.txt index 01c287ff..5ee96f0d 100644 --- a/examples/tuto/03_static_rangebearing/CMakeLists.txt +++ b/examples/tuto/03_static_rangebearing/CMakeLists.txt @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib / basics example - cmake configuration file +# codac / basics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/tuto/03_static_rangebearing/build.sh b/examples/tuto/03_static_rangebearing/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/tuto/03_static_rangebearing/build.sh +++ b/examples/tuto/03_static_rangebearing/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/tuto/04_dyn_rangeonly/04_dyn_rangeonly.cpp b/examples/tuto/04_dyn_rangeonly/04_dyn_rangeonly.cpp index 2dd44ac3..3c3e882d 100644 --- a/examples/tuto/04_dyn_rangeonly/04_dyn_rangeonly.cpp +++ b/examples/tuto/04_dyn_rangeonly/04_dyn_rangeonly.cpp @@ -1,20 +1,20 @@ /** - * tubex-lib - Examples + * Codac - Examples * Dynamic range-only localization * ---------------------------------------------------------------------------- * * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include -#include +#include +#include using namespace std; -using namespace tubex; +using namespace codac; int main() { diff --git a/examples/tuto/04_dyn_rangeonly/04_dyn_rangeonly.py b/examples/tuto/04_dyn_rangeonly/04_dyn_rangeonly.py index 37b2d1ea..d6cc41f7 100644 --- a/examples/tuto/04_dyn_rangeonly/04_dyn_rangeonly.py +++ b/examples/tuto/04_dyn_rangeonly/04_dyn_rangeonly.py @@ -1,9 +1,9 @@ -# tubex-lib - Examples +# Codac - Examples # Dynamic range-only localization # ---------------------------------------------------------------------------- from pyibex import * -from tubex_lib import * +from codac import * import sys # only for checking if this example still works diff --git a/examples/tuto/04_dyn_rangeonly/CMakeLists.txt b/examples/tuto/04_dyn_rangeonly/CMakeLists.txt index dc10fcad..7bae7641 100644 --- a/examples/tuto/04_dyn_rangeonly/CMakeLists.txt +++ b/examples/tuto/04_dyn_rangeonly/CMakeLists.txt @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib / basics example - cmake configuration file +# codac / basics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/tuto/04_dyn_rangeonly/build.sh b/examples/tuto/04_dyn_rangeonly/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/tuto/04_dyn_rangeonly/build.sh +++ b/examples/tuto/04_dyn_rangeonly/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/examples/tuto/05_dyn_rangebearing/05_dyn_rangebearing.cpp b/examples/tuto/05_dyn_rangebearing/05_dyn_rangebearing.cpp index 2280e9fe..2ddaf85d 100644 --- a/examples/tuto/05_dyn_rangebearing/05_dyn_rangebearing.cpp +++ b/examples/tuto/05_dyn_rangebearing/05_dyn_rangebearing.cpp @@ -1,21 +1,21 @@ /** - * tubex-lib - Examples + * Codac - Examples * Dynamic range-bearing localization * ---------------------------------------------------------------------------- * * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include -#include -#include +#include +#include +#include using namespace std; -using namespace tubex; +using namespace codac; using namespace pyibex; int main() diff --git a/examples/tuto/05_dyn_rangebearing/05_dyn_rangebearing.py b/examples/tuto/05_dyn_rangebearing/05_dyn_rangebearing.py index 56fae496..1b2b9788 100644 --- a/examples/tuto/05_dyn_rangebearing/05_dyn_rangebearing.py +++ b/examples/tuto/05_dyn_rangebearing/05_dyn_rangebearing.py @@ -1,9 +1,9 @@ -# tubex-lib - Examples +# Codac - Examples # Dynamic range-only localization # ---------------------------------------------------------------------------- from pyibex import * -from tubex_lib import * +from codac import * import sys # only for checking if this example still works diff --git a/examples/tuto/05_dyn_rangebearing/CMakeLists.txt b/examples/tuto/05_dyn_rangebearing/CMakeLists.txt index 3635b1b8..8b512ca5 100644 --- a/examples/tuto/05_dyn_rangebearing/CMakeLists.txt +++ b/examples/tuto/05_dyn_rangebearing/CMakeLists.txt @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib / basics example - cmake configuration file +# codac / basics example - cmake configuration file # ================================================================== cmake_minimum_required(VERSION 3.0.2) @@ -24,18 +24,18 @@ find_package(Eigen3 REQUIRED NO_MODULE) message(STATUS "Found Eigen3 version ${EIGEN3_VERSION}") -# Adding Tubex +# Adding Codac - # In case you installed Tubex in a local directory, you need + # In case you installed Codac in a local directory, you need # to specify its path with the CMAKE_PREFIX_PATH option. - # set(CMAKE_PREFIX_PATH "~/tubex-lib/build_install") + # set(CMAKE_PREFIX_PATH "~/codac/build_install") - find_package(TUBEX REQUIRED) - message(STATUS "Found Tubex version ${TUBEX_VERSION}") + find_package(CODAC REQUIRED) + message(STATUS "Found Codac version ${CODAC_VERSION}") # Compilation add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) - target_compile_options(${PROJECT_NAME} PUBLIC ${TUBEX_CXX_FLAGS}) - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${TUBEX_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PUBLIC ${TUBEX_LIBRARIES} Ibex::ibex ${TUBEX_LIBRARIES}) \ No newline at end of file + target_compile_options(${PROJECT_NAME} PUBLIC ${CODAC_CXX_FLAGS}) + target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${CODAC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${CODAC_LIBRARIES} Ibex::ibex ${CODAC_LIBRARIES}) \ No newline at end of file diff --git a/examples/tuto/05_dyn_rangebearing/build.sh b/examples/tuto/05_dyn_rangebearing/build.sh index f0e8d6e0..40460b9f 100755 --- a/examples/tuto/05_dyn_rangebearing/build.sh +++ b/examples/tuto/05_dyn_rangebearing/build.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash diff --git a/make.sh b/make.sh index 61d2b2eb..42d2770f 100755 --- a/make.sh +++ b/make.sh @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - build script +# Codac - build script # ================================================================== #!/bin/bash @@ -14,7 +14,7 @@ # ./build.sh tests clean # ./build.sh examples clean -TUBEX_DIR="$(pwd)" +CODAC_DIR="$(pwd)" if [ -z "${WITH_TUBE_TREE}" ] @@ -30,7 +30,7 @@ fi find . -name build | xargs rm -fr fi -# Building Tubex library +# Building Codac library mkdir build -p cd build diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 44334cb9..c57e7be7 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -1,10 +1,10 @@ # ================================================================== -# tubex-lib / Python binding - cmake configuration file +# codac / Python binding - cmake configuration file # ================================================================== add_subdirectory(pybind11) - set(PYTHON_PACKAGE_NAME "tubex_lib") + set(PYTHON_PACKAGE_NAME "codac") set(PYTHON_PACKAGE_DIR "${CMAKE_CURRENT_BINARY_DIR}/python_package") file(MAKE_DIRECTORY ${PYTHON_PACKAGE_DIR}) @@ -54,41 +54,41 @@ # Generating a library tube.so containing the python binding: pybind11_add_module(tube SHARED - tubex_py.cpp - - src/core/arithmetic/tubex_py_arithmetic.cpp - src/core/cn/tubex_py_ContractorNetwork.cpp - - src/core/contractors/static/tubex_py_CtcDist.cpp - src/core/contractors/static/tubex_py_CtcFunction.cpp - src/core/contractors/static/tubex_py_CtcConstell.cpp - - src/core/contractors/dyn/tubex_py_DynCtc.cpp - src/core/contractors/dyn/tubex_py_CtcDelay.cpp - src/core/contractors/dyn/tubex_py_CtcDeriv.cpp - src/core/contractors/dyn/tubex_py_CtcEval.cpp - src/core/contractors/dyn/tubex_py_CtcLohner.cpp - src/core/contractors/dyn/tubex_py_CtcPicard.cpp - - src/core/dynamics/tube/tubex_py_Tube.cpp - src/core/dynamics/tube/tubex_py_TubeVector.cpp - src/core/dynamics/trajectory/tubex_py_Trajectory.cpp - src/core/dynamics/trajectory/tubex_py_RandTrajectory.cpp - src/core/dynamics/trajectory/tubex_py_TrajectoryVector.cpp - src/core/dynamics/slice/tubex_py_Slice.cpp - - src/core/functions/tubex_py_TFnc.cpp - src/core/functions/tubex_py_TFunction.cpp - - src/core/graphics/tubex_py_graphics.cpp - src/core/graphics/tubex_py_ColorMap.cpp - src/core/graphics/tubex_py_Figure.cpp - src/core/graphics/tubex_py_VIBesFig.cpp - src/core/graphics/tubex_py_VIBesFigTube.cpp - src/core/graphics/tubex_py_VIBesFigTubeVector.cpp - src/core/graphics/tubex_py_VIBesFigMap.cpp - - src/robotics/tubex_py_DataLoader.cpp + codac_py.cpp + + src/core/arithmetic/codac_py_arithmetic.cpp + src/core/cn/codac_py_ContractorNetwork.cpp + + src/core/contractors/static/codac_py_CtcDist.cpp + src/core/contractors/static/codac_py_CtcFunction.cpp + src/core/contractors/static/codac_py_CtcConstell.cpp + + src/core/contractors/dyn/codac_py_DynCtc.cpp + src/core/contractors/dyn/codac_py_CtcDelay.cpp + src/core/contractors/dyn/codac_py_CtcDeriv.cpp + src/core/contractors/dyn/codac_py_CtcEval.cpp + src/core/contractors/dyn/codac_py_CtcLohner.cpp + src/core/contractors/dyn/codac_py_CtcPicard.cpp + + src/core/dynamics/tube/codac_py_Tube.cpp + src/core/dynamics/tube/codac_py_TubeVector.cpp + src/core/dynamics/trajectory/codac_py_Trajectory.cpp + src/core/dynamics/trajectory/codac_py_RandTrajectory.cpp + src/core/dynamics/trajectory/codac_py_TrajectoryVector.cpp + src/core/dynamics/slice/codac_py_Slice.cpp + + src/core/functions/codac_py_TFnc.cpp + src/core/functions/codac_py_TFunction.cpp + + src/core/graphics/codac_py_graphics.cpp + src/core/graphics/codac_py_ColorMap.cpp + src/core/graphics/codac_py_Figure.cpp + src/core/graphics/codac_py_VIBesFig.cpp + src/core/graphics/codac_py_VIBesFigTube.cpp + src/core/graphics/codac_py_VIBesFigTubeVector.cpp + src/core/graphics/codac_py_VIBesFigMap.cpp + + src/robotics/codac_py_DataLoader.cpp ) target_include_directories(tube @@ -97,11 +97,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/docstring) target_link_libraries(tube - PRIVATE tubex tubex-rob ${LIBS}) + PRIVATE codac codac-rob ${LIBS}) - # ex: from tubex_lib import tube + # ex: from codac import tube # tube.Tube - # ex: from tubex_lib.tube import Tube + # ex: from codac.tube import Tube # Tube # Copy the generated library in the package folder @@ -110,9 +110,9 @@ ) #pybind11_add_module(graphics SHARED - # tubex_py_VIBesFig.cpp + # codac_py_VIBesFig.cpp #) - #target_link_libraries(graphics PRIVATE tubex tubex-rob ${LIBS}) + #target_link_libraries(graphics PRIVATE codac codac-rob ${LIBS}) #add_custom_command(TARGET graphics POST_BUILD # COMMAND ${CMAKE_COMMAND} -E copy "$" "${PYTHON_PACKAGE_DIR}/${PYTHON_PACKAGE_NAME}" #) diff --git a/python/tubex_lib/__init__.py b/python/codac/__init__.py similarity index 91% rename from python/tubex_lib/__init__.py rename to python/codac/__init__.py index 236399a4..d1411297 100644 --- a/python/tubex_lib/__init__.py +++ b/python/codac/__init__.py @@ -1,7 +1,7 @@ import pyibex from pyibex import Ctc, Interval, IntervalVector, Function, BoolInterval from pyibex.geometry import CtcPolar -from tubex_lib.tube import * +from codac.tube import * from .version import __version__ # Predefined contractor objects diff --git a/python/tubex_lib/tests/__init__.py b/python/codac/tests/__init__.py similarity index 60% rename from python/tubex_lib/tests/__init__.py rename to python/codac/tests/__init__.py index d278cb59..94d66c88 100644 --- a/python/tubex_lib/tests/__init__.py +++ b/python/codac/tests/__init__.py @@ -1,2 +1,2 @@ # from pyibex import Interval, IntervalVector -# from tubex_lib.tube import * \ No newline at end of file +# from codac.tube import * \ No newline at end of file diff --git a/python/tubex_lib/tests/test_arithmetic.py b/python/codac/tests/test_arithmetic.py similarity index 99% rename from python/tubex_lib/tests/test_arithmetic.py rename to python/codac/tests/test_arithmetic.py index 4dd96a96..832dbba7 100644 --- a/python/tubex_lib/tests/test_arithmetic.py +++ b/python/codac/tests/test_arithmetic.py @@ -3,7 +3,7 @@ import unittest import pyibex from pyibex import Interval, IntervalVector -from tubex_lib import * +from codac import * class TestArithmeticOnTube(unittest.TestCase): diff --git a/python/tubex_lib/tests/test_cn.py b/python/codac/tests/test_cn.py similarity index 99% rename from python/tubex_lib/tests/test_cn.py rename to python/codac/tests/test_cn.py index e5e55266..23fd93fb 100644 --- a/python/tubex_lib/tests/test_cn.py +++ b/python/codac/tests/test_cn.py @@ -2,8 +2,8 @@ import unittest from pyibex import Interval, IntervalVector, Function -from tubex_lib import * -import tubex_lib as tubex +from codac import * +import codac as codac class TestCN(unittest.TestCase): diff --git a/python/tubex_lib/tests/test_ctc_constell.py b/python/codac/tests/test_ctc_constell.py similarity index 98% rename from python/tubex_lib/tests/test_ctc_constell.py rename to python/codac/tests/test_ctc_constell.py index 249767fd..44150792 100644 --- a/python/tubex_lib/tests/test_ctc_constell.py +++ b/python/codac/tests/test_ctc_constell.py @@ -2,8 +2,8 @@ import unittest from pyibex import Interval, IntervalVector -from tubex_lib import * -import tubex_lib as tubex +from codac import * +import codac as codac class TestCtcConstell(unittest.TestCase): diff --git a/python/tubex_lib/tests/test_ctcdelay.py b/python/codac/tests/test_ctcdelay.py similarity index 98% rename from python/tubex_lib/tests/test_ctcdelay.py rename to python/codac/tests/test_ctcdelay.py index 7f520cac..87a329a1 100644 --- a/python/tubex_lib/tests/test_ctcdelay.py +++ b/python/codac/tests/test_ctcdelay.py @@ -3,7 +3,7 @@ import unittest import math from pyibex import Interval, IntervalVector -from tubex_lib import * +from codac import * class TestCtcDelay(unittest.TestCase): diff --git a/python/tubex_lib/tests/test_ctceval.py b/python/codac/tests/test_ctceval.py similarity index 99% rename from python/tubex_lib/tests/test_ctceval.py rename to python/codac/tests/test_ctceval.py index aa8d218b..7e5a87c6 100644 --- a/python/tubex_lib/tests/test_ctceval.py +++ b/python/codac/tests/test_ctceval.py @@ -2,7 +2,7 @@ import unittest from pyibex import Interval, IntervalVector -from tubex_lib import * +from codac import * class TestCtcEval(unittest.TestCase): diff --git a/python/tubex_lib/tests/test_definition.py b/python/codac/tests/test_definition.py similarity index 98% rename from python/tubex_lib/tests/test_definition.py rename to python/codac/tests/test_definition.py index ff1e7418..5f44bdad 100644 --- a/python/tubex_lib/tests/test_definition.py +++ b/python/codac/tests/test_definition.py @@ -2,8 +2,8 @@ import unittest from pyibex import Interval, IntervalVector -from tubex_lib import * -import tubex_lib as tubex +from codac import * +import codac as codac class TestSlice(unittest.TestCase): @@ -141,8 +141,8 @@ class TestTubeClassFunction(unittest.TestCase): # traj1_outside = Trajectory(Interval(-1.,10.), f3); - # self.assertEqual(tube1.contains(traj1_inside), tubex.YES); - # self.assertEqual(tube1.contains(traj1_outside), tubex.NO); + # self.assertEqual(tube1.contains(traj1_inside), codac.YES); + # self.assertEqual(tube1.contains(traj1_outside), codac.NO); def test_2(self): tube2 = Tube(Interval(-1.,10.), 0.01, TFunction("t^2+[-1,1]")); diff --git a/python/tubex_lib/tests/test_function.py b/python/codac/tests/test_function.py similarity index 94% rename from python/tubex_lib/tests/test_function.py rename to python/codac/tests/test_function.py index 75a4bd24..c7b8ce04 100644 --- a/python/tubex_lib/tests/test_function.py +++ b/python/codac/tests/test_function.py @@ -2,8 +2,8 @@ import unittest from pyibex import Interval, IntervalVector -from tubex_lib import * -import tubex_lib as tubex +from codac import * +import codac as codac class TestFunctionOnTube(unittest.TestCase): diff --git a/python/tubex_lib/tests/test_multi_arithmetic.py b/python/codac/tests/test_multi_arithmetic.py similarity index 87% rename from python/tubex_lib/tests/test_multi_arithmetic.py rename to python/codac/tests/test_multi_arithmetic.py index 8df20330..8987cd0b 100644 --- a/python/tubex_lib/tests/test_multi_arithmetic.py +++ b/python/codac/tests/test_multi_arithmetic.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import unittest -from tubex_lib import * +from codac import * class TestArithmeticOnTube(unittest.TestCase): @@ -60,10 +60,10 @@ def test_pow(self): self.assertEqual(pow(testdx,testintvy), Interval(81.)); self.assertEqual(pow(testintvx,testintvy),Interval(81.)) - testtubex = Tube(Interval(0,1),0.1,Interval(3)) + testcodac = Tube(Interval(0,1),0.1,Interval(3)) testtubey = Tube(Interval(0,1),0.1,Interval(4)) - self.assertApproxIntv(pow(testtubex,testdy).codomain(),Interval(81.)) - self.assertApproxIntv(pow(testtubex,testintvy).codomain(),Interval(81.)) + self.assertApproxIntv(pow(testcodac,testdy).codomain(),Interval(81.)) + self.assertApproxIntv(pow(testcodac,testintvy).codomain(),Interval(81.)) testtrajx = Trajectory(Interval(3,4), TFunction("3"), 0.1) testtrajy = Trajectory(Interval(3,4), TFunction("4"), 0.1) @@ -81,13 +81,13 @@ def test_atan2(self): self.assertApproxIntv(atan2(testdy,testintvx), Interval(0.9272952180016122)); self.assertApproxIntv(atan2(testintvy,testintvx),Interval(0.9272952180016122)) - testtubex = Tube(Interval(0,1),0.1,Interval(3)) + testcodac = Tube(Interval(0,1),0.1,Interval(3)) testtubey = Tube(Interval(0,1),0.1,Interval(4)) - self.assertApproxIntv(atan2(testtubey,testtubex).codomain(),Interval(0.9272952180016122)) + self.assertApproxIntv(atan2(testtubey,testcodac).codomain(),Interval(0.9272952180016122)) self.assertApproxIntv(atan2(testtubey,testdx).codomain(),Interval(0.9272952180016122)) - self.assertApproxIntv(atan2(testdy,testtubex).codomain(),Interval(0.9272952180016122)) + self.assertApproxIntv(atan2(testdy,testcodac).codomain(),Interval(0.9272952180016122)) self.assertApproxIntv(atan2(testtubey,testintvx).codomain(),Interval(0.9272952180016122)) - self.assertApproxIntv(atan2(testintvy,testtubex).codomain(),Interval(0.9272952180016122)) + self.assertApproxIntv(atan2(testintvy,testcodac).codomain(),Interval(0.9272952180016122)) testtrajx = Trajectory(Interval(3,4), TFunction("3"), 0.1) testtrajy = Trajectory(Interval(3,4), TFunction("4"), 0.1) diff --git a/python/tubex_py.cpp b/python/codac_py.cpp similarity index 88% rename from python/tubex_py.cpp rename to python/codac_py.cpp index 1e851180..f3e8176e 100644 --- a/python/tubex_py.cpp +++ b/python/codac_py.cpp @@ -4,24 +4,24 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include "ibex_Ctc.h" -#include "tubex_DynCtc.h" -#include "tubex_TFnc.h" -#include "tubex_VIBesFig.h" -#include "tubex_Trajectory.h" +#include "codac_DynCtc.h" +#include "codac_TFnc.h" +#include "codac_VIBesFig.h" +#include "codac_Trajectory.h" -#include "src/core/contractors/dyn/tubex_py_DynCtc.h" // virtual items -#include "src/core/functions/tubex_py_TFnc.h" // virtual items +#include "src/core/contractors/dyn/codac_py_DynCtc.h" // virtual items +#include "src/core/functions/codac_py_TFnc.h" // virtual items #include using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; void export_arithmetic(py::module& m); @@ -60,7 +60,7 @@ void export_DataLoader(py::module& m); PYBIND11_MODULE(tube, m) { - m.doc() = "Python binding of tubex-lib"; + m.doc() = "Python binding of codac"; export_arithmetic(m); export_ContractorNetwork(m); diff --git a/python/setup.py.in b/python/setup.py.in index fa1644a4..8cb481b6 100644 --- a/python/setup.py.in +++ b/python/setup.py.in @@ -16,7 +16,7 @@ setup( version='${PROJECT_VERSION_FULL}', author='Simon Rohou, Benoit Desrochers', author_email='simon.rohou@ensta-bretagne.fr', - url='http://simon-rohou.fr/research/tubex-lib', + url='http://simon-rohou.fr/research/codac', description='${PROJECT_DESCRIPTION}', long_description='${PROJECT_LONG_DESCRIPTION}', ${FORCE_PYTHON_EXT} diff --git a/python/src/core/arithmetic/tubex_py_arithmetic.cpp b/python/src/core/arithmetic/codac_py_arithmetic.cpp similarity index 97% rename from python/src/core/arithmetic/tubex_py_arithmetic.cpp rename to python/src/core/arithmetic/codac_py_arithmetic.cpp index bbb65cc4..29ad1bbd 100644 --- a/python/src/core/arithmetic/tubex_py_arithmetic.cpp +++ b/python/src/core/arithmetic/codac_py_arithmetic.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -15,12 +15,12 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_tube_arithmetic.h" -#include "tubex_traj_arithmetic.h" +#include "codac_tube_arithmetic.h" +#include "codac_traj_arithmetic.h" #include "ibex_Interval.h" using namespace ibex; -using namespace tubex; +using namespace codac; using namespace pybind11::literals; namespace py = pybind11; diff --git a/python/src/core/cn/tubex_py_ContractorNetwork.cpp b/python/src/core/cn/codac_py_ContractorNetwork.cpp similarity index 91% rename from python/src/core/cn/tubex_py_ContractorNetwork.cpp rename to python/src/core/cn/codac_py_ContractorNetwork.cpp index 7cd601b9..819367df 100644 --- a/python/src/core/cn/tubex_py_ContractorNetwork.cpp +++ b/python/src/core/cn/codac_py_ContractorNetwork.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -16,69 +16,69 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_ContractorNetwork.h" +#include "codac_ContractorNetwork.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_ContractorNetwork_docs.h" +#include "codac_py_ContractorNetwork_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; -tubex::Domain pyobject_to_domain(py::object object) +codac::Domain pyobject_to_domain(py::object object) { if(py::isinstance(object)) // todo: get a reference instead of const (possible?) { const double itv = object.cast(); - return tubex::Domain(itv); + return codac::Domain(itv); } else if(py::isinstance(object)) // todo: get a reference instead of const (possible?) { const double itv = object.cast(); - return tubex::Domain(itv); + return codac::Domain(itv); } else if(py::isinstance(object)) { Interval &itv = object.cast(); - return tubex::Domain(itv); + return codac::Domain(itv); } else if(py::isinstance(object)) { // todo: remove dynamic allocation here IntervalVector *v = new IntervalVector(object.cast()); - return tubex::Domain(*v); + return codac::Domain(*v); } else if(py::isinstance(object)) // todo: this seems to be never used { Vector itv = object.cast(); - return tubex::Domain(itv); + return codac::Domain(itv); } else if(py::isinstance(object)) { IntervalVector &itv = object.cast(); - return tubex::Domain(itv); + return codac::Domain(itv); } else if(py::isinstance(object)) { Tube &itv = object.cast(); - return tubex::Domain(itv); + return codac::Domain(itv); } else if(py::isinstance(object)) { TubeVector &itv = object.cast(); - return tubex::Domain(itv); + return codac::Domain(itv); } else { - throw invalid_argument("unable to convert the py::object into a valid tubex::Domain"); + throw invalid_argument("unable to convert the py::object into a valid codac::Domain"); } } -vector pylist_to_vectordomains(py::list lst) +vector pylist_to_vectordomains(py::list lst) { - vector domains; + vector domains; if(lst.size() < 1) throw invalid_argument("Size of the input list is 0"); @@ -203,7 +203,7 @@ void export_ContractorNetwork(py::module& m) // Place this function after the other set_name() .def("set_name", [](ContractorNetwork& cn, py::object obj, const string& name) { - tubex::Domain dom = pyobject_to_domain(obj); + codac::Domain dom = pyobject_to_domain(obj); cn.set_name(dom, name); }, CONTRACTORNETWORK_VOID_SET_NAME_DOMAIN_STRING, diff --git a/python/src/core/contractors/dyn/tubex_py_CtcDelay.cpp b/python/src/core/contractors/dyn/codac_py_CtcDelay.cpp similarity index 91% rename from python/src/core/contractors/dyn/tubex_py_CtcDelay.cpp rename to python/src/core/contractors/dyn/codac_py_CtcDelay.cpp index fe85605f..8015a92e 100644 --- a/python/src/core/contractors/dyn/tubex_py_CtcDelay.cpp +++ b/python/src/core/contractors/dyn/codac_py_CtcDelay.cpp @@ -13,14 +13,14 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_py_DynCtc.h" -#include "tubex_CtcDelay.h" +#include "codac_py_DynCtc.h" +#include "codac_CtcDelay.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_CtcDelay_docs.h" +#include "codac_py_CtcDelay_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/contractors/dyn/tubex_py_CtcDeriv.cpp b/python/src/core/contractors/dyn/codac_py_CtcDeriv.cpp similarity index 91% rename from python/src/core/contractors/dyn/tubex_py_CtcDeriv.cpp rename to python/src/core/contractors/dyn/codac_py_CtcDeriv.cpp index 2e48c58e..2a56acd3 100644 --- a/python/src/core/contractors/dyn/tubex_py_CtcDeriv.cpp +++ b/python/src/core/contractors/dyn/codac_py_CtcDeriv.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -15,14 +15,14 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_py_DynCtc.h" -#include "tubex_CtcDeriv.h" +#include "codac_py_DynCtc.h" +#include "codac_CtcDeriv.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_CtcDeriv_docs.h" +#include "codac_py_CtcDeriv_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/contractors/dyn/tubex_py_CtcEval.cpp b/python/src/core/contractors/dyn/codac_py_CtcEval.cpp similarity index 93% rename from python/src/core/contractors/dyn/tubex_py_CtcEval.cpp rename to python/src/core/contractors/dyn/codac_py_CtcEval.cpp index 9d087d92..f264ea99 100644 --- a/python/src/core/contractors/dyn/tubex_py_CtcEval.cpp +++ b/python/src/core/contractors/dyn/codac_py_CtcEval.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -15,14 +15,14 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_py_DynCtc.h" -#include "tubex_CtcEval.h" +#include "codac_py_DynCtc.h" +#include "codac_CtcEval.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_CtcEval_docs.h" +#include "codac_py_CtcEval_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/contractors/dyn/tubex_py_CtcLohner.cpp b/python/src/core/contractors/dyn/codac_py_CtcLohner.cpp similarity index 87% rename from python/src/core/contractors/dyn/tubex_py_CtcLohner.cpp rename to python/src/core/contractors/dyn/codac_py_CtcLohner.cpp index 918b4935..9b1e8185 100644 --- a/python/src/core/contractors/dyn/tubex_py_CtcLohner.cpp +++ b/python/src/core/contractors/dyn/codac_py_CtcLohner.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Auguste Bourgois, Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -15,14 +15,14 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_py_DynCtc.h" -#include "tubex_CtcLohner.h" +#include "codac_py_DynCtc.h" +#include "codac_CtcLohner.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_CtcLohner_docs.h" +#include "codac_py_CtcLohner_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/contractors/dyn/tubex_py_CtcPicard.cpp b/python/src/core/contractors/dyn/codac_py_CtcPicard.cpp similarity index 90% rename from python/src/core/contractors/dyn/tubex_py_CtcPicard.cpp rename to python/src/core/contractors/dyn/codac_py_CtcPicard.cpp index ba08e013..e9db0636 100644 --- a/python/src/core/contractors/dyn/tubex_py_CtcPicard.cpp +++ b/python/src/core/contractors/dyn/codac_py_CtcPicard.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -15,14 +15,14 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_py_DynCtc.h" -#include "tubex_CtcPicard.h" +#include "codac_py_DynCtc.h" +#include "codac_CtcPicard.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_CtcPicard_docs.h" +#include "codac_py_CtcPicard_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/contractors/dyn/tubex_py_DynCtc.cpp b/python/src/core/contractors/dyn/codac_py_DynCtc.cpp similarity index 91% rename from python/src/core/contractors/dyn/tubex_py_DynCtc.cpp rename to python/src/core/contractors/dyn/codac_py_DynCtc.cpp index 176c221c..8d72345d 100644 --- a/python/src/core/contractors/dyn/tubex_py_DynCtc.cpp +++ b/python/src/core/contractors/dyn/codac_py_DynCtc.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -15,12 +15,12 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_py_DynCtc.h" +#include "codac_py_DynCtc.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_DynCtc_docs.h" +#include "codac_py_DynCtc_docs.h" using namespace std; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/contractors/dyn/tubex_py_DynCtc.h b/python/src/core/contractors/dyn/codac_py_DynCtc.h similarity index 82% rename from python/src/core/contractors/dyn/tubex_py_DynCtc.h rename to python/src/core/contractors/dyn/codac_py_DynCtc.h index c3c7239f..b8a7a87a 100644 --- a/python/src/core/contractors/dyn/tubex_py_DynCtc.h +++ b/python/src/core/contractors/dyn/codac_py_DynCtc.h @@ -4,22 +4,22 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_PY_DYNCTC_H__ -#define __TUBEX_PY_DYNCTC_H__ +#ifndef __CODAC_PY_DYNCTC_H__ +#define __CODAC_PY_DYNCTC_H__ #include #include "pyIbex_type_caster.h" -#include "tubex_Domain.h" -#include "tubex_DynCtc.h" +#include "codac_Domain.h" +#include "codac_DynCtc.h" -namespace tubex +namespace codac { class pyDynCtc : public DynCtc { diff --git a/python/src/core/contractors/static/tubex_py_CtcConstell.cpp b/python/src/core/contractors/static/codac_py_CtcConstell.cpp similarity index 89% rename from python/src/core/contractors/static/tubex_py_CtcConstell.cpp rename to python/src/core/contractors/static/codac_py_CtcConstell.cpp index 328fd777..5967b152 100644 --- a/python/src/core/contractors/static/tubex_py_CtcConstell.cpp +++ b/python/src/core/contractors/static/codac_py_CtcConstell.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -15,13 +15,13 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_CtcConstell.h" +#include "codac_CtcConstell.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_CtcConstell_docs.h" +#include "codac_py_CtcConstell_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/contractors/static/tubex_py_CtcDist.cpp b/python/src/core/contractors/static/codac_py_CtcDist.cpp similarity index 92% rename from python/src/core/contractors/static/tubex_py_CtcDist.cpp rename to python/src/core/contractors/static/codac_py_CtcDist.cpp index 10d8f744..fd43df98 100644 --- a/python/src/core/contractors/static/tubex_py_CtcDist.cpp +++ b/python/src/core/contractors/static/codac_py_CtcDist.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -15,13 +15,13 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_CtcDist.h" +#include "codac_CtcDist.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_CtcDist_docs.h" +#include "codac_py_CtcDist_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/contractors/static/tubex_py_CtcFunction.cpp b/python/src/core/contractors/static/codac_py_CtcFunction.cpp similarity index 95% rename from python/src/core/contractors/static/tubex_py_CtcFunction.cpp rename to python/src/core/contractors/static/codac_py_CtcFunction.cpp index a2cd0c52..f0cc9cac 100644 --- a/python/src/core/contractors/static/tubex_py_CtcFunction.cpp +++ b/python/src/core/contractors/static/codac_py_CtcFunction.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -16,13 +16,13 @@ #include "pyIbex_type_caster.h" #include "ibex_Domain.h" -#include "tubex_CtcFunction.h" +#include "codac_CtcFunction.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_CtcFunction_docs.h" +#include "codac_py_CtcFunction_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/dynamics/slice/tubex_py_Slice.cpp b/python/src/core/dynamics/slice/codac_py_Slice.cpp similarity index 98% rename from python/src/core/dynamics/slice/tubex_py_Slice.cpp rename to python/src/core/dynamics/slice/codac_py_Slice.cpp index 546c1d69..411f0cf3 100644 --- a/python/src/core/dynamics/slice/tubex_py_Slice.cpp +++ b/python/src/core/dynamics/slice/codac_py_Slice.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -16,13 +16,13 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_Slice.h" +#include "codac_Slice.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_Slice_docs.h" +#include "codac_py_Slice_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/dynamics/trajectory/tubex_py_RandTrajectory.cpp b/python/src/core/dynamics/trajectory/codac_py_RandTrajectory.cpp similarity index 87% rename from python/src/core/dynamics/trajectory/tubex_py_RandTrajectory.cpp rename to python/src/core/dynamics/trajectory/codac_py_RandTrajectory.cpp index f75ad0e8..e7ed600a 100644 --- a/python/src/core/dynamics/trajectory/tubex_py_RandTrajectory.cpp +++ b/python/src/core/dynamics/trajectory/codac_py_RandTrajectory.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -16,13 +16,13 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_RandTrajectory.h" +#include "codac_RandTrajectory.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_RandTrajectory_docs.h" +#include "codac_py_RandTrajectory_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/dynamics/trajectory/tubex_py_Trajectory.cpp b/python/src/core/dynamics/trajectory/codac_py_Trajectory.cpp similarity index 97% rename from python/src/core/dynamics/trajectory/tubex_py_Trajectory.cpp rename to python/src/core/dynamics/trajectory/codac_py_Trajectory.cpp index cab963df..880a2743 100644 --- a/python/src/core/dynamics/trajectory/tubex_py_Trajectory.cpp +++ b/python/src/core/dynamics/trajectory/codac_py_Trajectory.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -16,13 +16,13 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_Trajectory.h" +#include "codac_Trajectory.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_Trajectory_docs.h" +#include "codac_py_Trajectory_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/dynamics/trajectory/tubex_py_TrajectoryVector.cpp b/python/src/core/dynamics/trajectory/codac_py_TrajectoryVector.cpp similarity index 98% rename from python/src/core/dynamics/trajectory/tubex_py_TrajectoryVector.cpp rename to python/src/core/dynamics/trajectory/codac_py_TrajectoryVector.cpp index ba149873..5d2aab4c 100644 --- a/python/src/core/dynamics/trajectory/tubex_py_TrajectoryVector.cpp +++ b/python/src/core/dynamics/trajectory/codac_py_TrajectoryVector.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -16,13 +16,13 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_TrajectoryVector.h" +#include "codac_TrajectoryVector.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_TrajectoryVector_docs.h" +#include "codac_py_TrajectoryVector_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/dynamics/tube/tubex_py_Tube.cpp b/python/src/core/dynamics/tube/codac_py_Tube.cpp similarity index 99% rename from python/src/core/dynamics/tube/tubex_py_Tube.cpp rename to python/src/core/dynamics/tube/codac_py_Tube.cpp index 9ae83411..43f89149 100644 --- a/python/src/core/dynamics/tube/tubex_py_Tube.cpp +++ b/python/src/core/dynamics/tube/codac_py_Tube.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -16,13 +16,13 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_Tube.h" +#include "codac_Tube.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_Tube_docs.h" +#include "codac_py_Tube_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/dynamics/tube/tubex_py_TubeVector.cpp b/python/src/core/dynamics/tube/codac_py_TubeVector.cpp similarity index 99% rename from python/src/core/dynamics/tube/tubex_py_TubeVector.cpp rename to python/src/core/dynamics/tube/codac_py_TubeVector.cpp index fc8567b2..5cb46c25 100644 --- a/python/src/core/dynamics/tube/tubex_py_TubeVector.cpp +++ b/python/src/core/dynamics/tube/codac_py_TubeVector.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -16,13 +16,13 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_TubeVector.h" +#include "codac_TubeVector.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_TubeVector_docs.h" +#include "codac_py_TubeVector_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/functions/tubex_py_TFnc.cpp b/python/src/core/functions/codac_py_TFnc.cpp similarity index 89% rename from python/src/core/functions/tubex_py_TFnc.cpp rename to python/src/core/functions/codac_py_TFnc.cpp index c6ebda51..b234c25f 100644 --- a/python/src/core/functions/tubex_py_TFnc.cpp +++ b/python/src/core/functions/codac_py_TFnc.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -15,13 +15,13 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_py_TFnc.h" +#include "codac_py_TFnc.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_TFnc_docs.h" +#include "codac_py_TFnc_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/functions/tubex_py_TFnc.h b/python/src/core/functions/codac_py_TFnc.h similarity index 90% rename from python/src/core/functions/tubex_py_TFnc.h rename to python/src/core/functions/codac_py_TFnc.h index 768bd306..d56ff609 100644 --- a/python/src/core/functions/tubex_py_TFnc.h +++ b/python/src/core/functions/codac_py_TFnc.h @@ -4,23 +4,23 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_PY_TFNC_H__ -#define __TUBEX_PY_TFNC_H__ +#ifndef __CODAC_PY_TFNC_H__ +#define __CODAC_PY_TFNC_H__ #include #include "pyIbex_type_caster.h" -#include "tubex_Tube.h" -#include "tubex_TubeVector.h" -#include "tubex_TFnc.h" +#include "codac_Tube.h" +#include "codac_TubeVector.h" +#include "codac_TFnc.h" -namespace tubex +namespace codac { class pyTFnc : public TFnc { diff --git a/python/src/core/functions/tubex_py_TFunction.cpp b/python/src/core/functions/codac_py_TFunction.cpp similarity index 96% rename from python/src/core/functions/tubex_py_TFunction.cpp rename to python/src/core/functions/codac_py_TFunction.cpp index f15cf46f..161cc90e 100644 --- a/python/src/core/functions/tubex_py_TFunction.cpp +++ b/python/src/core/functions/codac_py_TFunction.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -15,15 +15,15 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_Tube.h" -#include "tubex_TubeVector.h" -#include "tubex_TFunction.h" +#include "codac_Tube.h" +#include "codac_TubeVector.h" +#include "codac_TFunction.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_TFunction_docs.h" +#include "codac_py_TFunction_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/graphics/tubex_py_ColorMap.cpp b/python/src/core/graphics/codac_py_ColorMap.cpp similarity index 86% rename from python/src/core/graphics/tubex_py_ColorMap.cpp rename to python/src/core/graphics/codac_py_ColorMap.cpp index 5ec8dc68..bd135751 100644 --- a/python/src/core/graphics/tubex_py_ColorMap.cpp +++ b/python/src/core/graphics/codac_py_ColorMap.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -15,13 +15,13 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_ColorMap.h" +#include "codac_ColorMap.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_ColorMap_docs.h" +#include "codac_py_ColorMap_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/graphics/tubex_py_Figure.cpp b/python/src/core/graphics/codac_py_Figure.cpp similarity index 86% rename from python/src/core/graphics/tubex_py_Figure.cpp rename to python/src/core/graphics/codac_py_Figure.cpp index 8d463ca9..d6af0af6 100644 --- a/python/src/core/graphics/tubex_py_Figure.cpp +++ b/python/src/core/graphics/codac_py_Figure.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -15,13 +15,13 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_Figure.h" +#include "codac_Figure.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_Figure_docs.h" +#include "codac_py_Figure_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/graphics/tubex_py_VIBesFig.cpp b/python/src/core/graphics/codac_py_VIBesFig.cpp similarity index 96% rename from python/src/core/graphics/tubex_py_VIBesFig.cpp rename to python/src/core/graphics/codac_py_VIBesFig.cpp index f924a1f8..92368c9f 100644 --- a/python/src/core/graphics/tubex_py_VIBesFig.cpp +++ b/python/src/core/graphics/codac_py_VIBesFig.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -15,13 +15,13 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_VIBesFig.h" +#include "codac_VIBesFig.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_VIBesFig_docs.h" +#include "codac_py_VIBesFig_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/graphics/tubex_py_VIBesFigMap.cpp b/python/src/core/graphics/codac_py_VIBesFigMap.cpp similarity index 98% rename from python/src/core/graphics/tubex_py_VIBesFigMap.cpp rename to python/src/core/graphics/codac_py_VIBesFigMap.cpp index 4a10d957..55cbb2b1 100644 --- a/python/src/core/graphics/tubex_py_VIBesFigMap.cpp +++ b/python/src/core/graphics/codac_py_VIBesFigMap.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -15,13 +15,13 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_VIBesFigMap.h" +#include "codac_VIBesFigMap.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_VIBesFigMap_docs.h" +#include "codac_py_VIBesFigMap_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/graphics/tubex_py_VIBesFigTube.cpp b/python/src/core/graphics/codac_py_VIBesFigTube.cpp similarity index 97% rename from python/src/core/graphics/tubex_py_VIBesFigTube.cpp rename to python/src/core/graphics/codac_py_VIBesFigTube.cpp index d64935cf..d8358948 100644 --- a/python/src/core/graphics/tubex_py_VIBesFigTube.cpp +++ b/python/src/core/graphics/codac_py_VIBesFigTube.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -15,13 +15,13 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_VIBesFigTube.h" +#include "codac_VIBesFigTube.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_VIBesFigTube_docs.h" +#include "codac_py_VIBesFigTube_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/graphics/tubex_py_VIBesFigTubeVector.cpp b/python/src/core/graphics/codac_py_VIBesFigTubeVector.cpp similarity index 97% rename from python/src/core/graphics/tubex_py_VIBesFigTubeVector.cpp rename to python/src/core/graphics/codac_py_VIBesFigTubeVector.cpp index 5d456dbf..8e3c455c 100644 --- a/python/src/core/graphics/tubex_py_VIBesFigTubeVector.cpp +++ b/python/src/core/graphics/codac_py_VIBesFigTubeVector.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -15,13 +15,13 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_VIBesFigTubeVector.h" +#include "codac_VIBesFigTubeVector.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_VIBesFigTubeVector_docs.h" +#include "codac_py_VIBesFigTubeVector_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/python/src/core/graphics/tubex_py_graphics.cpp b/python/src/core/graphics/codac_py_graphics.cpp similarity index 94% rename from python/src/core/graphics/tubex_py_graphics.cpp rename to python/src/core/graphics/codac_py_graphics.cpp index fb831526..8bc42dbc 100644 --- a/python/src/core/graphics/tubex_py_graphics.cpp +++ b/python/src/core/graphics/codac_py_graphics.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ diff --git a/python/src/robotics/tubex_py_DataLoader.cpp b/python/src/robotics/codac_py_DataLoader.cpp similarity index 93% rename from python/src/robotics/tubex_py_DataLoader.cpp rename to python/src/robotics/codac_py_DataLoader.cpp index 0c3b2c96..39221af1 100644 --- a/python/src/robotics/tubex_py_DataLoader.cpp +++ b/python/src/robotics/codac_py_DataLoader.cpp @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -15,13 +15,13 @@ #include #include "pyIbex_type_caster.h" -#include "tubex_DataLoader.h" +#include "codac_DataLoader.h" // Generated file from Doxygen XML (doxygen2docstring.py): -#include "tubex_py_DataLoader_docs.h" +#include "codac_py_DataLoader_docs.h" using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; namespace py = pybind11; using namespace pybind11::literals; diff --git a/scripts/docker/build_pybinding.sh b/scripts/docker/build_pybinding.sh index c0309f20..c823305a 100755 --- a/scripts/docker/build_pybinding.sh +++ b/scripts/docker/build_pybinding.sh @@ -51,8 +51,8 @@ for PYBIN in /opt/python/cp3*/bin; do auditwheel repair "$whl" -w /io/wheelhouse/ done - "${PYBIN}/python" -m pip install tubex_lib --no-deps --no-index -f /io/wheelhouse - (cd "$HOME"; "${PYBIN}/python" -m unittest discover tubex_lib.tests) + "${PYBIN}/python" -m pip install codac --no-deps --no-index -f /io/wheelhouse + (cd "$HOME"; "${PYBIN}/python" -m unittest discover codac.tests) cd /io rm -fr build_dir diff --git a/scripts/pybind/doxygen2docstring.py b/scripts/pybind/doxygen2docstring.py index e907858b..8631e551 100644 --- a/scripts/pybind/doxygen2docstring.py +++ b/scripts/pybind/doxygen2docstring.py @@ -7,7 +7,7 @@ constants. They can be used with pybind11 for sharing C++ documentation to Python binding. - Project: tubex-lib + Project: codac Author: Simon Rohou Date: 2020 """ @@ -30,7 +30,7 @@ def anchor_id(filename, memberdef): anchor = filename.replace(".h", "") \ .replace(".cpp", "") \ - .replace("tubex_", "") \ + .replace("codac_", "") \ if memberdef: @@ -53,7 +53,7 @@ def anchor_id(filename, memberdef): .replace(".", "") \ .replace("std::", "") \ .replace("ibex::", "") \ - .replace("tubex::", "") \ + .replace("codac::", "") \ .replace("::", "") \ .replace("@", "_") \ .replace("|=", "UNIEQ") \ @@ -84,7 +84,7 @@ def normalize(str): return str.replace("const", "") \ .replace("std::", "") \ .replace("ibex::", "") \ - .replace("tubex::", "") \ + .replace("codac::", "") \ .replace("< ", "<") \ .replace(" >", ">") \ .replace("*", "") \ @@ -133,7 +133,7 @@ def sentence(str): if "class" not in xml_doc: continue - namespace = "tubex" + namespace = "codac" indent = " " # Parsing XML file from Doxygen output (XML mode enabled) @@ -142,7 +142,7 @@ def sentence(str): root = tree.getroot() input_filename = root.find(".//location").get("file").split("/")[-1] - output_filename = input_filename.replace(".h", "_docs.h").replace("tubex_", "tubex_py_") + output_filename = input_filename.replace(".h", "_docs.h").replace("codac_", "codac_py_") output_file_fullpath = sys.argv[2] + "/" + output_filename # We do not want to create again the files if nothing has changed since last diff --git a/scripts/pybind/pybind11gen.py b/scripts/pybind/pybind11gen.py index bf858dd8..7ac83737 100755 --- a/scripts/pybind/pybind11gen.py +++ b/scripts/pybind/pybind11gen.py @@ -94,7 +94,7 @@ def process_hint(parameters): def gen_doc_tag_(py_methname, class_name, parameters): letters = string.ascii_uppercase suffix = ''.join(random.choice(letters) for i in range(1)) - l = [p['raw_type'].replace("ibex::","").replace('std::', "").replace('tubex::', "").replace('<','_').replace(">", "_") for p in parameters] + l = [p['raw_type'].replace("ibex::","").replace('std::', "").replace('codac::', "").replace('<','_').replace(">", "_") for p in parameters] # print(l) l = [p.upper() for p in l] # print(l) @@ -337,7 +337,7 @@ def _ctr_hook(clsname, method, hook_data): * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -351,12 +351,12 @@ def _ctr_hook(clsname, method, hook_data): * ---------------------------------------------------------------------------- * \date 2020 * \\author Simon Rohou, Benoît Desrochers - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_Tube.h" +#include "codac_Tube.h" #include #include #include @@ -367,7 +367,7 @@ def _ctr_hook(clsname, method, hook_data): using py::class_; using py::init; -using namespace tubex; +using namespace codac; using ibex::Interval; using ibex::IntervalVector; @@ -384,8 +384,8 @@ def process_module(module_name, header, hooks): pybind_dict = process_header(header, hooks) m_name = Path(header.name.split("_")[-1]).stem - outModuleFile = Path("/tmp") / f"tubex_py_{m_name}.cpp" - outModuleDocsFile = Path("/tmp") / f"tubex_py_{m_name}_docs.h" + outModuleFile = Path("/tmp") / f"codac_py_{m_name}.cpp" + outModuleDocsFile = Path("/tmp") / f"codac_py_{m_name}_docs.h" with outModuleDocsFile.open("w") as fout: fout.write(doc_header % m_name ) diff --git a/src/3rd/CMakeLists.txt b/src/3rd/CMakeLists.txt index 44a093c5..66493437 100644 --- a/src/3rd/CMakeLists.txt +++ b/src/3rd/CMakeLists.txt @@ -1,5 +1,5 @@ # ================================================================== -# tubex-3rd - cmake configuration file +# codac-3rd - cmake configuration file # ================================================================== add_subdirectory(pyibex) diff --git a/src/3rd/capd/CMakeLists.txt b/src/3rd/capd/CMakeLists.txt index 8963fb24..aa7c7712 100644 --- a/src/3rd/capd/CMakeLists.txt +++ b/src/3rd/capd/CMakeLists.txt @@ -1,29 +1,29 @@ # ================================================================== -# tubex-capd - cmake configuration file +# codac-capd - cmake configuration file # ================================================================== -list(APPEND SRC ${CMAKE_CURRENT_SOURCE_DIR}/tubex_capd_integrateODE.h - ${CMAKE_CURRENT_SOURCE_DIR}/tubex_capd_integrateODE.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/tubex_capd_helpers.h - ${CMAKE_CURRENT_SOURCE_DIR}/tubex_capd_helpers.cpp) +list(APPEND SRC ${CMAKE_CURRENT_SOURCE_DIR}/codac_capd_integrateODE.h + ${CMAKE_CURRENT_SOURCE_DIR}/codac_capd_integrateODE.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/codac_capd_helpers.h + ${CMAKE_CURRENT_SOURCE_DIR}/codac_capd_helpers.cpp) ################################################################################ -# Create the target for libtubex-capd +# Create the target for libcodac-capd ################################################################################ - add_library(tubex-capd ${SRC}) - target_compile_options(tubex-capd PUBLIC ${TUBEX_CFLAGS}) + add_library(codac-capd ${SRC}) + target_compile_options(codac-capd PUBLIC ${CODAC_CFLAGS}) - # todo: find a clean way to access tubex header files? - set(TUBEX_HEADERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../include) - target_include_directories(tubex-capd PUBLIC ${TUBEX_HEADERS_DIR} + # todo: find a clean way to access codac header files? + set(CODAC_HEADERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../include) + target_include_directories(codac-capd PUBLIC ${CODAC_HEADERS_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) - target_link_libraries(tubex-capd PUBLIC Ibex::ibex tubex) + target_link_libraries(codac-capd PUBLIC Ibex::ibex codac) ################################################################################ -# Installation of libtubex-capd files +# Installation of libcodac-capd files ################################################################################ # Getting header files from sources @@ -31,24 +31,24 @@ list(APPEND SRC ${CMAKE_CURRENT_SOURCE_DIR}/tubex_capd_integrateODE.h foreach(srcfile ${SRC}) if(srcfile MATCHES "\\.h$" OR srcfile MATCHES "\\.hpp$") list(APPEND HDR ${srcfile}) - # Copying header files for other Tubex libraries compiled in the same time + # Copying header files for other Codac libraries compiled in the same time file(COPY ${srcfile} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../../../include) endif() endforeach() -# Generates a tubex_capd.h file +# Generates a codac_capd.h file - set(TUBEX_3RD_CAPD_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/tubex-capd.h) - file(WRITE ${TUBEX_3RD_CAPD_MAIN_HEADER} "/* This file is generated by CMake */\n\n") - file(APPEND ${TUBEX_3RD_CAPD_MAIN_HEADER} "#ifndef __TUBEX_3RD_CAPD_H__\n#define __TUBEX_3RD_CAPD_H__\n\n") + set(CODAC_3RD_CAPD_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/codac-capd.h) + file(WRITE ${CODAC_3RD_CAPD_MAIN_HEADER} "/* This file is generated by CMake */\n\n") + file(APPEND ${CODAC_3RD_CAPD_MAIN_HEADER} "#ifndef __CODAC_3RD_CAPD_H__\n#define __CODAC_3RD_CAPD_H__\n\n") foreach(header_path ${HDR}) get_filename_component(header_name ${header_path} NAME) - file(APPEND ${TUBEX_3RD_CAPD_MAIN_HEADER} "#include <${header_name}>\n") + file(APPEND ${CODAC_3RD_CAPD_MAIN_HEADER} "#include <${header_name}>\n") endforeach() - file(APPEND ${TUBEX_3RD_CAPD_MAIN_HEADER} "\n#endif \n") - file(COPY ${TUBEX_3RD_CAPD_MAIN_HEADER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../../../include) + file(APPEND ${CODAC_3RD_CAPD_MAIN_HEADER} "\n#endif \n") + file(COPY ${CODAC_3RD_CAPD_MAIN_HEADER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../../../include) # Install files in system directories -install(TARGETS tubex-capd DESTINATION ${CMAKE_INSTALL_LIBDIR}) -install(FILES ${HDR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tubex-capd) -install(FILES ${TUBEX_3RD_CAPD_MAIN_HEADER} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tubex-capd) \ No newline at end of file +install(TARGETS codac-capd DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(FILES ${HDR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/codac-capd) +install(FILES ${CODAC_3RD_CAPD_MAIN_HEADER} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/codac-capd) \ No newline at end of file diff --git a/src/3rd/capd/tubex_capd_helpers.cpp b/src/3rd/capd/codac_capd_helpers.cpp similarity index 96% rename from src/3rd/capd/tubex_capd_helpers.cpp rename to src/3rd/capd/codac_capd_helpers.cpp index 977cd060..9d808df6 100644 --- a/src/3rd/capd/tubex_capd_helpers.cpp +++ b/src/3rd/capd/codac_capd_helpers.cpp @@ -1,6 +1,6 @@ -#include "tubex_capd_helpers.h" +#include "codac_capd_helpers.h" -namespace tubex { +namespace codac { ibex::Interval CapdHelpers::c2i_i(const capd::interval &x) { return ibex::Interval(x.leftBound(), x.rightBound()); } diff --git a/src/3rd/capd/tubex_capd_helpers.h b/src/3rd/capd/codac_capd_helpers.h similarity index 81% rename from src/3rd/capd/tubex_capd_helpers.h rename to src/3rd/capd/codac_capd_helpers.h index 0f8cec3b..770bf889 100644 --- a/src/3rd/capd/tubex_capd_helpers.h +++ b/src/3rd/capd/codac_capd_helpers.h @@ -1,10 +1,10 @@ -#ifndef TUBEX_LIB_TUBEX_CAPD_HELPERS_H -#define TUBEX_LIB_TUBEX_CAPD_HELPERS_H +#ifndef CODAC_LIB_CODAC_CAPD_HELPERS_H +#define CODAC_LIB_CODAC_CAPD_HELPERS_H #include "capd/capdlib.h" #include "ibex.h" -namespace tubex { +namespace codac { class CapdHelpers { public: static ibex::Interval c2i_i(const capd::interval &x); @@ -18,4 +18,4 @@ class CapdHelpers { }; } -#endif //TUBEX_LIB_TUBEX_CAPD_HELPERS_H +#endif //CODAC_LIB_CODAC_CAPD_HELPERS_H diff --git a/src/3rd/capd/tubex_capd_integrateODE.cpp b/src/3rd/capd/codac_capd_integrateODE.cpp similarity index 93% rename from src/3rd/capd/tubex_capd_integrateODE.cpp rename to src/3rd/capd/codac_capd_integrateODE.cpp index aafde4f3..f1344f33 100644 --- a/src/3rd/capd/tubex_capd_integrateODE.cpp +++ b/src/3rd/capd/codac_capd_integrateODE.cpp @@ -3,24 +3,24 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Julien Damers - * \copyright Copyright 2020 Tubex + * \copyright Copyright 2020 Codac * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include -#include "tubex_capd_integrateODE.h" -#include "tubex_Exception.h" -#include "tubex_TFunction.h" +#include "codac_capd_integrateODE.h" +#include "codac_Exception.h" +#include "codac_TFunction.h" #include "ibex_Expr2Minibex.h" -#include "tubex_capd_helpers.h" +#include "codac_capd_helpers.h" #include using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; -namespace tubex +namespace codac { string capd_str_function(const Function& f) { diff --git a/src/3rd/capd/tubex_capd_integrateODE.h b/src/3rd/capd/codac_capd_integrateODE.h similarity index 91% rename from src/3rd/capd/tubex_capd_integrateODE.h rename to src/3rd/capd/codac_capd_integrateODE.h index 28ad813f..f1e9332d 100644 --- a/src/3rd/capd/tubex_capd_integrateODE.h +++ b/src/3rd/capd/codac_capd_integrateODE.h @@ -4,20 +4,20 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Julien Damers - * \copyright Copyright 2020 Tubex + * \copyright Copyright 2020 Codac * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_CAPDINTEGRATEODE_H__ -#define __TUBEX_CAPDINTEGRATEODE_H__ +#ifndef __CODAC_CAPDINTEGRATEODE_H__ +#define __CODAC_CAPDINTEGRATEODE_H__ -#include "tubex_TubeVector.h" -#include "tubex_TFunction.h" +#include "codac_TubeVector.h" +#include "codac_TFunction.h" #include "ibex_IntervalVector.h" #include "ibex_Function.h" -namespace tubex +namespace codac { // Autonomous diff --git a/src/3rd/pyibex/CMakeLists.txt b/src/3rd/pyibex/CMakeLists.txt index 10b7f55d..bde3304a 100644 --- a/src/3rd/pyibex/CMakeLists.txt +++ b/src/3rd/pyibex/CMakeLists.txt @@ -1,5 +1,5 @@ # ================================================================== -# tubex-pyibex - cmake configuration file +# codac-pyibex - cmake configuration file # ================================================================== list(APPEND SRC ${CMAKE_CURRENT_SOURCE_DIR}/pyibex_Catan2.h @@ -11,21 +11,21 @@ ################################################################################ -# Create the target for libtubex-pyibex +# Create the target for libcodac-pyibex ################################################################################ - add_library(tubex-pyibex ${SRC}) - target_compile_options(tubex-pyibex PUBLIC ${TUBEX_CFLAGS}) + add_library(codac-pyibex ${SRC}) + target_compile_options(codac-pyibex PUBLIC ${CODAC_CFLAGS}) - # todo: find a clean way to access tubex header files? - set(TUBEX_HEADERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../include) - target_include_directories(tubex-pyibex PUBLIC ${TUBEX_HEADERS_DIR} + # todo: find a clean way to access codac header files? + set(CODAC_HEADERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../include) + target_include_directories(codac-pyibex PUBLIC ${CODAC_HEADERS_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) - target_link_libraries(tubex-pyibex PUBLIC Ibex::ibex tubex) + target_link_libraries(codac-pyibex PUBLIC Ibex::ibex codac) ################################################################################ -# Installation of libtubex-pyibex files +# Installation of libcodac-pyibex files ################################################################################ # Getting header files from sources @@ -33,25 +33,25 @@ foreach(srcfile ${SRC}) if(srcfile MATCHES "\\.h$" OR srcfile MATCHES "\\.hpp$") list(APPEND HDR ${srcfile}) - # Copying header files for other Tubex libraries compiled in the same time + # Copying header files for other Codac libraries compiled in the same time file(COPY ${srcfile} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../../../include) endif() endforeach() -# Generates a tubex-pyibex.h file +# Generates a codac-pyibex.h file - set(TUBEX_3RD_PYIBEX_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/tubex-pyibex.h) - file(WRITE ${TUBEX_3RD_PYIBEX_MAIN_HEADER} "/* This file is generated by CMake */\n\n") - file(APPEND ${TUBEX_3RD_PYIBEX_MAIN_HEADER} "#ifndef __TUBEX_3RD_PYIBEX_H__\n#define __TUBEX_3RD_PYIBEX_H__\n\n") + set(CODAC_3RD_PYIBEX_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/codac-pyibex.h) + file(WRITE ${CODAC_3RD_PYIBEX_MAIN_HEADER} "/* This file is generated by CMake */\n\n") + file(APPEND ${CODAC_3RD_PYIBEX_MAIN_HEADER} "#ifndef __CODAC_3RD_PYIBEX_H__\n#define __CODAC_3RD_PYIBEX_H__\n\n") foreach(header_path ${HDR}) get_filename_component(header_name ${header_path} NAME) - file(APPEND ${TUBEX_3RD_PYIBEX_MAIN_HEADER} "#include <${header_name}>\n") + file(APPEND ${CODAC_3RD_PYIBEX_MAIN_HEADER} "#include <${header_name}>\n") endforeach() - file(APPEND ${TUBEX_3RD_PYIBEX_MAIN_HEADER} "\n#endif \n") - file(COPY ${TUBEX_3RD_PYIBEX_MAIN_HEADER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../../../include) + file(APPEND ${CODAC_3RD_PYIBEX_MAIN_HEADER} "\n#endif \n") + file(COPY ${CODAC_3RD_PYIBEX_MAIN_HEADER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../../../include) # Install files in system directories - install(TARGETS tubex-pyibex DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES ${HDR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tubex-pyibex) - install(FILES ${TUBEX_3RD_PYIBEX_MAIN_HEADER} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tubex-pyibex) \ No newline at end of file + install(TARGETS codac-pyibex DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES ${HDR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/codac-pyibex) + install(FILES ${CODAC_3RD_PYIBEX_MAIN_HEADER} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/codac-pyibex) \ No newline at end of file diff --git a/src/3rd/pyibex/pyibex_predef_contractors.cpp b/src/3rd/pyibex/pyibex_predef_contractors.cpp index 3eb429f1..d032e662 100644 --- a/src/3rd/pyibex/pyibex_predef_contractors.cpp +++ b/src/3rd/pyibex/pyibex_predef_contractors.cpp @@ -3,14 +3,14 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include "pyibex_predef_contractors.h" -namespace tubex +namespace codac { namespace ctc { diff --git a/src/3rd/pyibex/pyibex_predef_contractors.h b/src/3rd/pyibex/pyibex_predef_contractors.h index cb590963..7bf89863 100644 --- a/src/3rd/pyibex/pyibex_predef_contractors.h +++ b/src/3rd/pyibex/pyibex_predef_contractors.h @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -14,7 +14,7 @@ #include "pyibex_CtcPolar.h" -namespace tubex +namespace codac { namespace ctc { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 51b4876c..5812eb70 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib - cmake configuration file +# Codac - cmake configuration file # ================================================================== add_subdirectory(core) @@ -12,90 +12,90 @@ add_subdirectory(3rd) # 3rd party (todo: make a clean dependency) # Generating PKG file # =================== -set(TUBEX_PKG_CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/tubex.pc) +set(CODAC_PKG_CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/codac.pc) -set(TUBEX_PKG_CONFIG_CFLAGS "-I\${includedir}/ibex -I\${includedir}/tubex -I\${includedir}/tubex-rob -I\${includedir}/tubex-pyibex") -set(TUBEX_PKG_CONFIG_LIBS "-L\${libdir} -ltubex -ltubex-rob -ltubex-pyibex") +set(CODAC_PKG_CONFIG_CFLAGS "-I\${includedir}/ibex -I\${includedir}/codac -I\${includedir}/codac-rob -I\${includedir}/codac-pyibex") +set(CODAC_PKG_CONFIG_LIBS "-L\${libdir} -lcodac -lcodac-rob -lcodac-pyibex") if(WITH_CAPD) - set(TUBEX_PKG_CONFIG_CFLAGS "${TUBEX_PKG_CONFIG_CFLAGS} -I\${includedir}/tubex-capd") - set(TUBEX_PKG_CONFIG_LIBS "${TUBEX_PKG_CONFIG_LIBS} -ltubex-capd") + set(CODAC_PKG_CONFIG_CFLAGS "${CODAC_PKG_CONFIG_CFLAGS} -I\${includedir}/codac-capd") + set(CODAC_PKG_CONFIG_LIBS "${CODAC_PKG_CONFIG_LIBS} -lcodac-capd") endif() -set(TUBEX_PKG_CONFIG_LIBS "${TUBEX_PKG_CONFIG_LIBS} -ltubex") # Seems to be needed +set(CODAC_PKG_CONFIG_LIBS "${CODAC_PKG_CONFIG_LIBS} -lcodac") # Seems to be needed -file(GENERATE OUTPUT ${TUBEX_PKG_CONFIG_FILE} +file(GENERATE OUTPUT ${CODAC_PKG_CONFIG_FILE} CONTENT "prefix=${CMAKE_INSTALL_PREFIX} includedir=\${prefix}/${CMAKE_INSTALL_INCLUDEDIR} libdir=\${prefix}/${CMAKE_INSTALL_LIBDIR} -Name: tubex +Name: codac Description: ${PROJECT_DESCRIPTION} Url: ${PROJECT_HOMEPAGE_URL} Version: ${PROJECT_VERSION} Requires: ibex -Cflags: ${TUBEX_PKG_CONFIG_CFLAGS} -Libs: ${TUBEX_PKG_CONFIG_LIBS}") +Cflags: ${CODAC_PKG_CONFIG_CFLAGS} +Libs: ${CODAC_PKG_CONFIG_LIBS}") -install(FILES ${TUBEX_PKG_CONFIG_FILE} DESTINATION ${CMAKE_INSTALL_PKGCONFIG}) +install(FILES ${CODAC_PKG_CONFIG_FILE} DESTINATION ${CMAKE_INSTALL_PKGCONFIG}) -# Generating tubex-config.cmake file +# Generating codac-config.cmake file # ================================== -set(TUBEX_CMAKE_CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/tubex-config.cmake) +set(CODAC_CMAKE_CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/codac-config.cmake) -file(WRITE ${TUBEX_CMAKE_CONFIG_FILE} - "# Try to find Tubex +file(WRITE ${CODAC_CMAKE_CONFIG_FILE} + "# Try to find Codac # This file has been generated by CMake -find_path(TUBEX_INCLUDE_DIR tubex.h - PATH_SUFFIXES include/tubex) -find_path(TUBEX_ROB_INCLUDE_DIR tubex-rob.h - PATH_SUFFIXES include/tubex-rob) -find_path(TUBEX_PYIBEX_INCLUDE_DIR tubex-pyibex.h - PATH_SUFFIXES include/tubex-pyibex) +find_path(CODAC_INCLUDE_DIR codac.h + PATH_SUFFIXES include/codac) +find_path(CODAC_ROB_INCLUDE_DIR codac-rob.h + PATH_SUFFIXES include/codac-rob) +find_path(CODAC_PYIBEX_INCLUDE_DIR codac-pyibex.h + PATH_SUFFIXES include/codac-pyibex) -find_library(TUBEX_LIBRARY NAMES tubex +find_library(CODAC_LIBRARY NAMES codac PATH_SUFFIXES lib) -find_library(TUBEX_ROB_LIBRARY NAMES tubex-rob +find_library(CODAC_ROB_LIBRARY NAMES codac-rob PATH_SUFFIXES lib) -find_library(TUBEX_PYIBEX_LIBRARY NAMES tubex-pyibex +find_library(CODAC_PYIBEX_LIBRARY NAMES codac-pyibex PATH_SUFFIXES lib) -set(TUBEX_VERSION ${PROJECT_VERSION}) -set(TUBEX_LIBRARIES \${TUBEX_LIBRARY} \${TUBEX_ROB_LIBRARY} \${TUBEX_PYIBEX_LIBRARY}) -set(TUBEX_INCLUDE_DIRS \${TUBEX_INCLUDE_DIR} \${TUBEX_ROB_INCLUDE_DIR} \${TUBEX_PYIBEX_INCLUDE_DIR}) +set(CODAC_VERSION ${PROJECT_VERSION}) +set(CODAC_LIBRARIES \${CODAC_LIBRARY} \${CODAC_ROB_LIBRARY} \${CODAC_PYIBEX_LIBRARY}) +set(CODAC_INCLUDE_DIRS \${CODAC_INCLUDE_DIR} \${CODAC_ROB_INCLUDE_DIR} \${CODAC_PYIBEX_INCLUDE_DIR}) -set(TUBEX_C_FLAGS \"${CMAKE_C_FLAGS}\") -set(TUBEX_CXX_FLAGS \"${CMAKE_CXX_FLAGS}\") +set(CODAC_C_FLAGS \"${CMAKE_C_FLAGS}\") +set(CODAC_CXX_FLAGS \"${CMAKE_CXX_FLAGS}\") ") if((CMAKE_BUILD_TYPE MATCHES Debug) AND (NOT MSVC)) -# If Tubex is built in Debug, -pg (added by Ibex at the time of Tubex +# If Codac is built in Debug, -pg (added by Ibex at the time of Codac # compilation) might be also necessary to be able to successfully build # programs in Release (otherwise it would be only added by Ibex if the program # is built in Debug)... -file(APPEND ${TUBEX_CMAKE_CONFIG_FILE} " +file(APPEND ${CODAC_CMAKE_CONFIG_FILE} " set(CMAKE_EXE_LINKER_FLAGS \"${CMAKE_EXE_LINKER_FLAGS} -pg\") ") endif() if(WITH_CAPD) - file(APPEND ${TUBEX_CMAKE_CONFIG_FILE} " + file(APPEND ${CODAC_CMAKE_CONFIG_FILE} " # Optional 3rd party: - find_path(TUBEX_CAPD_INCLUDE_DIR tubex-capd.h - PATH_SUFFIXES include/tubex-capd) - set(TUBEX_INCLUDE_DIRS \${TUBEX_INCLUDE_DIRS} \${TUBEX_CAPD_INCLUDE_DIR}) + find_path(CODAC_CAPD_INCLUDE_DIR codac-capd.h + PATH_SUFFIXES include/codac-capd) + set(CODAC_INCLUDE_DIRS \${CODAC_INCLUDE_DIRS} \${CODAC_CAPD_INCLUDE_DIR}) - find_library(TUBEX_CAPD_LIBRARY NAMES tubex-capd + find_library(CODAC_CAPD_LIBRARY NAMES codac-capd PATH_SUFFIXES lib) - set(TUBEX_LIBRARIES \${TUBEX_LIBRARIES} \${TUBEX_CAPD_LIBRARY}) + set(CODAC_LIBRARIES \${CODAC_LIBRARIES} \${CODAC_CAPD_LIBRARY}) ") endif() -install(FILES ${TUBEX_CMAKE_CONFIG_FILE} DESTINATION ${CMAKE_INSTALL_CMAKE}) \ No newline at end of file +install(FILES ${CODAC_CMAKE_CONFIG_FILE} DESTINATION ${CMAKE_INSTALL_CMAKE}) \ No newline at end of file diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index f23fd5e5..04d32ed7 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1,140 +1,140 @@ # ================================================================== -# tubex-lib - cmake configuration file +# Codac - cmake configuration file # ================================================================== - list(APPEND SRC ${CMAKE_CURRENT_SOURCE_DIR}/functions/tubex_TFnc.h - ${CMAKE_CURRENT_SOURCE_DIR}/functions/tubex_TFnc.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/functions/tubex_TFunction.h - ${CMAKE_CURRENT_SOURCE_DIR}/functions/tubex_TFunction.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/functions/tubex_DelayTFunction.h - ${CMAKE_CURRENT_SOURCE_DIR}/functions/tubex_DelayTFunction.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/tubex_polygon_arithmetic.h - ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/tubex_polygon_arithmetic.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/tubex_predef_values.h - ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/tubex_tube_arithmetic.h - ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/tubex_tube_arithmetic_scalar.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/tubex_tube_arithmetic_vector.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/tubex_traj_arithmetic.h - ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/tubex_traj_arithmetic_scalar.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/tubex_traj_arithmetic_vector.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/graphics/tubex_Figure.h - ${CMAKE_CURRENT_SOURCE_DIR}/graphics/tubex_Figure.cpp + list(APPEND SRC ${CMAKE_CURRENT_SOURCE_DIR}/functions/codac_TFnc.h + ${CMAKE_CURRENT_SOURCE_DIR}/functions/codac_TFnc.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/functions/codac_TFunction.h + ${CMAKE_CURRENT_SOURCE_DIR}/functions/codac_TFunction.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/functions/codac_DelayTFunction.h + ${CMAKE_CURRENT_SOURCE_DIR}/functions/codac_DelayTFunction.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/codac_polygon_arithmetic.h + ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/codac_polygon_arithmetic.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/codac_predef_values.h + ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/codac_tube_arithmetic.h + ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/codac_tube_arithmetic_scalar.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/codac_tube_arithmetic_vector.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/codac_traj_arithmetic.h + ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/codac_traj_arithmetic_scalar.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic/codac_traj_arithmetic_vector.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/graphics/codac_Figure.h + ${CMAKE_CURRENT_SOURCE_DIR}/graphics/codac_Figure.cpp ${CMAKE_CURRENT_SOURCE_DIR}/graphics/vibes/vibes.h ${CMAKE_CURRENT_SOURCE_DIR}/graphics/vibes/vibes.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/graphics/tubex_VIBesFigTube.h - ${CMAKE_CURRENT_SOURCE_DIR}/graphics/tubex_VIBesFigTube.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/graphics/tubex_ColorMap.h - ${CMAKE_CURRENT_SOURCE_DIR}/graphics/tubex_ColorMap.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/graphics/tubex_VIBesFigTubeVector.h - ${CMAKE_CURRENT_SOURCE_DIR}/graphics/tubex_VIBesFigTubeVector.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/graphics/tubex_colors.h - ${CMAKE_CURRENT_SOURCE_DIR}/graphics/tubex_colors.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/graphics/tubex_VIBesFig.h - ${CMAKE_CURRENT_SOURCE_DIR}/graphics/tubex_VIBesFig.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/graphics/tubex_VIBesFigPaving.h - ${CMAKE_CURRENT_SOURCE_DIR}/graphics/tubex_VIBesFigPaving.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/paving/tubex_ConnectedSubset.h - ${CMAKE_CURRENT_SOURCE_DIR}/paving/tubex_ConnectedSubset.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/paving/tubex_Paving.h - ${CMAKE_CURRENT_SOURCE_DIR}/paving/tubex_Paving.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/paving/tubex_Set.h - ${CMAKE_CURRENT_SOURCE_DIR}/paving/tubex_Set.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/paving/tubex_TubePaving.h - ${CMAKE_CURRENT_SOURCE_DIR}/paving/tubex_TubePaving.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/paving/tubex_ConnectedSubset_degree.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/paving/tubex_SIVIAPaving.h - ${CMAKE_CURRENT_SOURCE_DIR}/paving/tubex_SIVIAPaving.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/geometry/tubex_Polygon.h - ${CMAKE_CURRENT_SOURCE_DIR}/geometry/tubex_Polygon.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/geometry/tubex_ConvexPolygon.h - ${CMAKE_CURRENT_SOURCE_DIR}/geometry/tubex_ConvexPolygon.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/geometry/tubex_Edge.h - ${CMAKE_CURRENT_SOURCE_DIR}/geometry/tubex_Edge.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/geometry/tubex_GrahamScan.h - ${CMAKE_CURRENT_SOURCE_DIR}/geometry/tubex_GrahamScan.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/geometry/tubex_Point.h - ${CMAKE_CURRENT_SOURCE_DIR}/geometry/tubex_Point.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tubex_DynamicalItem.h - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tubex_DynamicalItem.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tube/tubex_TubeVector.h - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tube/tubex_TubeVector.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tube/tubex_TubeVector_operators.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tube/tubex_Tube.h - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tube/tubex_Tube.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tube/tubex_Tube_operators.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tube/tubex_TubeTreeSynthesis.h - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tube/tubex_TubeTreeSynthesis.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/slice/tubex_Slice.h - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/slice/tubex_Slice.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/slice/tubex_Slice_polygon.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/slice/tubex_Slice_operators.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/trajectory/tubex_RandTrajectory.h - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/trajectory/tubex_RandTrajectory.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/trajectory/tubex_Trajectory.h - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/trajectory/tubex_Trajectory.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/trajectory/tubex_Trajectory_operators.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/trajectory/tubex_TrajectoryVector.h - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/trajectory/tubex_TrajectoryVector.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/trajectory/tubex_TrajectoryVector_operators.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/exceptions/tubex_Exception.h - ${CMAKE_CURRENT_SOURCE_DIR}/exceptions/tubex_Exception.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/exceptions/tubex_DomainsTypeException.h - ${CMAKE_CURRENT_SOURCE_DIR}/exceptions/tubex_DomainsTypeException.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/exceptions/tubex_DomainsSizeException.h - ${CMAKE_CURRENT_SOURCE_DIR}/exceptions/tubex_DomainsSizeException.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/serialize/tubex_serialize_trajectories.h - ${CMAKE_CURRENT_SOURCE_DIR}/serialize/tubex_serialize_trajectories.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/serialize/tubex_serialize_tubes.h - ${CMAKE_CURRENT_SOURCE_DIR}/serialize/tubex_serialize_tubes.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/serialize/tubex_serialize_intervals.h - ${CMAKE_CURRENT_SOURCE_DIR}/serialize/tubex_serialize_intervals.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/static/tubex_CtcDist.h - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/static/tubex_CtcDist.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/static/tubex_CtcFunction.h - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/static/tubex_CtcFunction.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_DynCtc.h - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_DynCtc.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_CtcPicard.h - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_CtcPicard.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_CtcLohner.h - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_CtcLohner.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_CtcChain.h - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_CtcChain.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_CtcDelay.h - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_CtcDelay.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_CtcStatic.h - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_CtcStatic.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_CtcEval.h - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_CtcEval.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_CtcDeriv.h - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_CtcDeriv.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_CtcLinobs.h - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/tubex_CtcLinobs.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/tubex_predef_contractors.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/tubex_predef_contractors.h - ${CMAKE_CURRENT_SOURCE_DIR}/cn/tubex_Domain.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/cn/tubex_Domain.h - ${CMAKE_CURRENT_SOURCE_DIR}/cn/tubex_Contractor.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/cn/tubex_Contractor.h - ${CMAKE_CURRENT_SOURCE_DIR}/cn/tubex_ContractorNetwork.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/cn/tubex_ContractorNetwork_solve.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/cn/tubex_ContractorNetwork_visu.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/cn/tubex_ContractorNetwork.h - ${CMAKE_CURRENT_SOURCE_DIR}/cn/tubex_Hashcode.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/cn/tubex_Hashcode.h - ${CMAKE_CURRENT_SOURCE_DIR}/tools/tubex_Tools.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/tools/tubex_Tools.h - ${CMAKE_CURRENT_SOURCE_DIR}/tools/tubex_Eigen.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/tools/tubex_Eigen.h + ${CMAKE_CURRENT_SOURCE_DIR}/graphics/codac_VIBesFigTube.h + ${CMAKE_CURRENT_SOURCE_DIR}/graphics/codac_VIBesFigTube.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/graphics/codac_ColorMap.h + ${CMAKE_CURRENT_SOURCE_DIR}/graphics/codac_ColorMap.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/graphics/codac_VIBesFigTubeVector.h + ${CMAKE_CURRENT_SOURCE_DIR}/graphics/codac_VIBesFigTubeVector.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/graphics/codac_colors.h + ${CMAKE_CURRENT_SOURCE_DIR}/graphics/codac_colors.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/graphics/codac_VIBesFig.h + ${CMAKE_CURRENT_SOURCE_DIR}/graphics/codac_VIBesFig.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/graphics/codac_VIBesFigPaving.h + ${CMAKE_CURRENT_SOURCE_DIR}/graphics/codac_VIBesFigPaving.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/paving/codac_ConnectedSubset.h + ${CMAKE_CURRENT_SOURCE_DIR}/paving/codac_ConnectedSubset.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/paving/codac_Paving.h + ${CMAKE_CURRENT_SOURCE_DIR}/paving/codac_Paving.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/paving/codac_Set.h + ${CMAKE_CURRENT_SOURCE_DIR}/paving/codac_Set.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/paving/codac_TubePaving.h + ${CMAKE_CURRENT_SOURCE_DIR}/paving/codac_TubePaving.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/paving/codac_ConnectedSubset_degree.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/paving/codac_SIVIAPaving.h + ${CMAKE_CURRENT_SOURCE_DIR}/paving/codac_SIVIAPaving.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/geometry/codac_Polygon.h + ${CMAKE_CURRENT_SOURCE_DIR}/geometry/codac_Polygon.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/geometry/codac_ConvexPolygon.h + ${CMAKE_CURRENT_SOURCE_DIR}/geometry/codac_ConvexPolygon.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/geometry/codac_Edge.h + ${CMAKE_CURRENT_SOURCE_DIR}/geometry/codac_Edge.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/geometry/codac_GrahamScan.h + ${CMAKE_CURRENT_SOURCE_DIR}/geometry/codac_GrahamScan.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/geometry/codac_Point.h + ${CMAKE_CURRENT_SOURCE_DIR}/geometry/codac_Point.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/codac_DynamicalItem.h + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/codac_DynamicalItem.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tube/codac_TubeVector.h + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tube/codac_TubeVector.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tube/codac_TubeVector_operators.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tube/codac_Tube.h + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tube/codac_Tube.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tube/codac_Tube_operators.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tube/codac_TubeTreeSynthesis.h + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/tube/codac_TubeTreeSynthesis.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/slice/codac_Slice.h + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/slice/codac_Slice.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/slice/codac_Slice_polygon.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/slice/codac_Slice_operators.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/trajectory/codac_RandTrajectory.h + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/trajectory/codac_RandTrajectory.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/trajectory/codac_Trajectory.h + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/trajectory/codac_Trajectory.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/trajectory/codac_Trajectory_operators.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/trajectory/codac_TrajectoryVector.h + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/trajectory/codac_TrajectoryVector.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dynamics/trajectory/codac_TrajectoryVector_operators.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/exceptions/codac_Exception.h + ${CMAKE_CURRENT_SOURCE_DIR}/exceptions/codac_Exception.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/exceptions/codac_DomainsTypeException.h + ${CMAKE_CURRENT_SOURCE_DIR}/exceptions/codac_DomainsTypeException.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/exceptions/codac_DomainsSizeException.h + ${CMAKE_CURRENT_SOURCE_DIR}/exceptions/codac_DomainsSizeException.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/serialize/codac_serialize_trajectories.h + ${CMAKE_CURRENT_SOURCE_DIR}/serialize/codac_serialize_trajectories.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/serialize/codac_serialize_tubes.h + ${CMAKE_CURRENT_SOURCE_DIR}/serialize/codac_serialize_tubes.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/serialize/codac_serialize_intervals.h + ${CMAKE_CURRENT_SOURCE_DIR}/serialize/codac_serialize_intervals.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/static/codac_CtcDist.h + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/static/codac_CtcDist.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/static/codac_CtcFunction.h + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/static/codac_CtcFunction.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_DynCtc.h + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_DynCtc.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_CtcPicard.h + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_CtcPicard.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_CtcLohner.h + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_CtcLohner.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_CtcChain.h + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_CtcChain.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_CtcDelay.h + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_CtcDelay.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_CtcStatic.h + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_CtcStatic.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_CtcEval.h + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_CtcEval.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_CtcDeriv.h + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_CtcDeriv.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_CtcLinobs.h + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn/codac_CtcLinobs.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/codac_predef_contractors.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/codac_predef_contractors.h + ${CMAKE_CURRENT_SOURCE_DIR}/cn/codac_Domain.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cn/codac_Domain.h + ${CMAKE_CURRENT_SOURCE_DIR}/cn/codac_Contractor.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cn/codac_Contractor.h + ${CMAKE_CURRENT_SOURCE_DIR}/cn/codac_ContractorNetwork.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cn/codac_ContractorNetwork_solve.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cn/codac_ContractorNetwork_visu.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cn/codac_ContractorNetwork.h + ${CMAKE_CURRENT_SOURCE_DIR}/cn/codac_Hashcode.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cn/codac_Hashcode.h + ${CMAKE_CURRENT_SOURCE_DIR}/tools/codac_Tools.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tools/codac_Tools.h + ${CMAKE_CURRENT_SOURCE_DIR}/tools/codac_Eigen.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tools/codac_Eigen.h ) ################################################################################ -# Create the target for libtubex +# Create the target for libcodac ################################################################################ - add_library(tubex ${SRC}) - target_include_directories(tubex PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/functions + add_library(codac ${SRC}) + target_include_directories(codac PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/functions ${CMAKE_CURRENT_SOURCE_DIR}/arithmetic ${CMAKE_CURRENT_SOURCE_DIR}/graphics ${CMAKE_CURRENT_SOURCE_DIR}/graphics/vibes @@ -151,15 +151,15 @@ ${CMAKE_CURRENT_SOURCE_DIR}/contractors/dyn ${CMAKE_CURRENT_SOURCE_DIR}/cn ${CMAKE_CURRENT_SOURCE_DIR}/tools) - target_link_libraries(tubex PUBLIC Ibex::ibex) + target_link_libraries(codac PUBLIC Ibex::ibex) - #set_property(TARGET tubex PROPERTY CXX_STANDARD 17) + #set_property(TARGET codac PROPERTY CXX_STANDARD 17) add_compile_options(-O3 -Wall) - #set_property(TARGET tubex PROPERTY CXX_STANDARD_REQUIRED ON) + #set_property(TARGET codac PROPERTY CXX_STANDARD_REQUIRED ON) ################################################################################ -# Installation of libtubex files +# Installation of libcodac files ################################################################################ # Getting header files from sources @@ -167,47 +167,47 @@ foreach(srcfile ${SRC}) if(srcfile MATCHES "\\.h$" OR srcfile MATCHES "\\.hpp$") list(APPEND HDR ${srcfile}) - # Copying header files for other Tubex libraries compiled in the same time + # Copying header files for other Codac libraries compiled in the same time file(COPY ${srcfile} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../../include) endif() endforeach() -# Generating a tubex.h file +# Generating a codac.h file - set(TUBEX_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/tubex.h) - file(WRITE ${TUBEX_MAIN_HEADER} "/* This file is generated by CMake */\n\n") - file(APPEND ${TUBEX_MAIN_HEADER} "#ifndef __TUBEX_H__\n#define __TUBEX_H__\n\n") + set(CODAC_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/codac.h) + file(WRITE ${CODAC_MAIN_HEADER} "/* This file is generated by CMake */\n\n") + file(APPEND ${CODAC_MAIN_HEADER} "#ifndef __CODAC_H__\n#define __CODAC_H__\n\n") # Simplifying access to frequently used items of IBEX - file(APPEND ${TUBEX_MAIN_HEADER} "#include \n") - file(APPEND ${TUBEX_MAIN_HEADER} "#include \n") - file(APPEND ${TUBEX_MAIN_HEADER} "#include \n") - file(APPEND ${TUBEX_MAIN_HEADER} "#include \n") - file(APPEND ${TUBEX_MAIN_HEADER} "#include \n") - file(APPEND ${TUBEX_MAIN_HEADER} "#include \n") - file(APPEND ${TUBEX_MAIN_HEADER} "#include \n") - file(APPEND ${TUBEX_MAIN_HEADER} "#include \n") - file(APPEND ${TUBEX_MAIN_HEADER} "\n") - file(APPEND ${TUBEX_MAIN_HEADER} "namespace tubex\n{\n") - file(APPEND ${TUBEX_MAIN_HEADER} " using ibex::Interval;\n") - file(APPEND ${TUBEX_MAIN_HEADER} " using ibex::IntervalVector;\n") - file(APPEND ${TUBEX_MAIN_HEADER} " using ibex::Vector;\n") - file(APPEND ${TUBEX_MAIN_HEADER} " using ibex::Matrix;\n") - file(APPEND ${TUBEX_MAIN_HEADER} " using ibex::IntervalMatrix;\n") - file(APPEND ${TUBEX_MAIN_HEADER} " using ibex::BoolInterval;\n") - file(APPEND ${TUBEX_MAIN_HEADER} " using ibex::Ctc;\n") - file(APPEND ${TUBEX_MAIN_HEADER} " using ibex::Function;\n") - file(APPEND ${TUBEX_MAIN_HEADER} "}\n\n") - file(APPEND ${TUBEX_MAIN_HEADER} "#include \n") # todo: clean this organization - file(APPEND ${TUBEX_MAIN_HEADER} "#include \n") # todo: clean this organization + file(APPEND ${CODAC_MAIN_HEADER} "#include \n") + file(APPEND ${CODAC_MAIN_HEADER} "#include \n") + file(APPEND ${CODAC_MAIN_HEADER} "#include \n") + file(APPEND ${CODAC_MAIN_HEADER} "#include \n") + file(APPEND ${CODAC_MAIN_HEADER} "#include \n") + file(APPEND ${CODAC_MAIN_HEADER} "#include \n") + file(APPEND ${CODAC_MAIN_HEADER} "#include \n") + file(APPEND ${CODAC_MAIN_HEADER} "#include \n") + file(APPEND ${CODAC_MAIN_HEADER} "\n") + file(APPEND ${CODAC_MAIN_HEADER} "namespace codac\n{\n") + file(APPEND ${CODAC_MAIN_HEADER} " using ibex::Interval;\n") + file(APPEND ${CODAC_MAIN_HEADER} " using ibex::IntervalVector;\n") + file(APPEND ${CODAC_MAIN_HEADER} " using ibex::Vector;\n") + file(APPEND ${CODAC_MAIN_HEADER} " using ibex::Matrix;\n") + file(APPEND ${CODAC_MAIN_HEADER} " using ibex::IntervalMatrix;\n") + file(APPEND ${CODAC_MAIN_HEADER} " using ibex::BoolInterval;\n") + file(APPEND ${CODAC_MAIN_HEADER} " using ibex::Ctc;\n") + file(APPEND ${CODAC_MAIN_HEADER} " using ibex::Function;\n") + file(APPEND ${CODAC_MAIN_HEADER} "}\n\n") + file(APPEND ${CODAC_MAIN_HEADER} "#include \n") # todo: clean this organization + file(APPEND ${CODAC_MAIN_HEADER} "#include \n") # todo: clean this organization foreach(header_path ${HDR}) get_filename_component(header_name ${header_path} NAME) - file(APPEND ${TUBEX_MAIN_HEADER} "#include <${header_name}>\n") + file(APPEND ${CODAC_MAIN_HEADER} "#include <${header_name}>\n") endforeach() - file(APPEND ${TUBEX_MAIN_HEADER} "\n#endif /* __TUBEX_H__ */\n") - file(COPY ${TUBEX_MAIN_HEADER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../../include) + file(APPEND ${CODAC_MAIN_HEADER} "\n#endif /* __CODAC_H__ */\n") + file(COPY ${CODAC_MAIN_HEADER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../../include) # Install files in system directories - install(TARGETS tubex DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES ${HDR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tubex) - install(FILES ${TUBEX_MAIN_HEADER} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tubex) \ No newline at end of file + install(TARGETS codac DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES ${HDR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/codac) + install(FILES ${CODAC_MAIN_HEADER} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/codac) \ No newline at end of file diff --git a/src/core/arithmetic/tubex_polygon_arithmetic.cpp b/src/core/arithmetic/codac_polygon_arithmetic.cpp similarity index 97% rename from src/core/arithmetic/tubex_polygon_arithmetic.cpp rename to src/core/arithmetic/codac_polygon_arithmetic.cpp index 2abc2169..f5a7038f 100644 --- a/src/core/arithmetic/tubex_polygon_arithmetic.cpp +++ b/src/core/arithmetic/codac_polygon_arithmetic.cpp @@ -4,17 +4,17 @@ * \date 2020 * \author Simon Rohou * \bugfixes Bertrand Neveu - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_polygon_arithmetic.h" +#include "codac_polygon_arithmetic.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { const ConvexPolygon operator+(const ConvexPolygon& x) { diff --git a/src/core/arithmetic/tubex_polygon_arithmetic.h b/src/core/arithmetic/codac_polygon_arithmetic.h similarity index 87% rename from src/core/arithmetic/tubex_polygon_arithmetic.h rename to src/core/arithmetic/codac_polygon_arithmetic.h index 08bf7b6c..b130d416 100644 --- a/src/core/arithmetic/tubex_polygon_arithmetic.h +++ b/src/core/arithmetic/codac_polygon_arithmetic.h @@ -4,19 +4,19 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_POLYGON_ARITHMETIC_H__ -#define __TUBEX_POLYGON_ARITHMETIC_H__ +#ifndef __CODAC_POLYGON_ARITHMETIC_H__ +#define __CODAC_POLYGON_ARITHMETIC_H__ #include "ibex_IntervalVector.h" #include "ibex_IntervalMatrix.h" -#include "tubex_ConvexPolygon.h" +#include "codac_ConvexPolygon.h" -namespace tubex +namespace codac { const ConvexPolygon operator+(const ConvexPolygon& x); const ConvexPolygon operator+(const ConvexPolygon& x, const ibex::IntervalVector& v); diff --git a/src/core/arithmetic/tubex_predef_values.h b/src/core/arithmetic/codac_predef_values.h similarity index 75% rename from src/core/arithmetic/tubex_predef_values.h rename to src/core/arithmetic/codac_predef_values.h index 071743bb..5fdc9829 100644 --- a/src/core/arithmetic/tubex_predef_values.h +++ b/src/core/arithmetic/codac_predef_values.h @@ -4,17 +4,17 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_PREDEF_VALUES_H__ -#define __TUBEX_PREDEF_VALUES_H__ +#ifndef __CODAC_PREDEF_VALUES_H__ +#define __CODAC_PREDEF_VALUES_H__ #include "ibex_Interval.h" -namespace tubex +namespace codac { const double oo = POS_INFINITY; } diff --git a/src/core/arithmetic/tubex_traj_arithmetic.h b/src/core/arithmetic/codac_traj_arithmetic.h similarity index 98% rename from src/core/arithmetic/tubex_traj_arithmetic.h rename to src/core/arithmetic/codac_traj_arithmetic.h index 4c336367..3efe81c6 100644 --- a/src/core/arithmetic/tubex_traj_arithmetic.h +++ b/src/core/arithmetic/codac_traj_arithmetic.h @@ -4,18 +4,18 @@ * ---------------------------------------------------------------------------- * \date 2019 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_TRAJ_ARITHMETIC_H__ -#define __TUBEX_TRAJ_ARITHMETIC_H__ +#ifndef __CODAC_TRAJ_ARITHMETIC_H__ +#define __CODAC_TRAJ_ARITHMETIC_H__ -#include "tubex_Trajectory.h" -#include "tubex_TrajectoryVector.h" +#include "codac_Trajectory.h" +#include "codac_TrajectoryVector.h" -namespace tubex +namespace codac { class Trajectory; class TrajectoryVector; diff --git a/src/core/arithmetic/tubex_traj_arithmetic_scalar.cpp b/src/core/arithmetic/codac_traj_arithmetic_scalar.cpp similarity index 98% rename from src/core/arithmetic/tubex_traj_arithmetic_scalar.cpp rename to src/core/arithmetic/codac_traj_arithmetic_scalar.cpp index e4e245bf..a029a8df 100644 --- a/src/core/arithmetic/tubex_traj_arithmetic_scalar.cpp +++ b/src/core/arithmetic/codac_traj_arithmetic_scalar.cpp @@ -4,17 +4,17 @@ * \date 2019 * \author Simon Rohou * \bugfixes Bertrand Neveu - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_traj_arithmetic.h" +#include "codac_traj_arithmetic.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { const Trajectory operator+(const Trajectory& x) { diff --git a/src/core/arithmetic/tubex_traj_arithmetic_vector.cpp b/src/core/arithmetic/codac_traj_arithmetic_vector.cpp similarity index 94% rename from src/core/arithmetic/tubex_traj_arithmetic_vector.cpp rename to src/core/arithmetic/codac_traj_arithmetic_vector.cpp index e4da01b1..ef135b08 100644 --- a/src/core/arithmetic/tubex_traj_arithmetic_vector.cpp +++ b/src/core/arithmetic/codac_traj_arithmetic_vector.cpp @@ -3,17 +3,17 @@ * ---------------------------------------------------------------------------- * \date 2019 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_traj_arithmetic.h" +#include "codac_traj_arithmetic.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { const TrajectoryVector operator+(const TrajectoryVector& x) { @@ -36,7 +36,7 @@ namespace tubex assert(x1.tdomain() == x2.tdomain()); \ TrajectoryVector y(x1); \ for(int i = 0 ; i < y.size() ; i++) \ - y[i] = tubex::f(x1[i], x2[i]); \ + y[i] = codac::f(x1[i], x2[i]); \ return y; \ } \ \ @@ -45,7 +45,7 @@ namespace tubex assert(x1.size() == x2.size()); \ TrajectoryVector y(x1); \ for(int i = 0 ; i < y.size() ; i++) \ - y[i] = tubex::f(x1[i], x2[i]); \ + y[i] = codac::f(x1[i], x2[i]); \ return y; \ } \ \ @@ -54,7 +54,7 @@ namespace tubex assert(x1.size() == x2.size()); \ TrajectoryVector y(x2); \ for(int i = 0 ; i < y.size() ; i++) \ - y[i] = tubex::f(x1[i], x2[i]); \ + y[i] = codac::f(x1[i], x2[i]); \ return y; \ } \ diff --git a/src/core/arithmetic/tubex_tube_arithmetic.h b/src/core/arithmetic/codac_tube_arithmetic.h similarity index 98% rename from src/core/arithmetic/tubex_tube_arithmetic.h rename to src/core/arithmetic/codac_tube_arithmetic.h index 9ad0ad84..9d0c59a6 100644 --- a/src/core/arithmetic/tubex_tube_arithmetic.h +++ b/src/core/arithmetic/codac_tube_arithmetic.h @@ -4,7 +4,7 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). @@ -12,15 +12,15 @@ * \return Tube output */ -#ifndef __TUBEX_TUBE_ARITHMETIC_H__ -#define __TUBEX_TUBE_ARITHMETIC_H__ +#ifndef __CODAC_TUBE_ARITHMETIC_H__ +#define __CODAC_TUBE_ARITHMETIC_H__ #include "ibex_Interval.h" #include "ibex_IntervalVector.h" -#include "tubex_Tube.h" -#include "tubex_TubeVector.h" +#include "codac_Tube.h" +#include "codac_TubeVector.h" -namespace tubex +namespace codac { /// \name Scalar outputs /// @{ diff --git a/src/core/arithmetic/tubex_tube_arithmetic_scalar.cpp b/src/core/arithmetic/codac_tube_arithmetic_scalar.cpp similarity index 98% rename from src/core/arithmetic/tubex_tube_arithmetic_scalar.cpp rename to src/core/arithmetic/codac_tube_arithmetic_scalar.cpp index 63306393..1b5d7acf 100644 --- a/src/core/arithmetic/tubex_tube_arithmetic_scalar.cpp +++ b/src/core/arithmetic/codac_tube_arithmetic_scalar.cpp @@ -4,18 +4,18 @@ * \date 2015 * \author Simon Rohou * \bugfixes Bertrand Neveu - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_tube_arithmetic.h" -#include "tubex_Slice.h" +#include "codac_tube_arithmetic.h" +#include "codac_Slice.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { const Tube operator+(const Tube& x) { diff --git a/src/core/arithmetic/tubex_tube_arithmetic_vector.cpp b/src/core/arithmetic/codac_tube_arithmetic_vector.cpp similarity index 92% rename from src/core/arithmetic/tubex_tube_arithmetic_vector.cpp rename to src/core/arithmetic/codac_tube_arithmetic_vector.cpp index de5803c2..9528691c 100644 --- a/src/core/arithmetic/tubex_tube_arithmetic_vector.cpp +++ b/src/core/arithmetic/codac_tube_arithmetic_vector.cpp @@ -3,18 +3,18 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_tube_arithmetic.h" -#include "tubex_Slice.h" +#include "codac_tube_arithmetic.h" +#include "codac_Slice.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { const TubeVector operator+(const TubeVector& x) { @@ -38,7 +38,7 @@ namespace tubex \ TubeVector y(x1); \ for(int i = 0 ; i < y.size() ; i++) \ - y[i] = tubex::f(x1[i], x2[i]); \ + y[i] = codac::f(x1[i], x2[i]); \ return y; \ } \ \ @@ -48,7 +48,7 @@ namespace tubex \ TubeVector y(x1); \ for(int i = 0 ; i < y.size() ; i++) \ - y[i] = tubex::f(x1[i], x2[i]); \ + y[i] = codac::f(x1[i], x2[i]); \ return y; \ } \ \ @@ -58,7 +58,7 @@ namespace tubex \ TubeVector y(x2); \ for(int i = 0 ; i < y.size() ; i++) \ - y[i] = tubex::f(x1[i], x2[i]); \ + y[i] = codac::f(x1[i], x2[i]); \ return y; \ } \ \ @@ -69,7 +69,7 @@ namespace tubex \ TubeVector y(x1); \ for(int i = 0 ; i < y.size() ; i++) \ - y[i] = tubex::f(x1[i], x2[i]); \ + y[i] = codac::f(x1[i], x2[i]); \ return y; \ } \ \ @@ -80,7 +80,7 @@ namespace tubex \ TubeVector y(x2); \ for(int i = 0 ; i < y.size() ; i++) \ - y[i] = tubex::f(x1[i], x2[i]); \ + y[i] = codac::f(x1[i], x2[i]); \ return y; \ } \ \ diff --git a/src/core/cn/tubex_Contractor.cpp b/src/core/cn/codac_Contractor.cpp similarity index 95% rename from src/core/cn/tubex_Contractor.cpp rename to src/core/cn/codac_Contractor.cpp index fb5b04d8..d1069b89 100644 --- a/src/core/cn/tubex_Contractor.cpp +++ b/src/core/cn/codac_Contractor.cpp @@ -3,21 +3,21 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_Contractor.h" -#include "tubex_CtcEval.h" -#include "tubex_CtcDeriv.h" -#include "tubex_CtcDist.h" -#include "tubex_Exception.h" +#include "codac_Contractor.h" +#include "codac_CtcEval.h" +#include "codac_CtcDeriv.h" +#include "codac_CtcDist.h" +#include "codac_Exception.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { int Contractor::ctc_counter = 0; @@ -39,7 +39,7 @@ namespace tubex } Contractor::Contractor(DynCtc& ctc, const vector& v_domains) - : Contractor(Type::T_TUBEX, v_domains) + : Contractor(Type::T_CODAC, v_domains) { assert(!v_domains.empty()); @@ -66,7 +66,7 @@ namespace tubex m_static_ctc = reference_wrapper(ac.m_static_ctc); break; - case Type::T_TUBEX: + case Type::T_CODAC: m_dyn_ctc = reference_wrapper(ac.m_dyn_ctc); break; @@ -96,9 +96,9 @@ namespace tubex return m_static_ctc.get(); } - DynCtc& Contractor::tubex_ctc() + DynCtc& Contractor::codac_ctc() { - assert(m_type == Type::T_TUBEX); + assert(m_type == Type::T_CODAC); return m_dyn_ctc.get(); } @@ -138,7 +138,7 @@ namespace tubex if(typeid(m_static_ctc.get()) != typeid(x.m_static_ctc.get())) return false; - case Type::T_TUBEX: + case Type::T_CODAC: if(typeid(m_dyn_ctc.get()) != typeid(x.m_dyn_ctc.get())) return false; @@ -319,7 +319,7 @@ namespace tubex } } - else if(m_type == Type::T_TUBEX) + else if(m_type == Type::T_CODAC) { m_dyn_ctc.get().contract(m_v_domains); } @@ -387,7 +387,7 @@ namespace tubex case Type::T_EQUALITY: return "="; - case Type::T_TUBEX: + case Type::T_CODAC: if(m_name.empty()) { if(typeid(m_dyn_ctc.get()) == typeid(CtcEval)) diff --git a/src/core/cn/tubex_Contractor.h b/src/core/cn/codac_Contractor.h similarity index 83% rename from src/core/cn/tubex_Contractor.h rename to src/core/cn/codac_Contractor.h index 2ae75543..93ffc72e 100644 --- a/src/core/cn/tubex_Contractor.h +++ b/src/core/cn/codac_Contractor.h @@ -4,28 +4,28 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_CONTRACTOR_H__ -#define __TUBEX_CONTRACTOR_H__ +#ifndef __CODAC_CONTRACTOR_H__ +#define __CODAC_CONTRACTOR_H__ #include #include #include "ibex_Ctc.h" -#include "tubex_DynCtc.h" -#include "tubex_Domain.h" -#include "tubex_ContractorNetwork.h" -#include "tubex_Hashcode.h" +#include "codac_DynCtc.h" +#include "codac_Domain.h" +#include "codac_ContractorNetwork.h" +#include "codac_Hashcode.h" namespace ibex { class Ctc; } -namespace tubex +namespace codac { class Domain; class ContractorNetwork; @@ -35,7 +35,7 @@ namespace tubex { public: - enum class Type { T_COMPONENT, T_EQUALITY, T_IBEX, T_TUBEX }; + enum class Type { T_COMPONENT, T_EQUALITY, T_IBEX, T_CODAC }; Contractor(Type type, const std::vector& v_domains); Contractor(ibex::Ctc& ctc, const std::vector& v_domains); @@ -47,7 +47,7 @@ namespace tubex Type type() const; ibex::Ctc& ibex_ctc(); - DynCtc& tubex_ctc(); + DynCtc& codac_ctc(); bool is_active() const; void set_active(bool active); diff --git a/src/core/cn/tubex_ContractorNetwork.cpp b/src/core/cn/codac_ContractorNetwork.cpp similarity index 98% rename from src/core/cn/tubex_ContractorNetwork.cpp rename to src/core/cn/codac_ContractorNetwork.cpp index 7be8cc93..b7c2c642 100644 --- a/src/core/cn/tubex_ContractorNetwork.cpp +++ b/src/core/cn/codac_ContractorNetwork.cpp @@ -3,20 +3,20 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_ContractorNetwork.h" -#include "tubex_CtcEval.h" -#include "tubex_Exception.h" -#include "tubex_DomainsTypeException.h" +#include "codac_ContractorNetwork.h" +#include "codac_CtcEval.h" +#include "codac_Exception.h" +#include "codac_DomainsTypeException.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { // Public methods diff --git a/src/core/cn/tubex_ContractorNetwork.h b/src/core/cn/codac_ContractorNetwork.h similarity index 98% rename from src/core/cn/tubex_ContractorNetwork.h rename to src/core/cn/codac_ContractorNetwork.h index 93e4b5ba..0f07993d 100644 --- a/src/core/cn/tubex_ContractorNetwork.h +++ b/src/core/cn/codac_ContractorNetwork.h @@ -4,29 +4,29 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_CONTRACTORNETWORK_H__ -#define __TUBEX_CONTRACTORNETWORK_H__ +#ifndef __CODAC_CONTRACTORNETWORK_H__ +#define __CODAC_CONTRACTORNETWORK_H__ #include #include #include "ibex_Ctc.h" -#include "tubex_DynCtc.h" -#include "tubex_Domain.h" -#include "tubex_Contractor.h" -#include "tubex_CtcDeriv.h" -#include "tubex_Hashcode.h" +#include "codac_DynCtc.h" +#include "codac_Domain.h" +#include "codac_Contractor.h" +#include "codac_CtcDeriv.h" +#include "codac_Hashcode.h" namespace ibex { class Ctc; } -namespace tubex +namespace codac { class Domain; class Contractor; diff --git a/src/core/cn/tubex_ContractorNetwork_solve.cpp b/src/core/cn/codac_ContractorNetwork_solve.cpp similarity index 96% rename from src/core/cn/tubex_ContractorNetwork_solve.cpp rename to src/core/cn/codac_ContractorNetwork_solve.cpp index 42274bba..79fb6417 100644 --- a/src/core/cn/tubex_ContractorNetwork_solve.cpp +++ b/src/core/cn/codac_ContractorNetwork_solve.cpp @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include -#include "tubex_ContractorNetwork.h" -#include "tubex_Exception.h" +#include "codac_ContractorNetwork.h" +#include "codac_Exception.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { // Public methods diff --git a/src/core/cn/tubex_ContractorNetwork_visu.cpp b/src/core/cn/codac_ContractorNetwork_visu.cpp similarity index 96% rename from src/core/cn/tubex_ContractorNetwork_visu.cpp rename to src/core/cn/codac_ContractorNetwork_visu.cpp index 5be05c31..78ae9950 100644 --- a/src/core/cn/tubex_ContractorNetwork_visu.cpp +++ b/src/core/cn/codac_ContractorNetwork_visu.cpp @@ -3,21 +3,21 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include #include -#include "tubex_Tools.h" -#include "tubex_ContractorNetwork.h" -#include "tubex_Exception.h" +#include "codac_Tools.h" +#include "codac_ContractorNetwork.h" +#include "codac_Exception.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { // Public methods @@ -49,7 +49,7 @@ namespace tubex bool contractor_found = false; for(auto& added_ctc : m_map_ctc) - if(added_ctc.second->type() == Contractor::Type::T_TUBEX && &added_ctc.second->tubex_ctc() == &ctc) + if(added_ctc.second->type() == Contractor::Type::T_CODAC && &added_ctc.second->codac_ctc() == &ctc) { added_ctc.second->set_name(name); contractor_found = true; diff --git a/src/core/cn/tubex_Domain.cpp b/src/core/cn/codac_Domain.cpp similarity index 99% rename from src/core/cn/tubex_Domain.cpp rename to src/core/cn/codac_Domain.cpp index b873dc36..26ecd14f 100644 --- a/src/core/cn/tubex_Domain.cpp +++ b/src/core/cn/codac_Domain.cpp @@ -3,20 +3,20 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_Tools.h" -#include "tubex_Domain.h" -#include "tubex_Figure.h" // for add_suffix -#include "tubex_Exception.h" +#include "codac_Tools.h" +#include "codac_Domain.h" +#include "codac_Figure.h" // for add_suffix +#include "codac_Exception.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { int Domain::dom_counter = 0; diff --git a/src/core/cn/tubex_Domain.h b/src/core/cn/codac_Domain.h similarity index 94% rename from src/core/cn/tubex_Domain.h rename to src/core/cn/codac_Domain.h index b957e078..a25d16e1 100644 --- a/src/core/cn/tubex_Domain.h +++ b/src/core/cn/codac_Domain.h @@ -4,25 +4,25 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_DOMAIN_H__ -#define __TUBEX_DOMAIN_H__ +#ifndef __CODAC_DOMAIN_H__ +#define __CODAC_DOMAIN_H__ #include #include "ibex_Interval.h" #include "ibex_IntervalVector.h" -#include "tubex_Slice.h" -#include "tubex_Tube.h" -#include "tubex_TubeVector.h" -#include "tubex_Contractor.h" -#include "tubex_ContractorNetwork.h" -#include "tubex_Hashcode.h" - -namespace tubex +#include "codac_Slice.h" +#include "codac_Tube.h" +#include "codac_TubeVector.h" +#include "codac_Contractor.h" +#include "codac_ContractorNetwork.h" +#include "codac_Hashcode.h" + +namespace codac { // todo: assert if structure of referenced domain changes (size, nb slices) diff --git a/src/core/cn/tubex_Hashcode.cpp b/src/core/cn/codac_Hashcode.cpp similarity index 93% rename from src/core/cn/tubex_Hashcode.cpp rename to src/core/cn/codac_Hashcode.cpp index db845dfa..5cc99680 100644 --- a/src/core/cn/tubex_Hashcode.cpp +++ b/src/core/cn/codac_Hashcode.cpp @@ -3,20 +3,20 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_Hashcode.h" -#include "tubex_CtcEval.h" -#include "tubex_CtcDeriv.h" -#include "tubex_CtcDist.h" +#include "codac_Hashcode.h" +#include "codac_CtcEval.h" +#include "codac_CtcDeriv.h" +#include "codac_CtcDist.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { // ContractorHashcode class @@ -43,7 +43,7 @@ namespace tubex assert(m_ptr[m_n-1] > 4); // reserved codes break; - case Contractor::Type::T_TUBEX: + case Contractor::Type::T_CODAC: if(typeid(ctc.m_dyn_ctc.get()) == typeid(CtcEval)) m_ptr[m_n-1] = 2; diff --git a/src/core/cn/tubex_Hashcode.h b/src/core/cn/codac_Hashcode.h similarity index 82% rename from src/core/cn/tubex_Hashcode.h rename to src/core/cn/codac_Hashcode.h index eca15741..ca57ef03 100644 --- a/src/core/cn/tubex_Hashcode.h +++ b/src/core/cn/codac_Hashcode.h @@ -4,19 +4,19 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_HASHCODE_H__ -#define __TUBEX_HASHCODE_H__ +#ifndef __CODAC_HASHCODE_H__ +#define __CODAC_HASHCODE_H__ #include -#include "tubex_Contractor.h" -#include "tubex_Domain.h" +#include "codac_Contractor.h" +#include "codac_Domain.h" -namespace tubex +namespace codac { class Domain; class Contractor; diff --git a/src/core/contractors/tubex_predef_contractors.cpp b/src/core/contractors/codac_predef_contractors.cpp similarity index 81% rename from src/core/contractors/tubex_predef_contractors.cpp rename to src/core/contractors/codac_predef_contractors.cpp index 9c81f3db..55076f1e 100644 --- a/src/core/contractors/tubex_predef_contractors.cpp +++ b/src/core/contractors/codac_predef_contractors.cpp @@ -3,14 +3,14 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_predef_contractors.h" +#include "codac_predef_contractors.h" -namespace tubex +namespace codac { namespace ctc { diff --git a/src/core/contractors/tubex_predef_contractors.h b/src/core/contractors/codac_predef_contractors.h similarity index 72% rename from src/core/contractors/tubex_predef_contractors.h rename to src/core/contractors/codac_predef_contractors.h index 7a776eb6..0c8ca7fb 100644 --- a/src/core/contractors/tubex_predef_contractors.h +++ b/src/core/contractors/codac_predef_contractors.h @@ -4,20 +4,20 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_PREDEF_CTC_H__ -#define __TUBEX_PREDEF_CTC_H__ +#ifndef __CODAC_PREDEF_CTC_H__ +#define __CODAC_PREDEF_CTC_H__ -#include "tubex_CtcDeriv.h" -#include "tubex_CtcDist.h" -#include "tubex_CtcEval.h" -#include "tubex_CtcDelay.h" +#include "codac_CtcDeriv.h" +#include "codac_CtcDist.h" +#include "codac_CtcEval.h" +#include "codac_CtcDelay.h" -namespace tubex +namespace codac { namespace ctc { diff --git a/src/core/contractors/dyn/tubex_CtcChain.cpp b/src/core/contractors/dyn/codac_CtcChain.cpp similarity index 91% rename from src/core/contractors/dyn/tubex_CtcChain.cpp rename to src/core/contractors/dyn/codac_CtcChain.cpp index 74203118..57385be1 100755 --- a/src/core/contractors/dyn/tubex_CtcChain.cpp +++ b/src/core/contractors/dyn/codac_CtcChain.cpp @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_CtcChain.h" -#include "tubex_Domain.h" -#include "tubex_DomainsTypeException.h" +#include "codac_CtcChain.h" +#include "codac_Domain.h" +#include "codac_DomainsTypeException.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { IntervalMatrix exp_At(const Matrix& A, const Interval& t) { diff --git a/src/core/contractors/dyn/tubex_CtcChain.h b/src/core/contractors/dyn/codac_CtcChain.h similarity index 86% rename from src/core/contractors/dyn/tubex_CtcChain.h rename to src/core/contractors/dyn/codac_CtcChain.h index 1fe36596..f958937a 100755 --- a/src/core/contractors/dyn/tubex_CtcChain.h +++ b/src/core/contractors/dyn/codac_CtcChain.h @@ -4,17 +4,17 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_CTCCHAIN_H__ -#define __TUBEX_CTCCHAIN_H__ +#ifndef __CODAC_CTCCHAIN_H__ +#define __CODAC_CTCCHAIN_H__ -#include "tubex_CtcLinobs.h" +#include "codac_CtcLinobs.h" -namespace tubex +namespace codac { /** * \class CtcChain diff --git a/src/core/contractors/dyn/tubex_CtcDelay.cpp b/src/core/contractors/dyn/codac_CtcDelay.cpp similarity index 97% rename from src/core/contractors/dyn/tubex_CtcDelay.cpp rename to src/core/contractors/dyn/codac_CtcDelay.cpp index 2e837853..0b2dbb1b 100644 --- a/src/core/contractors/dyn/tubex_CtcDelay.cpp +++ b/src/core/contractors/dyn/codac_CtcDelay.cpp @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Raphael Voges - * \copyright Copyright 2020 Tubex Team + * \copyright Copyright 2020 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_CtcDelay.h" -#include "tubex_Domain.h" -#include "tubex_DomainsTypeException.h" +#include "codac_CtcDelay.h" +#include "codac_Domain.h" +#include "codac_DomainsTypeException.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { CtcDelay::CtcDelay() : DynCtc(true) { diff --git a/src/core/contractors/dyn/tubex_CtcDelay.h b/src/core/contractors/dyn/codac_CtcDelay.h similarity index 94% rename from src/core/contractors/dyn/tubex_CtcDelay.h rename to src/core/contractors/dyn/codac_CtcDelay.h index 41b84db1..237f7fa1 100644 --- a/src/core/contractors/dyn/tubex_CtcDelay.h +++ b/src/core/contractors/dyn/codac_CtcDelay.h @@ -4,17 +4,17 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Raphael Voges - * \copyright Copyright 2020 Tubex Team + * \copyright Copyright 2020 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_CTCDELAY_H__ -#define __TUBEX_CTCDELAY_H__ +#ifndef __CODAC_CTCDELAY_H__ +#define __CODAC_CTCDELAY_H__ -#include "tubex_DynCtc.h" +#include "codac_DynCtc.h" -namespace tubex +namespace codac { /** * \class CtcDelay diff --git a/src/core/contractors/dyn/tubex_CtcDeriv.cpp b/src/core/contractors/dyn/codac_CtcDeriv.cpp similarity index 97% rename from src/core/contractors/dyn/tubex_CtcDeriv.cpp rename to src/core/contractors/dyn/codac_CtcDeriv.cpp index 5e0a5b0a..da7fd32d 100644 --- a/src/core/contractors/dyn/tubex_CtcDeriv.cpp +++ b/src/core/contractors/dyn/codac_CtcDeriv.cpp @@ -3,20 +3,20 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_CtcDeriv.h" -#include "tubex_ConvexPolygon.h" -#include "tubex_Domain.h" -#include "tubex_DomainsTypeException.h" +#include "codac_CtcDeriv.h" +#include "codac_ConvexPolygon.h" +#include "codac_Domain.h" +#include "codac_DomainsTypeException.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { CtcDeriv::CtcDeriv() : DynCtc(false) diff --git a/src/core/contractors/dyn/tubex_CtcDeriv.h b/src/core/contractors/dyn/codac_CtcDeriv.h similarity index 96% rename from src/core/contractors/dyn/tubex_CtcDeriv.h rename to src/core/contractors/dyn/codac_CtcDeriv.h index 3744eacc..356ab476 100644 --- a/src/core/contractors/dyn/tubex_CtcDeriv.h +++ b/src/core/contractors/dyn/codac_CtcDeriv.h @@ -4,18 +4,18 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_CTCDERIV_H__ -#define __TUBEX_CTCDERIV_H__ +#ifndef __CODAC_CTCDERIV_H__ +#define __CODAC_CTCDERIV_H__ -#include "tubex_DynCtc.h" -#include "tubex_Slice.h" +#include "codac_DynCtc.h" +#include "codac_Slice.h" -namespace tubex +namespace codac { class Domain; diff --git a/src/core/contractors/dyn/tubex_CtcEval.cpp b/src/core/contractors/dyn/codac_CtcEval.cpp similarity index 98% rename from src/core/contractors/dyn/tubex_CtcEval.cpp rename to src/core/contractors/dyn/codac_CtcEval.cpp index 36f7b9a9..e1bac81e 100644 --- a/src/core/contractors/dyn/tubex_CtcEval.cpp +++ b/src/core/contractors/dyn/codac_CtcEval.cpp @@ -3,22 +3,22 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include -#include "tubex_CtcEval.h" -#include "tubex_CtcDeriv.h" -#include "tubex_Domain.h" -#include "tubex_DomainsTypeException.h" -#include "tubex_DomainsSizeException.h" +#include "codac_CtcEval.h" +#include "codac_CtcDeriv.h" +#include "codac_Domain.h" +#include "codac_DomainsTypeException.h" +#include "codac_DomainsSizeException.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { CtcEval::CtcEval() : DynCtc(true) // inter-temporal as [t] may involve several times diff --git a/src/core/contractors/dyn/tubex_CtcEval.h b/src/core/contractors/dyn/codac_CtcEval.h similarity index 97% rename from src/core/contractors/dyn/tubex_CtcEval.h rename to src/core/contractors/dyn/codac_CtcEval.h index 8f1d625c..7dea24a3 100644 --- a/src/core/contractors/dyn/tubex_CtcEval.h +++ b/src/core/contractors/dyn/codac_CtcEval.h @@ -4,17 +4,17 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_CTCEVAL_H__ -#define __TUBEX_CTCEVAL_H__ +#ifndef __CODAC_CTCEVAL_H__ +#define __CODAC_CTCEVAL_H__ -#include "tubex_DynCtc.h" +#include "codac_DynCtc.h" -namespace tubex +namespace codac { /** * \class CtcEval diff --git a/src/core/contractors/dyn/tubex_CtcLinobs.cpp b/src/core/contractors/dyn/codac_CtcLinobs.cpp similarity index 97% rename from src/core/contractors/dyn/tubex_CtcLinobs.cpp rename to src/core/contractors/dyn/codac_CtcLinobs.cpp index a3f155ee..72e03cb6 100644 --- a/src/core/contractors/dyn/tubex_CtcLinobs.cpp +++ b/src/core/contractors/dyn/codac_CtcLinobs.cpp @@ -3,20 +3,20 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_CtcLinobs.h" -#include "tubex_Domain.h" -#include "tubex_polygon_arithmetic.h" -#include "tubex_DomainsTypeException.h" +#include "codac_CtcLinobs.h" +#include "codac_Domain.h" +#include "codac_polygon_arithmetic.h" +#include "codac_DomainsTypeException.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { CtcLinobs::CtcLinobs(const Matrix& A, const Vector& b, IntervalMatrix (*exp_At)(const Matrix& A, const Interval& t)) : DynCtc(), m_A(A), m_b(b), m_exp_At(exp_At) diff --git a/src/core/contractors/dyn/tubex_CtcLinobs.h b/src/core/contractors/dyn/codac_CtcLinobs.h similarity index 94% rename from src/core/contractors/dyn/tubex_CtcLinobs.h rename to src/core/contractors/dyn/codac_CtcLinobs.h index 58918743..b9a06a65 100644 --- a/src/core/contractors/dyn/tubex_CtcLinobs.h +++ b/src/core/contractors/dyn/codac_CtcLinobs.h @@ -4,21 +4,21 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_CTCLINOBS_H__ -#define __TUBEX_CTCLINOBS_H__ +#ifndef __CODAC_CTCLINOBS_H__ +#define __CODAC_CTCLINOBS_H__ #include #include #include -#include "tubex_DynCtc.h" -#include "tubex_ConvexPolygon.h" +#include "codac_DynCtc.h" +#include "codac_ConvexPolygon.h" -namespace tubex +namespace codac { /** * \class CtcLinobs diff --git a/src/core/contractors/dyn/tubex_CtcLohner.cpp b/src/core/contractors/dyn/codac_CtcLohner.cpp similarity index 95% rename from src/core/contractors/dyn/tubex_CtcLohner.cpp rename to src/core/contractors/dyn/codac_CtcLohner.cpp index 39f6e5ff..94db3e91 100644 --- a/src/core/contractors/dyn/tubex_CtcLohner.cpp +++ b/src/core/contractors/dyn/codac_CtcLohner.cpp @@ -3,24 +3,24 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Auguste Bourgois - * \copyright Copyright 2020 Tubex Team + * \copyright Copyright 2020 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_CtcLohner.h" +#include "codac_CtcLohner.h" -#include +#include #include #include -#include -#include +#include +#include using namespace ibex; using namespace std; -namespace tubex { +namespace codac { // todo: to be placed in header file @@ -195,7 +195,7 @@ CtcLohner::CtcLohner(const ibex::Function &f, int contractions, double eps) dim(f.nb_var()), eps(eps) {} -void CtcLohner::contract(tubex::TubeVector &tube, TimePropag t_propa) { +void CtcLohner::contract(codac::TubeVector &tube, TimePropag t_propa) { assert((!tube.is_empty()) && (tube.size() == dim)); IntervalVector input_gate(dim, Interval(0)), output_gate(dim, Interval(0)), slice(dim, Interval(0)); double h; @@ -237,9 +237,9 @@ void CtcLohner::contract(tubex::TubeVector &tube, TimePropag t_propa) { } } -void CtcLohner::contract(tubex::Tube &tube, TimePropag t_propa) { +void CtcLohner::contract(codac::Tube &tube, TimePropag t_propa) { assert(!tube.is_empty()); - tubex::TubeVector tubeVector(1, tube); + codac::TubeVector tubeVector(1, tube); contract(tubeVector, t_propa); tube = tubeVector[0]; } @@ -269,4 +269,4 @@ void CtcLohner::contract(vector &v_domains) { throw DomainsTypeException(m_ctc_name, v_domains, m_str_expected_doms); } -} // namespace tubex \ No newline at end of file +} // namespace codac \ No newline at end of file diff --git a/src/core/contractors/dyn/tubex_CtcLohner.h b/src/core/contractors/dyn/codac_CtcLohner.h similarity index 83% rename from src/core/contractors/dyn/tubex_CtcLohner.h rename to src/core/contractors/dyn/codac_CtcLohner.h index b17f3200..1a16448e 100644 --- a/src/core/contractors/dyn/tubex_CtcLohner.h +++ b/src/core/contractors/dyn/codac_CtcLohner.h @@ -4,20 +4,20 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Auguste Bourgois - * \copyright Copyright 2020 Tubex Team + * \copyright Copyright 2020 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_CTCLOHNER_H__ -#define __TUBEX_CTCLOHNER_H__ +#ifndef __CODAC_CTCLOHNER_H__ +#define __CODAC_CTCLOHNER_H__ -#include "tubex_DynCtc.h" -#include "tubex_TFnc.h" -#include "tubex_Slice.h" +#include "codac_DynCtc.h" +#include "codac_TFnc.h" +#include "codac_Slice.h" -namespace tubex { +namespace codac { /** * \class CtcLohner @@ -25,7 +25,7 @@ namespace tubex { * \brief \f$\mathcal{C}_\textrm{lohner}\f$ that contracts a tube \f$[\mathbf{x}](\cdot)\f$ according * to a differential constraint \f$\dot{\mathbf{x}}=\mathbf{f}(\mathbf{x})\f$ */ -class CtcLohner : public tubex::DynCtc { +class CtcLohner : public codac::DynCtc { public: /** @@ -43,7 +43,7 @@ class CtcLohner : public tubex::DynCtc { * @param tube tube to contract * @param t_propa direction of contraction */ - void contract(tubex::TubeVector &tube, TimePropag t_propa = TimePropag::FORWARD | TimePropag::BACKWARD); + void contract(codac::TubeVector &tube, TimePropag t_propa = TimePropag::FORWARD | TimePropag::BACKWARD); /** * \brief Contracts the tube with respect to the specified differential constraint, either forward, backward (or both) in time @@ -51,7 +51,7 @@ class CtcLohner : public tubex::DynCtc { * @param tube tube to contract * @param t_propa direction of contraction */ - void contract(tubex::Tube &tube, TimePropag t_propa = TimePropag::FORWARD | TimePropag::BACKWARD); + void contract(codac::Tube &tube, TimePropag t_propa = TimePropag::FORWARD | TimePropag::BACKWARD); /* * \brief Contracts a set of abstract domains @@ -60,7 +60,7 @@ class CtcLohner : public tubex::DynCtc { * * \param v_domains vector of Domain pointers */ - void contract(std::vector &v_domains) override; + void contract(std::vector &v_domains) override; protected: ibex::Function m_f; //!< forward function @@ -73,6 +73,6 @@ class CtcLohner : public tubex::DynCtc { friend class ContractorNetwork; }; -} // namespace tubex +} // namespace codac #endif \ No newline at end of file diff --git a/src/core/contractors/dyn/tubex_CtcPicard.cpp b/src/core/contractors/dyn/codac_CtcPicard.cpp similarity index 98% rename from src/core/contractors/dyn/tubex_CtcPicard.cpp rename to src/core/contractors/dyn/codac_CtcPicard.cpp index c981bcea..9ce60869 100644 --- a/src/core/contractors/dyn/tubex_CtcPicard.cpp +++ b/src/core/contractors/dyn/codac_CtcPicard.cpp @@ -3,20 +3,20 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_CtcPicard.h" -#include "tubex_DomainsTypeException.h" +#include "codac_CtcPicard.h" +#include "codac_DomainsTypeException.h" using namespace std; using namespace ibex; #define EPSILON std::numeric_limits::epsilon() -namespace tubex +namespace codac { CtcPicard::CtcPicard(Function& f, float delta) : DynCtc(true), m_f_ptr(new TFunction(f)), m_f(*m_f_ptr), m_delta(delta) diff --git a/src/core/contractors/dyn/tubex_CtcPicard.h b/src/core/contractors/dyn/codac_CtcPicard.h similarity index 87% rename from src/core/contractors/dyn/tubex_CtcPicard.h rename to src/core/contractors/dyn/codac_CtcPicard.h index 06382aef..d9f6019f 100644 --- a/src/core/contractors/dyn/tubex_CtcPicard.h +++ b/src/core/contractors/dyn/codac_CtcPicard.h @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_CTCPICARD_H__ -#define __TUBEX_CTCPICARD_H__ +#ifndef __CODAC_CTCPICARD_H__ +#define __CODAC_CTCPICARD_H__ -#include "tubex_DynCtc.h" -#include "tubex_TFnc.h" -#include "tubex_Slice.h" +#include "codac_DynCtc.h" +#include "codac_TFnc.h" +#include "codac_Slice.h" -namespace tubex +namespace codac { /** * \brief CtcPicard class. diff --git a/src/core/contractors/dyn/tubex_CtcStatic.cpp b/src/core/contractors/dyn/codac_CtcStatic.cpp similarity index 98% rename from src/core/contractors/dyn/tubex_CtcStatic.cpp rename to src/core/contractors/dyn/codac_CtcStatic.cpp index 13d36a79..8e0d3a66 100644 --- a/src/core/contractors/dyn/tubex_CtcStatic.cpp +++ b/src/core/contractors/dyn/codac_CtcStatic.cpp @@ -3,18 +3,18 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_CtcStatic.h" -#include "tubex_DomainsTypeException.h" +#include "codac_CtcStatic.h" +#include "codac_DomainsTypeException.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { CtcStatic::CtcStatic(Ctc& static_ctc, bool dynamic_ctc) : DynCtc(false), m_static_ctc(static_ctc), m_dynamic_ctc(dynamic_ctc ? 1 : 0) diff --git a/src/core/contractors/dyn/tubex_CtcStatic.h b/src/core/contractors/dyn/codac_CtcStatic.h similarity index 96% rename from src/core/contractors/dyn/tubex_CtcStatic.h rename to src/core/contractors/dyn/codac_CtcStatic.h index 77b2f52d..1d81a570 100644 --- a/src/core/contractors/dyn/tubex_CtcStatic.h +++ b/src/core/contractors/dyn/codac_CtcStatic.h @@ -4,19 +4,19 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_CTCSTATIC_H__ -#define __TUBEX_CTCSTATIC_H__ +#ifndef __CODAC_CTCSTATIC_H__ +#define __CODAC_CTCSTATIC_H__ #include "ibex_Ctc.h" -#include "tubex_DynCtc.h" -#include "tubex_Domain.h" +#include "codac_DynCtc.h" +#include "codac_Domain.h" -namespace tubex +namespace codac { /** * \class CtcStatic diff --git a/src/core/contractors/dyn/tubex_DynCtc.cpp b/src/core/contractors/dyn/codac_DynCtc.cpp similarity index 90% rename from src/core/contractors/dyn/tubex_DynCtc.cpp rename to src/core/contractors/dyn/codac_DynCtc.cpp index 44db274d..91d5801c 100644 --- a/src/core/contractors/dyn/tubex_DynCtc.cpp +++ b/src/core/contractors/dyn/codac_DynCtc.cpp @@ -3,17 +3,17 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_DynCtc.h" +#include "codac_DynCtc.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { DynCtc::DynCtc(bool intertemporal) : m_intertemporal(intertemporal) diff --git a/src/core/contractors/dyn/tubex_DynCtc.h b/src/core/contractors/dyn/codac_DynCtc.h similarity index 95% rename from src/core/contractors/dyn/tubex_DynCtc.h rename to src/core/contractors/dyn/codac_DynCtc.h index 5e8c9185..f0346443 100644 --- a/src/core/contractors/dyn/tubex_DynCtc.h +++ b/src/core/contractors/dyn/codac_DynCtc.h @@ -4,18 +4,18 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_DYNCTC_H__ -#define __TUBEX_DYNCTC_H__ +#ifndef __CODAC_DYNCTC_H__ +#define __CODAC_DYNCTC_H__ -#include "tubex_Tube.h" -#include "tubex_TubeVector.h" +#include "codac_Tube.h" +#include "codac_TubeVector.h" -namespace tubex +namespace codac { class Domain; diff --git a/src/core/contractors/static/tubex_CtcDist.cpp b/src/core/contractors/static/codac_CtcDist.cpp similarity index 93% rename from src/core/contractors/static/tubex_CtcDist.cpp rename to src/core/contractors/static/codac_CtcDist.cpp index 32cf1c99..7037397a 100644 --- a/src/core/contractors/static/tubex_CtcDist.cpp +++ b/src/core/contractors/static/codac_CtcDist.cpp @@ -3,17 +3,17 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_CtcDist.h" +#include "codac_CtcDist.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { CtcDist::CtcDist() : Ctc(5) diff --git a/src/core/contractors/static/tubex_CtcDist.h b/src/core/contractors/static/codac_CtcDist.h similarity index 93% rename from src/core/contractors/static/tubex_CtcDist.h rename to src/core/contractors/static/codac_CtcDist.h index 30afe44f..692ef9c7 100644 --- a/src/core/contractors/static/tubex_CtcDist.h +++ b/src/core/contractors/static/codac_CtcDist.h @@ -4,17 +4,17 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_CTCDIST_H__ -#define __TUBEX_CTCDIST_H__ +#ifndef __CODAC_CTCDIST_H__ +#define __CODAC_CTCDIST_H__ #include "ibex_Ctc.h" -namespace tubex +namespace codac { /** * \class CtcDist diff --git a/src/core/contractors/static/tubex_CtcFunction.cpp b/src/core/contractors/static/codac_CtcFunction.cpp similarity index 98% rename from src/core/contractors/static/tubex_CtcFunction.cpp rename to src/core/contractors/static/codac_CtcFunction.cpp index 2dfa4892..5d5075f0 100644 --- a/src/core/contractors/static/tubex_CtcFunction.cpp +++ b/src/core/contractors/static/codac_CtcFunction.cpp @@ -3,18 +3,18 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_CtcFunction.h" +#include "codac_CtcFunction.h" #include "ibex_CtcFwdBwd.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { CtcFunction::CtcFunction(const Function& f) : CtcFwdBwd(*new Function(f)) diff --git a/src/core/contractors/static/tubex_CtcFunction.h b/src/core/contractors/static/codac_CtcFunction.h similarity index 98% rename from src/core/contractors/static/tubex_CtcFunction.h rename to src/core/contractors/static/codac_CtcFunction.h index 7f95db78..006f9a20 100644 --- a/src/core/contractors/static/tubex_CtcFunction.h +++ b/src/core/contractors/static/codac_CtcFunction.h @@ -4,21 +4,21 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_CTCFUNCTION_H__ -#define __TUBEX_CTCFUNCTION_H__ +#ifndef __CODAC_CTCFUNCTION_H__ +#define __CODAC_CTCFUNCTION_H__ #include #include "ibex_Function.h" #include "ibex_CtcFwdBwd.h" #include "ibex_Domain.h" -#include "tubex_TubeVector.h" +#include "codac_TubeVector.h" -namespace tubex +namespace codac { /** * \class CtcFunction diff --git a/src/core/dynamics/tubex_DynamicalItem.cpp b/src/core/dynamics/codac_DynamicalItem.cpp similarity index 85% rename from src/core/dynamics/tubex_DynamicalItem.cpp rename to src/core/dynamics/codac_DynamicalItem.cpp index 4bd687d3..f71511a3 100644 --- a/src/core/dynamics/tubex_DynamicalItem.cpp +++ b/src/core/dynamics/codac_DynamicalItem.cpp @@ -3,17 +3,17 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_DynamicalItem.h" +#include "codac_DynamicalItem.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { DynamicalItem::~DynamicalItem() { diff --git a/src/core/dynamics/tubex_DynamicalItem.h b/src/core/dynamics/codac_DynamicalItem.h similarity index 93% rename from src/core/dynamics/tubex_DynamicalItem.h rename to src/core/dynamics/codac_DynamicalItem.h index 505a9c63..9390849f 100644 --- a/src/core/dynamics/tubex_DynamicalItem.h +++ b/src/core/dynamics/codac_DynamicalItem.h @@ -4,18 +4,18 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_DYNAMICALITEM_H__ -#define __TUBEX_DYNAMICALITEM_H__ +#ifndef __CODAC_DYNAMICALITEM_H__ +#define __CODAC_DYNAMICALITEM_H__ #include "ibex_Interval.h" #include "ibex_IntervalVector.h" -namespace tubex +namespace codac { /** * \class DynamicalItem diff --git a/src/core/dynamics/slice/tubex_Slice.cpp b/src/core/dynamics/slice/codac_Slice.cpp similarity index 99% rename from src/core/dynamics/slice/tubex_Slice.cpp rename to src/core/dynamics/slice/codac_Slice.cpp index 38f8baa1..0e4a08ee 100644 --- a/src/core/dynamics/slice/tubex_Slice.cpp +++ b/src/core/dynamics/slice/codac_Slice.cpp @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include -#include "tubex_Slice.h" -#include "tubex_CtcDeriv.h" +#include "codac_Slice.h" +#include "codac_CtcDeriv.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { // Public methods diff --git a/src/core/dynamics/slice/tubex_Slice.h b/src/core/dynamics/slice/codac_Slice.h similarity index 98% rename from src/core/dynamics/slice/tubex_Slice.h rename to src/core/dynamics/slice/codac_Slice.h index f7a5feae..e4fe9faf 100644 --- a/src/core/dynamics/slice/tubex_Slice.h +++ b/src/core/dynamics/slice/codac_Slice.h @@ -4,22 +4,22 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_SLICE_H__ -#define __TUBEX_SLICE_H__ +#ifndef __CODAC_SLICE_H__ +#define __CODAC_SLICE_H__ -#include "tubex_Tube.h" -#include "tubex_Trajectory.h" -#include "tubex_DynamicalItem.h" -#include "tubex_ConvexPolygon.h" -#include "tubex_TubeTreeSynthesis.h" +#include "codac_Tube.h" +#include "codac_Trajectory.h" +#include "codac_DynamicalItem.h" +#include "codac_ConvexPolygon.h" +#include "codac_TubeTreeSynthesis.h" #include "ibex_BoolInterval.h" -namespace tubex +namespace codac { #define EPSILON_CONTAINS ibex::next_float(0.) * 1000. //!< epsilon limit of the contains() algorithm diff --git a/src/core/dynamics/slice/tubex_Slice_operators.cpp b/src/core/dynamics/slice/codac_Slice_operators.cpp similarity index 95% rename from src/core/dynamics/slice/tubex_Slice_operators.cpp rename to src/core/dynamics/slice/codac_Slice_operators.cpp index 7244a4e1..c9da7588 100644 --- a/src/core/dynamics/slice/tubex_Slice_operators.cpp +++ b/src/core/dynamics/slice/codac_Slice_operators.cpp @@ -3,17 +3,17 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_Slice.h" +#include "codac_Slice.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { #define macro_assignment_op_slice(f) \ \ diff --git a/src/core/dynamics/slice/tubex_Slice_polygon.cpp b/src/core/dynamics/slice/codac_Slice_polygon.cpp similarity index 98% rename from src/core/dynamics/slice/tubex_Slice_polygon.cpp rename to src/core/dynamics/slice/codac_Slice_polygon.cpp index bc41abd1..927c7186 100644 --- a/src/core/dynamics/slice/tubex_Slice_polygon.cpp +++ b/src/core/dynamics/slice/codac_Slice_polygon.cpp @@ -3,17 +3,17 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_Slice.h" +#include "codac_Slice.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { Interval yilb(const Interval& t, const Slice& x, const Slice& v) { diff --git a/src/core/dynamics/trajectory/tubex_RandTrajectory.cpp b/src/core/dynamics/trajectory/codac_RandTrajectory.cpp similarity index 89% rename from src/core/dynamics/trajectory/tubex_RandTrajectory.cpp rename to src/core/dynamics/trajectory/codac_RandTrajectory.cpp index 620f676d..6f108afb 100644 --- a/src/core/dynamics/trajectory/tubex_RandTrajectory.cpp +++ b/src/core/dynamics/trajectory/codac_RandTrajectory.cpp @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include -#include "tubex_RandTrajectory.h" -#include "tubex_Tools.h" +#include "codac_RandTrajectory.h" +#include "codac_Tools.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { // Public methods diff --git a/src/core/dynamics/trajectory/tubex_RandTrajectory.h b/src/core/dynamics/trajectory/codac_RandTrajectory.h similarity index 85% rename from src/core/dynamics/trajectory/tubex_RandTrajectory.h rename to src/core/dynamics/trajectory/codac_RandTrajectory.h index aad793f3..d9cb2d72 100644 --- a/src/core/dynamics/trajectory/tubex_RandTrajectory.h +++ b/src/core/dynamics/trajectory/codac_RandTrajectory.h @@ -4,17 +4,17 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_RANDTRAJECTORY_H__ -#define __TUBEX_RANDTRAJECTORY_H__ +#ifndef __CODAC_RANDTRAJECTORY_H__ +#define __CODAC_RANDTRAJECTORY_H__ -#include "tubex_Trajectory.h" +#include "codac_Trajectory.h" -namespace tubex +namespace codac { /** * \class RandTrajectory diff --git a/src/core/dynamics/trajectory/tubex_Trajectory.cpp b/src/core/dynamics/trajectory/codac_Trajectory.cpp similarity index 99% rename from src/core/dynamics/trajectory/tubex_Trajectory.cpp rename to src/core/dynamics/trajectory/codac_Trajectory.cpp index b49529aa..2298e991 100644 --- a/src/core/dynamics/trajectory/tubex_Trajectory.cpp +++ b/src/core/dynamics/trajectory/codac_Trajectory.cpp @@ -3,18 +3,18 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include -#include "tubex_Trajectory.h" +#include "codac_Trajectory.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { // Public methods diff --git a/src/core/dynamics/trajectory/tubex_Trajectory.h b/src/core/dynamics/trajectory/codac_Trajectory.h similarity index 98% rename from src/core/dynamics/trajectory/tubex_Trajectory.h rename to src/core/dynamics/trajectory/codac_Trajectory.h index a5120cfb..8305925f 100644 --- a/src/core/dynamics/trajectory/tubex_Trajectory.h +++ b/src/core/dynamics/trajectory/codac_Trajectory.h @@ -4,20 +4,20 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_TRAJECTORY_H__ -#define __TUBEX_TRAJECTORY_H__ +#ifndef __CODAC_TRAJECTORY_H__ +#define __CODAC_TRAJECTORY_H__ #include -#include "tubex_DynamicalItem.h" -#include "tubex_TFunction.h" -#include "tubex_traj_arithmetic.h" +#include "codac_DynamicalItem.h" +#include "codac_TFunction.h" +#include "codac_traj_arithmetic.h" -namespace tubex +namespace codac { class TFunction; class TrajectoryVector; diff --git a/src/core/dynamics/trajectory/tubex_TrajectoryVector.cpp b/src/core/dynamics/trajectory/codac_TrajectoryVector.cpp similarity index 98% rename from src/core/dynamics/trajectory/tubex_TrajectoryVector.cpp rename to src/core/dynamics/trajectory/codac_TrajectoryVector.cpp index 7cc5efc4..e3173120 100644 --- a/src/core/dynamics/trajectory/tubex_TrajectoryVector.cpp +++ b/src/core/dynamics/trajectory/codac_TrajectoryVector.cpp @@ -3,18 +3,18 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include -#include "tubex_TrajectoryVector.h" +#include "codac_TrajectoryVector.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { // Public methods diff --git a/src/core/dynamics/trajectory/tubex_TrajectoryVector.h b/src/core/dynamics/trajectory/codac_TrajectoryVector.h similarity index 98% rename from src/core/dynamics/trajectory/tubex_TrajectoryVector.h rename to src/core/dynamics/trajectory/codac_TrajectoryVector.h index 0b63f872..40c925ee 100644 --- a/src/core/dynamics/trajectory/tubex_TrajectoryVector.h +++ b/src/core/dynamics/trajectory/codac_TrajectoryVector.h @@ -4,24 +4,24 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_TRAJECTORYVECTOR_H__ -#define __TUBEX_TRAJECTORYVECTOR_H__ +#ifndef __CODAC_TRAJECTORYVECTOR_H__ +#define __CODAC_TRAJECTORYVECTOR_H__ #include #include #include "ibex_Vector.h" #include "ibex_Interval.h" -#include "tubex_TFunction.h" -#include "tubex_Trajectory.h" -#include "tubex_DynamicalItem.h" -#include "tubex_traj_arithmetic.h" +#include "codac_TFunction.h" +#include "codac_Trajectory.h" +#include "codac_DynamicalItem.h" +#include "codac_traj_arithmetic.h" -namespace tubex +namespace codac { class TFunction; class TubeVector; diff --git a/src/core/dynamics/trajectory/tubex_TrajectoryVector_operators.cpp b/src/core/dynamics/trajectory/codac_TrajectoryVector_operators.cpp similarity index 92% rename from src/core/dynamics/trajectory/tubex_TrajectoryVector_operators.cpp rename to src/core/dynamics/trajectory/codac_TrajectoryVector_operators.cpp index 7717516c..bb73c051 100644 --- a/src/core/dynamics/trajectory/tubex_TrajectoryVector_operators.cpp +++ b/src/core/dynamics/trajectory/codac_TrajectoryVector_operators.cpp @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2019 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include "ibex_Vector.h" -#include "tubex_Trajectory.h" -#include "tubex_TrajectoryVector.h" +#include "codac_Trajectory.h" +#include "codac_TrajectoryVector.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { #define macro_assign_vect_vect(f) \ \ diff --git a/src/core/dynamics/trajectory/tubex_Trajectory_operators.cpp b/src/core/dynamics/trajectory/codac_Trajectory_operators.cpp similarity index 94% rename from src/core/dynamics/trajectory/tubex_Trajectory_operators.cpp rename to src/core/dynamics/trajectory/codac_Trajectory_operators.cpp index a5898f68..ac61228d 100644 --- a/src/core/dynamics/trajectory/tubex_Trajectory_operators.cpp +++ b/src/core/dynamics/trajectory/codac_Trajectory_operators.cpp @@ -3,17 +3,17 @@ * ---------------------------------------------------------------------------- * \date 2019 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_Trajectory.h" +#include "codac_Trajectory.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { #define macro_assign_scal(fdef,f) \ \ diff --git a/src/core/dynamics/tube/tubex_Tube.cpp b/src/core/dynamics/tube/codac_Tube.cpp similarity index 99% rename from src/core/dynamics/tube/tubex_Tube.cpp rename to src/core/dynamics/tube/codac_Tube.cpp index 4568a585..01aff026 100644 --- a/src/core/dynamics/tube/tubex_Tube.cpp +++ b/src/core/dynamics/tube/codac_Tube.cpp @@ -3,23 +3,23 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_Tube.h" -#include "tubex_Exception.h" -#include "tubex_CtcDeriv.h" -#include "tubex_CtcEval.h" -#include "tubex_serialize_trajectories.h" +#include "codac_Tube.h" +#include "codac_Exception.h" +#include "codac_CtcDeriv.h" +#include "codac_CtcEval.h" +#include "codac_serialize_trajectories.h" #include "ibex_LargestFirst.h" #include "ibex_NoBisectableVariableException.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { // Public methods diff --git a/src/core/dynamics/tube/tubex_Tube.h b/src/core/dynamics/tube/codac_Tube.h similarity index 99% rename from src/core/dynamics/tube/tubex_Tube.h rename to src/core/dynamics/tube/codac_Tube.h index 5979c648..18da6bb7 100644 --- a/src/core/dynamics/tube/tubex_Tube.h +++ b/src/core/dynamics/tube/codac_Tube.h @@ -4,30 +4,30 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_TUBE_H__ -#define __TUBEX_TUBE_H__ +#ifndef __CODAC_TUBE_H__ +#define __CODAC_TUBE_H__ #include #include #include -#include "tubex_TFnc.h" -#include "tubex_Slice.h" -#include "tubex_Trajectory.h" -#include "tubex_serialize_tubes.h" -#include "tubex_tube_arithmetic.h" -#include "tubex_TubeTreeSynthesis.h" -#include "tubex_Polygon.h" +#include "codac_TFnc.h" +#include "codac_Slice.h" +#include "codac_Trajectory.h" +#include "codac_serialize_tubes.h" +#include "codac_tube_arithmetic.h" +#include "codac_TubeTreeSynthesis.h" +#include "codac_Polygon.h" #include "ibex_BoolInterval.h" // The following define constant is now set in CMake configuration file: //#define AUTO_SYNTHESIS_BY_DEFAULT false -namespace tubex +namespace codac { class TFnc; class Tube; diff --git a/src/core/dynamics/tube/tubex_TubeTreeSynthesis.cpp b/src/core/dynamics/tube/codac_TubeTreeSynthesis.cpp similarity index 99% rename from src/core/dynamics/tube/tubex_TubeTreeSynthesis.cpp rename to src/core/dynamics/tube/codac_TubeTreeSynthesis.cpp index 8c5477fe..f0f34c9e 100644 --- a/src/core/dynamics/tube/tubex_TubeTreeSynthesis.cpp +++ b/src/core/dynamics/tube/codac_TubeTreeSynthesis.cpp @@ -3,17 +3,17 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_TubeTreeSynthesis.h" +#include "codac_TubeTreeSynthesis.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { TubeTreeSynthesis::TubeTreeSynthesis(const Tube* tube, int k0, int kf, const vector& v_tube_slices) : m_tube_ref(tube), m_parent(NULL) diff --git a/src/core/dynamics/tube/tubex_TubeTreeSynthesis.h b/src/core/dynamics/tube/codac_TubeTreeSynthesis.h similarity index 92% rename from src/core/dynamics/tube/tubex_TubeTreeSynthesis.h rename to src/core/dynamics/tube/codac_TubeTreeSynthesis.h index a1c12e19..3cbbb1ec 100644 --- a/src/core/dynamics/tube/tubex_TubeTreeSynthesis.h +++ b/src/core/dynamics/tube/codac_TubeTreeSynthesis.h @@ -3,17 +3,17 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_TUBETREESYNTHESIS_H__ -#define __TUBEX_TUBETREESYNTHESIS_H__ +#ifndef __CODAC_TUBETREESYNTHESIS_H__ +#define __CODAC_TUBETREESYNTHESIS_H__ -#include "tubex_Slice.h" +#include "codac_Slice.h" -namespace tubex +namespace codac { class TubeTreeSynthesis { diff --git a/src/core/dynamics/tube/tubex_TubeVector.cpp b/src/core/dynamics/tube/codac_TubeVector.cpp similarity index 99% rename from src/core/dynamics/tube/tubex_TubeVector.cpp rename to src/core/dynamics/tube/codac_TubeVector.cpp index 5ac60747..887af132 100644 --- a/src/core/dynamics/tube/tubex_TubeVector.cpp +++ b/src/core/dynamics/tube/codac_TubeVector.cpp @@ -3,23 +3,23 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_TubeVector.h" -#include "tubex_Exception.h" -#include "tubex_CtcDeriv.h" -#include "tubex_CtcEval.h" +#include "codac_TubeVector.h" +#include "codac_Exception.h" +#include "codac_CtcDeriv.h" +#include "codac_CtcEval.h" #include "ibex_LargestFirst.h" -#include "tubex_serialize_trajectories.h" +#include "codac_serialize_trajectories.h" #include "ibex_NoBisectableVariableException.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { // Public methods diff --git a/src/core/dynamics/tube/tubex_TubeVector.h b/src/core/dynamics/tube/codac_TubeVector.h similarity index 99% rename from src/core/dynamics/tube/tubex_TubeVector.h rename to src/core/dynamics/tube/codac_TubeVector.h index c8b5ab19..486a7bf2 100644 --- a/src/core/dynamics/tube/tubex_TubeVector.h +++ b/src/core/dynamics/tube/codac_TubeVector.h @@ -4,25 +4,25 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_TUBEVECTOR_H__ -#define __TUBEX_TUBEVECTOR_H__ +#ifndef __CODAC_TUBEVECTOR_H__ +#define __CODAC_TUBEVECTOR_H__ #include #include #include #include -#include "tubex_TFnc.h" -#include "tubex_TrajectoryVector.h" -#include "tubex_tube_arithmetic.h" -#include "tubex_serialize_tubes.h" +#include "codac_TFnc.h" +#include "codac_TrajectoryVector.h" +#include "codac_tube_arithmetic.h" +#include "codac_serialize_tubes.h" #include "ibex_BoolInterval.h" -namespace tubex +namespace codac { class TFnc; class Tube; diff --git a/src/core/dynamics/tube/tubex_TubeVector_operators.cpp b/src/core/dynamics/tube/codac_TubeVector_operators.cpp similarity index 93% rename from src/core/dynamics/tube/tubex_TubeVector_operators.cpp rename to src/core/dynamics/tube/codac_TubeVector_operators.cpp index 9db84c7d..0d691dc0 100644 --- a/src/core/dynamics/tube/tubex_TubeVector_operators.cpp +++ b/src/core/dynamics/tube/codac_TubeVector_operators.cpp @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_Tube.h" -#include "tubex_TubeVector.h" -#include "tubex_TrajectoryVector.h" +#include "codac_Tube.h" +#include "codac_TubeVector.h" +#include "codac_TrajectoryVector.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { #define macro_assign_vect_vect(f) \ \ diff --git a/src/core/dynamics/tube/tubex_Tube_operators.cpp b/src/core/dynamics/tube/codac_Tube_operators.cpp similarity index 96% rename from src/core/dynamics/tube/tubex_Tube_operators.cpp rename to src/core/dynamics/tube/codac_Tube_operators.cpp index 8c70e643..393d6b73 100644 --- a/src/core/dynamics/tube/tubex_Tube_operators.cpp +++ b/src/core/dynamics/tube/codac_Tube_operators.cpp @@ -3,18 +3,18 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_Tube.h" -#include "tubex_Trajectory.h" +#include "codac_Tube.h" +#include "codac_Trajectory.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { #define macro_assign_scal(f) \ \ diff --git a/src/core/exceptions/tubex_DomainsSizeException.cpp b/src/core/exceptions/codac_DomainsSizeException.cpp similarity index 84% rename from src/core/exceptions/tubex_DomainsSizeException.cpp rename to src/core/exceptions/codac_DomainsSizeException.cpp index 0a6cd20f..508e8a13 100644 --- a/src/core/exceptions/tubex_DomainsSizeException.cpp +++ b/src/core/exceptions/codac_DomainsSizeException.cpp @@ -3,16 +3,16 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_DomainsSizeException.h" +#include "codac_DomainsSizeException.h" using namespace std; -namespace tubex +namespace codac { DomainsSizeException::DomainsSizeException(const string& ctc_name) : Exception(ctc_name + "::contract", diff --git a/src/core/exceptions/tubex_DomainsSizeException.h b/src/core/exceptions/codac_DomainsSizeException.h similarity index 80% rename from src/core/exceptions/tubex_DomainsSizeException.h rename to src/core/exceptions/codac_DomainsSizeException.h index 0116176d..75b1b097 100644 --- a/src/core/exceptions/tubex_DomainsSizeException.h +++ b/src/core/exceptions/codac_DomainsSizeException.h @@ -4,20 +4,20 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_DOMAINSSIZEEXCEPTION_H__ -#define __TUBEX_DOMAINSSIZEEXCEPTION_H__ +#ifndef __CODAC_DOMAINSSIZEEXCEPTION_H__ +#define __CODAC_DOMAINSSIZEEXCEPTION_H__ #include #include -#include "tubex_Exception.h" -#include "tubex_Domain.h" +#include "codac_Exception.h" +#include "codac_Domain.h" -namespace tubex +namespace codac { /** * \class DomainsSizeException diff --git a/src/core/exceptions/tubex_DomainsTypeException.cpp b/src/core/exceptions/codac_DomainsTypeException.cpp similarity index 95% rename from src/core/exceptions/tubex_DomainsTypeException.cpp rename to src/core/exceptions/codac_DomainsTypeException.cpp index 94f3418a..10e3e7bf 100644 --- a/src/core/exceptions/tubex_DomainsTypeException.cpp +++ b/src/core/exceptions/codac_DomainsTypeException.cpp @@ -3,16 +3,16 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_DomainsTypeException.h" +#include "codac_DomainsTypeException.h" using namespace std; -namespace tubex +namespace codac { DomainsTypeException::DomainsTypeException(const string& ctc_name, const vector& v_ptr_domains, diff --git a/src/core/exceptions/tubex_DomainsTypeException.h b/src/core/exceptions/codac_DomainsTypeException.h similarity index 93% rename from src/core/exceptions/tubex_DomainsTypeException.h rename to src/core/exceptions/codac_DomainsTypeException.h index d58bc66f..81babd92 100644 --- a/src/core/exceptions/tubex_DomainsTypeException.h +++ b/src/core/exceptions/codac_DomainsTypeException.h @@ -4,20 +4,20 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_DOMAINSTYPEEXCEPTION_H__ -#define __TUBEX_DOMAINSTYPEEXCEPTION_H__ +#ifndef __CODAC_DOMAINSTYPEEXCEPTION_H__ +#define __CODAC_DOMAINSTYPEEXCEPTION_H__ #include #include -#include "tubex_Exception.h" -#include "tubex_Domain.h" +#include "codac_Exception.h" +#include "codac_Domain.h" -namespace tubex +namespace codac { /** * \class DomainsTypeException diff --git a/src/core/exceptions/tubex_Exception.cpp b/src/core/exceptions/codac_Exception.cpp similarity index 88% rename from src/core/exceptions/tubex_Exception.cpp rename to src/core/exceptions/codac_Exception.cpp index e7543c94..c6441348 100644 --- a/src/core/exceptions/tubex_Exception.cpp +++ b/src/core/exceptions/codac_Exception.cpp @@ -3,18 +3,18 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include #include -#include "tubex_Exception.h" +#include "codac_Exception.h" using namespace std; -namespace tubex +namespace codac { Exception::Exception(const std::string& function_name, const std::string& custom_message) { diff --git a/src/core/exceptions/tubex_Exception.h b/src/core/exceptions/codac_Exception.h similarity index 89% rename from src/core/exceptions/tubex_Exception.h rename to src/core/exceptions/codac_Exception.h index 5e98eb77..b38b4e12 100644 --- a/src/core/exceptions/tubex_Exception.h +++ b/src/core/exceptions/codac_Exception.h @@ -4,15 +4,15 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ // For maximum portability, we recommend you use __func__, but provide a fallback definition with the preprocessor: // https://gcc.gnu.org/onlinedocs/gcc-4.8.1/gcc/Function-Names.html -#ifndef __TUBEX_EXCEPTION_H__ -#define __TUBEX_EXCEPTION_H__ +#ifndef __CODAC_EXCEPTION_H__ +#define __CODAC_EXCEPTION_H__ #if __STDC_VERSION__ < 199901L # if __GNUC__ >= 2 @@ -27,11 +27,11 @@ #include #include -namespace tubex +namespace codac { /** * \class Exception - * \brief Root class of all exceptions raised by Tubex + * \brief Root class of all exceptions raised by Codac */ class Exception : public std::exception { diff --git a/src/core/functions/tubex_DelayTFunction.cpp b/src/core/functions/codac_DelayTFunction.cpp similarity index 87% rename from src/core/functions/tubex_DelayTFunction.cpp rename to src/core/functions/codac_DelayTFunction.cpp index 677e3a72..f3c1e24e 100644 --- a/src/core/functions/tubex_DelayTFunction.cpp +++ b/src/core/functions/codac_DelayTFunction.cpp @@ -3,18 +3,18 @@ * ---------------------------------------------------------------------------- * \date 2017 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_DelayTFunction.h" -#include "tubex_TubeVector.h" +#include "codac_DelayTFunction.h" +#include "codac_TubeVector.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { DelayTFunction::DelayTFunction(double delay) : TFnc(1, 1, true), m_delay(delay) { diff --git a/src/core/functions/tubex_DelayTFunction.h b/src/core/functions/codac_DelayTFunction.h similarity index 84% rename from src/core/functions/tubex_DelayTFunction.h rename to src/core/functions/codac_DelayTFunction.h index d83f0bff..6477916d 100644 --- a/src/core/functions/tubex_DelayTFunction.h +++ b/src/core/functions/codac_DelayTFunction.h @@ -3,17 +3,17 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_DELAYTFUNCTION_H__ -#define __TUBEX_DELAYTFUNCTION_H__ +#ifndef __CODAC_DELAYTFUNCTION_H__ +#define __CODAC_DELAYTFUNCTION_H__ -#include "tubex_TFnc.h" +#include "codac_TFnc.h" -namespace tubex +namespace codac { class DelayTFunction : public TFnc { diff --git a/src/core/functions/tubex_TFnc.cpp b/src/core/functions/codac_TFnc.cpp similarity index 93% rename from src/core/functions/tubex_TFnc.cpp rename to src/core/functions/codac_TFnc.cpp index e287f7f3..eabf76f9 100644 --- a/src/core/functions/tubex_TFnc.cpp +++ b/src/core/functions/codac_TFnc.cpp @@ -3,20 +3,20 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_TFnc.h" -#include "tubex_Slice.h" -#include "tubex_TubeVector.h" -#include "tubex_Tube.h" +#include "codac_TFnc.h" +#include "codac_Slice.h" +#include "codac_TubeVector.h" +#include "codac_Tube.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { TFnc::TFnc() { diff --git a/src/core/functions/tubex_TFnc.h b/src/core/functions/codac_TFnc.h similarity index 93% rename from src/core/functions/tubex_TFnc.h rename to src/core/functions/codac_TFnc.h index 5742933e..966ffa03 100644 --- a/src/core/functions/tubex_TFnc.h +++ b/src/core/functions/codac_TFnc.h @@ -3,17 +3,17 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_TFNC_H__ -#define __TUBEX_TFNC_H__ +#ifndef __CODAC_TFNC_H__ +#define __CODAC_TFNC_H__ #include "ibex_IntervalVector.h" -namespace tubex +namespace codac { class Tube; class TubeVector; diff --git a/src/core/functions/tubex_TFunction.cpp b/src/core/functions/codac_TFunction.cpp similarity index 98% rename from src/core/functions/tubex_TFunction.cpp rename to src/core/functions/codac_TFunction.cpp index 463006b5..e5baf185 100644 --- a/src/core/functions/tubex_TFunction.cpp +++ b/src/core/functions/codac_TFunction.cpp @@ -3,21 +3,21 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include -#include "tubex_TFunction.h" -#include "tubex_Tube.h" -#include "tubex_TubeVector.h" +#include "codac_TFunction.h" +#include "codac_Tube.h" +#include "codac_TubeVector.h" #include "ibex_Expr2Minibex.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { std::string to_string(const Function& f) { diff --git a/src/core/functions/tubex_TFunction.h b/src/core/functions/codac_TFunction.h similarity index 93% rename from src/core/functions/tubex_TFunction.h rename to src/core/functions/codac_TFunction.h index a1b70240..851b8109 100644 --- a/src/core/functions/tubex_TFunction.h +++ b/src/core/functions/codac_TFunction.h @@ -3,21 +3,21 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_TFUNCTION_H__ -#define __TUBEX_TFUNCTION_H__ +#ifndef __CODAC_TFUNCTION_H__ +#define __CODAC_TFUNCTION_H__ #include #include "ibex_Function.h" -#include "tubex_TFnc.h" -#include "tubex_Trajectory.h" -#include "tubex_TrajectoryVector.h" +#include "codac_TFnc.h" +#include "codac_Trajectory.h" +#include "codac_TrajectoryVector.h" -namespace tubex +namespace codac { class Slice; class Trajectory; diff --git a/src/core/geometry/tubex_ConvexPolygon.cpp b/src/core/geometry/codac_ConvexPolygon.cpp similarity index 98% rename from src/core/geometry/tubex_ConvexPolygon.cpp rename to src/core/geometry/codac_ConvexPolygon.cpp index 2955177f..8678dcc9 100644 --- a/src/core/geometry/tubex_ConvexPolygon.cpp +++ b/src/core/geometry/codac_ConvexPolygon.cpp @@ -3,7 +3,7 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -11,14 +11,14 @@ #include #include #include "ibex_IntervalMatrix.h" -#include "tubex_ConvexPolygon.h" -#include "tubex_GrahamScan.h" -#include "tubex_VIBesFig.h" +#include "codac_ConvexPolygon.h" +#include "codac_GrahamScan.h" +#include "codac_VIBesFig.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { // Definition diff --git a/src/core/geometry/tubex_ConvexPolygon.h b/src/core/geometry/codac_ConvexPolygon.h similarity index 89% rename from src/core/geometry/tubex_ConvexPolygon.h rename to src/core/geometry/codac_ConvexPolygon.h index 56ca730f..c64eccc5 100644 --- a/src/core/geometry/tubex_ConvexPolygon.h +++ b/src/core/geometry/codac_ConvexPolygon.h @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_CONVEXPOLYGON_H__ -#define __TUBEX_CONVEXPOLYGON_H__ +#ifndef __CODAC_CONVEXPOLYGON_H__ +#define __CODAC_CONVEXPOLYGON_H__ #include -#include "tubex_Polygon.h" +#include "codac_Polygon.h" #include "ibex_BoolInterval.h" -namespace tubex +namespace codac { class ConvexPolygon : public Polygon { diff --git a/src/core/geometry/tubex_Edge.cpp b/src/core/geometry/codac_Edge.cpp similarity index 98% rename from src/core/geometry/tubex_Edge.cpp rename to src/core/geometry/codac_Edge.cpp index 705c8bc1..ed30e87a 100644 --- a/src/core/geometry/tubex_Edge.cpp +++ b/src/core/geometry/codac_Edge.cpp @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include #include -#include "tubex_Edge.h" +#include "codac_Edge.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { // Definition diff --git a/src/core/geometry/tubex_Edge.h b/src/core/geometry/codac_Edge.h similarity index 93% rename from src/core/geometry/tubex_Edge.h rename to src/core/geometry/codac_Edge.h index 9f29611a..618af26d 100644 --- a/src/core/geometry/tubex_Edge.h +++ b/src/core/geometry/codac_Edge.h @@ -3,21 +3,21 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_EDGE_H__ -#define __TUBEX_EDGE_H__ +#ifndef __CODAC_EDGE_H__ +#define __CODAC_EDGE_H__ #include "ibex_Vector.h" #include "ibex_Interval.h" #include "ibex_IntervalVector.h" #include "ibex_BoolInterval.h" -#include "tubex_Point.h" +#include "codac_Point.h" -namespace tubex +namespace codac { class Edge { diff --git a/src/core/geometry/tubex_GrahamScan.cpp b/src/core/geometry/codac_GrahamScan.cpp similarity index 98% rename from src/core/geometry/tubex_GrahamScan.cpp rename to src/core/geometry/codac_GrahamScan.cpp index 3bc9fb87..73a0cfb1 100644 --- a/src/core/geometry/tubex_GrahamScan.cpp +++ b/src/core/geometry/codac_GrahamScan.cpp @@ -3,7 +3,7 @@ * ---------------------------------------------------------------------------- * \date 2019 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -11,12 +11,12 @@ #include #include #include -#include "tubex_GrahamScan.h" +#include "codac_GrahamScan.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { // Class GrahamScan diff --git a/src/core/geometry/tubex_GrahamScan.h b/src/core/geometry/codac_GrahamScan.h similarity index 89% rename from src/core/geometry/tubex_GrahamScan.h rename to src/core/geometry/codac_GrahamScan.h index fe3a97bc..d01e0a6d 100644 --- a/src/core/geometry/tubex_GrahamScan.h +++ b/src/core/geometry/codac_GrahamScan.h @@ -3,20 +3,20 @@ * ---------------------------------------------------------------------------- * \date 2019 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_GRAHAMSCAN_H__ -#define __TUBEX_GRAHAMSCAN_H__ +#ifndef __CODAC_GRAHAMSCAN_H__ +#define __CODAC_GRAHAMSCAN_H__ #include #include "ibex_Interval.h" -#include "tubex_Point.h" -#include "tubex_ConvexPolygon.h" +#include "codac_Point.h" +#include "codac_ConvexPolygon.h" -namespace tubex +namespace codac { enum class OrientationInterval { CLOCKWISE, COUNTERCLOCKWISE, UNDEFINED } ; diff --git a/src/core/geometry/tubex_Point.cpp b/src/core/geometry/codac_Point.cpp similarity index 98% rename from src/core/geometry/tubex_Point.cpp rename to src/core/geometry/codac_Point.cpp index 670446fa..ea42d163 100644 --- a/src/core/geometry/tubex_Point.cpp +++ b/src/core/geometry/codac_Point.cpp @@ -3,18 +3,18 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include -#include "tubex_Point.h" +#include "codac_Point.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { // Definition diff --git a/src/core/geometry/tubex_Point.h b/src/core/geometry/codac_Point.h similarity index 96% rename from src/core/geometry/tubex_Point.h rename to src/core/geometry/codac_Point.h index 67a35866..0aba2a37 100644 --- a/src/core/geometry/tubex_Point.h +++ b/src/core/geometry/codac_Point.h @@ -3,13 +3,13 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_POINT_H__ -#define __TUBEX_POINT_H__ +#ifndef __CODAC_POINT_H__ +#define __CODAC_POINT_H__ #ifdef _MSC_VER // Enable additional features in math.h. @@ -29,7 +29,7 @@ #include #define BOUNDED_INFINITY numeric_limits::max() -namespace tubex +namespace codac { class Point // todo: derive from IntervalVector? { diff --git a/src/core/geometry/tubex_Polygon.cpp b/src/core/geometry/codac_Polygon.cpp similarity index 96% rename from src/core/geometry/tubex_Polygon.cpp rename to src/core/geometry/codac_Polygon.cpp index 514429f4..c782832b 100644 --- a/src/core/geometry/tubex_Polygon.cpp +++ b/src/core/geometry/codac_Polygon.cpp @@ -3,7 +3,7 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -11,14 +11,14 @@ #include #include #include "ibex_IntervalMatrix.h" -#include "tubex_Polygon.h" -#include "tubex_GrahamScan.h" -#include "tubex_VIBesFig.h" +#include "codac_Polygon.h" +#include "codac_GrahamScan.h" +#include "codac_VIBesFig.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { // Definition diff --git a/src/core/geometry/tubex_Polygon.h b/src/core/geometry/codac_Polygon.h similarity index 90% rename from src/core/geometry/tubex_Polygon.h rename to src/core/geometry/codac_Polygon.h index 3d9d92a7..f9d835cc 100644 --- a/src/core/geometry/tubex_Polygon.h +++ b/src/core/geometry/codac_Polygon.h @@ -3,21 +3,21 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_POLYGON_H__ -#define __TUBEX_POLYGON_H__ +#ifndef __CODAC_POLYGON_H__ +#define __CODAC_POLYGON_H__ #include #include "ibex_Vector.h" #include "ibex_IntervalVector.h" -#include "tubex_Edge.h" -#include "tubex_Point.h" +#include "codac_Edge.h" +#include "codac_Point.h" -namespace tubex +namespace codac { class Polygon { diff --git a/src/core/graphics/tubex_ColorMap.cpp b/src/core/graphics/codac_ColorMap.cpp similarity index 98% rename from src/core/graphics/tubex_ColorMap.cpp rename to src/core/graphics/codac_ColorMap.cpp index 12e3b47c..43e1317d 100644 --- a/src/core/graphics/tubex_ColorMap.cpp +++ b/src/core/graphics/codac_ColorMap.cpp @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2019 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_ColorMap.h" -#include "tubex_Exception.h" -#include "tubex_VIBesFig.h" +#include "codac_ColorMap.h" +#include "codac_Exception.h" +#include "codac_VIBesFig.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { ColorMap::ColorMap(InterpolMode interpol_mode) : m_interpol_mode(interpol_mode) diff --git a/src/core/graphics/tubex_ColorMap.h b/src/core/graphics/codac_ColorMap.h similarity index 95% rename from src/core/graphics/tubex_ColorMap.h rename to src/core/graphics/codac_ColorMap.h index 9c511729..a385278a 100644 --- a/src/core/graphics/tubex_ColorMap.h +++ b/src/core/graphics/codac_ColorMap.h @@ -4,18 +4,18 @@ * ---------------------------------------------------------------------------- * \date 2019 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_COLORMAP_H__ -#define __TUBEX_COLORMAP_H__ +#ifndef __CODAC_COLORMAP_H__ +#define __CODAC_COLORMAP_H__ -#include "tubex_colors.h" -#include "tubex_Trajectory.h" +#include "codac_colors.h" +#include "codac_Trajectory.h" -namespace tubex +namespace codac { /** * \enum InterpolMode diff --git a/src/core/graphics/tubex_Figure.cpp b/src/core/graphics/codac_Figure.cpp similarity index 95% rename from src/core/graphics/tubex_Figure.cpp rename to src/core/graphics/codac_Figure.cpp index d92c99d7..995217b9 100644 --- a/src/core/graphics/tubex_Figure.cpp +++ b/src/core/graphics/codac_Figure.cpp @@ -3,12 +3,12 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_Figure.h" +#include "codac_Figure.h" // A real value to display unbounded slices: #include @@ -18,7 +18,7 @@ using namespace std; using namespace ibex; -namespace tubex +namespace codac { Figure::Figure(const string& fig_name) : m_name(fig_name) { diff --git a/src/core/graphics/tubex_Figure.h b/src/core/graphics/codac_Figure.h similarity index 97% rename from src/core/graphics/tubex_Figure.h rename to src/core/graphics/codac_Figure.h index 72471052..487dc483 100644 --- a/src/core/graphics/tubex_Figure.h +++ b/src/core/graphics/codac_Figure.h @@ -4,18 +4,18 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_FIGURE_H__ -#define __TUBEX_FIGURE_H__ +#ifndef __CODAC_FIGURE_H__ +#define __CODAC_FIGURE_H__ #include #include "ibex_IntervalVector.h" -namespace tubex +namespace codac { /** * \class Figure diff --git a/src/core/graphics/tubex_VIBesFig.cpp b/src/core/graphics/codac_VIBesFig.cpp similarity index 99% rename from src/core/graphics/tubex_VIBesFig.cpp rename to src/core/graphics/codac_VIBesFig.cpp index a03e61a1..777e7ee4 100644 --- a/src/core/graphics/tubex_VIBesFig.cpp +++ b/src/core/graphics/codac_VIBesFig.cpp @@ -3,17 +3,17 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_VIBesFig.h" +#include "codac_VIBesFig.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { VIBesFig::VIBesFig(const string& fig_name) : Figure(fig_name) diff --git a/src/core/graphics/tubex_VIBesFig.h b/src/core/graphics/codac_VIBesFig.h similarity index 98% rename from src/core/graphics/tubex_VIBesFig.h rename to src/core/graphics/codac_VIBesFig.h index ce719e04..cbb60d65 100644 --- a/src/core/graphics/tubex_VIBesFig.h +++ b/src/core/graphics/codac_VIBesFig.h @@ -4,22 +4,22 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_VIBESFIG_H__ -#define __TUBEX_VIBESFIG_H__ +#ifndef __CODAC_VIBESFIG_H__ +#define __CODAC_VIBESFIG_H__ -#include "tubex_Figure.h" -#include "tubex_Point.h" -#include "tubex_Polygon.h" -#include "tubex_ConvexPolygon.h" -#include "tubex_ColorMap.h" +#include "codac_Figure.h" +#include "codac_Point.h" +#include "codac_Polygon.h" +#include "codac_ConvexPolygon.h" +#include "codac_ColorMap.h" #include "vibes.h" -namespace tubex +namespace codac { /** * \class VIBesFig diff --git a/src/core/graphics/tubex_VIBesFigPaving.cpp b/src/core/graphics/codac_VIBesFigPaving.cpp similarity index 95% rename from src/core/graphics/tubex_VIBesFigPaving.cpp rename to src/core/graphics/codac_VIBesFigPaving.cpp index db19a7fc..ec81f3c4 100644 --- a/src/core/graphics/tubex_VIBesFigPaving.cpp +++ b/src/core/graphics/codac_VIBesFigPaving.cpp @@ -3,17 +3,17 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_VIBesFigPaving.h" +#include "codac_VIBesFigPaving.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { VIBesFigPaving::VIBesFigPaving(const string& fig_name, const Paving *paving) : VIBesFig(fig_name), m_paving(paving) diff --git a/src/core/graphics/tubex_VIBesFigPaving.h b/src/core/graphics/codac_VIBesFigPaving.h similarity index 90% rename from src/core/graphics/tubex_VIBesFigPaving.h rename to src/core/graphics/codac_VIBesFigPaving.h index bc55cc86..dee44605 100644 --- a/src/core/graphics/tubex_VIBesFigPaving.h +++ b/src/core/graphics/codac_VIBesFigPaving.h @@ -4,18 +4,18 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_VIBESFIGPAVING_H__ -#define __TUBEX_VIBESFIGPAVING_H__ +#ifndef __CODAC_VIBESFIGPAVING_H__ +#define __CODAC_VIBESFIGPAVING_H__ -#include "tubex_VIBesFig.h" -#include "tubex_Paving.h" +#include "codac_VIBesFig.h" +#include "codac_Paving.h" -namespace tubex +namespace codac { /** * \class VIBesFigPaving diff --git a/src/core/graphics/tubex_VIBesFigTube.cpp b/src/core/graphics/codac_VIBesFigTube.cpp similarity index 98% rename from src/core/graphics/tubex_VIBesFigTube.cpp rename to src/core/graphics/codac_VIBesFigTube.cpp index aaeec0ad..e2564ec6 100644 --- a/src/core/graphics/tubex_VIBesFigTube.cpp +++ b/src/core/graphics/codac_VIBesFigTube.cpp @@ -3,22 +3,22 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include "ibex_Interval.h" #include "ibex_IntervalVector.h" -#include "tubex_Tools.h" -#include "tubex_ConvexPolygon.h" -#include "tubex_VIBesFigTube.h" -#include "tubex_Exception.h" +#include "codac_Tools.h" +#include "codac_ConvexPolygon.h" +#include "codac_VIBesFigTube.h" +#include "codac_Exception.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { VIBesFigTube::VIBesFigTube(const string& fig_name, const Tube *tube, const Trajectory *traj) : VIBesFig(fig_name) diff --git a/src/core/graphics/tubex_VIBesFigTube.h b/src/core/graphics/codac_VIBesFigTube.h similarity index 98% rename from src/core/graphics/tubex_VIBesFigTube.h rename to src/core/graphics/codac_VIBesFigTube.h index c58476ce..3adaf891 100644 --- a/src/core/graphics/tubex_VIBesFigTube.h +++ b/src/core/graphics/codac_VIBesFigTube.h @@ -4,20 +4,20 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_VIBESFIGTUBE_H__ -#define __TUBEX_VIBESFIGTUBE_H__ +#ifndef __CODAC_VIBESFIGTUBE_H__ +#define __CODAC_VIBESFIGTUBE_H__ -#include "tubex_VIBesFig.h" -#include "tubex_Tube.h" -#include "tubex_Slice.h" -#include "tubex_Trajectory.h" +#include "codac_VIBesFig.h" +#include "codac_Tube.h" +#include "codac_Slice.h" +#include "codac_Trajectory.h" -namespace tubex +namespace codac { #define DEFAULT_TUBE_NAME "[?](·)" #define DEFAULT_TRAJ_NAME "?(·)" diff --git a/src/core/graphics/tubex_VIBesFigTubeVector.cpp b/src/core/graphics/codac_VIBesFigTubeVector.cpp similarity index 98% rename from src/core/graphics/tubex_VIBesFigTubeVector.cpp rename to src/core/graphics/codac_VIBesFigTubeVector.cpp index 9bd767ba..57b87746 100644 --- a/src/core/graphics/tubex_VIBesFigTubeVector.cpp +++ b/src/core/graphics/codac_VIBesFigTubeVector.cpp @@ -3,18 +3,18 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_VIBesFigTubeVector.h" -#include "tubex_Exception.h" +#include "codac_VIBesFigTubeVector.h" +#include "codac_Exception.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { VIBesFigTubeVector::VIBesFigTubeVector(const std::string& fig_name) : Figure(fig_name), m_n(0), m_v_figs(NULL) diff --git a/src/core/graphics/tubex_VIBesFigTubeVector.h b/src/core/graphics/codac_VIBesFigTubeVector.h similarity index 97% rename from src/core/graphics/tubex_VIBesFigTubeVector.h rename to src/core/graphics/codac_VIBesFigTubeVector.h index 229daec3..e2266cda 100644 --- a/src/core/graphics/tubex_VIBesFigTubeVector.h +++ b/src/core/graphics/codac_VIBesFigTubeVector.h @@ -4,19 +4,19 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_VIBESFIGTUBEVECTOR_H__ -#define __TUBEX_VIBESFIGTUBEVECTOR_H__ +#ifndef __CODAC_VIBESFIGTUBEVECTOR_H__ +#define __CODAC_VIBESFIGTUBEVECTOR_H__ -#include "tubex_VIBesFigTube.h" -#include "tubex_TubeVector.h" -#include "tubex_TrajectoryVector.h" +#include "codac_VIBesFigTube.h" +#include "codac_TubeVector.h" +#include "codac_TrajectoryVector.h" -namespace tubex +namespace codac { /** * \class VIBesFigTubeVector diff --git a/src/core/graphics/tubex_colors.cpp b/src/core/graphics/codac_colors.cpp similarity index 98% rename from src/core/graphics/tubex_colors.cpp rename to src/core/graphics/codac_colors.cpp index b8ad2d15..914a5772 100644 --- a/src/core/graphics/tubex_colors.cpp +++ b/src/core/graphics/codac_colors.cpp @@ -3,7 +3,7 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -11,11 +11,11 @@ #include #include #include -#include "tubex_colors.h" +#include "codac_colors.h" using namespace std; -namespace tubex +namespace codac { const string rgb2hex(rgb rgb_value, const char* prefix) { diff --git a/src/core/graphics/tubex_colors.h b/src/core/graphics/codac_colors.h similarity index 96% rename from src/core/graphics/tubex_colors.h rename to src/core/graphics/codac_colors.h index 5d7bc1ed..ea0d8c44 100644 --- a/src/core/graphics/tubex_colors.h +++ b/src/core/graphics/codac_colors.h @@ -4,17 +4,17 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_COLORS_H__ -#define __TUBEX_COLORS_H__ +#ifndef __CODAC_COLORS_H__ +#define __CODAC_COLORS_H__ #include -namespace tubex +namespace codac { /** * \struct rgb diff --git a/src/core/paving/tubex_ConnectedSubset.cpp b/src/core/paving/codac_ConnectedSubset.cpp similarity index 95% rename from src/core/paving/tubex_ConnectedSubset.cpp rename to src/core/paving/codac_ConnectedSubset.cpp index d8c05000..f75a8ab8 100644 --- a/src/core/paving/tubex_ConnectedSubset.cpp +++ b/src/core/paving/codac_ConnectedSubset.cpp @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include -#include "tubex_ConnectedSubset.h" -#include "tubex_Paving.h" +#include "codac_ConnectedSubset.h" +#include "codac_Paving.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { ConnectedSubset::ConnectedSubset(const vector& v_subset_items) : Set(IntervalVector(2, Interval::EMPTY_SET), SetValue::IN | SetValue::MAYBE), diff --git a/src/core/paving/tubex_ConnectedSubset.h b/src/core/paving/codac_ConnectedSubset.h similarity index 98% rename from src/core/paving/tubex_ConnectedSubset.h rename to src/core/paving/codac_ConnectedSubset.h index cb6bb35e..c0f2ce6b 100644 --- a/src/core/paving/tubex_ConnectedSubset.h +++ b/src/core/paving/codac_ConnectedSubset.h @@ -4,17 +4,17 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou, Peter Franek - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_CONNECTEDSUBSET_H__ -#define __TUBEX_CONNECTEDSUBSET_H__ +#ifndef __CODAC_CONNECTEDSUBSET_H__ +#define __CODAC_CONNECTEDSUBSET_H__ -#include "tubex_Set.h" +#include "codac_Set.h" -namespace tubex +namespace codac { class Paving; diff --git a/src/core/paving/tubex_ConnectedSubset_degree.cpp b/src/core/paving/codac_ConnectedSubset_degree.cpp similarity index 98% rename from src/core/paving/tubex_ConnectedSubset_degree.cpp rename to src/core/paving/codac_ConnectedSubset_degree.cpp index be580e33..dee170ca 100644 --- a/src/core/paving/tubex_ConnectedSubset_degree.cpp +++ b/src/core/paving/codac_ConnectedSubset_degree.cpp @@ -3,7 +3,7 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou, Peter Franek - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -11,13 +11,13 @@ #include #include #include "ibex_IntervalMatrix.h" -#include "tubex_ConnectedSubset.h" -#include "tubex_Paving.h" +#include "codac_ConnectedSubset.h" +#include "codac_Paving.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { bool ConnectedSubset::zero_proven(IntervalVector (*f)(const IntervalVector& b)) { diff --git a/src/core/paving/tubex_Paving.cpp b/src/core/paving/codac_Paving.cpp similarity index 98% rename from src/core/paving/tubex_Paving.cpp rename to src/core/paving/codac_Paving.cpp index e663cf35..5ff4842c 100644 --- a/src/core/paving/tubex_Paving.cpp +++ b/src/core/paving/codac_Paving.cpp @@ -3,20 +3,20 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include #include -#include "tubex_Paving.h" +#include "codac_Paving.h" #include "ibex_LargestFirst.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { // Basics diff --git a/src/core/paving/tubex_Paving.h b/src/core/paving/codac_Paving.h similarity index 97% rename from src/core/paving/tubex_Paving.h rename to src/core/paving/codac_Paving.h index b8802303..ddf55aaa 100644 --- a/src/core/paving/tubex_Paving.h +++ b/src/core/paving/codac_Paving.h @@ -4,18 +4,18 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_PAVING_H__ -#define __TUBEX_PAVING_H__ +#ifndef __CODAC_PAVING_H__ +#define __CODAC_PAVING_H__ -#include "tubex_Set.h" -#include "tubex_ConnectedSubset.h" +#include "codac_Set.h" +#include "codac_ConnectedSubset.h" -namespace tubex +namespace codac { /** * \class Paving diff --git a/src/core/paving/tubex_SIVIAPaving.cpp b/src/core/paving/codac_SIVIAPaving.cpp similarity index 92% rename from src/core/paving/tubex_SIVIAPaving.cpp rename to src/core/paving/codac_SIVIAPaving.cpp index afc37313..e6141418 100644 --- a/src/core/paving/tubex_SIVIAPaving.cpp +++ b/src/core/paving/codac_SIVIAPaving.cpp @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include #include -#include "tubex_SIVIAPaving.h" +#include "codac_SIVIAPaving.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { SIVIAPaving::SIVIAPaving(const IntervalVector& init_box) : Paving(init_box) { diff --git a/src/core/paving/tubex_SIVIAPaving.h b/src/core/paving/codac_SIVIAPaving.h similarity index 89% rename from src/core/paving/tubex_SIVIAPaving.h rename to src/core/paving/codac_SIVIAPaving.h index 315c405d..289699fd 100644 --- a/src/core/paving/tubex_SIVIAPaving.h +++ b/src/core/paving/codac_SIVIAPaving.h @@ -4,19 +4,19 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_SIVIAPAVING_H__ -#define __TUBEX_SIVIAPAVING_H__ +#ifndef __CODAC_SIVIAPAVING_H__ +#define __CODAC_SIVIAPAVING_H__ -#include "tubex_Paving.h" +#include "codac_Paving.h" #include "ibex_Function.h" #include "ibex_IntervalVector.h" -namespace tubex +namespace codac { /** * \class SIVIAPaving diff --git a/src/core/paving/tubex_Set.cpp b/src/core/paving/codac_Set.cpp similarity index 89% rename from src/core/paving/tubex_Set.cpp rename to src/core/paving/codac_Set.cpp index 4d4057af..36080d1d 100644 --- a/src/core/paving/tubex_Set.cpp +++ b/src/core/paving/codac_Set.cpp @@ -3,18 +3,18 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include -#include "tubex_Set.h" +#include "codac_Set.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { Set::Set(const IntervalVector& box, SetValue value) : m_value(value), m_box(box) diff --git a/src/core/paving/tubex_Set.h b/src/core/paving/codac_Set.h similarity index 96% rename from src/core/paving/tubex_Set.h rename to src/core/paving/codac_Set.h index 3e03f22a..c920910e 100644 --- a/src/core/paving/tubex_Set.h +++ b/src/core/paving/codac_Set.h @@ -4,17 +4,17 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_SET_H__ -#define __TUBEX_SET_H__ +#ifndef __CODAC_SET_H__ +#define __CODAC_SET_H__ #include "ibex_IntervalVector.h" -namespace tubex +namespace codac { /** * \enum SetValue diff --git a/src/core/paving/tubex_TubePaving.cpp b/src/core/paving/codac_TubePaving.cpp similarity index 94% rename from src/core/paving/tubex_TubePaving.cpp rename to src/core/paving/codac_TubePaving.cpp index a2f2c8fb..0f12e01a 100644 --- a/src/core/paving/tubex_TubePaving.cpp +++ b/src/core/paving/codac_TubePaving.cpp @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2019 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include #include -#include "tubex_TubePaving.h" +#include "codac_TubePaving.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { TubePaving::TubePaving(const IntervalVector& init_box) : Paving(init_box, SetValue::MAYBE) { diff --git a/src/core/paving/tubex_TubePaving.h b/src/core/paving/codac_TubePaving.h similarity index 85% rename from src/core/paving/tubex_TubePaving.h rename to src/core/paving/codac_TubePaving.h index bc33afd6..30fb0bbc 100644 --- a/src/core/paving/tubex_TubePaving.h +++ b/src/core/paving/codac_TubePaving.h @@ -4,18 +4,18 @@ * ---------------------------------------------------------------------------- * \date 2019 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_TUBEPAVING_H__ -#define __TUBEX_TUBEPAVING_H__ +#ifndef __CODAC_TUBEPAVING_H__ +#define __CODAC_TUBEPAVING_H__ -#include "tubex_Paving.h" -#include "tubex_TubeVector.h" +#include "codac_Paving.h" +#include "codac_TubeVector.h" -namespace tubex +namespace codac { /** * \class TubePaving diff --git a/src/core/serialize/tubex_serialize_intervals.cpp b/src/core/serialize/codac_serialize_intervals.cpp similarity index 95% rename from src/core/serialize/tubex_serialize_intervals.cpp rename to src/core/serialize/codac_serialize_intervals.cpp index 20086eb6..37f44a34 100644 --- a/src/core/serialize/tubex_serialize_intervals.cpp +++ b/src/core/serialize/codac_serialize_intervals.cpp @@ -3,18 +3,18 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_serialize_intervals.h" -#include "tubex_Exception.h" +#include "codac_serialize_intervals.h" +#include "codac_Exception.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { enum class IntervalType { BOUNDED, EMPTY_SET, ALL_REALS, POS_REALS, NEG_REALS }; diff --git a/src/core/serialize/tubex_serialize_intervals.h b/src/core/serialize/codac_serialize_intervals.h similarity index 94% rename from src/core/serialize/tubex_serialize_intervals.h rename to src/core/serialize/codac_serialize_intervals.h index 554dfe54..08e0528c 100644 --- a/src/core/serialize/tubex_serialize_intervals.h +++ b/src/core/serialize/codac_serialize_intervals.h @@ -4,19 +4,19 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_SERIALIZ_INTERVALS_H__ -#define __TUBEX_SERIALIZ_INTERVALS_H__ +#ifndef __CODAC_SERIALIZ_INTERVALS_H__ +#define __CODAC_SERIALIZ_INTERVALS_H__ #include #include "ibex_Interval.h" #include "ibex_IntervalVector.h" -namespace tubex +namespace codac { /// \name Interval /// @{ diff --git a/src/core/serialize/tubex_serialize_trajectories.cpp b/src/core/serialize/codac_serialize_trajectories.cpp similarity index 96% rename from src/core/serialize/tubex_serialize_trajectories.cpp rename to src/core/serialize/codac_serialize_trajectories.cpp index 23fd3af9..af1d4c47 100644 --- a/src/core/serialize/tubex_serialize_trajectories.cpp +++ b/src/core/serialize/codac_serialize_trajectories.cpp @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include "ibex_Vector.h" -#include "tubex_Exception.h" -#include "tubex_serialize_trajectories.h" +#include "codac_Exception.h" +#include "codac_serialize_trajectories.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { void serialize_Trajectory(ofstream& bin_file, const Trajectory& traj, int version_number) { diff --git a/src/core/serialize/tubex_serialize_trajectories.h b/src/core/serialize/codac_serialize_trajectories.h similarity index 90% rename from src/core/serialize/tubex_serialize_trajectories.h rename to src/core/serialize/codac_serialize_trajectories.h index 02c8edca..e31ee747 100644 --- a/src/core/serialize/tubex_serialize_trajectories.h +++ b/src/core/serialize/codac_serialize_trajectories.h @@ -4,20 +4,20 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_SERIALIZ_TRAJECTORIES_H__ -#define __TUBEX_SERIALIZ_TRAJECTORIES_H__ +#ifndef __CODAC_SERIALIZ_TRAJECTORIES_H__ +#define __CODAC_SERIALIZ_TRAJECTORIES_H__ #include -#include "tubex_Trajectory.h" -#include "tubex_TrajectoryVector.h" -#include "tubex_serialize_tubes.h" +#include "codac_Trajectory.h" +#include "codac_TrajectoryVector.h" +#include "codac_serialize_tubes.h" -namespace tubex +namespace codac { /// \name Trajectory /// @{ diff --git a/src/core/serialize/tubex_serialize_tubes.cpp b/src/core/serialize/codac_serialize_tubes.cpp similarity index 95% rename from src/core/serialize/tubex_serialize_tubes.cpp rename to src/core/serialize/codac_serialize_tubes.cpp index 31fb2c05..bed1591b 100644 --- a/src/core/serialize/tubex_serialize_tubes.cpp +++ b/src/core/serialize/codac_serialize_tubes.cpp @@ -3,22 +3,22 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_serialize_tubes.h" -#include "tubex_serialize_intervals.h" -#include "tubex_Exception.h" -#include "tubex_Tube.h" -#include "tubex_TubeVector.h" -#include "tubex_Slice.h" +#include "codac_serialize_tubes.h" +#include "codac_serialize_intervals.h" +#include "codac_Exception.h" +#include "codac_Tube.h" +#include "codac_TubeVector.h" +#include "codac_Slice.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { void serialize_Tube(ofstream& bin_file, const Tube& tube, int version_number) { diff --git a/src/core/serialize/tubex_serialize_tubes.h b/src/core/serialize/codac_serialize_tubes.h similarity index 95% rename from src/core/serialize/tubex_serialize_tubes.h rename to src/core/serialize/codac_serialize_tubes.h index a8983efc..836688b1 100644 --- a/src/core/serialize/tubex_serialize_tubes.h +++ b/src/core/serialize/codac_serialize_tubes.h @@ -4,17 +4,17 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_SERIALIZ_TUBES_H__ -#define __TUBEX_SERIALIZ_TUBES_H__ +#ifndef __CODAC_SERIALIZ_TUBES_H__ +#define __CODAC_SERIALIZ_TUBES_H__ #include -namespace tubex +namespace codac { #define SERIALIZATION_VERSION 2 diff --git a/src/core/tools/tubex_Eigen.cpp b/src/core/tools/codac_Eigen.cpp similarity index 93% rename from src/core/tools/tubex_Eigen.cpp rename to src/core/tools/codac_Eigen.cpp index 85bd82ae..9cc0fa83 100644 --- a/src/core/tools/tubex_Eigen.cpp +++ b/src/core/tools/codac_Eigen.cpp @@ -1,7 +1,7 @@ -#include "tubex_Eigen.h" +#include "codac_Eigen.h" -namespace tubex { +namespace codac { Eigen::MatrixXd EigenHelpers::i2e(const ibex::Matrix &x) { Eigen::MatrixXd m(x.nb_rows(), x.nb_cols()); for (int i = 0; i < x.nb_rows(); ++i) { diff --git a/src/core/tools/tubex_Eigen.h b/src/core/tools/codac_Eigen.h similarity index 70% rename from src/core/tools/tubex_Eigen.h rename to src/core/tools/codac_Eigen.h index e7c090a1..2b85cfb8 100644 --- a/src/core/tools/tubex_Eigen.h +++ b/src/core/tools/codac_Eigen.h @@ -1,12 +1,12 @@ -#ifndef TUBEX_LIB_TUBEX_EIGEN_H -#define TUBEX_LIB_TUBEX_EIGEN_H +#ifndef CODAC_LIB_CODAC_EIGEN_H +#define CODAC_LIB_CODAC_EIGEN_H #include #include #include -namespace tubex { +namespace codac { class EigenHelpers { public: static Eigen::MatrixXd i2e(const ibex::Matrix &x); @@ -17,4 +17,4 @@ class EigenHelpers { }; } -#endif //TUBEX_LIB_TUBEX_EIGEN_H +#endif //CODAC_LIB_CODAC_EIGEN_H diff --git a/src/core/tools/tubex_Tools.cpp b/src/core/tools/codac_Tools.cpp similarity index 92% rename from src/core/tools/tubex_Tools.cpp rename to src/core/tools/codac_Tools.cpp index 1275abce..2e1496a0 100644 --- a/src/core/tools/tubex_Tools.cpp +++ b/src/core/tools/codac_Tools.cpp @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include #include -#include "tubex_Tools.h" +#include "codac_Tools.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { void Tools::replace_all(string& input, const string& search, const string& format) { diff --git a/src/core/tools/tubex_Tools.h b/src/core/tools/codac_Tools.h similarity index 91% rename from src/core/tools/tubex_Tools.h rename to src/core/tools/codac_Tools.h index 94fafdd4..ca81fa81 100644 --- a/src/core/tools/tubex_Tools.h +++ b/src/core/tools/codac_Tools.h @@ -4,18 +4,18 @@ * ---------------------------------------------------------------------------- * \date 2020 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_TOOLS_H__ -#define __TUBEX_TOOLS_H__ +#ifndef __CODAC_TOOLS_H__ +#define __CODAC_TOOLS_H__ #include #include "ibex_Interval.h" -namespace tubex +namespace codac { /** * \class Tools diff --git a/src/robotics/CMakeLists.txt b/src/robotics/CMakeLists.txt index bab96240..c75f3049 100644 --- a/src/robotics/CMakeLists.txt +++ b/src/robotics/CMakeLists.txt @@ -1,44 +1,44 @@ # ================================================================== -# tubex-rob - cmake configuration file +# codac-rob - cmake configuration file # ================================================================== - list(APPEND SRC ${CMAKE_CURRENT_SOURCE_DIR}/graphics/tubex_VIBesFigMap.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/graphics/tubex_VIBesFigMap.h - ${CMAKE_CURRENT_SOURCE_DIR}/objects/tubex_Beacon.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/objects/tubex_Beacon.h - ${CMAKE_CURRENT_SOURCE_DIR}/loops/tubex_TPlane.h - ${CMAKE_CURRENT_SOURCE_DIR}/loops/tubex_TPlane.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/data/tubex_DataLoaderLissajous.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/data/tubex_DataLoaderRedermor.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/data/tubex_DataLoader.h - ${CMAKE_CURRENT_SOURCE_DIR}/data/tubex_DataLoaderRedermor.h - ${CMAKE_CURRENT_SOURCE_DIR}/data/tubex_DataLoader.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/data/tubex_DataLoaderLissajous.h - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/tubex_CtcConstell.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/contractors/tubex_CtcConstell.h + list(APPEND SRC ${CMAKE_CURRENT_SOURCE_DIR}/graphics/codac_VIBesFigMap.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/graphics/codac_VIBesFigMap.h + ${CMAKE_CURRENT_SOURCE_DIR}/objects/codac_Beacon.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/objects/codac_Beacon.h + ${CMAKE_CURRENT_SOURCE_DIR}/loops/codac_TPlane.h + ${CMAKE_CURRENT_SOURCE_DIR}/loops/codac_TPlane.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/data/codac_DataLoaderLissajous.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/data/codac_DataLoaderRedermor.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/data/codac_DataLoader.h + ${CMAKE_CURRENT_SOURCE_DIR}/data/codac_DataLoaderRedermor.h + ${CMAKE_CURRENT_SOURCE_DIR}/data/codac_DataLoader.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/data/codac_DataLoaderLissajous.h + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/codac_CtcConstell.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/contractors/codac_CtcConstell.h ) ################################################################################ -# Create the target for libtubex-rob +# Create the target for libcodac-rob ################################################################################ - add_library(tubex-rob ${SRC}) - target_compile_options(tubex-rob PUBLIC ${TUBEX_CFLAGS}) + add_library(codac-rob ${SRC}) + target_compile_options(codac-rob PUBLIC ${CODAC_CFLAGS}) - # todo: find a clean way to access tubex header files? - set(TUBEX_HEADERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../include) - target_include_directories(tubex-rob PUBLIC ${TUBEX_HEADERS_DIR} + # todo: find a clean way to access codac header files? + set(CODAC_HEADERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../include) + target_include_directories(codac-rob PUBLIC ${CODAC_HEADERS_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/graphics ${CMAKE_CURRENT_SOURCE_DIR}/objects ${CMAKE_CURRENT_SOURCE_DIR}/loops ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_SOURCE_DIR}/contractors) - target_link_libraries(tubex-rob PUBLIC Ibex::ibex tubex) + target_link_libraries(codac-rob PUBLIC Ibex::ibex codac) ################################################################################ -# Installation of libtubex-rob files +# Installation of libcodac-rob files ################################################################################ # Getting header files from sources @@ -46,25 +46,25 @@ foreach(srcfile ${SRC}) if(srcfile MATCHES "\\.h$" OR srcfile MATCHES "\\.hpp$") list(APPEND HDR ${srcfile}) - # Copying header files for other Tubex libraries compiled in the same time + # Copying header files for other Codac libraries compiled in the same time file(COPY ${srcfile} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../../include) endif() endforeach() -# Generating a tubex-rob.h file +# Generating a codac-rob.h file - set(TUBEX_ROB_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/tubex-rob.h) - file(WRITE ${TUBEX_ROB_MAIN_HEADER} "/* This file is generated by CMake */\n\n") - file(APPEND ${TUBEX_ROB_MAIN_HEADER} "#ifndef __TUBEX_ROB_H__\n#define __TUBEX_ROB_H__\n\n") + set(CODAC_ROB_MAIN_HEADER ${CMAKE_CURRENT_BINARY_DIR}/codac-rob.h) + file(WRITE ${CODAC_ROB_MAIN_HEADER} "/* This file is generated by CMake */\n\n") + file(APPEND ${CODAC_ROB_MAIN_HEADER} "#ifndef __CODAC_ROB_H__\n#define __CODAC_ROB_H__\n\n") foreach(header_path ${HDR}) get_filename_component(header_name ${header_path} NAME) - file(APPEND ${TUBEX_ROB_MAIN_HEADER} "#include <${header_name}>\n") + file(APPEND ${CODAC_ROB_MAIN_HEADER} "#include <${header_name}>\n") endforeach() - file(APPEND ${TUBEX_ROB_MAIN_HEADER} "\n#endif /* __TUBEX_ROB_H__ */\n") - file(COPY ${TUBEX_ROB_MAIN_HEADER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../../include) + file(APPEND ${CODAC_ROB_MAIN_HEADER} "\n#endif /* __CODAC_ROB_H__ */\n") + file(COPY ${CODAC_ROB_MAIN_HEADER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../../include) # Install files in system directories - install(TARGETS tubex-rob DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES ${HDR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tubex-rob) - install(FILES ${TUBEX_ROB_MAIN_HEADER} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tubex-rob) \ No newline at end of file + install(TARGETS codac-rob DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES ${HDR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/codac-rob) + install(FILES ${CODAC_ROB_MAIN_HEADER} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/codac-rob) \ No newline at end of file diff --git a/src/robotics/contractors/tubex_CtcConstell.cpp b/src/robotics/contractors/codac_CtcConstell.cpp similarity index 91% rename from src/robotics/contractors/tubex_CtcConstell.cpp rename to src/robotics/contractors/codac_CtcConstell.cpp index 025a20de..feb2f0f2 100644 --- a/src/robotics/contractors/tubex_CtcConstell.cpp +++ b/src/robotics/contractors/codac_CtcConstell.cpp @@ -3,18 +3,18 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include -#include "tubex_CtcConstell.h" +#include "codac_CtcConstell.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { CtcConstell::CtcConstell(const vector& map) : Ctc(2), m_map(map) diff --git a/src/robotics/contractors/tubex_CtcConstell.h b/src/robotics/contractors/codac_CtcConstell.h similarity index 85% rename from src/robotics/contractors/tubex_CtcConstell.h rename to src/robotics/contractors/codac_CtcConstell.h index c92531f2..5e43ef39 100644 --- a/src/robotics/contractors/tubex_CtcConstell.h +++ b/src/robotics/contractors/codac_CtcConstell.h @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2018 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_CTCCONSTELL_H__ -#define __TUBEX_CTCCONSTELL_H__ +#ifndef __CODAC_CTCCONSTELL_H__ +#define __CODAC_CTCCONSTELL_H__ #include "ibex_Ctc.h" #include #include -namespace tubex +namespace codac { /** * \brief CtcConstell class. diff --git a/src/robotics/data/tubex_DataLoader.cpp b/src/robotics/data/codac_DataLoader.cpp similarity index 97% rename from src/robotics/data/tubex_DataLoader.cpp rename to src/robotics/data/codac_DataLoader.cpp index def91dc1..5a5ee998 100644 --- a/src/robotics/data/tubex_DataLoader.cpp +++ b/src/robotics/data/codac_DataLoader.cpp @@ -3,7 +3,7 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ @@ -11,16 +11,16 @@ #include #include #include -#include "tubex_DataLoader.h" -#include "tubex_Exception.h" -#include "tubex_Tools.h" +#include "codac_DataLoader.h" +#include "codac_Exception.h" +#include "codac_Tools.h" -#define DATA_FILE_EXTENSION ".tubex" +#define DATA_FILE_EXTENSION ".codac" using namespace std; using namespace ibex; -namespace tubex +namespace codac { DataLoader::DataLoader() { diff --git a/src/robotics/data/tubex_DataLoader.h b/src/robotics/data/codac_DataLoader.h similarity index 94% rename from src/robotics/data/tubex_DataLoader.h rename to src/robotics/data/codac_DataLoader.h index 65083026..c18fdc90 100644 --- a/src/robotics/data/tubex_DataLoader.h +++ b/src/robotics/data/codac_DataLoader.h @@ -3,21 +3,21 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_DATALOADER_H__ -#define __TUBEX_DATALOADER_H__ +#ifndef __CODAC_DATALOADER_H__ +#define __CODAC_DATALOADER_H__ #include #include -#include "tubex_TubeVector.h" -#include "tubex_TrajectoryVector.h" -#include "tubex_Beacon.h" +#include "codac_TubeVector.h" +#include "codac_TrajectoryVector.h" +#include "codac_Beacon.h" -namespace tubex +namespace codac { class DataLoader { diff --git a/src/robotics/data/tubex_DataLoaderLissajous.cpp b/src/robotics/data/codac_DataLoaderLissajous.cpp similarity index 95% rename from src/robotics/data/tubex_DataLoaderLissajous.cpp rename to src/robotics/data/codac_DataLoaderLissajous.cpp index 7ac19a24..138b7e4e 100644 --- a/src/robotics/data/tubex_DataLoaderLissajous.cpp +++ b/src/robotics/data/codac_DataLoaderLissajous.cpp @@ -3,20 +3,20 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include -#include "tubex_DataLoaderLissajous.h" -#include "tubex_TFunction.h" -#include "tubex_Tube.h" +#include "codac_DataLoaderLissajous.h" +#include "codac_TFunction.h" +#include "codac_Tube.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { DataLoaderLissajous::DataLoaderLissajous() : DataLoader() diff --git a/src/robotics/data/tubex_DataLoaderLissajous.h b/src/robotics/data/codac_DataLoaderLissajous.h similarity index 86% rename from src/robotics/data/tubex_DataLoaderLissajous.h rename to src/robotics/data/codac_DataLoaderLissajous.h index 7b740575..3ac9f920 100644 --- a/src/robotics/data/tubex_DataLoaderLissajous.h +++ b/src/robotics/data/codac_DataLoaderLissajous.h @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_DATALOADERLISSAJOUS_H__ -#define __TUBEX_DATALOADERLISSAJOUS_H__ +#ifndef __CODAC_DATALOADERLISSAJOUS_H__ +#define __CODAC_DATALOADERLISSAJOUS_H__ #include "ibex_Interval.h" -#include "tubex_DataLoader.h" -#include "tubex_Beacon.h" +#include "codac_DataLoader.h" +#include "codac_Beacon.h" -namespace tubex +namespace codac { class DataLoaderLissajous : DataLoader { diff --git a/src/robotics/data/tubex_DataLoaderRedermor.cpp b/src/robotics/data/codac_DataLoaderRedermor.cpp similarity index 96% rename from src/robotics/data/tubex_DataLoaderRedermor.cpp rename to src/robotics/data/codac_DataLoaderRedermor.cpp index 38c60003..c21fd72a 100644 --- a/src/robotics/data/tubex_DataLoaderRedermor.cpp +++ b/src/robotics/data/codac_DataLoaderRedermor.cpp @@ -3,21 +3,21 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include -#include "tubex_DataLoaderRedermor.h" -#include "tubex_TFunction.h" -#include "tubex_Exception.h" -#include "tubex_Tube.h" +#include "codac_DataLoaderRedermor.h" +#include "codac_TFunction.h" +#include "codac_Exception.h" +#include "codac_Tube.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { DataLoaderRedermor::DataLoaderRedermor(const string& file_path) : DataLoader(file_path) diff --git a/src/robotics/data/tubex_DataLoaderRedermor.h b/src/robotics/data/codac_DataLoaderRedermor.h similarity index 80% rename from src/robotics/data/tubex_DataLoaderRedermor.h rename to src/robotics/data/codac_DataLoaderRedermor.h index c75fc299..fe1929a0 100644 --- a/src/robotics/data/tubex_DataLoaderRedermor.h +++ b/src/robotics/data/codac_DataLoaderRedermor.h @@ -3,19 +3,19 @@ * ---------------------------------------------------------------------------- * \date 2016 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_DATALOADERREDERMOR_H__ -#define __TUBEX_DATALOADERREDERMOR_H__ +#ifndef __CODAC_DATALOADERREDERMOR_H__ +#define __CODAC_DATALOADERREDERMOR_H__ #include "ibex_Interval.h" -#include "tubex_DataLoader.h" -#include "tubex_Beacon.h" +#include "codac_DataLoader.h" +#include "codac_Beacon.h" -namespace tubex +namespace codac { class DataLoaderRedermor : DataLoader { diff --git a/src/robotics/graphics/tubex_VIBesFigMap.cpp b/src/robotics/graphics/codac_VIBesFigMap.cpp similarity index 99% rename from src/robotics/graphics/tubex_VIBesFigMap.cpp rename to src/robotics/graphics/codac_VIBesFigMap.cpp index 29f0e86e..eaa33e33 100644 --- a/src/robotics/graphics/tubex_VIBesFigMap.cpp +++ b/src/robotics/graphics/codac_VIBesFigMap.cpp @@ -3,25 +3,25 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace std; using namespace ibex; #define GRAY_DISPLAY_MODE 0 -namespace tubex +namespace codac { VIBesFigMap::VIBesFigMap(const string& fig_name) : VIBesFig(fig_name) diff --git a/src/robotics/graphics/tubex_VIBesFigMap.h b/src/robotics/graphics/codac_VIBesFigMap.h similarity index 98% rename from src/robotics/graphics/tubex_VIBesFigMap.h rename to src/robotics/graphics/codac_VIBesFigMap.h index 5664b696..04490bef 100644 --- a/src/robotics/graphics/tubex_VIBesFigMap.h +++ b/src/robotics/graphics/codac_VIBesFigMap.h @@ -4,24 +4,24 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_VIBESFIGMAP_H__ -#define __TUBEX_VIBESFIGMAP_H__ +#ifndef __CODAC_VIBESFIGMAP_H__ +#define __CODAC_VIBESFIGMAP_H__ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -namespace tubex +namespace codac { #define TRAJ_MAX_NB_DISPLAYED_POINTS 2000 #define TUBE_MAX_NB_DISPLAYED_SLICES 2000 diff --git a/src/robotics/loops/tubex_TPlane.cpp b/src/robotics/loops/codac_TPlane.cpp similarity index 98% rename from src/robotics/loops/tubex_TPlane.cpp rename to src/robotics/loops/codac_TPlane.cpp index db8c4851..6c323397 100644 --- a/src/robotics/loops/tubex_TPlane.cpp +++ b/src/robotics/loops/codac_TPlane.cpp @@ -3,17 +3,17 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#include "tubex_TPlane.h" +#include "codac_TPlane.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { TPlane::TPlane() : Paving(IntervalVector(2), SetValue::MAYBE) diff --git a/src/robotics/loops/tubex_TPlane.h b/src/robotics/loops/codac_TPlane.h similarity index 96% rename from src/robotics/loops/tubex_TPlane.h rename to src/robotics/loops/codac_TPlane.h index 1e5133a5..4bc63cd9 100644 --- a/src/robotics/loops/tubex_TPlane.h +++ b/src/robotics/loops/codac_TPlane.h @@ -4,19 +4,19 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_TPLANE_H__ -#define __TUBEX_TPLANE_H__ +#ifndef __CODAC_TPLANE_H__ +#define __CODAC_TPLANE_H__ -#include "tubex_Paving.h" -#include "tubex_TubeVector.h" -#include "tubex_ConnectedSubset.h" +#include "codac_Paving.h" +#include "codac_TubeVector.h" +#include "codac_ConnectedSubset.h" -namespace tubex +namespace codac { /** * \class TPlane diff --git a/src/robotics/objects/tubex_Beacon.cpp b/src/robotics/objects/codac_Beacon.cpp similarity index 92% rename from src/robotics/objects/tubex_Beacon.cpp rename to src/robotics/objects/codac_Beacon.cpp index e8682ed0..8ff905c0 100644 --- a/src/robotics/objects/tubex_Beacon.cpp +++ b/src/robotics/objects/codac_Beacon.cpp @@ -3,18 +3,18 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ #include -#include "tubex_Beacon.h" +#include "codac_Beacon.h" using namespace std; using namespace ibex; -namespace tubex +namespace codac { Beacon::Beacon(const Vector& pos) : m_pos(pos), m_pos_box(pos) diff --git a/src/robotics/objects/tubex_Beacon.h b/src/robotics/objects/codac_Beacon.h similarity index 87% rename from src/robotics/objects/tubex_Beacon.h rename to src/robotics/objects/codac_Beacon.h index eac35ee9..f9468600 100644 --- a/src/robotics/objects/tubex_Beacon.h +++ b/src/robotics/objects/codac_Beacon.h @@ -3,17 +3,17 @@ * ---------------------------------------------------------------------------- * \date 2015 * \author Simon Rohou - * \copyright Copyright 2020 Simon Rohou + * \copyright Copyright 2021 Codac Team * \license This program is distributed under the terms of * the GNU Lesser General Public License (LGPL). */ -#ifndef __TUBEX_BEACON_H__ -#define __TUBEX_BEACON_H__ +#ifndef __CODAC_BEACON_H__ +#define __CODAC_BEACON_H__ #include "ibex_IntervalVector.h" -namespace tubex +namespace codac { class Beacon { diff --git a/tests/3rd/CMakeLists.txt b/tests/3rd/CMakeLists.txt index 6f20475c..5995410f 100644 --- a/tests/3rd/CMakeLists.txt +++ b/tests/3rd/CMakeLists.txt @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib / tests - cmake configuration file +# codac / tests - cmake configuration file # ================================================================== if(WITH_CAPD) diff --git a/tests/3rd/capd/CMakeLists.txt b/tests/3rd/capd/CMakeLists.txt index 05771fb6..2f13929f 100644 --- a/tests/3rd/capd/CMakeLists.txt +++ b/tests/3rd/capd/CMakeLists.txt @@ -1,8 +1,8 @@ # ================================================================== -# tubex-lib / tests - cmake configuration file +# codac / tests - cmake configuration file # ================================================================== - set(TESTS_NAME tubex-tests-3rd-capd) + set(TESTS_NAME codac-tests-3rd-capd) list(APPEND SRC_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tests_ode.cpp @@ -12,11 +12,11 @@ pkg_search_module(PKG_CAPD REQUIRED capd capd-gui mpcapd mpcapd-gui) add_executable(${TESTS_NAME} ${SRC_TESTS}) - # todo: find a clean way to access tubex header files? - set(TUBEX_HEADERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../include) - target_include_directories(${TESTS_NAME} SYSTEM PUBLIC ${TUBEX_HEADERS_DIR} + # todo: find a clean way to access codac header files? + set(CODAC_HEADERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../include) + target_include_directories(${TESTS_NAME} SYSTEM PUBLIC ${CODAC_HEADERS_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../catch ${PKG_CAPD_INCLUDE_DIRS}) - target_link_libraries(${TESTS_NAME} PUBLIC Ibex::ibex tubex tubex-capd ${PKG_CAPD_LDFLAGS}) + target_link_libraries(${TESTS_NAME} PUBLIC Ibex::ibex codac codac-capd ${PKG_CAPD_LDFLAGS}) add_dependencies(check ${TESTS_NAME}) add_test(NAME ${TESTS_NAME} COMMAND ${TESTS_NAME}) \ No newline at end of file diff --git a/tests/3rd/capd/tests_ode.cpp b/tests/3rd/capd/tests_ode.cpp index dd3cbc7c..73717be5 100644 --- a/tests/3rd/capd/tests_ode.cpp +++ b/tests/3rd/capd/tests_ode.cpp @@ -1,13 +1,13 @@ #include "catch_interval.hpp" -#include "tubex_CtcDelay.h" -#include "tubex-capd.h" -#include "tubex_VIBesFigTube.h" +#include "codac_CtcDelay.h" +#include "codac-capd.h" +#include "codac_VIBesFigTube.h" using namespace std; using namespace Catch; using namespace Detail; using namespace ibex; -using namespace tubex; +using namespace codac; #define VIBES_DRAWING 0 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cf745f4d..829217b3 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,5 @@ # ================================================================== -# tubex-lib / tests - cmake configuration file +# codac / tests - cmake configuration file # ================================================================== add_subdirectory(core) diff --git a/tests/catch/catch_interval.hpp b/tests/catch/catch_interval.hpp index 5a8178fa..aad59067 100644 --- a/tests/catch/catch_interval.hpp +++ b/tests/catch/catch_interval.hpp @@ -16,16 +16,16 @@ * Created : 2016 * ---------------------------------------------------------------------------- */ -#ifndef __TUBEX_CATCH_H__ -#define __TUBEX_CATCH_H__ +#ifndef __CODAC_CATCH_H__ +#define __CODAC_CATCH_H__ #include "catch.hpp" #include "ibex_Interval.h" #include "ibex_IntervalVector.h" -#include "tubex_Point.h" -#include "tubex_ConvexPolygon.h" -#include "tubex_TubeVector.h" -#include "tubex_Slice.h" +#include "codac_Point.h" +#include "codac_ConvexPolygon.h" +#include "codac_TubeVector.h" +#include "codac_Slice.h" namespace Catch { @@ -126,11 +126,11 @@ namespace Catch class ApproxSlice { public: - explicit ApproxSlice(tubex::Slice value) : + explicit ApproxSlice(codac::Slice value) : m_value(value) {} - friend bool operator ==(tubex::Slice lhs, ApproxSlice const& rhs) + friend bool operator ==(codac::Slice lhs, ApproxSlice const& rhs) { return lhs.tdomain() == ApproxIntv(rhs.m_value.tdomain()) && lhs.codomain() == ApproxIntvVector(rhs.m_value.codomain()) && @@ -138,17 +138,17 @@ namespace Catch lhs.output_gate() == ApproxIntvVector(rhs.m_value.output_gate()); } - friend bool operator ==(ApproxSlice const& lhs, tubex::Slice rhs) + friend bool operator ==(ApproxSlice const& lhs, codac::Slice rhs) { return operator ==(rhs, lhs); } - friend bool operator !=(tubex::Slice lhs, ApproxSlice const& rhs) + friend bool operator !=(codac::Slice lhs, ApproxSlice const& rhs) { return !operator ==(lhs, rhs); } - friend bool operator !=(ApproxSlice const& lhs, tubex::Slice rhs) + friend bool operator !=(ApproxSlice const& lhs, codac::Slice rhs) { return !operator ==(rhs, lhs); } @@ -161,22 +161,22 @@ namespace Catch } private: - tubex::Slice m_value; + codac::Slice m_value; }; class ApproxTube { public: - explicit ApproxTube(tubex::Tube value) : + explicit ApproxTube(codac::Tube value) : m_value(value) {} - friend bool operator ==(tubex::Tube lhs, ApproxTube const& rhs) + friend bool operator ==(codac::Tube lhs, ApproxTube const& rhs) { if(lhs.nb_slices() != rhs.m_value.nb_slices()) return false; - const tubex::Slice *s = lhs.first_slice(), *s_x = rhs.m_value.first_slice(); + const codac::Slice *s = lhs.first_slice(), *s_x = rhs.m_value.first_slice(); while(s != NULL) { if(*s != ApproxSlice(*s_x)) // todo @@ -188,17 +188,17 @@ namespace Catch return true; } - friend bool operator ==(ApproxTube const& lhs, tubex::Tube rhs) + friend bool operator ==(ApproxTube const& lhs, codac::Tube rhs) { return operator ==(rhs, lhs); } - friend bool operator !=(tubex::Tube lhs, ApproxTube const& rhs) + friend bool operator !=(codac::Tube lhs, ApproxTube const& rhs) { return !operator ==(lhs, rhs); } - friend bool operator !=(ApproxTube const& lhs, tubex::Tube rhs) + friend bool operator !=(ApproxTube const& lhs, codac::Tube rhs) { return !operator ==(rhs, lhs); } @@ -211,17 +211,17 @@ namespace Catch } private: - tubex::Tube m_value; + codac::Tube m_value; }; class ApproxTubeVector { public: - explicit ApproxTubeVector(tubex::TubeVector value) : + explicit ApproxTubeVector(codac::TubeVector value) : m_value(value) {} - friend bool operator ==(tubex::TubeVector lhs, ApproxTubeVector const& rhs) + friend bool operator ==(codac::TubeVector lhs, ApproxTubeVector const& rhs) { if((lhs.nb_slices() != rhs.m_value.nb_slices()) || (lhs.size() != rhs.m_value.size())) return false; @@ -231,17 +231,17 @@ namespace Catch return true; } - friend bool operator ==(ApproxTubeVector const& lhs, tubex::TubeVector rhs) + friend bool operator ==(ApproxTubeVector const& lhs, codac::TubeVector rhs) { return operator ==(rhs, lhs); } - friend bool operator !=(tubex::TubeVector lhs, ApproxTubeVector const& rhs) + friend bool operator !=(codac::TubeVector lhs, ApproxTubeVector const& rhs) { return !operator ==(lhs, rhs); } - friend bool operator !=(ApproxTubeVector const& lhs, tubex::TubeVector rhs) + friend bool operator !=(ApproxTubeVector const& lhs, codac::TubeVector rhs) { return !operator ==(rhs, lhs); } @@ -254,7 +254,7 @@ namespace Catch } private: - tubex::TubeVector m_value; + codac::TubeVector m_value; }; class ApproxVector @@ -349,29 +349,29 @@ namespace Catch class ApproxPoint { public: - explicit ApproxPoint(tubex::Point value) : + explicit ApproxPoint(codac::Point value) : m_value(value) { m_value.inflate(100.*DEFAULT_EPSILON); } - friend bool operator ==(tubex::Point lhs, ApproxPoint const& rhs) + friend bool operator ==(codac::Point lhs, ApproxPoint const& rhs) { return lhs == rhs.m_value || (lhs.x().intersects(rhs.m_value.x()) && lhs.y().intersects(rhs.m_value.y())); } - friend bool operator ==(ApproxPoint const& lhs, tubex::Point rhs) + friend bool operator ==(ApproxPoint const& lhs, codac::Point rhs) { return operator ==(rhs, lhs); } - friend bool operator !=(tubex::Point lhs, ApproxPoint const& rhs) + friend bool operator !=(codac::Point lhs, ApproxPoint const& rhs) { return !operator ==(lhs, rhs); } - friend bool operator !=(ApproxPoint const& lhs, tubex::Point rhs) + friend bool operator !=(ApproxPoint const& lhs, codac::Point rhs) { return !operator ==(rhs, lhs); } @@ -384,25 +384,25 @@ namespace Catch } private: - tubex::Point m_value; + codac::Point m_value; }; class ApproxConvexPolygon { public: - explicit ApproxConvexPolygon(tubex::ConvexPolygon value, double epsilon = 100.*DEFAULT_EPSILON) : + explicit ApproxConvexPolygon(codac::ConvexPolygon value, double epsilon = 100.*DEFAULT_EPSILON) : m_epsilon(epsilon), m_value(value) { } - const tubex::ConvexPolygon& polygon() const + const codac::ConvexPolygon& polygon() const { return m_value; } - friend bool operator ==(tubex::ConvexPolygon lhs, ApproxConvexPolygon const& rhs) + friend bool operator ==(codac::ConvexPolygon lhs, ApproxConvexPolygon const& rhs) { if(lhs == rhs.m_value) return true; @@ -434,17 +434,17 @@ namespace Catch return true; } - friend bool operator ==(ApproxConvexPolygon const& lhs, tubex::ConvexPolygon rhs) + friend bool operator ==(ApproxConvexPolygon const& lhs, codac::ConvexPolygon rhs) { return operator ==(rhs, lhs); } - friend bool operator !=(tubex::ConvexPolygon lhs, ApproxConvexPolygon const& rhs) + friend bool operator !=(codac::ConvexPolygon lhs, ApproxConvexPolygon const& rhs) { return !operator ==(lhs, rhs); } - friend bool operator !=(ApproxConvexPolygon const& lhs, tubex::ConvexPolygon rhs) + friend bool operator !=(ApproxConvexPolygon const& lhs, codac::ConvexPolygon rhs) { return !operator ==(rhs, lhs); } @@ -458,7 +458,7 @@ namespace Catch private: double m_epsilon; - tubex::ConvexPolygon m_value; + codac::ConvexPolygon m_value; }; } diff --git a/tests/core/CMakeLists.txt b/tests/core/CMakeLists.txt index cd2eb6de..a22cce7b 100644 --- a/tests/core/CMakeLists.txt +++ b/tests/core/CMakeLists.txt @@ -1,8 +1,8 @@ # ================================================================== -# tubex-lib / tests - cmake configuration file +# codac / tests - cmake configuration file # ================================================================== -set(TESTS_NAME tubex-tests-core) +set(TESTS_NAME codac-tests-core) list(APPEND SRC_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tests_predefined_tubes.cpp @@ -27,10 +27,10 @@ list(APPEND SRC_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ) add_executable(${TESTS_NAME} ${SRC_TESTS}) -# todo: find a clean way to access tubex header files? -set(TUBEX_HEADERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../include) -target_include_directories(${TESTS_NAME} SYSTEM PUBLIC ${TUBEX_HEADERS_DIR} +# todo: find a clean way to access codac header files? +set(CODAC_HEADERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../include) +target_include_directories(${TESTS_NAME} SYSTEM PUBLIC ${CODAC_HEADERS_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../catch) -target_link_libraries(${TESTS_NAME} PUBLIC Ibex::ibex tubex) +target_link_libraries(${TESTS_NAME} PUBLIC Ibex::ibex codac) add_dependencies(check ${TESTS_NAME}) add_test(NAME ${TESTS_NAME} COMMAND ${TESTS_NAME}) \ No newline at end of file diff --git a/tests/core/tests_arithmetic.cpp b/tests/core/tests_arithmetic.cpp index b4db232b..78c5c4e8 100644 --- a/tests/core/tests_arithmetic.cpp +++ b/tests/core/tests_arithmetic.cpp @@ -1,12 +1,12 @@ #include "catch_interval.hpp" -#include "tubex_tube_arithmetic.h" -#include "tubex_traj_arithmetic.h" +#include "codac_tube_arithmetic.h" +#include "codac_traj_arithmetic.h" using namespace Catch; using namespace Detail; using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; TEST_CASE("Arithmetic on tubes") { diff --git a/tests/core/tests_cn.cpp b/tests/core/tests_cn.cpp index 56660365..dd94f89c 100644 --- a/tests/core/tests_cn.cpp +++ b/tests/core/tests_cn.cpp @@ -1,15 +1,15 @@ #include "catch_interval.hpp" -#include "tubex_ContractorNetwork.h" -#include "tubex_CtcDeriv.h" -#include "tubex_CtcEval.h" -#include "tubex_CtcFunction.h" +#include "codac_ContractorNetwork.h" +#include "codac_CtcDeriv.h" +#include "codac_CtcEval.h" +#include "codac_CtcFunction.h" #include "vibes.h" using namespace Catch; using namespace Detail; using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; #define VIBES_DRAWING 0 diff --git a/tests/core/tests_ctc_delay.cpp b/tests/core/tests_ctc_delay.cpp index d021db6b..d1e3c7e1 100644 --- a/tests/core/tests_ctc_delay.cpp +++ b/tests/core/tests_ctc_delay.cpp @@ -1,14 +1,14 @@ #include #include "catch_interval.hpp" -#include "tubex_VIBesFigTube.h" -#include "tubex_CtcDelay.h" +#include "codac_VIBesFigTube.h" +#include "codac_CtcDelay.h" #include "vibes.h" using namespace Catch; using namespace Detail; using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; #define VIBES_DRAWING 0 diff --git a/tests/core/tests_ctc_deriv.cpp b/tests/core/tests_ctc_deriv.cpp index d6959232..755fc1df 100644 --- a/tests/core/tests_ctc_deriv.cpp +++ b/tests/core/tests_ctc_deriv.cpp @@ -1,18 +1,18 @@ #include #include "catch_interval.hpp" -#include "tubex_VIBesFigTube.h" +#include "codac_VIBesFigTube.h" #include "vibes.h" // Using #define so that we can access protected methods // of the class for tests purposes #define protected public -#include "tubex_CtcDeriv.h" +#include "codac_CtcDeriv.h" using namespace Catch; using namespace Detail; using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; #define VIBES_DRAWING 0 diff --git a/tests/core/tests_ctc_eval.cpp b/tests/core/tests_ctc_eval.cpp index 39381cd9..c1d02ae7 100644 --- a/tests/core/tests_ctc_eval.cpp +++ b/tests/core/tests_ctc_eval.cpp @@ -1,15 +1,15 @@ #include #include "catch_interval.hpp" -#include "tubex_TFunction.h" -#include "tubex_CtcEval.h" -#include "tubex_CtcDeriv.h" -#include "tubex_VIBesFigTube.h" +#include "codac_TFunction.h" +#include "codac_CtcEval.h" +#include "codac_CtcDeriv.h" +#include "codac_VIBesFigTube.h" using namespace Catch; using namespace Detail; using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; #define VIBES_DRAWING 0 diff --git a/tests/core/tests_ctc_lohner.cpp b/tests/core/tests_ctc_lohner.cpp index 3ac3bbd2..7576b9bd 100644 --- a/tests/core/tests_ctc_lohner.cpp +++ b/tests/core/tests_ctc_lohner.cpp @@ -1,19 +1,19 @@ #include #include "catch_interval.hpp" -#include "tubex_VIBesFigTube.h" +#include "codac_VIBesFigTube.h" #include "vibes.h" // Using #define so that we can access protected methods // of the class for tests purposes #define protected public -#include "tubex_CtcLohner.h" +#include "codac_CtcLohner.h" using namespace Catch; using namespace Detail; using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; #define VIBES_DRAWING 0 diff --git a/tests/core/tests_ctc_picard.cpp b/tests/core/tests_ctc_picard.cpp index 93c89e98..d7c77720 100644 --- a/tests/core/tests_ctc_picard.cpp +++ b/tests/core/tests_ctc_picard.cpp @@ -1,18 +1,18 @@ #include #include "catch_interval.hpp" -#include "tubex_VIBesFigTube.h" +#include "codac_VIBesFigTube.h" #include "vibes.h" // Using #define so that we can access protected methods // of the class for tests purposes #define protected public -#include "tubex_CtcPicard.h" +#include "codac_CtcPicard.h" using namespace Catch; using namespace Detail; using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; #define VIBES_DRAWING 0 diff --git a/tests/core/tests_definition.cpp b/tests/core/tests_definition.cpp index 7877b8f3..5bbafb8b 100644 --- a/tests/core/tests_definition.cpp +++ b/tests/core/tests_definition.cpp @@ -1,11 +1,11 @@ #include "catch_interval.hpp" -#include "tubex_TFunction.h" +#include "codac_TFunction.h" using namespace Catch; using namespace Detail; using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; TEST_CASE("Tube definition") { diff --git a/tests/core/tests_functions.cpp b/tests/core/tests_functions.cpp index 42480de7..92ce6bed 100644 --- a/tests/core/tests_functions.cpp +++ b/tests/core/tests_functions.cpp @@ -1,12 +1,12 @@ #include "catch_interval.hpp" -#include "tubex_TFunction.h" -#include "tubex_VIBesFigTube.h" +#include "codac_TFunction.h" +#include "codac_VIBesFigTube.h" using namespace Catch; using namespace Detail; using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; #define VIBES_DRAWING 0 diff --git a/tests/core/tests_geometry.cpp b/tests/core/tests_geometry.cpp index b6844824..975bdcde 100644 --- a/tests/core/tests_geometry.cpp +++ b/tests/core/tests_geometry.cpp @@ -1,13 +1,13 @@ #include "catch_interval.hpp" -#include "tubex_Point.h" -#include "tubex_Edge.h" -#include "tubex_VIBesFig.h" +#include "codac_Point.h" +#include "codac_Edge.h" +#include "codac_VIBesFig.h" using namespace Catch; using namespace Detail; using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; #define VIBES_DRAWING 1 diff --git a/tests/core/tests_integration.cpp b/tests/core/tests_integration.cpp index 1800730d..43abc76f 100644 --- a/tests/core/tests_integration.cpp +++ b/tests/core/tests_integration.cpp @@ -6,7 +6,7 @@ using namespace Catch; using namespace Detail; using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; #define TEST_COMPUTATION_TIMES 0 #define COEFF_COMPUTATION_TIME 1. diff --git a/tests/core/tests_operators.cpp b/tests/core/tests_operators.cpp index f5a3edb7..e14c1c8b 100644 --- a/tests/core/tests_operators.cpp +++ b/tests/core/tests_operators.cpp @@ -1,12 +1,12 @@ #include "catch_interval.hpp" -#include "tubex_tube_arithmetic.h" +#include "codac_tube_arithmetic.h" #include "tests_predefined_tubes.h" using namespace Catch; using namespace Detail; using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; TEST_CASE("Operators") { diff --git a/tests/core/tests_polygons.cpp b/tests/core/tests_polygons.cpp index 3e55b0be..a7238ad9 100644 --- a/tests/core/tests_polygons.cpp +++ b/tests/core/tests_polygons.cpp @@ -1,18 +1,18 @@ #include "catch_interval.hpp" -#include "tubex_VIBesFig.h" -#include "tubex_polygon_arithmetic.h" +#include "codac_VIBesFig.h" +#include "codac_polygon_arithmetic.h" // Using #define so that we can access protected methods // of the class for tests purposes #define protected public -#include "tubex_CtcDeriv.h" -#include "tubex_GrahamScan.h" +#include "codac_CtcDeriv.h" +#include "codac_GrahamScan.h" using namespace Catch; using namespace Detail; using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; #define VIBES_DRAWING 1 diff --git a/tests/core/tests_predefined_tubes.cpp b/tests/core/tests_predefined_tubes.cpp index 5e22aedc..8b133346 100644 --- a/tests/core/tests_predefined_tubes.cpp +++ b/tests/core/tests_predefined_tubes.cpp @@ -2,7 +2,7 @@ using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; Tube tube_test_1() { diff --git a/tests/core/tests_predefined_tubes.h b/tests/core/tests_predefined_tubes.h index 96106f25..718b0c2e 100644 --- a/tests/core/tests_predefined_tubes.h +++ b/tests/core/tests_predefined_tubes.h @@ -1,9 +1,9 @@ #include "catch_interval.hpp" -#include "tubex_Tube.h" +#include "codac_Tube.h" -tubex::Tube tube_test_1(); -tubex::Tube tube_test_1_01(); -tubex::Tube tube_test2(); -tubex::Tube tube_test3(); -tubex::Tube tube_test4(); -tubex::Tube tube_test4_05(); \ No newline at end of file +codac::Tube tube_test_1(); +codac::Tube tube_test_1_01(); +codac::Tube tube_test2(); +codac::Tube tube_test3(); +codac::Tube tube_test4(); +codac::Tube tube_test4_05(); \ No newline at end of file diff --git a/tests/core/tests_serialization.cpp b/tests/core/tests_serialization.cpp index 4a628086..32b21141 100644 --- a/tests/core/tests_serialization.cpp +++ b/tests/core/tests_serialization.cpp @@ -1,19 +1,19 @@ #include -#include "tubex_serialize_trajectories.h" -#include "tubex_serialize_tubes.h" +#include "codac_serialize_trajectories.h" +#include "codac_serialize_tubes.h" #include "catch_interval.hpp" #include "tests_predefined_tubes.h" // Using #define so that we can access protected methods // of the class for tests purposes #define protected public -#include "tubex_TrajectoryVector.h" +#include "codac_TrajectoryVector.h" using namespace Catch; using namespace Detail; using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; TEST_CASE("serialization/deserialization of Tube") { diff --git a/tests/core/tests_slices_structure.cpp b/tests/core/tests_slices_structure.cpp index c19f01aa..04b380c2 100644 --- a/tests/core/tests_slices_structure.cpp +++ b/tests/core/tests_slices_structure.cpp @@ -5,7 +5,7 @@ using namespace Catch; using namespace Detail; using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; TEST_CASE("operator=") { diff --git a/tests/core/tests_trajectory.cpp b/tests/core/tests_trajectory.cpp index 96afe27f..818ec91b 100644 --- a/tests/core/tests_trajectory.cpp +++ b/tests/core/tests_trajectory.cpp @@ -4,7 +4,7 @@ using namespace Catch; using namespace Detail; using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; // todo: test TrajectoryVector diff --git a/tests/core/tests_values.cpp b/tests/core/tests_values.cpp index c2797907..3e9a9d88 100644 --- a/tests/core/tests_values.cpp +++ b/tests/core/tests_values.cpp @@ -1,20 +1,20 @@ #include "catch_interval.hpp" -#include "tubex_CtcEval.h" -#include "tubex_VIBesFigTube.h" -#include "tubex_VIBesFigTubeVector.h" +#include "codac_CtcEval.h" +#include "codac_VIBesFigTube.h" +#include "codac_VIBesFigTubeVector.h" #include "tests_predefined_tubes.h" #include "vibes.h" // Using #define so that we can access protected methods // of the class for tests purposes #define protected public -#include "tubex_CtcDeriv.h" +#include "codac_CtcDeriv.h" using namespace Catch; using namespace Detail; using namespace std; using namespace ibex; -using namespace tubex; +using namespace codac; #define VIBES_DRAWING 0