diff --git a/external/TimeSeries b/external/TimeSeries index 315a61f..16093a6 160000 --- a/external/TimeSeries +++ b/external/TimeSeries @@ -1 +1 @@ -Subproject commit 315a61fe6174e66bc0a94c1c91d7b3656649873f +Subproject commit 16093a64038da071e4dac879fc3fd2ec9fc21c5d diff --git a/include/Data/SpectrogramTimeSerie.h b/include/Data/SpectrogramTimeSerie.h index 45bfeae..9cd6412 100644 --- a/include/Data/SpectrogramTimeSerie.h +++ b/include/Data/SpectrogramTimeSerie.h @@ -24,8 +24,7 @@ public: SpectrogramTimeSerie() {} SpectrogramTimeSerie(SpectrogramTimeSerie::axis_t&& t, SpectrogramTimeSerie::axis_t&& y, - SpectrogramTimeSerie::container_type< - SpectrogramTimeSerie::raw_value_type>&& values, + SpectrogramTimeSerie::data_t&& values, std::vector& shape, double min_sampling, double max_sampling, bool y_is_log = true) : TimeSeries::TimeSerie(t, values, diff --git a/src/pybind11_wrappers/CoreWrappers.cpp b/src/pybind11_wrappers/CoreWrappers.cpp index 221b14b..8a206bd 100644 --- a/src/pybind11_wrappers/CoreWrappers.cpp +++ b/src/pybind11_wrappers/CoreWrappers.cpp @@ -173,8 +173,7 @@ PYBIND11_MODULE(pysciqlopcore, m) .def(py::init([](py::array_t t, py::array_t values) { assert(t.size() * 3 == values.size()); VectorTimeSerie::axis_t _t(t.size()); - VectorTimeSerie::container_type - _values(t.size()); + VectorTimeSerie::data_t _values(t.size()); copy_vector(t, values, _t, _values); return VectorTimeSerie(_t, _values); })) @@ -205,9 +204,7 @@ PYBIND11_MODULE(pysciqlopcore, m) assert((t.size() < values.size()) | (t.size() == 0)); // TODO check geometry MultiComponentTimeSerie::axis_t _t(t.size()); - MultiComponentTimeSerie::container_type< - MultiComponentTimeSerie::raw_value_type> - _values(values.size()); + MultiComponentTimeSerie::data_t _values(values.size()); copy_multicomp(t, values, _t, _values); std::vector shape; shape.push_back(values.shape(0)); @@ -241,9 +238,7 @@ PYBIND11_MODULE(pysciqlopcore, m) "Y axis size and data shape are incompatible"); SpectrogramTimeSerie::axis_t _t(t.size()); SpectrogramTimeSerie::axis_t _y(y.size()); - SpectrogramTimeSerie::container_type< - SpectrogramTimeSerie::raw_value_type> - _values(values.size()); + SpectrogramTimeSerie::data_t _values(values.size()); copy_spectro(t, y, values, _t, _y, _values); std::vector shape; shape.push_back(values.shape(0));