From f7e5cbb75b85dec176ee296b1de444825fcbcd5c Mon Sep 17 00:00:00 2001 From: Wout Date: Mon, 4 Mar 2024 10:21:38 +0100 Subject: [PATCH] Is bool boolval (#456) * add BoolVal to check * delete unnecessary linebreaks * remove unused import --- cpmpy/expressions/utils.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cpmpy/expressions/utils.py b/cpmpy/expressions/utils.py index 9b0310773..a42e88c82 100644 --- a/cpmpy/expressions/utils.py +++ b/cpmpy/expressions/utils.py @@ -24,15 +24,16 @@ import numpy as np import math -from collections.abc import Iterable # for _flatten -from itertools import chain, combinations +from collections.abc import Iterable # for flatten +from itertools import combinations from cpmpy.exceptions import IncompleteFunctionError def is_bool(arg): """ is it a boolean (incl numpy variants) """ - return isinstance(arg, (bool, np.bool_)) + from cpmpy import BoolVal + return isinstance(arg, (bool, np.bool_, BoolVal)) def is_int(arg):