merge conjunction, disjunction into master

Author: ctdunc

CHANGELOG.md

@@ -3,6 +3,9 @@
 ## Unreleased
 ### Added
 - Added check for pt_PT locale in test_model.py
+- Added methods for creating/adding/appending conjunction constraints
+- Added methods for creating expression constraints without adding to problem
+- Added methods for creating/adding/appending disjunction constraints
 ### Fixed
 ### Changed
 ### Removed

src/pyscipopt/scip.pxd

@@ -1507,10 +1507,27 @@ cdef extern from "scip/cons_disjunction.h":
                                             SCIP_Bool local,
                                             SCIP_Bool modifiable,
                                             SCIP_Bool dynamic)
+
     SCIP_RETCODE SCIPaddConsElemDisjunction(SCIP *scip,
                                             SCIP_CONS *cons,
                                             SCIP_CONS *addcons)
 
+cdef extern from "scip/cons_conjunction.h":
+    SCIP_RETCODE SCIPcreateConsConjunction(SCIP *scip,
+                                            SCIP_CONS **cons,
+                                            const char *name,
+                                            int nconss,
+                                            SCIP_CONS **conss,
+                                            SCIP_Bool enforce,
+                                            SCIP_Bool check,
+                                            SCIP_Bool local,
+                                            SCIP_Bool modifiable,
+                                            SCIP_Bool dynamic)
+
+    SCIP_RETCODE SCIPaddConsElemConjunction(SCIP *scip,
+                                            SCIP_CONS *cons,
+                                            SCIP_CONS *addcons)
+     
 cdef extern from "scip/cons_and.h":
     SCIP_RETCODE SCIPcreateConsAnd(SCIP* scip,
                                          SCIP_CONS** cons,