fix style

Author: yangeorget

nucs/heaps.py

@@ -32,9 +32,10 @@ def min_heap_init(capacity: int) -> NDArray:
 @njit(cache=True)
 def min_heap_add(heap: NDArray, capacity: int, val: int) -> None:
     if heap[capacity + val] == 0:
-        heap[heap[-1]] = val
-        min_heap_up(heap, heap[-1])
-        heap[-1] += 1
+        size = heap[-1]
+        heap[size] = val
+        min_heap_up(heap, size)
+        heap[-1] = size + 1
         heap[capacity + val] = 1
 
 
@@ -65,7 +66,7 @@ def min_heap_up(heap: NDArray, pos: int) -> None:
     while pos > 0:
         father = (pos - 1) >> 1
         if heap[father] <= heap[pos]:
-            break
+            return
         min_heap_swap(heap, pos, father)
         pos = father
 
@@ -75,13 +76,14 @@ def min_heap_down(heap: NDArray, pos: int) -> None:
     """
     Non-recursive version because of a Numba bug.
     """
+    size = heap[-1]
     while True:
         left = (pos << 1) + 1
-        if left >= heap[-1]:
-            break
+        if left >= size:
+            return
         right = left + 1
-        smallest = right if right < heap[-1] and heap[right] < heap[left] else left
+        smallest = right if right < size and heap[right] < heap[left] else left
         if heap[pos] <= heap[smallest]:
-            break
+            return
         min_heap_swap(heap, pos, smallest)
         pos = smallest

nucs/propagators/propagators.py

@@ -214,17 +214,32 @@ def reset_triggered_propagators(triggered_propagators: NDArray, propagator_nb: i
 
 
 @njit(cache=True)
-def update_propagators(
+def update_propagators_with_previous_prop(
     propagator_nb: int,
     triggered_propagators: NDArray,
     not_entailed_propagators: NDArray,
     triggers: NDArray,
     events: int,
     variable: int,
-    previous_prop_idx: int = -1,
+    previous_prop_idx: int,
 ) -> None:
     for prop_idx in triggers[variable, events]:
         if prop_idx == -1:
-            break
+            return
         if not_entailed_propagators[prop_idx] and prop_idx != previous_prop_idx:
             min_heap_add(triggered_propagators, propagator_nb, prop_idx)
+
+
+def update_propagators(
+    propagator_nb: int,
+    triggered_propagators: NDArray,
+    not_entailed_propagators: NDArray,
+    triggers: NDArray,
+    events: int,
+    variable: int,
+) -> None:
+    for prop_idx in triggers[variable, events]:
+        if prop_idx == -1:
+            return
+        if not_entailed_propagators[prop_idx]:
+            min_heap_add(triggered_propagators, propagator_nb, prop_idx)

nucs/solvers/bound_consistency_algorithm.py

@@ -38,7 +38,7 @@
 )
 from nucs.heaps import min_heap_pop
 from nucs.numba_helper import function_from_address
-from nucs.propagators.propagators import COMPUTE_DOMAINS_FCTS, update_propagators
+from nucs.propagators.propagators import COMPUTE_DOMAINS_FCTS, update_propagators_with_previous_prop
 from nucs.solvers.solver import is_solved
 
 
@@ -118,7 +118,7 @@ def bound_consistency_algorithm(
             if events:
                 if domain_min == domain_max:
                     events |= EVENT_MASK_GROUND
-                update_propagators(
+                update_propagators_with_previous_prop(
                     propagator_nb,
                     triggered_propagators,
                     not_entailed_propagators_stk[top],