cda-tum · wlambooy · Oct 30, 2024 · Nov 12, 2024 · Nov 12, 2024 · Nov 12, 2024
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -4,7 +4,6 @@ build:
   os: ubuntu-24.04
   tools:
     python: "3.12"
-
   jobs:
     post_checkout:
       # Skip docs build if the commit message contains "skip ci"

diff --git a/bindings/mnt/pyfiction/__init__.py b/bindings/mnt/pyfiction/__init__.py
@@ -18,7 +18,6 @@
             os.add_dll_directory(str(bin_path))
     if "ALGLIB_DIR" in os.environ:
         os.add_dll_directory(str(os.environ["ALGLIB_DIR"]))
-
 from .pyfiction import (  # type: ignore[import-not-found]
     __compiled_date__,
     __compiled_time__,
@@ -117,9 +116,12 @@
     defect_extent,
     dependent_cell_mode,
     design_sidb_gates,
-    design_sidb_gates_mode,
-    design_sidb_gates_params,
-    design_sidb_gates_stats,
+    design_sidb_gates_params_100,
+    design_sidb_gates_params_111,
+    design_sidb_gates_params_design_sidb_gates_mode_100,
+    design_sidb_gates_params_design_sidb_gates_mode_111,
+    design_sidb_gates_params_termination_condition_100,
+    design_sidb_gates_params_termination_condition_111,
     detect_bdl_pairs,
     detect_bdl_pairs_params,
     detect_bdl_wires_100,
@@ -195,6 +197,7 @@
     is_neutrally_charged_defect,
     is_operational,
     is_operational_params,
+    is_operational_params_termination_condition,
     is_positively_charged_defect,
     kink_induced_non_operational_input_patterns,
     manhattan_distance,
@@ -212,7 +215,12 @@
     offset_coordinate,
     offset_volume,
     operational_analysis_strategy,
-    operational_condition,
+    operational_assessment_100,
+    operational_assessment_111,
+    operational_assessment_for_input_100,
+    operational_assessment_for_input_111,
+    operational_condition_kinks,
+    operational_condition_positive_charges,
     operational_domain,
     operational_domain_contour_tracing,
     operational_domain_flood_fill,
@@ -284,6 +292,7 @@
     sign_to_charge_state,
     # logic
     simulate,
+    simulation_results_mode,
     siqad_area,
     siqad_coordinate,
     siqad_volume,
@@ -298,7 +307,6 @@
     technology_mapping_stats,
     # Networks
     technology_network,
-    termination_condition,
     time_to_solution,
     time_to_solution_for_given_simulation_results,
     time_to_solution_params,
@@ -439,9 +447,12 @@
     "defect_extent",
     "dependent_cell_mode",
     "design_sidb_gates",
-    "design_sidb_gates_mode",
-    "design_sidb_gates_params",
-    "design_sidb_gates_stats",
+    "design_sidb_gates_params_100",
+    "design_sidb_gates_params_111",
+    "design_sidb_gates_params_design_sidb_gates_mode_100",
+    "design_sidb_gates_params_design_sidb_gates_mode_111",
+    "design_sidb_gates_params_termination_condition_100",
+    "design_sidb_gates_params_termination_condition_111",
     "detect_bdl_pairs",
     "detect_bdl_pairs_params",
     "detect_bdl_wires_100",
@@ -517,6 +528,7 @@
     "is_neutrally_charged_defect",
     "is_operational",
     "is_operational_params",
+    "is_operational_params_termination_condition",
     "is_positively_charged_defect",
     "kink_induced_non_operational_input_patterns",
     "manhattan_distance",
@@ -534,7 +546,12 @@
     "offset_coordinate",
     "offset_volume",
     "operational_analysis_strategy",
-    "operational_condition",
+    "operational_assessment_100",
+    "operational_assessment_111",
+    "operational_assessment_for_input_100",
+    "operational_assessment_for_input_111",
+    "operational_condition_kinks",
+    "operational_condition_positive_charges",
     "operational_domain",
     "operational_domain_contour_tracing",
     "operational_domain_flood_fill",
@@ -606,6 +623,7 @@
     "sign_to_charge_state",
     # logic
     "simulate",
+    "simulation_results_mode",
     "siqad_area",
     "siqad_coordinate",
     "siqad_volume",
@@ -620,7 +638,6 @@
     "technology_mapping_stats",
     # Networks
     "technology_network",
-    "termination_condition",
     "time_to_solution",
     "time_to_solution_for_given_simulation_results",
     "time_to_solution_params",

diff --git a/bindings/mnt/pyfiction/include/pyfiction/algorithms/physical_design/design_sidb_gates.hpp b/bindings/mnt/pyfiction/include/pyfiction/algorithms/physical_design/design_sidb_gates.hpp
@@ -10,8 +10,11 @@
 #include <fiction/algorithms/physical_design/design_sidb_gates.hpp>
 #include <fiction/types.hpp>
 
+#include <fmt/format.h>
 #include <pybind11/pybind11.h>
 
+#include <string>
+
 namespace pyfiction
 {
 
@@ -24,78 +27,108 @@ void design_sidb_gates(pybind11::module& m)
     namespace py = pybind11;
 
     m.def("design_sidb_gates", &fiction::design_sidb_gates<Lyt, py_tt>, py::arg("skeleton"), py::arg("spec"),
-          py::arg("params") = fiction::design_sidb_gates_params<fiction::cell<Lyt>>{}, py::arg("stats") = nullptr,
+          py::arg("params") = fiction::design_sidb_gates_params<Lyt>{}, py::arg("stats") = nullptr,
           DOC(fiction_design_sidb_gates));
 }
 
-}  // namespace detail
-
-inline void design_sidb_gates(pybind11::module& m)
+template <typename Lyt>
+void design_sidb_gates_params(pybind11::module& m, const std::string& lattice = "")
 {
     namespace py = pybind11;
 
-    py::class_<fiction::design_sidb_gates_stats>(m, "design_sidb_gates_stats", DOC(fiction_design_sidb_gates_stats))
-        .def(py::init<>())
-        .def("__repr__",
-             [](const fiction::design_sidb_gates_stats& stats)
-             {
-                 std::stringstream stream{};
-                 stats.report(stream);
-                 return stream.str();
-             });
+    // TODO: it seems unnecessary to define these selector types for each lattice
 
     /**
      * Design approach selector type.
      */
-    py::enum_<typename fiction::design_sidb_gates_params<fiction::offset::ucoord_t>::design_sidb_gates_mode>(
-        m, "design_sidb_gates_mode", DOC(fiction_design_sidb_gates_params_design_sidb_gates_mode))
-        .value("QUICKCELL",
-               fiction::design_sidb_gates_params<fiction::offset::ucoord_t>::design_sidb_gates_mode::QUICKCELL,
+    py::enum_<typename fiction::design_sidb_gates_params<Lyt>::design_sidb_gates_mode>(
+        m, fmt::format("design_sidb_gates_params_design_sidb_gates_mode{}", lattice).c_str(),
+        DOC(fiction_design_sidb_gates_params_design_sidb_gates_mode))
+        .value("QUICKCELL", fiction::design_sidb_gates_params<Lyt>::design_sidb_gates_mode::QUICKCELL,
                DOC(fiction_design_sidb_gates_params_design_sidb_gates_mode_QUICKCELL))
-        .value("AUTOMATIC_EXHAUSTIVE_GATE_DESIGNER",
-               fiction::design_sidb_gates_params<
-                   fiction::offset::ucoord_t>::design_sidb_gates_mode::AUTOMATIC_EXHAUSTIVE_GATE_DESIGNER,
+        .value("EXHAUSTIVE", fiction::design_sidb_gates_params<Lyt>::design_sidb_gates_mode::EXHAUSTIVE,
                DOC(fiction_design_sidb_gates_params_design_sidb_gates_mode_QUICKCELL))
-        .value("RANDOM", fiction::design_sidb_gates_params<fiction::offset::ucoord_t>::design_sidb_gates_mode::RANDOM,
+        .value("RANDOM", fiction::design_sidb_gates_params<Lyt>::design_sidb_gates_mode::RANDOM,
                DOC(fiction_design_sidb_gates_params_design_sidb_gates_mode_RANDOM))
-        .value("PRUNING_ONLY",
-               fiction::design_sidb_gates_params<fiction::offset::ucoord_t>::design_sidb_gates_mode::PRUNING_ONLY,
+        .value("PRUNING_ONLY", fiction::design_sidb_gates_params<Lyt>::design_sidb_gates_mode::PRUNING_ONLY,
                DOC(fiction_design_sidb_gates_params_design_sidb_gates_mode_PRUNING_ONLY))
 
         ;
     /**
      * Termination condition selector type.
      */
-    py::enum_<typename fiction::design_sidb_gates_params<fiction::offset::ucoord_t>::termination_condition>(
-        m, "termination_condition")
-        .value(
-            "AFTER_FIRST_SOLUTION",
-            fiction::design_sidb_gates_params<fiction::offset::ucoord_t>::termination_condition::AFTER_FIRST_SOLUTION)
+    py::enum_<typename fiction::design_sidb_gates_params<Lyt>::termination_condition>(
+        m, fmt::format("design_sidb_gates_params_termination_condition{}", lattice).c_str(),
+        DOC(fiction_design_sidb_gates_params_termination_condition))
+        .value("OBTAINED_N_SOLUTIONS",
+               fiction::design_sidb_gates_params<Lyt>::termination_condition::OBTAINED_N_SOLUTIONS,
+               DOC(fiction_design_sidb_gates_params_termination_condition_OBTAINED_N_SOLUTIONS))
         .value("ALL_COMBINATIONS_ENUMERATED",
-               fiction::design_sidb_gates_params<
-                   fiction::offset::ucoord_t>::termination_condition::ALL_COMBINATIONS_ENUMERATED)
-
-        ;
+               fiction::design_sidb_gates_params<Lyt>::termination_condition::ALL_COMBINATIONS_ENUMERATED,
+               DOC(fiction_design_sidb_gates_params_termination_condition_ALL_COMBINATIONS_ENUMERATED));
 
     /**
      * Parameters.
      */
-    py::class_<fiction::design_sidb_gates_params<fiction::offset::ucoord_t>>(m, "design_sidb_gates_params",
-                                                                             DOC(fiction_design_sidb_gates_params))
+    py::class_<fiction::design_sidb_gates_params<Lyt>>(m, fmt::format("design_sidb_gates_params{}", lattice).c_str(),
+                                                       DOC(fiction_design_sidb_gates_params))
         .def(py::init<>())
-        .def_readwrite("operational_params",
-                       &fiction::design_sidb_gates_params<fiction::offset::ucoord_t>::operational_params,
+        .def_readwrite("operational_params", &fiction::design_sidb_gates_params<Lyt>::operational_params,
                        DOC(fiction_design_sidb_gates_params_operational_params))
-        .def_readwrite("design_mode", &fiction::design_sidb_gates_params<fiction::offset::ucoord_t>::design_mode,
+        .def_readwrite("design_mode", &fiction::design_sidb_gates_params<Lyt>::design_mode,
                        DOC(fiction_design_sidb_gates_params_design_mode))
-        .def_readwrite("canvas", &fiction::design_sidb_gates_params<fiction::offset::ucoord_t>::canvas,
-                       DOC(fiction_design_sidb_gates_params_canvas))
-        .def_readwrite("number_of_canvas_sidbs",
-                       &fiction::design_sidb_gates_params<fiction::offset::ucoord_t>::number_of_canvas_sidbs,
+        .def_readwrite("canvas", &fiction::design_sidb_gates_params<Lyt>::canvas,
+                       DOC(fiction_design_sidb_gates_params_canvas_overridden))
+        .def_readwrite("number_of_canvas_sidbs", &fiction::design_sidb_gates_params<Lyt>::number_of_canvas_sidbs,
                        DOC(fiction_design_sidb_gates_params_number_of_canvas_sidbs))
-        .def_readwrite("termination_cond",
-                       &fiction::design_sidb_gates_params<fiction::offset::ucoord_t>::termination_cond,
-                       DOC(fiction_design_sidb_gates_params_termination_condition));
+        .def_readwrite("termination_cond", &fiction::design_sidb_gates_params<Lyt>::termination_cond,
+                       DOC(fiction_design_sidb_gates_params_termination_cond))
+        .def_readwrite("maximum_number_of_solutions",
+                       &fiction::design_sidb_gates_params<Lyt>::maximum_number_of_solutions,
+                       DOC(fiction_design_sidb_gates_params_maximum_number_of_solutions))
+        .def_readwrite("available_threads", &fiction::design_sidb_gates_params<Lyt>::available_threads,
+                       DOC(fiction_design_sidb_gates_params_available_threads))
+        .def_readwrite("post_design_process", &fiction::design_sidb_gates_params<Lyt>::post_design_process,
+                       DOC(fiction_design_sidb_gates_params_post_design_process));
+}
+
+}  // namespace detail
+
+inline void design_sidb_gates(pybind11::module& m)
+{
+    namespace py = pybind11;
+
+    // stats are defined to be read-only
+
+    py::class_<fiction::design_sidb_gates_stats>(m, "design_sidb_gates_stats", DOC(fiction_design_sidb_gates_stats))
+        .def(py::init<>())
+        .def_readonly("time_total", &fiction::design_sidb_gates_stats::time_total,
+                      DOC(fiction_design_sidb_gates_stats_time_total_overridden))
+        .def_readonly("pruning_total", &fiction::design_sidb_gates_stats::pruning_total,
+                      DOC(fiction_design_sidb_gates_stats_pruning_total_overridden))
+        .def_readonly("sim_engine", &fiction::design_sidb_gates_stats::sim_engine,
+                      DOC(fiction_design_sidb_gates_stats_sim_engine))
+        .def_readonly("number_of_layouts", &fiction::design_sidb_gates_stats::number_of_layouts,
+                      DOC(fiction_design_sidb_gates_stats_number_of_layouts))
+        .def_readonly("number_of_layouts_after_first_pruning",
+                      &fiction::design_sidb_gates_stats::number_of_layouts_after_first_pruning,
+                      DOC(fiction_design_sidb_gates_stats_number_of_layouts_after_first_pruning))
+        .def_readonly("number_of_layouts_after_second_pruning",
+                      &fiction::design_sidb_gates_stats::number_of_layouts_after_second_pruning,
+                      DOC(fiction_design_sidb_gates_stats_number_of_layouts_after_second_pruning))
+        .def_readonly("number_of_layouts_after_third_pruning",
+                      &fiction::design_sidb_gates_stats::number_of_layouts_after_third_pruning,
+                      DOC(fiction_design_sidb_gates_stats_number_of_layouts_after_third_pruning))
+        .def("__repr__",
+             [](const fiction::design_sidb_gates_stats& stats)
+             {
+                 std::stringstream stream{};
+                 stats.report(stream);
+                 return stream.str();
+             });
+
+    detail::design_sidb_gates_params<py_sidb_100_lattice>(m, "_100");
+    detail::design_sidb_gates_params<py_sidb_111_lattice>(m, "_111");
 
     detail::design_sidb_gates<py_sidb_100_lattice>(m);
     detail::design_sidb_gates<py_sidb_111_lattice>(m);

diff --git a/bindings/mnt/pyfiction/include/pyfiction/algorithms/physical_design/exact.hpp b/bindings/mnt/pyfiction/include/pyfiction/algorithms/physical_design/exact.hpp
@@ -26,7 +26,6 @@ namespace pyfiction
 inline void exact(pybind11::module& m)
 {
     namespace py = pybind11;
-    namespace py = pybind11;
 
     py::enum_<fiction::technology_constraints>(m, "technology_constraints", DOC(fiction_technology_constraints))
         .value("NONE", fiction::technology_constraints::NONE, DOC(fiction_technology_constraints_NONE))

diff --git a/...t/pyfiction/include/pyfiction/algorithms/physical_design/graph_oriented_layout_design.hpp b/...t/pyfiction/include/pyfiction/algorithms/physical_design/graph_oriented_layout_design.hpp
@@ -25,7 +25,6 @@ namespace pyfiction
 inline void graph_oriented_layout_design(pybind11::module& m)
 {
     namespace py = pybind11;
-    namespace py = pybind11;
 
     py::enum_<fiction::graph_oriented_layout_design_params::effort_mode>(
         m, "gold_effort_mode", DOC(fiction_graph_oriented_layout_design_params_effort_mode))

diff --git a/bindings/mnt/pyfiction/include/pyfiction/algorithms/physical_design/orthogonal.hpp b/bindings/mnt/pyfiction/include/pyfiction/algorithms/physical_design/orthogonal.hpp
@@ -24,7 +24,6 @@ namespace pyfiction
 inline void orthogonal(pybind11::module& m)
 {
     namespace py = pybind11;
-    namespace py = pybind11;
 
     py::class_<fiction::orthogonal_physical_design_params>(m, "orthogonal_params",
                                                            DOC(fiction_orthogonal_physical_design_params))

diff --git a/...s/mnt/pyfiction/include/pyfiction/algorithms/physical_design/post_layout_optimization.hpp b/...s/mnt/pyfiction/include/pyfiction/algorithms/physical_design/post_layout_optimization.hpp
@@ -21,7 +21,6 @@ namespace pyfiction
 inline void post_layout_optimization(pybind11::module& m)
 {
     namespace py = pybind11;
-    namespace py = pybind11;
 
     py::class_<fiction::post_layout_optimization_params>(m, "post_layout_optimization_params",
                                                          DOC(fiction_post_layout_optimization_params))

diff --git a/bindings/mnt/pyfiction/include/pyfiction/algorithms/physical_design/wiring_reduction.hpp b/bindings/mnt/pyfiction/include/pyfiction/algorithms/physical_design/wiring_reduction.hpp
@@ -21,7 +21,6 @@ namespace pyfiction
 inline void wiring_reduction(pybind11::module& m)
 {
     namespace py = pybind11;
-    namespace py = pybind11;
 
     py::class_<fiction::wiring_reduction_params>(m, "wiring_reduction_params", DOC(fiction_wiring_reduction_params))
         .def(py::init<>())