update python wrapper to current state (#42)

Author: NoureldinYosri

.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/...

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__":

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
 
 

src/simplex.cc

@@ -299,8 +299,7 @@ void SimplexDecoder::decode_to_errors(const std::vector<uint64_t>& 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);
   }
 

src/tesseract.pybind.h

@@ -46,11 +46,11 @@ void add_tesseract_module(py::module &root) {
       .def("__str__", &TesseractConfig::str);
 
   py::class_<Node>(m, "Node")
-      .def(py::init<double, size_t, std::vector<size_t>>(), py::arg("errs") = std::vector<size_t>(),
-           py::arg("cost") = 0.0, py::arg("num_dets") = 0)
-      .def_readwrite("errs", &Node::errors)
+      .def(py::init<double, size_t, std::vector<size_t>>(), py::arg("cost") = 0.0,
+           py::arg("num_detectors") = 0, py::arg("errors") = std::vector<size_t>())
+      .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);