HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/SciQLOPCore Commit - r66:e718ad47d2bc

Spectrogram wrapper allow to set values from python...

jeandet -

r66:e718ad47d2bc

parent child

Context file:

r66:e718ad47d2bc

external/TimeSeries +1 -1

	@@ -1,1 +1,1
	1	Subproject commit 2146d47985f44d6914b224c3b99ebf9e16e87b3f		1	Subproject commit e08e903b65e9d884187e1809c75b22379783bfee

include/Data/SpectrogramTimeSerie.h +7 -1

             {
             public:
               using item_t =
-                  decltype(TimeSeries::TimeSerie<double, SpectrogramTimeSerie, 2>()[0]);
+                  decltype(std::declval<
+                           TimeSeries::TimeSerie<double, SpectrogramTimeSerie, 2>>()[0]);
+              using iterator_t = decltype(
+                  std::declval<TimeSeries::TimeSerie<double, SpectrogramTimeSerie, 2>>()
+                      .begin());
               SpectrogramTimeSerie() {}
               ~SpectrogramTimeSerie() = default;
               using TimeSerie::TimeSerie;

src/pybind11_wrappers/CoreWrappers.cpp +10 -7

               auto t_view      = t.unchecked<1>();
               auto values_view = values.unchecked<2>();
               const auto width = values.shape(0);
-              std::cout << "WIDTH" << width << std::endl;
               for(std::size_t i = 0; i < t.size(); i++)
               {
                 dest_t[i] = t_view[i];
                 for(int j = 0; j < width; j++)
                 {
                   dest_values[i * width + j] = values_view(j, i);
-                  std::cout << "dest_values[" << i * width + j << "] = values_view(" << j
-                            << ", " << i << ") = " << values_view(j, i) << std::endl;
                 }
               }
             }
                     *(ts.begin() + key) = value;
                   });
-              py::class_<SpectrogramTimeSerie::item_t>(m, "SpectrogramTimeSerieItem")
+              py::class_<SpectrogramTimeSerie::iterator_t>(m, "SpectrogramTimeSerieItem")
-                  .def("__getitem__", [](SpectrogramTimeSerie::item_t& self,
+                  .def("__getitem__", [](SpectrogramTimeSerie::iterator_t& self,
-                                         std::size_t key) { return self[key]; });
+                                         std::size_t key) { return (*self)[key]; })
+                  .def("__setitem__",
+                       [](SpectrogramTimeSerie::iterator_t& self, std::size_t key,
+                          double value) { (*self)[key] = value; });
               py::class_<SpectrogramTimeSerie, TimeSeries::ITimeSerie>(
                   m, "SpectrogramTimeSerie")
                     return SpectrogramTimeSerie(_t, _values, shape);
                   }))
                   .def("__getitem__",
-                       [](SpectrogramTimeSerie& ts, std::size_t key) { return ts[key]; });
+                       [](SpectrogramTimeSerie& ts,
+                          std::size_t key) -> SpectrogramTimeSerie::iterator_t {
+                         return ts.begin() + key;
+                       });
               py::class_<Variable2, std::shared_ptr<Variable2>>(m, "Variable2")
                   .def(py::init<const QString&>())

tests/TestVariables.py +31 -1

@@ -39,6 +39,24 class TimeSeriesData(unittest.TestCase):
39	ts[0]=123.	39	ts[0]=123.
40	self.assertEqual(ts[0],123.)	40	self.assertEqual(ts[0],123.)
41		41
		42	def test_set_VectorTimeSerie_values(self):
		43	ts = pysciqlopcore.VectorTimeSerie(10)
		44	ts.t[0]=111.
		45	self.assertEqual(ts.t[0],111.)
		46	ts[0].x=111.
		47	ts[0].y=222.
		48	ts[0].z=333.
		49	self.assertEqual(ts[0].x,111.)
		50	self.assertEqual(ts[0].y,222.)
		51	self.assertEqual(ts[0].z,333.)
		52
		53	def test_set_SpectrogramTimeSerie_values(self):
		54	ts = pysciqlopcore.SpectrogramTimeSerie((10,100))
		55	ts.t[0]=111.
		56	self.assertEqual(ts.t[0],111.)
		57	ts[0][11]=123.
		58	self.assertEqual(ts[0][11],123.)
		59
42	def test_build_ScalarTimeSerie_from_np_arrays(self):	60	def test_build_ScalarTimeSerie_from_np_arrays(self):
43	ts = pysciqlopcore.ScalarTimeSerie(np.arange(10), np.arange(10)*10)	61	ts = pysciqlopcore.ScalarTimeSerie(np.arange(10), np.arange(10)*10)
44	for i in range(len(ts)):	62	for i in range(len(ts)):
@@ -81,8 +99,20 class TimeSeriesData(unittest.TestCase):
81	ts = pysciqlopcore.SpectrogramTimeSerie(np.arange(10), v)	99	ts = pysciqlopcore.SpectrogramTimeSerie(np.arange(10), v)
82	for i in range(len(ts)):	100	for i in range(len(ts)):
83	for j in range(4):	101	for j in range(4):
84	print(f"ts[{i}][{j}] = " + str(ts[i][j]))	102	self.assertEqual(ts[i][j], i10*j)
		103
		104	class VariableData(unittest.TestCase):
		105	def test_default_state(self):
		106	v=pysciqlopcore.Variable2("hello")
		107	self.assertEqual(str(v.name), str("hello"))
		108	self.assertEqual(type(v.data), type(None))
		109	self.assertEqual(len(v), 0)
85		110
		111	def test_set_name(self):
		112	v=pysciqlopcore.Variable2("hello")
		113	self.assertEqual(str(v.name), str("hello"))
		114	v.name="newName"
		115	self.assertEqual(str(v.name), str("newName"))
86		116
87	if __name__ == '__main__':	117	if __name__ == '__main__':
88	unittest.main(exit=False)	118	unittest.main(exit=False)

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages