mpbn 4.1__py3-none-any.whl → 4.3.1__py3-none-any.whl

mpbn/__init__.py

@@ -74,7 +74,8 @@ def s2v(s):
 def v2s(v):
     return 1 if v > 0 else 0
 
-def is_dnf_unate(ba, f):
+
+def is_dnf(ba, f, test_unate=False):
     pos_lits = set()
     neg_lits = set()
     def is_lit(f):
@@ -98,6 +99,8 @@ def is_dnf_unate(ba, f):
         return False
 
     def test_monotonicity():
+        if not test_unate:
+            return True
         both = pos_lits.intersection(neg_lits)
         return not both
 
@@ -112,6 +115,9 @@ def is_dnf_unate(ba, f):
         return test_monotonicity()
     return False
 
+def is_dnf_unate(ba, f):
+    return is_dnf(ba, f, test_unate=True)
+
 def circuitasp_of_boolfunc(f, i, ba):
     atoms = []
     fid = clingo.String(i)
@@ -145,7 +151,7 @@ def circuitasp_of_boolfunc(f, i, ba):
     return "\n".join(atoms)
 
 DEFAULT_ENCODING = "mixed-dnf-bdd"
-DEFAULT_BOOLFUNCLIB = os.environ.get("MPBN_BOOLFUNCLIB", "aeon")
+DEFAULT_BOOLFUNCLIB = os.environ.get("MPBN_BOOLFUNCLIB", "pyeda")
 SUPPORTED_BOOLFUNCLIBS = ["aeon", "pyeda"]
 
 class MPBooleanNetwork(minibn.BooleanNetwork):
@@ -215,7 +221,7 @@ class MPBooleanNetwork(minibn.BooleanNetwork):
         if isinstance(f, str):
             f = self.ba.parse(f)
         f = self._autobool(f)
-        if self.auto_dnf:
+        if self.auto_dnf and (not is_dnf(self.ba, f) or self._simplify):
             f = self._bf_impl.make_dnf_boolfunc(self.ba, f,
                                 simplify=self._simplify,
                                 try_unate_hard=self.try_unate_hard)

mpbn/simulation.py

@@ -188,7 +188,7 @@ def sample_reachable_attractor(f, mem, x, A, depth, W, refresh_rate=10, emit=Non
     I = set(f)
     n = len(f)
     def filter_reachable_attractors(A, x):
-        H = spread(f, x, I, n)
+        H = spread(f, x, I, n) 
         return [(ia,a) for (ia,a) in A if is_subhypercube(a, (x,H))]
     k = 1
     x = x.copy()
@@ -201,7 +201,7 @@ def sample_reachable_attractor(f, mem, x, A, depth, W, refresh_rate=10, emit=Non
         if k % refresh_rate == 0:
             A = filter_reachable_attractors(A, x)
         k += 1
-    return A[0][0]
+    return None if (len(A)==0) else A[0][0]
 
 def sample_trace(f, mem, x, A, depth, W):
     if not isinstance(f, MPBNSim): f = MPBNSim(f)
@@ -257,6 +257,8 @@ def estimate_reachable_attractors_probabilities(f, x, A, nb_sims, depth, W):
     C = {ia: 0 for (ia,_) in A}
     for _ in tqdm(range(nb_sims)):
         ia = sample_reachable_attractor(f, mem, x, A, depth, W)
+        if (ia is None):
+        	continue
         C[ia] += 1
     for ia, _ in A:
         C[ia] = (C[ia]*100) / nb_sims

{mpbn-4.1.dist-info → mpbn-4.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: mpbn
-Version: 4.1
+Version: 4.3.1
 Summary: Simple implementation of Most Permissive Boolean networks
 Home-page: https://github.com/bnediction/mpbn
 Author: Loïc Paulevé

{mpbn-4.1.dist-info → mpbn-4.3.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
-mpbn/__init__.py,sha256=kbHB9JR5z2XP3FNaf2F06X9TaJM3PVVHzAsltT0_awg,22903
+mpbn/__init__.py,sha256=u1DrXvl-d5zIPQEnWIQedO6JDURjmEg3YWU8a731zWo,23083
 mpbn/converters.py,sha256=6uCjxaJ2MI19_I1h0Pk9YN6PcDx42_C-Ml8ZRMA9uxg,416
-mpbn/simulation.py,sha256=3lk6yu7k2POrSytmtnsGIh596B-qcAgBtl16iZ0vzM4,10594
+mpbn/simulation.py,sha256=DBtJbj1wyarHIbDcxLIuyWRNt2PRbiTjZxwB97cCAvE,10663
 mpbn/asplib/eval_circuit.asp,sha256=5rIbkVmvobaQwE_gHr0_USccPuI0QUPuzfw_1011hSE,989
 mpbn/asplib/eval_mixed.asp,sha256=n23pbjtxuWSCerL36Gb6O32bx8_1ukc52l1hQMMs8OE,787
 mpbn/asplib/mp_attractor.asp,sha256=CawLNxlYBZG2cl8XQAxA6EXEZ89Y9iw20CZ73n97Nu8,185
@@ -18,8 +18,8 @@ tests/test_fixpoints.py,sha256=bdDttzimiby48nVkVL-HXZ2rBldICBRbIZrVVbTGfso,786
 tests/test_input.py,sha256=mwMKd5UwAIY4Z1uZjYr09Ue8DLxD52CiPSoE-iXytfo,337
 tests/test_reachability.py,sha256=X7anTwFSIYcV2rltJBOW8TcAJnrt3SjYLqttB0eIL_Q,588
 tests/test_reachable_attractors.py,sha256=h78kvgmx9rTJWi3r2DZe_abYDxr02MLJ2iLDJUdLESY,540
-mpbn-4.1.dist-info/METADATA,sha256=9aJWcxNiK2cgjWBLpmTri09FhaoDlWLIGrd5qRRZEoE,2364
-mpbn-4.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-mpbn-4.1.dist-info/entry_points.txt,sha256=CpzAc9SkB-mH_dojzt1N3YgDxy8hniDrIGzSHcPDo8g,68
-mpbn-4.1.dist-info/top_level.txt,sha256=oe3jlFHbQ6oIXyE1q7yAAnf1m49oP_jBPUU05d71n74,11
-mpbn-4.1.dist-info/RECORD,,
+mpbn-4.3.1.dist-info/METADATA,sha256=z7C1Fvk5lLmvEwel3_R_jX3dNv_EQZTfcrXVGHJGJQw,2366
+mpbn-4.3.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+mpbn-4.3.1.dist-info/entry_points.txt,sha256=CpzAc9SkB-mH_dojzt1N3YgDxy8hniDrIGzSHcPDo8g,68
+mpbn-4.3.1.dist-info/top_level.txt,sha256=oe3jlFHbQ6oIXyE1q7yAAnf1m49oP_jBPUU05d71n74,11
+mpbn-4.3.1.dist-info/RECORD,,

{mpbn-4.1.dist-info → mpbn-4.3.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any