Feature: Merge Expr and GenExpr

examples/finished/logical.py

@@ -21,7 +21,7 @@
 def printFunc(name, m):
     """prints results"""
     print("* %s *" % name)
-    objSet = bool(m.getObjective().terms.keys())
+    objSet = bool(m.getObjective().children.keys())
     print("* Is objective set? %s" % objSet)
     if objSet:
         print("* Sense: %s" % m.getObjectiveSense())

examples/tutorial/logical.py

@@ -24,7 +24,7 @@ def _init():
 def _optimize(name, m):
     m.optimize()
     print("* %s constraint *" % name)
-    objSet = bool(m.getObjective().terms.keys())
+    objSet = bool(m.getObjective().children.keys())
     print("* Is objective set? %s" % objSet)
     if objSet:
         print("* Sense: %s" % m.getObjectiveSense())

setup.py

@@ -1,5 +1,9 @@
-from setuptools import find_packages, setup, Extension
-import os, platform, sys
+import os
+import platform
+import sys
+
+import numpy as np
+from setuptools import Extension, find_packages, setup
 
 # look for environment variable that specifies path to SCIP
 scipoptdir = os.environ.get("SCIPOPTDIR", "").strip('"')
@@ -112,7 +116,7 @@
     Extension(
         "pyscipopt.scip",
         [os.path.join(packagedir, "scip%s" % ext)],
-        include_dirs=includedirs,
+        include_dirs=includedirs + [np.get_include()],
         library_dirs=[libdir],
         libraries=[libname],
         extra_compile_args=extra_compile_args,
@@ -122,7 +126,14 @@
 ]
 
 if use_cython:
-    extensions = cythonize(extensions, compiler_directives={"language_level": 3, "linetrace": compile_with_line_tracing})
+    extensions = cythonize(
+        extensions,
+        compiler_directives={
+            "binding": True,
+            "language_level": 3,
+            "linetrace": compile_with_line_tracing,
+        },
+    )
 
 with open("README.md") as f:
     long_description = f.read()