Merge branch 'sepa-multilinear-flowers' into 'master'

Implementation of flower inequalities for AND constraints and nonlinear products.

See merge request integer/scip!3406

Author: discopt

CHANGELOG

@@ -10,6 +10,8 @@ Features
 - added more techniques to handle reflection symmetries, in particular, for orbitopes with column reflections and matrices whose rows and columns can be permuted by a symmetry
 - implemented symmetry detection callbacks for cons_disjunction and cons_superindicator
 - detailed information about applied symmetry handling techniques can be printed to the terminal
+- added a new separator sepa_multilinear to generate flower cuts from AND constraints nonlinear product expressions.
+- added functionality to deal with hypergraphs by means of efficient access to vertices, edges and intersections edges.
 
 Performance improvements
 ------------------------
@@ -32,6 +34,8 @@ Interface changes
 - SCIPgetAvgDPseudocostScore(), SCIPgetVarDPseudocostScore() for computing the discounted pseudo cost scores using ancestral pseudo costs
 - SCIPboundchgGetLPSolVal() for accessing the LP solution value in the branching data of the bound change
 - SCIPclearSymgraph() and SCIPcopySymgraphAsSubgraph() to clear and copy as symmetry detection graph, respectively
+- SCIPincludeSepaMultilinear() to include the new multilinear cut separator
+- SCIPhypergraphCreate(), SCIPhypergraphClear(), SCIPhypergraphFree(), SCIPhypergraphAddVertex(), SCIPhypergraphAddEdge(), SCIPhypergraphIsValid() and SCIPhypergraphComputeVerticesEdges() for building and deleting hypergraphs, SCIPhypergraphComputeOverlaps(), SCIPhypergraphOverlapFind(), SCIPhypergraphIntersectEdges(), SCIPhypergraphComputeOverlapsEdges(), SCIPhypergraphComputeVerticesOverlaps(), SCIPhypergraphOverlapsDisjoint() to deal with pair-wise intersections of hyperedges, SCIPhypergraphIterInit(), SCIPhypergraphIterClear(), SCIPhypergraphIterStart(), SCIPhypergraphIterValid(), SCIPhypergraphIterNext(), SCIPhypergraphIterBase(), SCIPhypergraphIterAdjacent(), SCIPhypergraphIterMinVertex(), SCIPhypergraphIterOverlap() for iterating over adjacent edges, SCIPhypergraphHasVertexEdges() SCIPhypergraphHasOverlaps(), SCIPhypergraphHasOverlapsEdges(), SCIPhypergraphHasVertexOverlaps(), SCIPhypergraphGetNVertices(), SCIPhypergraphGetNEdges(), SCIPhypergraphBlkmem(), SCIPhypergraphGetNOverlaps(), SCIPhypergraphVertexData(), SCIPhypergraphEdgeData(), SCIPhypergraphEdgeSize(), SCIPhypergraphEdgeVertices(), SCIPhypergraphVertexEdgesFirst(), SCIPhypergraphVertexEdgesBeyond(), SCIPhypergraphVertexEdgesGetAtIndex(), SCIPhypergraphOverlapData(), SCIPhypergraphOverlapSize(), SCIPhypergraphOverlapVertices() SCIPhypergraphEdgesOverlapsFirst(), SCIPhypergraphEdgesOverlapsBeyond(), SCIPhypergraphEdgesOverlapsGetAtIndex(), SCIPhypergraphOverlapsEdgesFirst(), SCIPhypergraphOverlapsEdgesBeyond(), SCIPhypergraphOverlapsEdgesGetAtIndex(), SCIPhypergraphVertexOverlapsFirst(), SCIPhypergraphVertexOverlapsBeyond() and SCIPhypergraphVertexOverlapsGetAtIndex() to query information about vertices, edges and overlaps as well as their incidences.
 
 ### Command line interface
 

CMakeLists.txt

@@ -17,7 +17,7 @@ set(SCIP_VERSION_MAJOR 10)
 set(SCIP_VERSION_MINOR 0)
 set(SCIP_VERSION_PATCH 0)
 set(SCIP_VERSION_SUB 0)
-set(SCIP_VERSION_API 118)
+set(SCIP_VERSION_API 119)
 
 project(SCIP
     VERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR}.${SCIP_VERSION_PATCH}.${SCIP_VERSION_SUB}

Makefile

@@ -691,6 +691,7 @@ SCIPPLUGINLIBOBJ=	scip/benders_default.o \
 			scip/heur_veclendiving.o \
 			scip/heur_zeroobj.o \
 			scip/heur_zirounding.o \
+			scip/hypergraph.o \
 			scip/message_default.o \
 			scip/nlhdlr_bilinear.o \
 			scip/nlhdlr_convex.o \
@@ -775,6 +776,7 @@ SCIPPLUGINLIBOBJ=	scip/benders_default.o \
 			scip/sepa_mcf.o \
 			scip/sepa_minor.o \
 			scip/sepa_mixing.o \
+			scip/sepa_multilinear.o \
 			scip/sepa_oddcycle.o \
 			scip/sepa_rapidlearning.o \
 			scip/sepa_rlt.o \

make/make.project

@@ -97,7 +97,7 @@ SCIP_VERSION_MAJOR = 10
 SCIP_VERSION_MINOR = 0
 SCIP_VERSION_PATCH = 0
 SCIP_VERSION_SUB = 0
-SCIP_VERSION_API = 118
+SCIP_VERSION_API = 119
 SCIP_VERSION = $(SCIP_VERSION_MAJOR).$(SCIP_VERSION_MINOR).$(SCIP_VERSION_PATCH).$(SCIP_VERSION_SUB)
 
 # compiling and linking parameters

src/CMakeLists.txt

@@ -166,6 +166,7 @@ set(scipsources
     scip/heur_veclendiving.c
     scip/heur_zeroobj.c
     scip/heur_zirounding.c
+    scip/hypergraph.c
     scip/message_default.c
     scip/nlhdlr_bilinear.c
     scip/nlhdlr_convex.c
@@ -254,6 +255,7 @@ set(scipsources
     scip/sepa_mcf.c
     scip/sepa_minor.c
     scip/sepa_mixing.c
+    scip/sepa_multilinear.c
     scip/sepa_oddcycle.c
     scip/sepa_rapidlearning.c
     scip/sepa_rlt.c
@@ -644,6 +646,7 @@ set(scipheaders
     scip/heur_zeroobj.h
     scip/heur_zirounding.h
     scip/history.h
+    scip/hypergraph.h
     scip/implics.h
     scip/interrupt.h
     scip/intervalarith.h
@@ -858,6 +861,7 @@ set(scipheaders
     scip/sepa_mcf.h
     scip/sepa_minor.h
     scip/sepa_mixing.h
+    scip/sepa_multilinear.h
     scip/sepa_oddcycle.h
     scip/sepa_rapidlearning.h
     scip/sepa_rlt.h
@@ -888,6 +892,7 @@ set(scipheaders
     scip/struct_expr.h
     scip/struct_heur.h
     scip/struct_history.h
+    scip/struct_hypergraph.h
     scip/struct_implics.h
     scip/struct_lp.h
     scip/struct_matrix.h
@@ -951,6 +956,7 @@ set(scipheaders
     scip/type_exprinterpret.h
     scip/type_heur.h
     scip/type_history.h
+    scip/type_hypergraph.h
     scip/type_implics.h
     scip/type_interrupt.h
     scip/type_lp.h