|
|
@@
-173,8
+173,7
PYBIND11_MODULE(pysciqlopcore, m)
|
|
|
173
|
.def(py::init([](py::array_t<double> t, py::array_t<double> values) {
|
|
173
|
.def(py::init([](py::array_t<double> t, py::array_t<double> values) {
|
|
|
174
|
assert(t.size() * 3 == values.size());
|
|
174
|
assert(t.size() * 3 == values.size());
|
|
|
175
|
VectorTimeSerie::axis_t _t(t.size());
|
|
175
|
VectorTimeSerie::axis_t _t(t.size());
|
|
|
176
|
VectorTimeSerie::container_type<VectorTimeSerie::raw_value_type>
|
|
176
|
VectorTimeSerie::data_t _values(t.size());
|
|
|
177
|
_values(t.size());
|
|
|
|
|
|
178
|
copy_vector(t, values, _t, _values);
|
|
177
|
copy_vector(t, values, _t, _values);
|
|
|
179
|
return VectorTimeSerie(_t, _values);
|
|
178
|
return VectorTimeSerie(_t, _values);
|
|
|
180
|
}))
|
|
179
|
}))
|
|
|
@@
-205,9
+204,7
PYBIND11_MODULE(pysciqlopcore, m)
|
|
|
205
|
assert((t.size() < values.size()) |
|
|
204
|
assert((t.size() < values.size()) |
|
|
|
206
|
(t.size() == 0)); // TODO check geometry
|
|
205
|
(t.size() == 0)); // TODO check geometry
|
|
|
207
|
MultiComponentTimeSerie::axis_t _t(t.size());
|
|
206
|
MultiComponentTimeSerie::axis_t _t(t.size());
|
|
|
208
|
MultiComponentTimeSerie::container_type<
|
|
207
|
MultiComponentTimeSerie::data_t _values(values.size());
|
|
|
209
|
MultiComponentTimeSerie::raw_value_type>
|
|
|
|
|
|
210
|
_values(values.size());
|
|
|
|
|
|
211
|
copy_multicomp(t, values, _t, _values);
|
|
208
|
copy_multicomp(t, values, _t, _values);
|
|
|
212
|
std::vector<std::size_t> shape;
|
|
209
|
std::vector<std::size_t> shape;
|
|
|
213
|
shape.push_back(values.shape(0));
|
|
210
|
shape.push_back(values.shape(0));
|
|
|
@@
-241,9
+238,7
PYBIND11_MODULE(pysciqlopcore, m)
|
|
|
241
|
"Y axis size and data shape are incompatible");
|
|
238
|
"Y axis size and data shape are incompatible");
|
|
|
242
|
SpectrogramTimeSerie::axis_t _t(t.size());
|
|
239
|
SpectrogramTimeSerie::axis_t _t(t.size());
|
|
|
243
|
SpectrogramTimeSerie::axis_t _y(y.size());
|
|
240
|
SpectrogramTimeSerie::axis_t _y(y.size());
|
|
|
244
|
SpectrogramTimeSerie::container_type<
|
|
241
|
SpectrogramTimeSerie::data_t _values(values.size());
|
|
|
245
|
SpectrogramTimeSerie::raw_value_type>
|
|
|
|
|
|
246
|
_values(values.size());
|
|
|
|
|
|
247
|
copy_spectro(t, y, values, _t, _y, _values);
|
|
242
|
copy_spectro(t, y, values, _t, _y, _values);
|
|
|
248
|
std::vector<std::size_t> shape;
|
|
243
|
std::vector<std::size_t> shape;
|
|
|
249
|
shape.push_back(values.shape(0));
|
|
244
|
shape.push_back(values.shape(0));
|
