⚗️ Added a runtime script for three state simulation and apply small …

…changes. (#520) * 🎨 make it easier to create layouts with positive sides. * ⚗️ add experiment script. * 📝 Update pyfiction docstrings Signed-off-by: GitHub Actions <[email protected]> * 🎨 small changes. * 📝 Update pyfiction docstrings Signed-off-by: GitHub Actions <[email protected]> * 🎨 Incorporated pre-commit fixes * 🚨 implement clang-tidy warnings. * 🎨 Incorporated pre-commit fixes * 🎨 small fix. * 📝 Update pyfiction docstrings Signed-off-by: GitHub Actions <[email protected]> * 🎨 Incorporated pre-commit fixes * 🎨 small fix to avoid window compile issue. * 🎨 small fix. * 🎨 small fix. * 🎨 small fix. * 🎨 move files. * 🎨 simplify params. * 📝 Update pyfiction docstrings Signed-off-by: GitHub Actions <[email protected]> * 🎨 Incorporated pre-commit fixes * 🐍 small fix. * 🎨 Incorporated pre-commit fixes * 🎨 small fix in the experiment script. * 🎨 Incorporated pre-commit fixes * ✅ add more test cases and small fixes. * 🎨 implement Marcels feedback. * 🎨 Incorporated pre-commit fixes * 📝 Update pyfiction docstrings Signed-off-by: GitHub Actions <[email protected]> * 📝 small fix. * 🎨 small fix. * 🎨 small update. * 🎨 Incorporated pre-commit fixes * ✅ add additional test. --------- Signed-off-by: GitHub Actions <[email protected]> Co-authored-by: GitHub Actions <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
cda-tum · Sep 16, 2024 · a2971b4 · a2971b4
1 parent 2957b0c
commit a2971b4
Show file tree

Hide file tree

Showing 21 changed files with 511 additions and 281 deletions.
diff --git a/bindings/pyfiction/include/pyfiction/algorithms/physical_design/design_sidb_gates.hpp b/bindings/pyfiction/include/pyfiction/algorithms/physical_design/design_sidb_gates.hpp
@@ -50,18 +50,16 @@ inline void design_sidb_gates(pybind11::module& m)
     py::class_<fiction::design_sidb_gates_params<fiction::offset::ucoord_t>>(m, "design_sidb_gates_params",
                                                                              DOC(fiction_design_sidb_gates_params))
         .def(py::init<>())
-        .def_readwrite("simulation_parameters",
-                       &fiction::design_sidb_gates_params<fiction::offset::ucoord_t>::simulation_parameters,
-                       DOC(fiction_design_sidb_gates_params))
+        .def_readwrite("operational_params",
+                       &fiction::design_sidb_gates_params<fiction::offset::ucoord_t>::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,
                        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_sidbs",
                        &fiction::design_sidb_gates_params<fiction::offset::ucoord_t>::number_of_sidbs,
-                       DOC(fiction_design_sidb_gates_params_number_of_sidbs))
-        .def_readwrite("sim_engine", &fiction::design_sidb_gates_params<fiction::offset::ucoord_t>::sim_engine,
-                       DOC(fiction_design_sidb_gates_params_sim_engine));
+                       DOC(fiction_design_sidb_gates_params_number_of_sidbs));
 
     detail::design_sidb_gates<py_sidb_100_lattice>(m);
     detail::design_sidb_gates<py_sidb_111_lattice>(m);

diff --git a/...s/pyfiction/include/pyfiction/algorithms/simulation/sidb/random_sidb_layout_generator.hpp b/...s/pyfiction/include/pyfiction/algorithms/simulation/sidb/random_sidb_layout_generator.hpp
@@ -44,9 +44,15 @@ inline void random_sidb_layout_generator(pybind11::module& m)
 
     py::enum_<typename fiction::generate_random_sidb_layout_params<fiction::offset::ucoord_t>::positive_charges>(
         m, "positive_charges", DOC(fiction_generate_random_sidb_layout_params_positive_charges))
