Bug Fixes. (#58)

* adding hash function for layout

* fixing bugs in Fold and hashing of layout

* copilot suggestion

* Adding test

* Update src/bloqade/shuttle/arch.py

Co-authored-by: Copilot <[email protected]>

* adding some basic tests

* run linter

---------

Co-authored-by: Copilot <[email protected]>

Author: weinbe58

src/bloqade/shuttle/arch.py

@@ -14,6 +14,16 @@ class Layout:
     fillable: set[str]
     """ The set of trap names that are fillable by the sorter. """
 
+    def __hash__(self):
+        return hash((frozenset(self.static_traps.items()), frozenset(self.fillable)))
+
+    def __eq__(self, other):
+        if not isinstance(other, Layout):
+            return NotImplemented
+        return (
+            self.static_traps == other.static_traps and self.fillable == other.fillable
+        )
+
     @staticmethod
     def _plot_zone(zone: Grid, ax, name: str, **plot_options):
         from matplotlib.axes import Axes  # type: ignore

src/bloqade/shuttle/passes/fold.py

@@ -39,6 +39,7 @@ def unsafe_run(self, mt: Method) -> RewriteResult:
             Call2Invoke(),
             InlineGetField(),
             InlineGetItem(),
+            ilist.rewrite.InlineGetItem(),
             DeadCodeElimination(),
             CommonSubexpressionElimination(),
         )

test/unit/test_arch.py

@@ -0,0 +1,16 @@
+from bloqade.geometry.dialects.grid import Grid
+
+from bloqade.shuttle.arch import Layout
+
+
+def test_layout():
+
+    layout = Layout({"test": Grid.from_positions(range(16), range(16))}, {"test"})
+
+    assert hash(layout) == hash(
+        (frozenset(layout.static_traps.items()), frozenset(layout.fillable))
+    )
+    assert layout == Layout(
+        {"test": Grid.from_positions(range(16), range(16))}, {"test"}
+    )
+    assert layout != 1