From 7f8cda56f96d44fcf737ea7e23d9efb2acc231b0 Mon Sep 17 00:00:00 2001 From: Nour Yosri Date: Wed, 25 Jun 2025 10:53:35 -0700 Subject: [PATCH 1/4] update python wrapper to current state --- src/py/simplex_test.py | 2 +- src/py/tesseract_test.py | 14 ++++---------- src/tesseract.pybind.h | 4 ++-- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/py/simplex_test.py b/src/py/simplex_test.py index 965fe9e..9a93b1c 100644 --- a/src/py/simplex_test.py +++ b/src/py/simplex_test.py @@ -45,7 +45,7 @@ def test_create_simplex_decoder(): decoder.decode_to_errors([1]) assert decoder.mask_from_errors([1]) == 0 assert decoder.cost_from_errors([2]) == pytest.approx(1.0986123) - assert decoder.decode([1, 2]) == 0 + assert decoder.decode([1]) == 0 if __name__ == "__main__": diff --git a/src/py/tesseract_test.py b/src/py/tesseract_test.py index 3c06a3f..2529b81 100644 --- a/src/py/tesseract_test.py +++ b/src/py/tesseract_test.py @@ -35,23 +35,17 @@ def test_create_config(): def test_create_node(): - node = tesseract_decoder.tesseract.Node(dets=["a"]) - assert node.dets == ["a"] - - -def test_create_qnode(): - qnode = tesseract_decoder.tesseract.QNode(num_dets=5, errs=[42]) - assert qnode.num_dets == 5 - assert str(qnode) == "QNode(cost=0, num_dets=5, errs=[42])" + node = tesseract_decoder.tesseract.Node(errs=[1, 0]) + assert node.errs == [1, 0] def test_create_decoder(): config = tesseract_decoder.tesseract.TesseractConfig(_DETECTOR_ERROR_MODEL) decoder = tesseract_decoder.tesseract.TesseractDecoder(config) decoder.decode_to_errors([0]) - decoder.decode_to_errors([0], 0) + decoder.decode_to_errors(detections=[0], det_order=0, det_beam=0) assert decoder.mask_from_errors([1]) == 0 - assert decoder.cost_from_errors([1]) == pytest.approx(1.609438) + assert decoder.cost_from_errors([1]) == pytest.approx(0.5108256237659907) assert decoder.decode([0]) == 0 diff --git a/src/tesseract.pybind.h b/src/tesseract.pybind.h index a8f4ff7..9cae996 100644 --- a/src/tesseract.pybind.h +++ b/src/tesseract.pybind.h @@ -46,8 +46,8 @@ void add_tesseract_module(py::module &root) { .def("__str__", &TesseractConfig::str); py::class_(m, "Node") - .def(py::init>(), py::arg("errs") = std::vector(), - py::arg("cost") = 0.0, py::arg("num_dets") = 0) + .def(py::init>(), py::arg("cost") = 0.0, + py::arg("num_dets") = 0, py::arg("errs") = std::vector()) .def_readwrite("errs", &Node::errors) .def_readwrite("cost", &Node::cost) .def_readwrite("num_dets", &Node::num_detectors) From a5c78d0737f88f4db46f8f4739d9e88a77716598 Mon Sep 17 00:00:00 2001 From: Nour Yosri Date: Wed, 25 Jun 2025 10:56:34 -0700 Subject: [PATCH 2/4] nit --- src/py/tesseract_test.py | 4 ++-- src/tesseract.pybind.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/py/tesseract_test.py b/src/py/tesseract_test.py index 2529b81..5cb2fd3 100644 --- a/src/py/tesseract_test.py +++ b/src/py/tesseract_test.py @@ -35,8 +35,8 @@ def test_create_config(): def test_create_node(): - node = tesseract_decoder.tesseract.Node(errs=[1, 0]) - assert node.errs == [1, 0] + node = tesseract_decoder.tesseract.Node(errors=[1, 0]) + assert node.errors == [1, 0] def test_create_decoder(): diff --git a/src/tesseract.pybind.h b/src/tesseract.pybind.h index 9cae996..d523540 100644 --- a/src/tesseract.pybind.h +++ b/src/tesseract.pybind.h @@ -47,10 +47,10 @@ void add_tesseract_module(py::module &root) { py::class_(m, "Node") .def(py::init>(), py::arg("cost") = 0.0, - py::arg("num_dets") = 0, py::arg("errs") = std::vector()) - .def_readwrite("errs", &Node::errors) + py::arg("num_detectors") = 0, py::arg("errors") = std::vector()) + .def_readwrite("errors", &Node::errors) .def_readwrite("cost", &Node::cost) - .def_readwrite("num_dets", &Node::num_detectors) + .def_readwrite("num_detectors", &Node::num_detectors) .def(py::self > py::self) .def("__str__", &Node::str); From fd84b7123a99518a5f83e116544b14c71353bd60 Mon Sep 17 00:00:00 2001 From: Nour Yosri Date: Wed, 25 Jun 2025 10:58:12 -0700 Subject: [PATCH 3/4] clang --- src/simplex.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/simplex.cc b/src/simplex.cc index 6550dd1..c8c5f3b 100644 --- a/src/simplex.cc +++ b/src/simplex.cc @@ -299,8 +299,7 @@ void SimplexDecoder::decode_to_errors(const std::vector& detections) { } // Get the model status - [[maybe_unused]] const HighsModelStatus& model_status = - highs->getModelStatus(); + [[maybe_unused]] const HighsModelStatus& model_status = highs->getModelStatus(); assert(model_status == HighsModelStatus::kOptimal); } From 1adacfb43d4dd8079b935e5edcb73ba1787468b8 Mon Sep 17 00:00:00 2001 From: Nour Yosri Date: Wed, 25 Jun 2025 11:00:04 -0700 Subject: [PATCH 4/4] absorb #38 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76de50c..ffaafa0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,4 +72,4 @@ jobs: [ -z "$files" ] || clang-format --dry-run --Werror $files - name: Bazel tests - run: bazel test src:all + run: bazel test src/...