Merge pull request #83 from mvcisback/attr

Use Attr to mirror aiger-bv

Author: mvcisback

aiger/aig.py

@@ -2,6 +2,7 @@
 from functools import reduce
 from typing import Tuple, FrozenSet, NamedTuple, Union
 
+import attr
 import funcy as fn
 from toposort import toposort
 
@@ -66,7 +67,8 @@ def _is_const_true(node):
 Node = Union[AndGate, ConstFalse, Inverter, Input, LatchIn]
 
 
-class AIG(NamedTuple):
+@attr.s(frozen=True, slots=True, auto_attribs=True, repr=False)
+class AIG:
     inputs: FrozenSet[str] = frozenset()
     node_map: FrozenSet[Tuple[str, Node]] = frozenset()
     latch_map: FrozenSet[Tuple[str, Node]] = frozenset()
@@ -79,9 +81,7 @@ def __repr__(self):
         return repr(self._to_aag())
 
     def __getitem__(self, others):
-        if not isinstance(others, tuple):
-            return super().__getitem__(others)
-
+        assert isinstance(others, tuple) and len(others) == 2
         kind, relabels = others
         assert kind in {'i', 'o', 'l'}
 
@@ -98,6 +98,9 @@ def __getitem__(self, others):
         input_kinds = (Input,) if kind == 'i' else (LatchIn,)
         return seq_compose(cmn.tee(relabels), self, input_kinds=input_kinds)
 
+    def evolve(self, **kwargs):
+        return attr.evolve(self, **kwargs)
+
     @property
     def outputs(self):
         return frozenset(fn.pluck(0, self.node_map))
@@ -165,7 +168,7 @@ def sub(node):
 
         circ = self._modify_leafs(sub)
         _cones = {(l_map[k][0], v) for k, v in circ.latch_map if k in latches}
-        aig = self._replace(
+        aig = self.evolve(
             node_map=circ.node_map | _cones,
             inputs=self.inputs | {n for n, _ in l_map.values()},
             latch_map={(k, v) for k, v in circ.latch_map if k not in latches},
@@ -201,7 +204,7 @@ def sub(node):
         out2latch = {oname: lname for oname, lname in zip(outputs, latches)}
         _latch_map = {(out2latch[k], v) for k, v in _latch_map}
         l2init = frozenset((n, val) for n, val in zip(latches, initials))
-        return aig._replace(
+        return aig.evolve(
             inputs=aig.inputs - set(inputs),
             node_map=aig.node_map if keep_outputs else frozenset(node_map),
             latch_map=aig.latch_map | _latch_map,
@@ -261,7 +264,7 @@ def _mod(node):
 
         node_map = ((name, _mod(cone)) for name, cone in self.node_map)
         latch_map = ((name, _mod(cone)) for name, cone in self.latch_map)
-        return self._replace(
+        return self.evolve(
             node_map=frozenset(node_map),
             latch_map=frozenset(latch_map)
         )

aiger/expr.py

@@ -1,12 +1,14 @@
-from typing import NamedTuple, Union
+from typing import Union
 
+import attr
 import funcy as fn
 
 from aiger import aig
 from aiger import common as cmn
 
 
-class BoolExpr(NamedTuple):
+@attr.s(frozen=True, slots=True, cmp=False, auto_attribs=True)
+class BoolExpr:
     aig: aig.AIG
 
     def __call__(self, inputs):

aiger/hypothesis.py

@@ -69,7 +69,7 @@ def parse(circ_str: str):
 
 def make_circuit(term):
     circ_str = ''.join(term)
-    return parse(circ_str)._replace(comments=(circ_str, ))
+    return parse(circ_str).evolve(comments=(circ_str, ))
 
 
 Circuits = st.builds(make_circuit,

aiger/test_parser.py

@@ -52,7 +52,7 @@ def test_sink_aag():
 
 @given(aigh.Circuits, st.data())
 def test_dummylatches_aag(circ, ddata):
-    circ2 = circ._replace(
+    circ2 = circ.evolve(
         latch2init={common._fresh(): False}
     )
     circ3 = circ._to_aag()._to_aig()

requirements.txt

@@ -1,4 +1,5 @@
 git+git://github.com/mvcisback/hypothesis-cfg.git@master#egg=hypothesis_cfg
+attrs==18.1.0
 bidict==0.17.2
 blessings==1.7
 click==6.7

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='py-aiger',
-    version='1.0.0',
+    version='2.0.0',
     description=DESC,
     url='http://github.com/mvcisback/py-aiger',
     author='Marcell Vazquez-Chanlatte',
@@ -17,6 +17,7 @@
         ],
     },
     install_requires=[
+        'attr',
         'bidict',
         'click',
         'funcy',