Skip to content

Commit 38072cd

Browse files
authored
Merge pull request #364 from SimonRohou/codac2_dev
[tube] operators on tubes
2 parents 30a3a06 + d529f17 commit 38072cd

9 files changed

Lines changed: 1390 additions & 332 deletions

File tree

python/src/core/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
domains/zonotope/codac2_py_Parallelepiped.cpp
5656
domains/zonotope/codac2_py_Zonotope.cpp
5757
domains/tube/codac2_py_Slice.h
58-
domains/tube/codac2_py_SlicedTube.h
58+
domains/tube/codac2_py_SlicedTube.cpp
5959
domains/tube/codac2_py_TDomain.cpp
6060
domains/tube/codac2_py_TimePropag.cpp
6161
domains/tube/codac2_py_TSlice.cpp

python/src/core/codac2_py_core.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "codac2_py_CtcInverseNotIn.h"
2323
#include "codac2_py_MatrixBlock.h"
2424
#include "codac2_py_Slice.h"
25-
#include "codac2_py_SlicedTube.h"
2625

2726
using namespace codac2;
2827
namespace py = pybind11;
@@ -77,8 +76,9 @@ void export_Parallelepiped(py::module& m);
7776
void export_TDomain(py::module& m);
7877
void export_TimePropag(py::module& m);
7978
void export_TSlice(py::module& m);
80-
void export_TubeBase(py::module& m);
79+
py::class_<TubeBase> export_TubeBase(py::module& m);
8180
void export_tube_cart_prod(py::module& m);
81+
void export_SlicedTube(py::module& m);
8282

8383
// functions
8484
void export_VarBase(py::module& m);
@@ -240,10 +240,8 @@ PYBIND11_MODULE(_core, m)
240240
export_Slice<IntervalMatrix>(m, "Slice_IntervalMatrix");
241241
export_TDomain(m);
242242
export_TSlice(m);
243-
export_TubeBase(m);
244-
export_SlicedTube<Interval>(m, "SlicedTube_Interval");
245-
export_SlicedTube<IntervalVector>(m, "SlicedTube_IntervalVector");
246-
export_SlicedTube<IntervalMatrix>(m, "SlicedTube_IntervalMatrix");
243+
auto tube_base = export_TubeBase(m);
244+
export_SlicedTube(m);
247245
export_tube_cart_prod(m);
248246

249247
export_arithmetic_add(py_V, py_IV, py_M, py_IM, py_B, py_IB);

0 commit comments

Comments
 (0)