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/... 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..5cb2fd3 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(errors=[1, 0]) + assert node.errors == [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/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); } diff --git a/src/tesseract.pybind.h b/src/tesseract.pybind.h index a8f4ff7..d523540 100644 --- a/src/tesseract.pybind.h +++ b/src/tesseract.pybind.h @@ -46,11 +46,11 @@ 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_readwrite("errs", &Node::errors) + .def(py::init>(), py::arg("cost") = 0.0, + 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);