NUCS 2.2.0__tar.gz → 3.0.0__tar.gz

{nucs-2.2.0 → nucs-3.0.0/NUCS.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NUCS
-Version: 2.2.0
+Version: 3.0.0
 Summary: A Numpy and Numba based Python library for solving Constraint Satisfaction Problems over finite domains
 Author-email: Yan Georget <yan.georget@gmail.com>
 Project-URL: Homepage, https://github.com/yangeorget/nucs
@@ -60,11 +60,11 @@ NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.queens -n 12 --log_level=IN
 2024-11-12 17:24:49,061 - INFO - nucs.solvers.backtrack_solver - Choice points stack has a maximal height of 128
 2024-11-12 17:24:49,200 - INFO - nucs.solvers.multiprocessing_solver - MultiprocessingSolver has 1 processors
 {
-    'OPTIMIZER_SOLUTION_NB': 0,
-    'PROBLEM_FILTER_NB': 262011,
-    'PROBLEM_SHAVING_NB': 0,
-    'PROBLEM_SHAVING_CHANGE_NB': 0,
-    'PROBLEM_SHAVING_NO_CHANGE_NB': 0,
+    'ALG_BC_NB': 262011,
+    'ALG_BC_WITH_SHAVING_NB': 0,
+    'ALG_SHAVING_NB': 0,
+    'ALG_SHAVING_CHANGE_NB': 0,
+    'ALG_SHAVING_NO_CHANGE_NB': 0,
     'PROPAGATOR_ENTAILMENT_NB': 0,
     'PROPAGATOR_FILTER_NB': 2269980,
     'PROPAGATOR_FILTER_NO_CHANGE_NB': 990450,
@@ -88,11 +88,11 @@ NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.bibd -v 8 -b 14 -r 7 -k 4 -
 2024-11-12 17:26:39,734 - INFO - nucs.solvers.backtrack_solver - BacktrackSolver uses consistency algorithm 0
 2024-11-12 17:26:39,734 - INFO - nucs.solvers.backtrack_solver - Choice points stack has a maximal height of 128
 {
-    'OPTIMIZER_SOLUTION_NB': 0,
-    'PROBLEM_FILTER_NB': 1425,
-    'PROBLEM_SHAVING_NB': 0,
-    'PROBLEM_SHAVING_CHANGE_NB': 0,
-    'PROBLEM_SHAVING_NO_CHANGE_NB': 0,
+    'ALG_BC_NB': 1425,
+    'ALG_BC_WITH_SHAVING_NB': 0,
+    'ALG_SHAVING_NB': 0,
+    'ALG_SHAVING_CHANGE_NB': 0,
+    'ALG_SHAVING_NO_CHANGE_NB': 0,
     'PROPAGATOR_ENTAILMENT_NB': 4711,
     'PROPAGATOR_FILTER_NB': 104392,
     'PROPAGATOR_FILTER_NO_CHANGE_NB': 73792,
@@ -127,11 +127,11 @@ NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.golomb -n 10 --symmetry_bre
 2024-11-12 17:27:45,717 - INFO - nucs.solvers.backtrack_solver - Found a (new) solution: 60
 2024-11-12 17:27:45,977 - INFO - nucs.solvers.backtrack_solver - Found a (new) solution: 55
 {
-    'OPTIMIZER_SOLUTION_NB': 10,
-    'PROBLEM_FILTER_NB': 22652,
-    'PROBLEM_SHAVING_NB': 0,
-    'PROBLEM_SHAVING_CHANGE_NB': 0,
-    'PROBLEM_SHAVING_NO_CHANGE_NB': 0,
+    'ALG_BC_NB': 22652,
+    'ALG_BC_WITH_SHAVING_NB': 0,
+    'ALG_SHAVING_NB': 0,
+    'ALG_SHAVING_CHANGE_NB': 0,
+    'ALG_SHAVING_NO_CHANGE_NB': 0,
     'PROPAGATOR_ENTAILMENT_NB': 107911,
     'PROPAGATOR_FILTER_NB': 2813035,
     'PROPAGATOR_FILTER_NO_CHANGE_NB': 1745836,

{nucs-2.2.0 → nucs-3.0.0}/NUCS.egg-info/SOURCES.txt

@@ -11,7 +11,6 @@ nucs/__init__.py
 nucs/constants.py
 nucs/numba_helper.py
 nucs/numpy_helper.py
-nucs/statistics.py
 nucs/examples/__init__.py
 nucs/examples/alpha/__init__.py
 nucs/examples/alpha/__main__.py

{nucs-2.2.0/NUCS.egg-info → nucs-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NUCS
-Version: 2.2.0
+Version: 3.0.0
 Summary: A Numpy and Numba based Python library for solving Constraint Satisfaction Problems over finite domains
 Author-email: Yan Georget <yan.georget@gmail.com>
 Project-URL: Homepage, https://github.com/yangeorget/nucs
@@ -60,11 +60,11 @@ NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.queens -n 12 --log_level=IN
 2024-11-12 17:24:49,061 - INFO - nucs.solvers.backtrack_solver - Choice points stack has a maximal height of 128
 2024-11-12 17:24:49,200 - INFO - nucs.solvers.multiprocessing_solver - MultiprocessingSolver has 1 processors
 {
-    'OPTIMIZER_SOLUTION_NB': 0,
-    'PROBLEM_FILTER_NB': 262011,
-    'PROBLEM_SHAVING_NB': 0,
-    'PROBLEM_SHAVING_CHANGE_NB': 0,
-    'PROBLEM_SHAVING_NO_CHANGE_NB': 0,
+    'ALG_BC_NB': 262011,
+    'ALG_BC_WITH_SHAVING_NB': 0,
+    'ALG_SHAVING_NB': 0,
+    'ALG_SHAVING_CHANGE_NB': 0,
+    'ALG_SHAVING_NO_CHANGE_NB': 0,
     'PROPAGATOR_ENTAILMENT_NB': 0,
     'PROPAGATOR_FILTER_NB': 2269980,
     'PROPAGATOR_FILTER_NO_CHANGE_NB': 990450,
@@ -88,11 +88,11 @@ NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.bibd -v 8 -b 14 -r 7 -k 4 -
 2024-11-12 17:26:39,734 - INFO - nucs.solvers.backtrack_solver - BacktrackSolver uses consistency algorithm 0
 2024-11-12 17:26:39,734 - INFO - nucs.solvers.backtrack_solver - Choice points stack has a maximal height of 128
 {
-    'OPTIMIZER_SOLUTION_NB': 0,
-    'PROBLEM_FILTER_NB': 1425,
-    'PROBLEM_SHAVING_NB': 0,
-    'PROBLEM_SHAVING_CHANGE_NB': 0,
-    'PROBLEM_SHAVING_NO_CHANGE_NB': 0,
+    'ALG_BC_NB': 1425,
+    'ALG_BC_WITH_SHAVING_NB': 0,
+    'ALG_SHAVING_NB': 0,
+    'ALG_SHAVING_CHANGE_NB': 0,
+    'ALG_SHAVING_NO_CHANGE_NB': 0,
     'PROPAGATOR_ENTAILMENT_NB': 4711,
     'PROPAGATOR_FILTER_NB': 104392,
     'PROPAGATOR_FILTER_NO_CHANGE_NB': 73792,
@@ -127,11 +127,11 @@ NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.golomb -n 10 --symmetry_bre
 2024-11-12 17:27:45,717 - INFO - nucs.solvers.backtrack_solver - Found a (new) solution: 60
 2024-11-12 17:27:45,977 - INFO - nucs.solvers.backtrack_solver - Found a (new) solution: 55
 {
-    'OPTIMIZER_SOLUTION_NB': 10,
-    'PROBLEM_FILTER_NB': 22652,
-    'PROBLEM_SHAVING_NB': 0,
-    'PROBLEM_SHAVING_CHANGE_NB': 0,
-    'PROBLEM_SHAVING_NO_CHANGE_NB': 0,
+    'ALG_BC_NB': 22652,
+    'ALG_BC_WITH_SHAVING_NB': 0,
+    'ALG_SHAVING_NB': 0,
+    'ALG_SHAVING_CHANGE_NB': 0,
+    'ALG_SHAVING_NO_CHANGE_NB': 0,
     'PROPAGATOR_ENTAILMENT_NB': 107911,
     'PROPAGATOR_FILTER_NB': 2813035,
     'PROPAGATOR_FILTER_NO_CHANGE_NB': 1745836,

{nucs-2.2.0 → nucs-3.0.0}/README.md

@@ -38,11 +38,11 @@ NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.queens -n 12 --log_level=IN
 2024-11-12 17:24:49,061 - INFO - nucs.solvers.backtrack_solver - Choice points stack has a maximal height of 128
 2024-11-12 17:24:49,200 - INFO - nucs.solvers.multiprocessing_solver - MultiprocessingSolver has 1 processors
 {
-    'OPTIMIZER_SOLUTION_NB': 0,
-    'PROBLEM_FILTER_NB': 262011,
-    'PROBLEM_SHAVING_NB': 0,
-    'PROBLEM_SHAVING_CHANGE_NB': 0,
-    'PROBLEM_SHAVING_NO_CHANGE_NB': 0,
+    'ALG_BC_NB': 262011,
+    'ALG_BC_WITH_SHAVING_NB': 0,
+    'ALG_SHAVING_NB': 0,
+    'ALG_SHAVING_CHANGE_NB': 0,
+    'ALG_SHAVING_NO_CHANGE_NB': 0,
     'PROPAGATOR_ENTAILMENT_NB': 0,
     'PROPAGATOR_FILTER_NB': 2269980,
     'PROPAGATOR_FILTER_NO_CHANGE_NB': 990450,
@@ -66,11 +66,11 @@ NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.bibd -v 8 -b 14 -r 7 -k 4 -
 2024-11-12 17:26:39,734 - INFO - nucs.solvers.backtrack_solver - BacktrackSolver uses consistency algorithm 0
 2024-11-12 17:26:39,734 - INFO - nucs.solvers.backtrack_solver - Choice points stack has a maximal height of 128
 {
-    'OPTIMIZER_SOLUTION_NB': 0,
-    'PROBLEM_FILTER_NB': 1425,
-    'PROBLEM_SHAVING_NB': 0,
-    'PROBLEM_SHAVING_CHANGE_NB': 0,
-    'PROBLEM_SHAVING_NO_CHANGE_NB': 0,
+    'ALG_BC_NB': 1425,
+    'ALG_BC_WITH_SHAVING_NB': 0,
+    'ALG_SHAVING_NB': 0,
+    'ALG_SHAVING_CHANGE_NB': 0,
+    'ALG_SHAVING_NO_CHANGE_NB': 0,
     'PROPAGATOR_ENTAILMENT_NB': 4711,
     'PROPAGATOR_FILTER_NB': 104392,
     'PROPAGATOR_FILTER_NO_CHANGE_NB': 73792,
@@ -105,11 +105,11 @@ NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.golomb -n 10 --symmetry_bre
 2024-11-12 17:27:45,717 - INFO - nucs.solvers.backtrack_solver - Found a (new) solution: 60
 2024-11-12 17:27:45,977 - INFO - nucs.solvers.backtrack_solver - Found a (new) solution: 55
 {
-    'OPTIMIZER_SOLUTION_NB': 10,
-    'PROBLEM_FILTER_NB': 22652,
-    'PROBLEM_SHAVING_NB': 0,
-    'PROBLEM_SHAVING_CHANGE_NB': 0,
-    'PROBLEM_SHAVING_NO_CHANGE_NB': 0,
+    'ALG_BC_NB': 22652,
+    'ALG_BC_WITH_SHAVING_NB': 0,
+    'ALG_SHAVING_NB': 0,
+    'ALG_SHAVING_CHANGE_NB': 0,
+    'ALG_SHAVING_NO_CHANGE_NB': 0,
     'PROPAGATOR_ENTAILMENT_NB': 107911,
     'PROPAGATOR_FILTER_NB': 2813035,
     'PROPAGATOR_FILTER_NO_CHANGE_NB': 1745836,

{nucs-2.2.0 → nucs-3.0.0}/docs/source/conf.py

@@ -6,8 +6,8 @@ project = 'NUCS'
 copyright = '2024, Yan Georget'
 author = 'Yan Georget'
 
-release = '2.2.0'
-version = '2.2.0'
+release = '3.0.0'
+version = '3.0.0'
 
 # -- General configuration
 

{nucs-2.2.0 → nucs-3.0.0}/nucs/constants.py

@@ -29,8 +29,10 @@ PROBLEM_UNBOUND = 1  # returned when the filtering of a problem has been complet
 PROBLEM_BOUND = 2  # returned when a problem is solved
 
 SIGNATURE_COMPUTE_DOMAINS = int64(int32[:, :], int32[:])  # domains, parameters
-SIGNATURE_DOM_HEURISTIC = int64(int32[:], int32[:])  # shr_domain, shr_domain_copy
-SIGNATURE_VAR_HEURISTIC = int64(int32[:, :])  # shr_domains
+SIGNATURE_DOM_HEURISTIC = int64(
+    int32[:, :, :], uint16[:, :], uint8[:], int64  # shr_domains_stack  # dom_update_stack  # stacks_top  # dom_idx
+)
+SIGNATURE_VAR_HEURISTIC = int64(int32[:, :, :], uint8[:])  # shr_domains_stack, stacks_top
 SIGNATURE_CONSISTENCY_ALG = int64(
     int64[:],  # statistics
     uint8[:],  # algorithms
@@ -57,10 +59,41 @@ TYPE_CONSISTENCY_ALG = types.FunctionType(SIGNATURE_CONSISTENCY_ALG)
 
 NUMBA_DISABLE_JIT = os.getenv("NUMBA_DISABLE_JIT")
 
-LOG_FORMAT = "%(asctime)s - %(levelname)s - %(name)s - %(message)s"
+LOG_FORMAT = "%(asctime)s - %(processName)s - %(levelname)s - %(name)s - %(funcName)s - %(message)s"
 LOG_LEVEL_DEBUG = "DEBUG"
 LOG_LEVEL_INFO = "INFO"
 LOG_LEVEL_WARNING = "WARNING"
 LOG_LEVEL_ERROR = "ERROR"
 LOG_LEVEL_CRITICAL = "CRITICAL"
 LOG_LEVELS = [LOG_LEVEL_DEBUG, LOG_LEVEL_INFO, LOG_LEVEL_WARNING, LOG_LEVEL_ERROR, LOG_LEVEL_CRITICAL]
+
+STATS_MAX = 13
+(
+    STATS_IDX_ALG_BC_NB,
+    STATS_IDX_ALG_BC_WITH_SHAVING_NB,
+    STATS_IDX_ALG_SHAVING_NB,
+    STATS_IDX_ALG_SHAVING_CHANGE_NB,
+    STATS_IDX_ALG_SHAVING_NO_CHANGE_NB,
+    STATS_IDX_PROPAGATOR_ENTAILMENT_NB,
+    STATS_IDX_PROPAGATOR_FILTER_NB,
+    STATS_IDX_PROPAGATOR_FILTER_NO_CHANGE_NB,
+    STATS_IDX_PROPAGATOR_INCONSISTENCY_NB,
+    STATS_IDX_SOLVER_BACKTRACK_NB,
+    STATS_IDX_SOLVER_CHOICE_NB,
+    STATS_IDX_SOLVER_CHOICE_DEPTH,
+    STATS_IDX_SOLVER_SOLUTION_NB,
+) = tuple(range(STATS_MAX))
+
+STATS_LBL_ALG_BC_NB = "ALG_BC_NB"
+STATS_LBL_ALG_BC_WITH_SHAVING_NB = "ALG_BC_WITH_SHAVING_NB"
+STATS_LBL_ALG_SHAVING_NB = "ALG_SHAVING_NB"
+STATS_LBL_ALG_SHAVING_CHANGE_NB = "ALG_SHAVING_CHANGE_NB"
+STATS_LBL_ALG_SHAVING_NO_CHANGE_NB = "ALG_SHAVING_NO_CHANGE_NB"
+STATS_LBL_PROPAGATOR_ENTAILMENT_NB = "PROPAGATOR_ENTAILMENT_NB"
+STATS_LBL_PROPAGATOR_FILTER_NB = "PROPAGATOR_FILTER_NB"
+STATS_LBL_PROPAGATOR_FILTER_NO_CHANGE_NB = "PROPAGATOR_FILTER_NO_CHANGE_NB"
+STATS_LBL_PROPAGATOR_INCONSISTENCY_NB = "PROPAGATOR_INCONSISTENCY_NB"
+STATS_LBL_SOLVER_BACKTRACK_NB = "SOLVER_BACKTRACK_NB"
+STATS_LBL_SOLVER_CHOICE_NB = "SOLVER_CHOICE_NB"
+STATS_LBL_SOLVER_CHOICE_DEPTH = "SOLVER_CHOICE_DEPTH"
+STATS_LBL_SOLVER_SOLUTION_NB = "SOLVER_SOLUTION_NB"

{nucs-2.2.0 → nucs-3.0.0}/nucs/examples/alpha/__main__.py

@@ -18,10 +18,9 @@ from nucs.constants import LOG_LEVEL_INFO, LOG_LEVELS
 from nucs.examples.alpha.alpha_problem import AlphaProblem
 from nucs.solvers.backtrack_solver import BacktrackSolver
 from nucs.solvers.heuristics import DOM_HEURISTIC_MIN_VALUE, VAR_HEURISTIC_SMALLEST_DOMAIN
-from nucs.statistics import get_statistics
 
 # Run with the following command (the second run is much faster because the code has been compiled):
-# NUMBA_CACHE_DIR=.numba/cache PYTHONPATH=. python -m nucs.examples.alpha
+# NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.alpha
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("--log_level", choices=LOG_LEVELS, default=LOG_LEVEL_INFO)
@@ -34,5 +33,5 @@ if __name__ == "__main__":
         log_level=args.log_level,
     )
     solutions = solver.find_all()
-    print(get_statistics(solver.statistics))
+    print(solver.get_statistics())
     print(problem.solution_as_dict(solutions[0]))

{nucs-2.2.0 → nucs-3.0.0}/nucs/examples/bibd/__main__.py

@@ -18,10 +18,9 @@ from nucs.constants import LOG_LEVEL_INFO, LOG_LEVELS
 from nucs.examples.bibd.bibd_problem import BIBDProblem
 from nucs.solvers.backtrack_solver import BacktrackSolver
 from nucs.solvers.heuristics import DOM_HEURISTIC_MAX_VALUE
-from nucs.statistics import get_statistics
 
 # Run with the following command (the second run is much faster because the code has been compiled):
-# NUMBA_CACHE_DIR=.numba/cache PYTHONPATH=. python -m nucs.examples.bibd -v 8 -b 14 -r 7 -k 4 -l 3 --symmetry_breaking
+# NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.bibd -v 8 -b 14 -r 7 -k 4 -l 3 --symmetry_breaking
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("-v", type=int)
@@ -35,4 +34,4 @@ if __name__ == "__main__":
     problem = BIBDProblem(args.v, args.b, args.r, args.k, args.l, args.symmetry_breaking)
     solver = BacktrackSolver(problem, dom_heuristic_idx=DOM_HEURISTIC_MAX_VALUE, log_level=args.log_level)
     solver.solve_all()
-    print(get_statistics(solver.statistics))
+    print(solver.get_statistics())

{nucs-2.2.0 → nucs-3.0.0}/nucs/examples/donald/__main__.py

@@ -18,10 +18,9 @@ from nucs.constants import LOG_LEVEL_INFO, LOG_LEVELS
 from nucs.examples.donald.donald_problem import DonaldProblem
 from nucs.solvers.backtrack_solver import BacktrackSolver
 from nucs.solvers.heuristics import DOM_HEURISTIC_MIN_VALUE, VAR_HEURISTIC_SMALLEST_DOMAIN
-from nucs.statistics import get_statistics
 
 # Run with the following command (the second run is much faster because the code has been compiled):
-# NUMBA_CACHE_DIR=.numba/cache PYTHONPATH=. python -m nucs.examples.donald
+# NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.donald
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("--log_level", choices=LOG_LEVELS, default=LOG_LEVEL_INFO)
@@ -33,6 +32,6 @@ if __name__ == "__main__":
         dom_heuristic_idx=DOM_HEURISTIC_MIN_VALUE,
         log_level=args.log_level,
     )
-    print(get_statistics(solver.statistics))
+    print(solver.get_statistics())
     for solution in solver.solve():
         print(problem.solution_as_dict(solution))

{nucs-2.2.0 → nucs-3.0.0}/nucs/examples/golomb/__main__.py

@@ -18,10 +18,9 @@ from nucs.constants import LOG_LEVEL_INFO, LOG_LEVELS
 from nucs.examples.golomb.golomb_problem import GolombProblem, golomb_consistency_algorithm
 from nucs.solvers.backtrack_solver import BacktrackSolver
 from nucs.solvers.consistency_algorithms import register_consistency_algorithm
-from nucs.statistics import get_statistics
 
 # Run with the following command (the second run is much faster because the code has been compiled):
-# NUMBA_CACHE_DIR=.numba/cache PYTHONPATH=. python -m nucs.examples.golomb -n 10 --symmetry_breaking
+# NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.golomb -n 10 --symmetry_breaking
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("-n", type=int, default=10)
@@ -32,6 +31,6 @@ if __name__ == "__main__":
     consistency_alg_golomb = register_consistency_algorithm(golomb_consistency_algorithm)
     solver = BacktrackSolver(problem, consistency_alg_idx=consistency_alg_golomb, log_level=args.log_level)
     solution = solver.minimize(problem.length_idx)
-    print(get_statistics(solver.statistics))
+    print(solver.get_statistics())
     if solution is not None:
         print(solution[: (args.n - 1)])

{nucs-2.2.0 → nucs-3.0.0}/nucs/examples/golomb/golomb_problem.py

@@ -127,7 +127,7 @@ def golomb_consistency_algorithm(
     shr_domains_stack: NDArray,
     not_entailed_propagators_stack: NDArray,
     dom_update_stack: NDArray,
-    stacks_height: NDArray,
+    stacks_top: NDArray,
     triggered_propagators: NDArray,
     compute_domains_addrs: NDArray,
 ) -> int:
@@ -139,7 +139,7 @@ def golomb_consistency_algorithm(
     """
     # first prune the search space
     mark_nb = (1 + int(math.sqrt(8 * len(dom_indices_arr) + 1))) // 2
-    ni_var_idx = first_not_instantiated_var_heuristic(shr_domains_stack[0])  # no domains shared between vars
+    ni_var_idx = first_not_instantiated_var_heuristic(shr_domains_stack, stacks_top)  # no domains shared between vars
     if 1 < ni_var_idx < mark_nb - 1:  # otherwise useless
         used_distance = np.zeros(sum_first(mark_nb - 2) + 1, dtype=np.bool)
         # a reusable array for storing the minimal sum of different integers:
@@ -148,7 +148,7 @@ def golomb_consistency_algorithm(
         # the following will mark at most sum(n-3) numbers as used
         # hence there will be at least n-2 unused numbers greater than 0
         for var_idx in range(index(mark_nb, ni_var_idx - 2, ni_var_idx - 1) + 1):
-            dist = shr_domains_stack[0, dom_indices_arr[var_idx], MIN]  # no offset
+            dist = shr_domains_stack[stacks_top[0], dom_indices_arr[var_idx], MIN]  # no offset
             if dist < len(used_distance):
                 used_distance[dist] = True
         # let's compute the sum of non-used numbers
@@ -161,9 +161,14 @@ def golomb_consistency_algorithm(
         for i in range(ni_var_idx - 1, mark_nb - 1):
             for j in range(i + 1, mark_nb):
                 dom_idx = dom_indices_arr[index(mark_nb, i, j)]
-                shr_domains_stack[0, dom_idx, MIN] = minimal_sum[j - i]  # no offset
+                shr_domains_stack[stacks_top[0], dom_idx, MIN] = minimal_sum[j - i]  # no offset
                 add_propagators(
-                    triggered_propagators, not_entailed_propagators_stack[0], shr_domains_propagators, dom_idx, MIN
+                    triggered_propagators,
+                    not_entailed_propagators_stack,
+                    stacks_top,
+                    shr_domains_propagators,
+                    dom_idx,
+                    MIN,
                 )
     return bound_consistency_algorithm(
         statistics,
@@ -179,7 +184,7 @@ def golomb_consistency_algorithm(
         shr_domains_stack,
         not_entailed_propagators_stack,
         dom_update_stack,
-        stacks_height,
+        stacks_top,
         triggered_propagators,
         compute_domains_addrs,
     )

{nucs-2.2.0 → nucs-3.0.0}/nucs/examples/knapsack/__main__.py

@@ -18,10 +18,9 @@ from nucs.constants import LOG_LEVEL_INFO, LOG_LEVELS
 from nucs.examples.knapsack.knapsack_problem import KnapsackProblem
 from nucs.solvers.backtrack_solver import BacktrackSolver
 from nucs.solvers.heuristics import DOM_HEURISTIC_MAX_VALUE, VAR_HEURISTIC_FIRST_NOT_INSTANTIATED
-from nucs.statistics import get_statistics
 
 # Run with the following command (the second run is much faster because the code has been compiled):
-# NUMBA_CACHE_DIR=.numba/cache PYTHONPATH=. python -m nucs.examples.knapsack
+# NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.knapsack
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("--log_level", choices=LOG_LEVELS, default=LOG_LEVEL_INFO)
@@ -38,5 +37,5 @@ if __name__ == "__main__":
         log_level=args.log_level,
     )
     solution = solver.maximize(problem.weight)
-    print(get_statistics(solver.statistics))
+    print(solver.get_statistics())
     print(solution)

{nucs-2.2.0 → nucs-3.0.0}/nucs/examples/magic_sequence/__main__.py

@@ -18,10 +18,9 @@ from nucs.constants import LOG_LEVEL_INFO, LOG_LEVELS
 from nucs.examples.magic_sequence.magic_sequence_problem import MagicSequenceProblem
 from nucs.solvers.backtrack_solver import BacktrackSolver
 from nucs.solvers.heuristics import DOM_HEURISTIC_MIN_VALUE, VAR_HEURISTIC_LAST_NOT_INSTANTIATED
-from nucs.statistics import get_statistics
 
 # Run with the following command (the second run is much faster because the code has been compiled):
-# NUMBA_CACHE_DIR=.numba/cache PYTHONPATH=. python -m nucs.examples.magic_sequence -n 100
+# NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.magic_sequence -n 100
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("-n", type=int, default=100)
@@ -35,4 +34,4 @@ if __name__ == "__main__":
         log_level=args.log_level,
     )
     solver.solve_all()
-    print(get_statistics(solver.statistics))
+    print(solver.get_statistics())

{nucs-2.2.0 → nucs-3.0.0}/nucs/examples/magic_square/__main__.py

@@ -18,10 +18,9 @@ from nucs.constants import LOG_LEVEL_INFO, LOG_LEVELS
 from nucs.examples.magic_square.magic_square_problem import MagicSquareProblem
 from nucs.solvers.backtrack_solver import BacktrackSolver
 from nucs.solvers.heuristics import DOM_HEURISTIC_MAX_VALUE, VAR_HEURISTIC_SMALLEST_DOMAIN
-from nucs.statistics import get_statistics
 
 # Run with the following command (the second run is much faster because the code has been compiled):
-# NUMBA_CACHE_DIR=.numba/cache PYTHONPATH=. python -m nucs.examples.magic_square -n 4 --symmetry_breaking
+# NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.magic_square -n 4 --symmetry_breaking
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("-n", type=int)
@@ -36,4 +35,4 @@ if __name__ == "__main__":
         log_level=args.log_level,
     )
     solver.solve_all()
-    print(get_statistics(solver.statistics))
+    print(solver.get_statistics())

{nucs-2.2.0 → nucs-3.0.0}/nucs/examples/quasigroup/__main__.py

@@ -18,10 +18,9 @@ from nucs.constants import LOG_LEVEL_INFO, LOG_LEVELS
 from nucs.examples.quasigroup.quasigroup_problem import Quasigroup5Problem
 from nucs.solvers.backtrack_solver import BacktrackSolver
 from nucs.solvers.heuristics import DOM_HEURISTIC_MIN_VALUE, VAR_HEURISTIC_SMALLEST_DOMAIN
-from nucs.statistics import get_statistics
 
 # Run with the following command (the second run is much faster because the code has been compiled):
-# NUMBA_CACHE_DIR=.numba/cache PYTHONPATH=. python -m nucs.examples.quasigroup -n 10 --symmetry_breaking
+# NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.quasigroup -n 10 --symmetry_breaking
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("-n", type=int, default=10)
@@ -36,4 +35,4 @@ if __name__ == "__main__":
         log_level=args.log_level,
     )
     solver.solve_all()
-    print(get_statistics(solver.statistics))
+    print(solver.get_statistics())

{nucs-2.2.0 → nucs-3.0.0}/nucs/examples/queens/__main__.py

@@ -20,10 +20,9 @@ from nucs.solvers.backtrack_solver import BacktrackSolver
 from nucs.solvers.consistency_algorithms import CONSISTENCY_ALG_BC, CONSISTENCY_ALG_SHAVING
 from nucs.solvers.heuristics import VAR_HEURISTIC_FIRST_NOT_INSTANTIATED, VAR_HEURISTIC_SMALLEST_DOMAIN
 from nucs.solvers.multiprocessing_solver import MultiprocessingSolver
-from nucs.statistics import get_statistics
 
 # Run with the following command (the second run is much faster because the code has been compiled):
-# NUMBA_CACHE_DIR=.numba/cache PYTHONPATH=. python -m nucs.examples.queens -n 10
+# NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.queens -n 10
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("-n", type=int, default=10)
@@ -33,17 +32,27 @@ if __name__ == "__main__":
     parser.add_argument("--ff", type=bool, action=argparse.BooleanOptionalAction, default=False)
     args = parser.parse_args()
     problem = QueensProblem(args.n)
-    problems = problem.split(args.processors, 0)
-    solver = MultiprocessingSolver(
-        [
-            BacktrackSolver(
-                problem,
-                consistency_alg_idx=CONSISTENCY_ALG_SHAVING if args.shaving else CONSISTENCY_ALG_BC,
-                var_heuristic_idx=VAR_HEURISTIC_SMALLEST_DOMAIN if args.ff else VAR_HEURISTIC_FIRST_NOT_INSTANTIATED,
-                log_level=args.log_level,
-            )
-            for problem in problems
-        ]
+    solver = (
+        MultiprocessingSolver(
+            [
+                BacktrackSolver(
+                    problem,
+                    consistency_alg_idx=CONSISTENCY_ALG_SHAVING if args.shaving else CONSISTENCY_ALG_BC,
+                    var_heuristic_idx=(
+                        VAR_HEURISTIC_SMALLEST_DOMAIN if args.ff else VAR_HEURISTIC_FIRST_NOT_INSTANTIATED
+                    ),
+                    log_level=args.log_level,
+                )
+                for problem in problem.split(args.processors, 0)
+            ]
+        )
+        if args.processors > 1
+        else BacktrackSolver(
+            problem,
+            consistency_alg_idx=CONSISTENCY_ALG_SHAVING if args.shaving else CONSISTENCY_ALG_BC,
+            var_heuristic_idx=VAR_HEURISTIC_SMALLEST_DOMAIN if args.ff else VAR_HEURISTIC_FIRST_NOT_INSTANTIATED,
+            log_level=args.log_level,
+        )
     )
     solver.solve_all()
-    print(get_statistics(solver.statistics))
+    print(solver.get_statistics())

{nucs-2.2.0 → nucs-3.0.0}/nucs/examples/schur_lemma/__main__.py

@@ -17,10 +17,9 @@ from rich import print
 from nucs.constants import LOG_LEVEL_INFO, LOG_LEVELS
 from nucs.examples.schur_lemma.schur_lemma_problem import SchurLemmaProblem
 from nucs.solvers.backtrack_solver import BacktrackSolver
-from nucs.statistics import get_statistics
 
 # Run with the following command (the second run is much faster because the code has been compiled):
-# NUMBA_CACHE_DIR=.numba/cache PYTHONPATH=. python -m nucs.examples.schur_lemma -n 20 --symmetry_breaking
+# NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.schur_lemma -n 20 --symmetry_breaking
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("-n", type=int, default=20)
@@ -30,4 +29,4 @@ if __name__ == "__main__":
     problem = SchurLemmaProblem(args.n, args.symmetry_breaking)
     solver = BacktrackSolver(problem, log_level=args.log_level)
     solver.solve_all()
-    print(get_statistics(solver.statistics))
+    print(solver.get_statistics())

{nucs-2.2.0 → nucs-3.0.0}/nucs/examples/sports_tournament_scheduling/__main__.py

@@ -20,10 +20,9 @@ from nucs.examples.sports_tournament_scheduling.sports_tournament_scheduling_pro
 )
 from nucs.solvers.backtrack_solver import BacktrackSolver
 from nucs.solvers.heuristics import DOM_HEURISTIC_MIN_VALUE, VAR_HEURISTIC_SMALLEST_DOMAIN
-from nucs.statistics import get_statistics
 
 # Run with the following command (the second run is much faster because the code has been compiled):
-# NUMBA_CACHE_DIR=.numba/cache PYTHONPATH=. python -m nucs.examples.sports_tournament_scheduling -n 8
+# NUMBA_CACHE_DIR=.numba/cache python -m nucs.examples.sports_tournament_scheduling -n 8
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("-n", type=int, default=8)
@@ -38,6 +37,6 @@ if __name__ == "__main__":
         log_level=args.log_level,
     )
     solution = next(solver.solve())
-    print(get_statistics(solver.statistics))
+    print(solver.get_statistics())
     if solution is not None:
         print(problem.solution_as_matrix(solution))

{nucs-2.2.0 → nucs-3.0.0}/nucs/propagators/propagators.py

@@ -141,13 +141,15 @@ def pop_propagator(triggered_propagators: NDArray, previous_prop_idx: int) -> in
 @njit(cache=True)
 def add_propagators(
     triggered_propagators: NDArray,
-    not_entailed_propagators: NDArray,
+    not_entailed_propagators_stack: NDArray,
+    stacks_top: NDArray,
     shr_domains_propagators: NDArray,
     dom_idx: int,
     bound: int,
 ) -> None:
+    cp_top_idx = stacks_top[0]
     for prop_idx in range(len(triggered_propagators)):
-        if shr_domains_propagators[dom_idx, bound, prop_idx] and not_entailed_propagators[prop_idx]:
+        if shr_domains_propagators[dom_idx, bound, prop_idx] and not_entailed_propagators_stack[cp_top_idx, prop_idx]:
             triggered_propagators[prop_idx] = True
     # np.logical_or(triggered_propagators, shr_domains_propagators[dom_idx, bound], triggered_propagators)
     # np.logical_and(triggered_propagators, not_entailed_propagators, triggered_propagators)