| @@ -1,1 +1,1 | |||
|
|
1 | Subproject commit 315a61fe6174e66bc0a94c1c91d7b3656649873f | |
|
|
1 | Subproject commit 16093a64038da071e4dac879fc3fd2ec9fc21c5d | |
| @@ -24,8 +24,7 public: | |||
|
|
24 | 24 | SpectrogramTimeSerie() {} |
|
|
25 | 25 | SpectrogramTimeSerie(SpectrogramTimeSerie::axis_t&& t, |
|
|
26 | 26 | SpectrogramTimeSerie::axis_t&& y, |
|
|
27 |
SpectrogramTimeSerie:: |
|
|
|
28 | SpectrogramTimeSerie::raw_value_type>&& values, | |
|
|
27 | SpectrogramTimeSerie::data_t&& values, | |
|
|
29 | 28 | std::vector<std::size_t>& shape, double min_sampling, |
|
|
30 | 29 | double max_sampling, bool y_is_log = true) |
|
|
31 | 30 | : TimeSeries::TimeSerie<double, SpectrogramTimeSerie, 2>(t, values, |
| @@ -173,8 +173,7 PYBIND11_MODULE(pysciqlopcore, m) | |||
|
|
173 | 173 | .def(py::init([](py::array_t<double> t, py::array_t<double> values) { |
|
|
174 | 174 | assert(t.size() * 3 == values.size()); |
|
|
175 | 175 | VectorTimeSerie::axis_t _t(t.size()); |
|
|
176 |
VectorTimeSerie:: |
|
|
|
177 | _values(t.size()); | |
|
|
176 | VectorTimeSerie::data_t _values(t.size()); | |
|
|
178 | 177 | copy_vector(t, values, _t, _values); |
|
|
179 | 178 | return VectorTimeSerie(_t, _values); |
|
|
180 | 179 | })) |
| @@ -205,9 +204,7 PYBIND11_MODULE(pysciqlopcore, m) | |||
|
|
205 | 204 | assert((t.size() < values.size()) | |
|
|
206 | 205 | (t.size() == 0)); // TODO check geometry |
|
|
207 | 206 | MultiComponentTimeSerie::axis_t _t(t.size()); |
|
|
208 |
MultiComponentTimeSerie:: |
|
|
|
209 | MultiComponentTimeSerie::raw_value_type> | |
|
|
210 | _values(values.size()); | |
|
|
207 | MultiComponentTimeSerie::data_t _values(values.size()); | |
|
|
211 | 208 | copy_multicomp(t, values, _t, _values); |
|
|
212 | 209 | std::vector<std::size_t> shape; |
|
|
213 | 210 | shape.push_back(values.shape(0)); |
| @@ -241,9 +238,7 PYBIND11_MODULE(pysciqlopcore, m) | |||
|
|
241 | 238 | "Y axis size and data shape are incompatible"); |
|
|
242 | 239 | SpectrogramTimeSerie::axis_t _t(t.size()); |
|
|
243 | 240 | SpectrogramTimeSerie::axis_t _y(y.size()); |
|
|
244 |
SpectrogramTimeSerie:: |
|
|
|
245 | SpectrogramTimeSerie::raw_value_type> | |
|
|
246 | _values(values.size()); | |
|
|
241 | SpectrogramTimeSerie::data_t _values(values.size()); | |
|
|
247 | 242 | copy_spectro(t, y, values, _t, _y, _values); |
|
|
248 | 243 | std::vector<std::size_t> shape; |
|
|
249 | 244 | shape.push_back(values.shape(0)); |
General Comments 0
You need to be logged in to leave comments.
Login now