Use PyNumber_Check for numeric type checks

Author: Zeroto521

src/pyscipopt/expr.pxi

@@ -48,6 +48,7 @@ from typing import TYPE_CHECKING, Union
 import numpy as np
 
 from cpython.dict cimport PyDict_Next, PyDict_GetItem
+from cpython.number cimport PyNumber_Check
 from cpython.object cimport Py_LE, Py_EQ, Py_GE, Py_TYPE
 from cpython.ref cimport PyObject
 from cpython.tuple cimport PyTuple_GET_ITEM
@@ -63,15 +64,15 @@ def _expr_richcmp(self: Union[Expr, GenExpr], other, int op):
         return NotImplemented
 
     if op == Py_LE:
-        if isinstance(other, NUMBER_TYPES):
+        if PyNumber_Check(other):
             return ExprCons(self, rhs=float(other))
         return (self - other) <= 0.0
     elif op == Py_GE:
-        if isinstance(other, NUMBER_TYPES):
+        if PyNumber_Check(other):
             return ExprCons(self, lhs=float(other))
         return (self - other) >= 0.0
     elif op == Py_EQ:
-        if isinstance(other, NUMBER_TYPES):
+        if PyNumber_Check(other):
             return ExprCons(self, lhs=float(other), rhs=float(other))
         return (self - other) == 0.0
     raise NotImplementedError("can only support with '<=', '>=', or '=='")
@@ -163,7 +164,7 @@ def buildGenExprObj(expr: Union[int, float, Expr, GenExpr]) -> GenExpr:
     if not isinstance(expr, GENEXPR_OP_TYPES):
         raise TypeError(f"Unsupported type {type(expr)}")
 
-    if isinstance(expr, NUMBER_TYPES):
+    if PyNumber_Check(expr):
         return Constant(expr)
 
     elif isinstance(expr, Expr):
@@ -223,7 +224,7 @@ cdef class Expr:
             # merge the terms by component-wise addition
             for v,c in right.terms.items():
                 terms[v] = terms.get(v, 0.0) + c
-        elif isinstance(right, NUMBER_TYPES):
+        elif PyNumber_Check(right):
             c = float(right)
             terms[CONST] = terms.get(CONST, 0.0) + c
         return Expr(terms)
@@ -235,7 +236,7 @@ cdef class Expr:
         if isinstance(other, Expr):
             for v,c in other.terms.items():
                 self.terms[v] = self.terms.get(v, 0.0) + c
-        elif isinstance(other, NUMBER_TYPES):
+        elif PyNumber_Check(other):
             c = float(other)
             self.terms[CONST] = self.terms.get(CONST, 0.0) + c
         return self
@@ -244,7 +245,7 @@ cdef class Expr:
         if not isinstance(other, EXPR_OP_TYPES):
             return NotImplemented
 
-        if isinstance(other, NUMBER_TYPES):
+        if PyNumber_Check(other):
             f = float(other)
             return Expr({v: f * c for v, c in self.terms.items()})
 
@@ -273,7 +274,7 @@ cdef class Expr:
         if not isinstance(other, EXPR_OP_TYPES):
             return NotImplemented
 
-        if isinstance(other, NUMBER_TYPES):
+        if PyNumber_Check(other):
             return 1.0 / other * self
         return buildGenExprObj(self) / other
 
@@ -299,7 +300,7 @@ cdef class Expr:
         Implements base**x as scip.exp(x * scip.log(base)).
         Note: base must be positive.
         """
-        if not isinstance(other, NUMBER_TYPES):
+        if not PyNumber_Check(other):
             raise TypeError(f"Unsupported base type {type(other)} for exponentiation.")
         if other <= 0.0:
             raise ValueError("Base of a**x must be positive, as expression is reformulated to scip.exp(x * scip.log(a)); got %g" % other)
@@ -385,7 +386,7 @@ cdef class ExprCons:
 
     def __richcmp__(self, other, op):
         '''turn it into a constraint'''
-        if not isinstance(other, NUMBER_TYPES):
+        if not PyNumber_Check(other):
             raise TypeError('Ranged ExprCons is not well defined!')
 
         if op == 1: # <=
@@ -593,7 +594,7 @@ cdef class GenExpr:
         Implements base**x as scip.exp(x * scip.log(base)). 
         Note: base must be positive.
         """
-        if not isinstance(other, NUMBER_TYPES):
+        if not PyNumber_Check(other):
             raise TypeError(f"Unsupported base type {type(other)} for exponentiation.")
         if other <= 0.0:
             raise ValueError("Base of a**x must be positive, as expression is reformulated to scip.exp(x * scip.log(a)); got %g" % other)
@@ -864,6 +865,5 @@ def expr_to_array(expr, nodes):
     return len(nodes) - 1
 
 
-cdef tuple NUMBER_TYPES = (int, float, np.number)
-cdef tuple EXPR_OP_TYPES = NUMBER_TYPES + (Expr,)
+cdef tuple EXPR_OP_TYPES = (int, float, np.number, Expr)
 cdef tuple GENEXPR_OP_TYPES = EXPR_OP_TYPES + (GenExpr,)