Skip to content

Commit 19450e0

Browse files
committed
Merge branch 'codac2' into codac2_codac4matlab
2 parents a41525a + 769a797 commit 19450e0

54 files changed

Lines changed: 2987 additions & 160 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

doc/manual/index.rst

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ The solution set is approximated from an initial box :math:`[\mathbf{x}_0]=[0,2]
5252
int main()
5353
{
5454
VectorVar x(3);
55-
AnalyticFunction f { {x},
56-
{
55+
AnalyticFunction f { {x}, {
5756
-(x[2]^2)+2*x[2]*sin(x[2]*x[0])+cos(x[2]*x[1]),
5857
2*x[2]*cos(x[2]*x[0])-sin(x[2]*x[1])
5958
}
@@ -191,7 +190,8 @@ User manual
191190
* :ref:`sec-intervals`
192191
* What is an interval?
193192
* :ref:`sec-intervals-class`
194-
* Boolean intervals
193+
* :ref:`sec-intervals-intervalvector-class`
194+
* :ref:`sec-intervals-boolinterval-class`
195195

196196
* :ref:`sec-linear`
197197
* :ref:`sec-linear-vecmat`
@@ -207,11 +207,11 @@ User manual
207207
* :ref:`sec-functions-analytic-operators`
208208
* Extension to custom expressions
209209
* Temporal functions
210+
* :ref:`sec-functions-parallelepiped-eval`
211+
* :ref:`sec-functions-peibos`
210212
* Set-membership functions
211213
* The class SetMembershipFunction
212214
* Extension to custom expressions
213-
* :ref:`sec-functions-parallelepiped-eval`
214-
* :ref:`sec-functions-peibos`
215215

216216
* Tubes
217217
* What is a tube?
@@ -338,10 +338,10 @@ User manual
338338
* :ref:`sec-tools-registration`
339339
* :ref:`sec-tools-octasym`
340340

341-
* Codac extensions
341+
* :ref:`sec-extensions`
342342
* :ref:`sec-extensions-capd`
343+
* :ref:`sec-extensions-sympy`
343344
* Interface with the IBEX library
344-
* Sympy (symbolic computation)
345345

346346
* Frequently Asked Questions
347347

@@ -356,9 +356,7 @@ How-to guides
356356
-------------
357357

358358
* Robotics
359-
* Non-linear state estimation
360-
* State estimation by solving data association
361-
* Range-only SLAM
359+
* :ref:`sec-tuto-cprob`
362360
* Explored area
363361
* Loop detections and verifications
364362

doc/manual/manual/functions/analytic/analytic_operators.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ If you notice any mathematical operators missing from the list below, feel free
245245
+-----------------------------------------------------+----------------------+---------------+-------------------------------------+--------+--------+-------+------------+
246246
| :math:`\min(x_1,x_2)` | ``min(x1,x2)`` | |MinOp| | ``x1``, ``x2``: scalar ||okk| ||okk| ||okk| ||okk| |
247247
+-----------------------------------------------------+----------------------+---------------+-------------------------------------+--------+--------+-------+------------+
248-
| :math:`x_1\bmod x_2` | -- | |ModOp| | -- ||nok| ||nok| ||nok| ||bok| |
248+
| :math:`x_1\mod p` | ``mod(x1,p)`` | |ModOp| | ``x1``, ``p``: scalar ||okk| ||nok| ||nok| ||okk| |
249249
+-----------------------------------------------------+----------------------+---------------+-------------------------------------+--------+--------+-------+------------+
250250
| :math:`(x_1)^{x_2}` | | ``pow(x1,x2)`` | |PowOp| | ``x1``, ``x2``: scalar ||okk| ||okk| ||okk| ||okk| |
251251
| | | ``x1^x2`` | | | | | | |

doc/manual/manual/tools/registration.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Inputs ``src`` and ``dst`` can be provided either as a list of 2d points, or wit
2727
.. code-tab:: py
2828

2929
def affine_transformation(src, dst):
30-
# with src/dst: two lists of Vector objects, or two SampledVectorTraj objects
30+
# with src/dst: two lists of Vector objects, or two SampledTraj_Vector objects
3131

3232
.. code-tab:: c++
3333

@@ -70,7 +70,7 @@ The following example estimates a transformation between two sampled trajectorie
7070

7171
# Reconstructing the dst trajectory using the estimated transformation
7272

73-
dst_estim = SampledVectorTraj()
73+
dst_estim = SampledTraj_Vector()
7474
for ti,src_i in src:
7575
dst_estim.set(ti, tr*src_i)
7676

169 KB
Loading
63.7 KB
Binary file not shown.
144 KB
Loading
250 KB
Loading
197 KB
Loading
229 KB
Loading
243 KB
Loading

0 commit comments

Comments
 (0)