Merge remote-tracking branch 'quantum/main'

Author: noajshu

src/common.cc

@@ -14,12 +14,31 @@
 
 #include "common.h"
 
-std::string common::Symptom::str() const {
-  std::string s = "Symptom{";
-  for (size_t d : detectors) {
-    s += "D" + std::to_string(d);
-    s += " ";
+#include <iomanip>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <vector>
+
+std::string vector_to_string(const std::vector<int>& vec) {
+  std::stringstream ss;
+  ss << "[";
+  for (size_t i = 0; i < vec.size(); ++i) {
+    ss << vec[i];
+    if (i < vec.size() - 1) {
+      ss << " ";
+    }
   }
+
+  ss << "]";
+  return ss.str();
+}
+
+std::string common::Symptom::str() const {
+  std::string s = "Symptom{detectors=";
+  s += vector_to_string(detectors);
+  s += ", observables=";
+  s += vector_to_string(observables);
   s += "}";
   return s;
 }
@@ -63,7 +82,9 @@ common::Error::Error(const stim::DemInstruction& error) {
 }
 
 std::string common::Error::str() const {
-  return "Error{cost=" + std::to_string(likelihood_cost) + ", symptom=" + symptom.str() + "}";
+  std::stringstream ss;
+  ss << std::fixed << std::setprecision(6) << likelihood_cost;
+  return "Error{cost=" + ss.str() + ", symptom=" + symptom.str() + "}";
 }
 
 double common::Error::get_probability() const {

src/common.pybind.h

@@ -26,7 +26,7 @@
 
 namespace py = pybind11;
 
-void add_common_module(py::module &root) {
+void add_common_module(py::module& root) {
   auto m = root.def_submodule("common", "classes commonly used by the decoder");
 
   py::class_<common::Symptom>(m, "Symptom", R"pbdoc(
@@ -58,7 +58,7 @@ void add_common_module(py::module &root) {
           "as_dem_instruction_targets",
           [](common::Symptom s) {
             std::vector<py::object> ret;
-            for (auto &t : s.as_dem_instruction_targets())
+            for (auto& t : s.as_dem_instruction_targets())
               ret.push_back(make_py_object(t, "DemTarget"));
             return ret;
           },
@@ -84,7 +84,7 @@ void add_common_module(py::module &root) {
       .def(py::init<>(), R"pbdoc(
         Default constructor for the `Error` class.
       )pbdoc")
-      .def(py::init<double, std::vector<int> &, std::vector<int>>(), py::arg("likelihood_cost"),
+      .def(py::init<double, std::vector<int>&, std::vector<int>>(), py::arg("likelihood_cost"),
            py::arg("detectors"), py::arg("observables"), R"pbdoc(
             Constructor for the `Error` class.
 

src/py/common_test.py

@@ -49,6 +49,16 @@ def test_error_from_direct_constructor():
     assert error.symptom.observables == observables
 
 
+def test_error_str():
+    # Test the new constructor with likelihood_cost, detectors, and observables
+    likelihood_cost = 5.5
+    detectors = [1, 2]
+    observables = [5, 10]
+    error = tesseract_decoder.common.Error(likelihood_cost, detectors, observables)
+
+    assert str(error) == "Error{cost=5.500000, symptom=Symptom{detectors=[1 2], observables=[5 10]}}"
+
+
 def test_as_dem_instruction_targets():
     s = tesseract_decoder.common.Symptom([1, 2], get_set_bits(4324))
     dits = s.as_dem_instruction_targets()
@@ -66,7 +76,7 @@ def test_as_dem_instruction_targets():
 def test_error_from_dem_instruction():
     di = stim.DemInstruction("error", [0.125], [stim.target_logical_observable_id(3)])
     error = tesseract_decoder.common.Error(di)
-    assert str(error) == "Error{cost=1.945910, symptom=Symptom{}}"
+    assert str(error) == "Error{cost=1.945910, symptom=Symptom{detectors=[], observables=[3]}}"
 
 def test_error_get_set_probability():
     error = tesseract_decoder.common.Error()
@@ -121,5 +131,8 @@ def test_dem_from_counts():
     )
 
 
+
+
+
 if __name__ == "__main__":
     raise SystemExit(pytest.main([__file__]))

src/py/utils_test.py

@@ -57,7 +57,7 @@ def test_build_det_orders_no_bfs():
 
 
 def test_get_errors_from_dem():
-    expected = "Error{cost=1.945910, symptom=Symptom{D0 }}, Error{cost=0.510826, symptom=Symptom{D0 D1 }}, Error{cost=1.098612, symptom=Symptom{D1 }}"
+    expected = "Error{cost=1.945910, symptom=Symptom{detectors=[0], observables=[]}}, Error{cost=0.510826, symptom=Symptom{detectors=[0 1], observables=[]}}, Error{cost=1.098612, symptom=Symptom{detectors=[1], observables=[]}}"
     assert (
         ", ".join(
             map(str, tesseract_decoder.utils.get_errors_from_dem(_DETECTOR_ERROR_MODEL))

src/simplex.pybind.h

@@ -227,7 +227,7 @@ void add_simplex_module(py::module& root) {
       .def(
           "decode",
           [](SimplexDecoder& self, const py::array_t<bool>& syndrome) {
-            if (syndrome.size() != self.num_detectors) {
+            if ((size_t)syndrome.size() != self.num_detectors) {
               std::ostringstream msg;
               msg << "Syndrome array size (" << syndrome.size()
                   << ") does not match the number of detectors in the decoder ("
@@ -237,7 +237,7 @@ void add_simplex_module(py::module& root) {
 
             std::vector<uint64_t> detections;
             auto syndrome_unchecked = syndrome.unchecked<1>();
-            for (size_t i = 0; i < syndrome_unchecked.size(); i++) {
+            for (size_t i = 0; i < (size_t)syndrome_unchecked.size(); i++) {
               if (syndrome_unchecked(i)) {
                 detections.push_back(i);
               }

src/tesseract.pybind.h

@@ -281,7 +281,7 @@ void add_tesseract_module(py::module& root) {
       .def(
           "decode",
           [](TesseractDecoder& self, const py::array_t<bool>& syndrome) {
-            if (syndrome.size() != self.num_detectors) {
+            if ((size_t)syndrome.size() != self.num_detectors) {
               std::ostringstream msg;
               msg << "Syndrome array size (" << syndrome.size()
                   << ") does not match the number of detectors in the decoder ("
@@ -291,7 +291,7 @@ void add_tesseract_module(py::module& root) {
 
             std::vector<uint64_t> detections;
             auto syndrome_unchecked = syndrome.unchecked<1>();
-            for (size_t i = 0; i < syndrome_unchecked.size(); ++i) {
+            for (size_t i = 0; i < (size_t)syndrome_unchecked.size(); ++i) {
               if (syndrome_unchecked(i)) {
                 detections.push_back(i);
               }

src/utils.pybind.h

@@ -23,7 +23,7 @@
 
 namespace py = pybind11;
 
-void add_utils_module(py::module &root) {
+void add_utils_module(py::module& root) {
   auto m = root.def_submodule("utils", "utility methods");
 
   m.attr("EPSILON") = EPSILON;

src/visualization.h

@@ -8,12 +8,12 @@
 #include "common.h"
 
 struct Visualizer {
-  void add_detector_coords(const std::vector<std::vector<double>> &);
-  void add_errors(const std::vector<common::Error> &);
-  void add_activated_errors(const std::vector<size_t> &);
-  void add_activated_detectors(const boost::dynamic_bitset<> &, size_t);
+  void add_detector_coords(const std::vector<std::vector<double>>&);
+  void add_errors(const std::vector<common::Error>&);
+  void add_activated_errors(const std::vector<size_t>&);
+  void add_activated_detectors(const boost::dynamic_bitset<>&, size_t);
 
-  void write(const char *fpath);
+  void write(const char* fpath);
 
  private:
   std::list<std::string> lines;