-        .value("ON", fiction::generate_random_sidb_layout_params<fiction::offset::ucoord_t>::positive_charges::ALLOWED)
-        .value("OFF",
-               fiction::generate_random_sidb_layout_params<fiction::offset::ucoord_t>::positive_charges::FORBIDDEN);
+        .value("ALLOWED",
+               fiction::generate_random_sidb_layout_params<fiction::offset::ucoord_t>::positive_charges::ALLOWED,
+               DOC(fiction_generate_random_sidb_layout_params_positive_charges_ALLOWED))
+        .value("FORBIDDEN",
+               fiction::generate_random_sidb_layout_params<fiction::offset::ucoord_t>::positive_charges::FORBIDDEN,
+               DOC(fiction_generate_random_sidb_layout_params_positive_charges_FORBIDDEN))
+        .value("MAY_OCCUR",
+               fiction::generate_random_sidb_layout_params<fiction::offset::ucoord_t>::positive_charges::MAY_OCCUR,
+               DOC(fiction_generate_random_sidb_layout_params_positive_charges_MAY_OCCUR));
 
     /**
      * Parameters.
@@ -63,9 +69,6 @@ inline void random_sidb_layout_generator(pybind11::module& m)
         .def_readwrite("positive_sidbs",
                        &fiction::generate_random_sidb_layout_params<fiction::offset::ucoord_t>::positive_sidbs,
                        DOC(fiction_generate_random_sidb_layout_params_positive_sidbs))
-        .def_readwrite("minimal_spacing",
-                       &fiction::generate_random_sidb_layout_params<fiction::offset::ucoord_t>::minimal_spacing,
-                       DOC(fiction_generate_random_sidb_layout_params_minimal_spacing))
         .def_readwrite("maximal_attempts",
                        &fiction::generate_random_sidb_layout_params<fiction::offset::ucoord_t>::maximal_attempts,
                        DOC(fiction_generate_random_sidb_layout_params_maximal_attempts))
@@ -77,8 +80,8 @@ inline void random_sidb_layout_generator(pybind11::module& m)
                        &fiction::generate_random_sidb_layout_params<
                            fiction::offset::ucoord_t>::maximal_attempts_for_multiple_layouts,
                        DOC(fiction_generate_random_sidb_layout_params_maximal_attempts_for_multiple_layouts));
-    // NOTE be careful with the order of the following calls! Python will resolve the first matching overload!
 
+    // NOTE be careful with the order of the following calls! Python will resolve the first matching overload!
     detail::random_layout_generator<py_sidb_100_lattice>(m);
     detail::random_layout_generator<py_sidb_111_lattice>(m);
 }

diff --git a/bindings/pyfiction/include/pyfiction/pybind11_mkdoc_docstrings.hpp b/bindings/pyfiction/include/pyfiction/pybind11_mkdoc_docstrings.hpp
@@ -295,6 +295,27 @@ Parameter ``params``:
     A cell-level layout that implements `lyt`'s gate types with
     building blocks defined in `GateLibrary`.)doc";
 
+static const char *__doc_fiction_are_cell_layouts_identical =
+R"doc(This function checks whether the given layouts `first_lyt` and
+`second_lyt` are identical by comparing various properties such as the
+number of cells, the types of cells, defects (if applicable), and
+charge states (if applicable). The comparison is done in a detailed
+manner depending on the specific layout type.
+
+@Note The aspect ratios of the cell-level layouts are not compared.
+
+Template parameter ``Lyt``:
+    The layout type. Must be a cell-level layout.
+
+Parameter ``first_lyt``:
+    The first layout to compare.
+
+Parameter ``second_lyt``:
+    The second layout to compare.
+
+Returns:
+    `true` if the layouts are identical, `false` otherwise.)doc";
+
 static const char *__doc_fiction_area =
 R"doc(Computes the area of a given coordinate assuming its origin is (0, 0,
 0). Calculates :math:`(|x| + 1) \cdot (|y| + 1)` by default. The
@@ -3495,11 +3516,7 @@ static const char *__doc_fiction_design_sidb_gates_params_design_sidb_gates_mode
 
 static const char *__doc_fiction_design_sidb_gates_params_number_of_sidbs = R"doc(Number of SiDBs placed in the canvas to create a working gate.)doc";
 
-static const char *__doc_fiction_design_sidb_gates_params_sim_engine =
-R"doc(The simulation engine to be used for the operational domain
-computation.)doc";
-
-static const char *__doc_fiction_design_sidb_gates_params_simulation_parameters = R"doc(All Parameters for physical SiDB simulations.)doc";
+static const char *__doc_fiction_design_sidb_gates_params_operational_params = R"doc(Parameters for the `is_operational` function.)doc";
 
 static const char *__doc_fiction_design_sidb_gates_params_termination_cond =
 R"doc(The design process is terminated after a valid SiDB gate design is
@@ -10870,10 +10887,6 @@ be difficult or even impossible to find several unique (given by
 number_of_unique_generated_layouts) layouts. Therefore, this parameter
 sets a limit for the maximum number of tries.)doc";
 
-static const char *__doc_fiction_generate_random_sidb_layout_params_minimal_spacing =
-R"doc(If positively charged SiDBs should be prevented, SiDBs are not placed
-closer than this value (Euclidean distance of two cells).)doc";
-
 static const char *__doc_fiction_generate_random_sidb_layout_params_number_of_sidbs = R"doc(Number of SiDBs that are placed on the layout.)doc";
 
 static const char *__doc_fiction_generate_random_sidb_layout_params_number_of_unique_generated_layouts = R"doc(The desired number of unique layouts to be generated.)doc";
@@ -10890,10 +10903,16 @@ static const char *__doc_fiction_generate_random_sidb_layout_params_positive_cha
 R"doc(Positive charges are not allowed to occur (i.e. SiDBs need to be
 seperated by a few lattice points).)doc";
 
+static const char *__doc_fiction_generate_random_sidb_layout_params_positive_charges_MAY_OCCUR =
+R"doc(Positive charges can occur, which means that the
+`can_positive_charges_occur` function returns `true`.)doc";
+
 static const char *__doc_fiction_generate_random_sidb_layout_params_positive_sidbs =
 R"doc(If positively charged SiDBs should be prevented, SiDBs are not placed
 closer than the minimal_spacing.)doc";
 
+static const char *__doc_fiction_generate_random_sidb_layout_params_sim_params = R"doc(Simulation parameters.)doc";
+
 static const char *__doc_fiction_geometric_temperature_schedule =
 R"doc(A logarithmically decreasing temperature schedule. The temperature is
 altered by multiplying it with `0.99`.

diff --git a/bindings/pyfiction/test/algorithms/physical_design/test_design_sidb_gates.py b/bindings/pyfiction/test/algorithms/physical_design/test_design_sidb_gates.py
@@ -26,14 +26,14 @@ def test_siqad_and_gate_skeleton_100(self):
         layout.assign_cell_type((10, 19), sidb_technology.cell_type.NORMAL)
 
         params = design_sidb_gates_params()
-        params.simulation_parameters.base = 2
-        params.simulation_parameters.mu_minus = -0.28
+        params.operational_params.simulation_parameters.base = 2
+        params.operational_params.simulation_parameters.mu_minus = -0.28
         params.design_mode = design_sidb_gates_mode.EXHAUSTIVE
         params.canvas = [(4, 8), (14, 11)]
         params.number_of_sidbs = 1
-        params.sim_engine = sidb_simulation_engine.QUICKEXACT
+        params.operational_params.sim_engine = sidb_simulation_engine.QUICKEXACT
 
-        self.assertEqual(params.simulation_parameters.mu_minus, -0.28)
+        self.assertEqual(params.operational_params.simulation_parameters.mu_minus, -0.28)
         self.assertEqual(params.number_of_sidbs, 1)
         self.assertEqual(params.canvas[0], (4, 8, 0))
         self.assertEqual(params.canvas[1], (14, 11))
@@ -72,14 +72,14 @@ def test_nor_gate_111(self):
         layout.assign_cell_type((23, 59), sidb_technology.cell_type.NORMAL)
 
         params = design_sidb_gates_params()
-        params.simulation_parameters.base = 2
-        params.simulation_parameters.mu_minus = -0.32
+        params.operational_params.simulation_parameters.base = 2
+        params.operational_params.simulation_parameters.mu_minus = -0.32
         params.design_mode = design_sidb_gates_mode.EXHAUSTIVE
         params.canvas = [(10, 22), (14, 34)]
         params.number_of_sidbs = 3
-        params.sim_engine = sidb_simulation_engine.QUICKEXACT
+        params.operational_params.sim_engine = sidb_simulation_engine.QUICKEXACT
 
-        self.assertEqual(params.simulation_parameters.mu_minus, -0.32)
+        self.assertEqual(params.operational_params.simulation_parameters.mu_minus, -0.32)
         self.assertEqual(params.number_of_sidbs, 3)
         self.assertEqual(params.canvas[0], (10, 22, 0))
         self.assertEqual(params.canvas[1], (14, 34))

diff --git a/bindings/pyfiction/test/algorithms/simulation/sidb/test_random_sidb_layout_generator.py b/bindings/pyfiction/test/algorithms/simulation/sidb/test_random_sidb_layout_generator.py
@@ -5,7 +5,7 @@
 
 class TestRandomSiDBLayoutGenerator(unittest.TestCase):
 
-    def test_area_with_one_coordinate_100_lattice(self):
+    def test_area_with_one_sidb_100_lattice(self):
         params = generate_random_sidb_layout_params()
         params.number_of_sidbs = 1
         params.coordinate_pair = ((10,10), (10,10))
@@ -15,6 +15,14 @@ def test_area_with_one_coordinate_100_lattice(self):
         self.assertEqual(cell.x, 10)
         self.assertEqual(cell.y, 10)
 
+    def test_area_with_five_sidb_100_lattice(self):
+        params = generate_random_sidb_layout_params()
+        params.number_of_sidbs = 5
+        print(params.number_of_sidbs)
+        params.coordinate_pair = ((0,0), (10,10))
+        result_lyt = generate_random_sidb_layout(sidb_100_lattice(), params)
+        self.assertEqual(result_lyt.num_cells(), 5)
+
     def test_area_with_one_coordinate_111_lattice(self):
         params = generate_random_sidb_layout_params()
         params.number_of_sidbs = 1

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -8,6 +8,14 @@ The format is based on `Keep a Changelog <https://keepachangelog.com/en/1.0.0/>`
 Unreleased```
 -------------
 
+Added
+#####
+- Experiments:
+    - Script to conduct 3-state physical simulation of SiDB layouts.
+
+Unreleased```
+-------------
+
 Added
 #####
 - Experiments:

diff --git a/...ysical_design_with_on_the_fly_gate_design/physical_design_with_on_the_fly_gate_design.cpp b/...ysical_design_with_on_the_fly_gate_design/physical_design_with_on_the_fly_gate_design.cpp
@@ -48,12 +48,12 @@ int main()  // NOLINT
     using cell_lyt = fiction::sidb_cell_clk_lyt_cube;
 
     fiction::design_sidb_gates_params<fiction::cell<cell_lyt>> design_gate_params{};
-    design_gate_params.simulation_parameters = fiction::sidb_simulation_parameters{2, -0.32};
+    design_gate_params.operational_params.simulation_parameters = fiction::sidb_simulation_parameters{2, -0.32};
     // needs to be changed if a different skeleton is used.
     design_gate_params.canvas = {{24, 17}, {34, 28}};
 
-    design_gate_params.number_of_sidbs = 3;
-    design_gate_params.sim_engine      = fiction::sidb_simulation_engine::QUICKEXACT;
+    design_gate_params.number_of_sidbs               = 3;
+    design_gate_params.operational_params.sim_engine = fiction::sidb_simulation_engine::QUICKEXACT;
     design_gate_params.termination_cond =
         fiction::design_sidb_gates_params<fiction::cell<cell_lyt>>::termination_condition::AFTER_FIRST_SOLUTION;
 

diff --git a/experiments/random_sidb_layout_generation/random_sidb_layout_generation.cpp b/experiments/random_sidb_layout_generation/random_sidb_layout_generation.cpp
@@ -4,6 +4,7 @@
 
 #include <fiction/algorithms/simulation/sidb/random_sidb_layout_generator.hpp>
 #include <fiction/io/write_sqd_layout.hpp>
+#include <fiction/technology/cell_technologies.hpp>
 #include <fiction/types.hpp>
 
 #include <fmt/format.h>
@@ -35,7 +36,7 @@ using namespace fiction;
  *   --SE_x <value>             Sets the x coordinate of the south-east cell corner in SiQAD coordinates.
  *   --SE_y <value>             Sets the y coordinate of the south-east cell corner in SiQAD coordinates.
  *   --positive_charges <type>  Specifies whether positively charged SiDBs are allowed ("ALLOWED") or forbidden
- * ("FORBIDDEN").
+ * ("FORBIDDEN") for default physical parameters.
  *   --lower <value>            Sets the number of SiDBs for the first bunch of layouts.
  *   --upper <value>            Sets the number of SiDBs for the last bunch of layouts.
  *   --num_layouts <value>      Sets the number of layouts to generate for each SiDB count.
@@ -95,10 +96,23 @@ int main(int argc, const char* argv[])  // NOLINT
     const int32_t se_y = std::stoi(options["--SE_y"]);
     // specifies whether positively charged SiDBs are allowed ("ALLOWED") or forbidden ("FORBIDDEN")
     const std::string charges_str = options["--positive_charges"];
-    // specifies whether positively charged SiDBs are allowed ("ALLOWED") or forbidden ("FORBIDDEN")
-    const generate_random_sidb_layout_params<offset::ucoord_t>::positive_charges charges =
-        (charges_str == "ALLOWED") ? generate_random_sidb_layout_params<offset::ucoord_t>::positive_charges::ALLOWED :
-                                     generate_random_sidb_layout_params<offset::ucoord_t>::positive_charges::FORBIDDEN;
+
+    // specifies whether positively charged SiDBs are allowed ("ALLOWED"), forbidden ("FORBIDDEN") or can occur
+    // ("MAY_OCCUR")
+    generate_random_sidb_layout_params<offset::ucoord_t>::positive_charges charges{};
+    if (charges_str == "ALLOWED")
+    {
+        charges = generate_random_sidb_layout_params<offset::ucoord_t>::positive_charges::ALLOWED;
+    }
+    else if (charges_str == "MAY_OCCUR")
+    {
+        charges = generate_random_sidb_layout_params<offset::ucoord_t>::positive_charges::MAY_OCCUR;
+    }
+    else
+    {
+        charges = generate_random_sidb_layout_params<offset::ucoord_t>::positive_charges::FORBIDDEN;
+    }
+
     // sets the number of SiDBs for the first bunch of layouts
     const uint64_t lower_limit = std::stoull(options["--lower"]);
     // sets the number of SiDBs for the last bunch of layouts
@@ -165,8 +179,8 @@ int main(int argc, const char* argv[])  // NOLINT
                 }
 
                 const generate_random_sidb_layout_params<offset::ucoord_t> params{
-                    {{nw_x, nw_y}, {se_x, se_y}}, number_of_placed_sidbs, charges, 2,
-                    static_cast<uint64_t>(10E6),  number_of_layouts};
+                    {{nw_x, nw_y}, {se_x, se_y}},         number_of_placed_sidbs,      charges,
+                    sidb_simulation_parameters{3, -0.32}, static_cast<uint64_t>(10E6), number_of_layouts};
                 const auto unique_lyts = generate_multiple_random_sidb_layouts(sidb_100_cell_clk_lyt{}, params);
                 for (auto i = 0u; i < unique_lyts.size(); i++)
                 {

diff --git a/...ostatic_ground_state/runtime_analysis.cpp → ...state/runtime_analysis_bestagon_gates.cpp b/...ostatic_ground_state/runtime_analysis.cpp → ...state/runtime_analysis_bestagon_gates.cpp
@@ -2,18 +2,19 @@
 // Created by Jan Drewniok on 17.05.24.
 //
 
-#include "fiction/algorithms/iter/bdl_input_iterator.hpp"
-#include "fiction/algorithms/simulation/sidb/exhaustive_ground_state_simulation.hpp"
-#include "fiction/algorithms/simulation/sidb/quickexact.hpp"
-#include "fiction/algorithms/simulation/sidb/quicksim.hpp"
-#include "fiction/algorithms/simulation/sidb/sidb_simulation_parameters.hpp"
-#include "fiction/algorithms/simulation/sidb/time_to_solution.hpp"
-#include "fiction/io/read_sqd_layout.hpp"
-#include "fiction/layouts/coordinates.hpp"
-#include "fiction/types.hpp"
-#include "fiction/utils/truth_table_utils.hpp"
 #include "fiction_experiments.hpp"
 
+#include <fiction/algorithms/iter/bdl_input_iterator.hpp>
+#include <fiction/algorithms/simulation/sidb/exhaustive_ground_state_simulation.hpp>
+#include <fiction/algorithms/simulation/sidb/quickexact.hpp>
+#include <fiction/algorithms/simulation/sidb/quicksim.hpp>
+#include <fiction/algorithms/simulation/sidb/sidb_simulation_parameters.hpp>
+#include <fiction/algorithms/simulation/sidb/time_to_solution.hpp>
+#include <fiction/io/read_sqd_layout.hpp>
+#include <fiction/layouts/coordinates.hpp>
+#include <fiction/types.hpp>
+#include <fiction/utils/truth_table_utils.hpp>
+
 #include <fmt/format.h>
 #include <mockturtle/utils/stopwatch.hpp>