Skip to content

Commit cbd931a

Browse files
committed
updated swig
1 parent ff1fdb0 commit cbd931a

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

lib/swig/tick/preprocessing/longitudinal_features_lagger.i

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,25 @@
44
#include "tick/preprocessing/longitudinal_features_lagger.h"
55
%}
66

7+
%include serialization.i
8+
79
class LongitudinalFeaturesLagger {
810

911
public:
10-
LongitudinalFeaturesLagger(const SBaseArrayDouble2dPtrList1D &features,
11-
const SArrayULongPtr n_lags);
12+
// This exists soley for cereal/swig
13+
LongitudinalFeaturesLagger();
14+
15+
LongitudinalFeaturesLagger(ulong n_intervals,
16+
SArrayULongPtr n_lags);
1217

1318
void dense_lag_preprocessor(ArrayDouble2d &features,
1419
ArrayDouble2d &out,
1520
ulong censoring) const;
1621

17-
void sparse_lag_preprocessor(ArrayULong &row,
18-
ArrayULong &col,
19-
ArrayDouble &data,
20-
ArrayULong &out_row,
21-
ArrayULong &out_col,
22-
ArrayDouble &out_data,
22+
void sparse_lag_preprocessor(ArrayULong &row, ArrayULong &col,
23+
ArrayDouble &data, ArrayULong &out_row,
24+
ArrayULong &out_col, ArrayDouble &out_data,
2325
ulong censoring) const;
24-
2526
};
2627

2728
TICK_MAKE_PICKLABLE(LongitudinalFeaturesLagger);

lib/swig/tick/preprocessing/preprocessing_module.i

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
%module preprocessing
44

5-
%include tick/base/defs.i
5+
%include defs.i
66
%include std_shared_ptr.i
7-
%include tick/base/serialization.i
7+
%include serialization.i
88

99
%shared_ptr(SparseLongitudinalFeaturesProduct);
1010
%shared_ptr(LongitudinalFeaturesLagger);
@@ -13,7 +13,7 @@
1313
#include "tick/base/tick_python.h"
1414
%}
1515

16-
%import(module="tick.base") tick/base/base_module.i
16+
%import(module="tick.base") base_module.i
1717

1818
%include sparse_longitudinal_features_product.i
1919
%include longitudinal_features_lagger.i

lib/swig/tick/preprocessing/sparse_longitudinal_features_product.i

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@
44
#include "tick/preprocessing/sparse_longitudinal_features_product.h"
55
%}
66

7+
%include serialization.i
8+
79
class SparseLongitudinalFeaturesProduct {
810

911
public:
10-
SparseLongitudinalFeaturesProduct(const SBaseArrayDouble2dPtrList1D &features);
12+
// This exists soley for cereal/swig
13+
SparseLongitudinalFeaturesProduct();
14+
15+
SparseLongitudinalFeaturesProduct(const ulong n_features);
1116

1217
void sparse_features_product(ArrayULong &row,
1318
ArrayULong &col,

0 commit comments

Comments
 (0)