PR #11214 from Eran: stabilized-value in pyrsutils; replace 9 cpp tes…

…ts with 1 py
IntelRealSense · Dec 14, 2022 · f2b2434 · f2b2434
2 parents 274ccca + 9fd5a2e
commit f2b2434
Show file tree

Hide file tree

Showing 12 changed files with 278 additions and 296 deletions.
diff --git a/third-party/rsutils/py/pyrsutils.cpp b/third-party/rsutils/py/pyrsutils.cpp
@@ -5,6 +5,8 @@
 #include <rsutils/easylogging/easyloggingpp.h>
 #include <rsutils/string/split.h>
 #include <rsutils/version.h>
+#include <rsutils/number/stabilized-value.h>
+#include <rsutils/string/from.h>
 
 #define NAME pyrsutils
 #define SNAME "pyrsutils"
@@ -37,8 +39,7 @@ PYBIND11_MODULE(NAME, m) {
               py::arg( "build" ) = 0 )
         .def_static( "from_number", []( version::number_type n ) { return version( n ); } )
         .def( "is_valid", &version::is_valid )
-        .def( "__nonzero__", &version::is_valid )  // Called to implement truth value testing in Python 2
-        .def( "__bool__", &version::is_valid )     // Called to implement truth value testing in Python 3
+        .def( "__bool__", &version::is_valid )
         .def( "major", &version::get_major )
         .def( "minor", &version::get_minor )
         .def( "patch", &version::get_patch )
@@ -63,4 +64,23 @@ PYBIND11_MODULE(NAME, m) {
         .def( py::self >= py::self )
         .def( py::self > py::self )
         .def( "is_between", &version::is_between );
+
+    using stabilized_value = rsutils::number::stabilized_value< double >;
+    auto not_empty = []( stabilized_value const & self ) {
+        return ! self.empty();
+    };
+    auto to_string = []( stabilized_value const & self ) -> std::string {
+        if( self.empty() )
+            return "EMPTY";
+        return rsutils::string::from( self.get() );
+    };
+    py::class_< stabilized_value >( m, "stabilized_value" )
+        .def( py::init< size_t >() )
+        .def( "empty", &stabilized_value::empty )
+        .def( "__bool__", not_empty )
+        .def( "add", &stabilized_value::add )
+        .def( "get", &stabilized_value::get, py::arg( "stabilization-percent" ) = 0.75 )
+        .def( "clear", &stabilized_value::clear )
+        .def( "to_string", to_string )
+        .def( "__str__", to_string );
 }
diff --git a/unit-tests/py/rspy/test.py b/unit-tests/py/rspy/test.py
@@ -300,6 +300,8 @@ def check_throws( _lambda, expected_type, expected_msg = None, abort_if_failed =
     """
     We expect the lambda, when called, to raise an exception!
     """
+    if not callable( _lambda ):
+        raise RuntimeError( "expecting a function, not " + _lambda )
     try:
         _lambda()
     except Exception as e:

diff --git a/unit-tests/rsutils/number/stabilized/test-60-percent.cpp b/unit-tests/rsutils/number/stabilized/test-60-percent.cpp
diff --git a/unit-tests/rsutils/number/stabilized/test-change-percent.cpp b/unit-tests/rsutils/number/stabilized/test-change-percent.cpp
diff --git a/unit-tests/rsutils/number/stabilized/test-empty.cpp b/unit-tests/rsutils/number/stabilized/test-empty.cpp
diff --git a/unit-tests/rsutils/number/stabilized/test-flickering-value.cpp b/unit-tests/rsutils/number/stabilized/test-flickering-value.cpp
diff --git a/unit-tests/rsutils/number/stabilized/test-illegal-input.cpp b/unit-tests/rsutils/number/stabilized/test-illegal-input.cpp
diff --git a/unit-tests/rsutils/number/stabilized/test-not-full.cpp b/unit-tests/rsutils/number/stabilized/test-not-full.cpp
diff --git a/unit-tests/rsutils/number/stabilized/test-same-value.cpp b/unit-tests/rsutils/number/stabilized/test-same-value.cpp