Merge branch 'pm/iis_api' into 'master'

IIS finder: Use subscip settings instead of arguments

See merge request integer/scip!3826

Author: DominikKamp

CHANGELOG

@@ -68,6 +68,7 @@ Interface changes
 
 ### New and changed callbacks
 
+- added SCIP_DECL_IISFINDERCOPY(), SCIP_DECL_IISFINDERFREE(), and SCIP_DECL_IISFINDEREXEC() for iisfinder implementations
 - added a new callback TABLE_COLLECT for the table plugin that collects the data for the specific statistics table in a SCIP_DATATREE object
 - for a table plugin, only one of the callbacks TABLE_COLLECT or TABLE_OUTPUT needs to be implemented, but implementing both is preferred;
   if TABLE_OUTPUT is omitted, then SCIP tries to print a table from the data given by TABLE_COLLECT
@@ -135,7 +136,7 @@ Interface changes
   STO readers respectively. These readers are all used when reading an SMPS instance.
 - SCIPdialogIsHidden(), SCIPdialogSetHidden() to determine whether a dialog should be hidden in help list
 - added SCIPincludeIISfinder(), SCIPincludeIISfinderBasic(), SCIPsetIISfinderCopy(), SCIPsetIISfinderFree(), SCIPgenerateIIS(), SCIPfindIISfinder(), SCIPgetIISfinders(), SCIPgetNIISfinders(), SCIPsetIISfinderPriority(), SCIPgetIIS()
-- added SCIPiisfinderGetName(), SCIPiisfinderGetData(), SCIPiisfinderGetDesc(), SCIPiisfinderGetPriority(), SCIPiisfinderSetData(), SCIPiisfinderGetTime(), SCIPiisfinderInfoMessage(), SCIPiisGetTime(), SCIPiisIsSubscipInfeasible(), SCIPiisIsSubscipIrreducible(), SCIPiisGetNNodes(), SCIPiisSetSubscipInfeasible(), SCIPiisSetSubscipIrreducible(), SCIPiisAddNNodes(), SCIPiisGetRandnumgen(), SCIPiisGetSubscip()
+- added SCIPiisfinderGetName(), SCIPiisfinderGetData(), SCIPiisfinderGetDesc(), SCIPiisfinderGetPriority(), SCIPiisfinderSetData(), SCIPiisfinderGetTime(), SCIPiisfinderInfoMessage(), SCIPiisGetTime(), SCIPiisIsSubscipInfeasible(), SCIPiisIsSubscipIrreducible(), SCIPiisGetNNodes(), SCIPiisSetSubscipInfeasible(), SCIPiisSetSubscipIrreducible(), SCIPiisAddNNodes(), SCIPiisGetRandnumgen(), SCIPiisGetSubscip(), SCIPiisGreedyMinimize()
 - functions to create, modify, and free SCIP_DATATREE objects and to print as JSON or table (see pub_datatree.h and scip_datatree.h)
 - SCIPcollect*Statistics() for every SCIPprint*Statistics() in scip_solvingstats.h
 - SCIPprintStatisticsJson() to output a JSON string of the table statistics data

CMakeLists.txt

@@ -21,7 +21,7 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_DEBUG} ${CMAKE_CXX_FLAGS_R
 set(SCIP_VERSION_MAJOR 10)
 set(SCIP_VERSION_MINOR 0)
 set(SCIP_VERSION_PATCH 0)
-set(SCIP_VERSION_API 145)
+set(SCIP_VERSION_API 146)
 
 project(SCIP
     VERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR}.${SCIP_VERSION_PATCH}

make/make.project

@@ -97,7 +97,7 @@ CLOCKTYPE	=	1
 SCIP_VERSION_MAJOR = 10
 SCIP_VERSION_MINOR = 0
 SCIP_VERSION_PATCH = 0
-SCIP_VERSION_API = 145
+SCIP_VERSION_API = 146
 SCIP_VERSION = $(SCIP_VERSION_MAJOR).$(SCIP_VERSION_MINOR).$(SCIP_VERSION_PATCH)
 
 # compiling and linking parameters

src/objscip/objiisfinder.cpp

@@ -112,7 +112,7 @@ SCIP_DECL_IISFINDEREXEC(iisfinderExecObj)
    assert(iisfinderdata->objiisfinder != NULL);
 
    /* call virtual method of iisfinder object */
-   SCIP_CALL( iisfinderdata->objiisfinder->scip_exec(iis, iisfinder, timelim, nodelim, removebounds, silent, result) );
+   SCIP_CALL( iisfinderdata->objiisfinder->scip_exec(iis, iisfinder, result) );
 
    return SCIP_OKAY;
 }

src/scip/iisfinder.c

@@ -40,7 +40,6 @@
 #include "scip/cons_linear.h"
 #include "scip/iisfinder.h"
 #include "scip/iisfinder_greedy.h"
-
 #include "scip/struct_iisfinder.h"
 
 
@@ -73,6 +72,9 @@ SCIP_RETCODE createSubscipIIS(
    int nvars;
    int i;
 
+   assert( set != NULL );
+   assert( iis != NULL );
+
    /* Create the subscip used for storing the IIS */
    if( iis->subscip != NULL )
    {
@@ -255,26 +257,20 @@ SCIP_RETCODE SCIPiisGenerate(
    SCIP_CONS** conss;
    SCIP_VAR** vars;
    SCIP_IIS* iis;
-   int i;
-   int j;
-   int nconss;
-   int nvars;
-   int nbounds;
    SCIP_RESULT result = SCIP_DIDNOTFIND;
+   SCIP_Real timelim;
+   SCIP_Longint nodelim;
    SCIP_Bool silent;
-   SCIP_Bool removebounds;
    SCIP_Bool minimal;
    SCIP_Bool stopafterone;
    SCIP_Bool removeunusedvars;
    SCIP_Bool trivial;
    SCIP_Bool islinear;
-   SCIP_Real timelim;
-   SCIP_Longint nodelim;
-
-   /* start timing */
-   SCIP_CALL( SCIPgetRealParam(set->scip, "iis/time", &timelim) );
-   SCIP_CALL( SCIPgetLongintParam(set->scip, "iis/nodes", &nodelim) );
-   SCIP_CALL( SCIPgetBoolParam(set->scip, "iis/silent", &silent) );
+   int nconss;
+   int nvars;
+   int nbounds;
+   int i;
+   int j;
 
    /* sort the iis finders by priority */
    SCIPsetSortIISfinders(set);
@@ -284,6 +280,8 @@ SCIP_RETCODE SCIPiisGenerate(
 
    /* Create the subscip used for storing the IIS */
    SCIP_CALL( SCIPiisReset(&iis) );
+   SCIP_CALL( SCIPgetRealParam(set->scip, "iis/time", &timelim) );
+   SCIP_CALL( SCIPgetLongintParam(set->scip, "iis/nodes", &nodelim) );
    SCIP_CALL( createSubscipIIS(set, iis, timelim, nodelim) );
 
    SCIPclockStart(iis->iistime, set);
@@ -369,33 +367,33 @@ SCIP_RETCODE SCIPiisGenerate(
 
    /* Try all IIS generators */
    SCIP_CALL( SCIPgetBoolParam(set->scip, "iis/stopafterone", &stopafterone) );
-   SCIP_CALL( SCIPgetBoolParam(set->scip, "iis/removebounds", &removebounds) );
    if( !trivial )
    {
       for( i = 0; i < set->niisfinders; ++i )
       {
          SCIP_IISFINDER* iisfinder;
          iisfinder = set->iisfinders[i];
-         assert(iis != NULL);
-
-         /* Recreate the subscip if one of the IIS finder algorithms has produced an invalid infeasible subsystem */
-         if( !iis->infeasible )
-            SCIP_CALL( createSubscipIIS(set, iis, timelim - SCIPclockGetTime(iis->iistime), nodelim) );
+         assert( iis->infeasible );
 
          /* start timing */
          SCIPclockStart(iisfinder->iisfindertime, set);
 
-         SCIPdebugMsg(set->scip, "----- STARTING IIS FINDER %s -----\n", iisfinder->name);
-         SCIP_CALL( iisfinder->iisfinderexec(iis, iisfinder, timelim, nodelim, removebounds, silent, &result) );
+         SCIPdebugMsg(iis->subscip, "----- STARTING IIS FINDER %s -----\n", iisfinder->name);
+         SCIP_CALL( iisfinder->iisfinderexec(iis, iisfinder, &result) );
+         assert( result == SCIP_SUCCESS || result == SCIP_DIDNOTFIND || result == SCIP_DIDNOTRUN );
 
          /* stop timing */
          SCIPclockStop(iisfinder->iisfindertime, set);
 
-         assert( result == SCIP_SUCCESS || result == SCIP_DIDNOTFIND || result == SCIP_DIDNOTRUN );
+         /* recreate the initial subscip if the IIS finder has produced an invalid infeasible subsystem */
+         if( !iis->infeasible )
+         {
+            SCIP_CALL( createSubscipIIS(set, iis, timelim, nodelim) );
+         }
 
          if( timelim - SCIPclockGetTime(iis->iistime) <= 0 || (nodelim != -1 && iis->nnodes > nodelim) )
          {
-            SCIPdebugMsg(set->scip, "Time or node limit hit. Stopping Search.\n");
+            SCIPdebugMsg(iis->subscip, "Time or node limit hit. Stopping Search.\n");
             break;
          }
 
@@ -408,13 +406,11 @@ SCIP_RETCODE SCIPiisGenerate(
    SCIP_CALL( SCIPgetBoolParam(set->scip, "iis/minimal", &minimal) );
    if( !iis->irreducible && minimal && !(timelim - SCIPclockGetTime(iis->iistime) <= 0 || (nodelim != -1 && iis->nnodes > nodelim)) && !trivial )
    {
-      SCIPdebugMsg(set->scip, "----- STARTING GREEDY DELETION ALGORITHM WITH BATCHSIZE=1. ATTEMPT TO ENSURE IRREDUCIBILITY -----\n");
+      assert( iis->infeasible );
 
-      if( !iis->infeasible )
-         SCIP_CALL( createSubscipIIS(set, iis, timelim, nodelim) );
+      SCIPdebugMsg(iis->subscip, "----- STARTING GREEDY SINGLETON DELETION ALGORITHM. ATTEMPT TO ENSURE IRREDUCIBILITY -----\n");
 
-      SCIP_CALL( SCIPexecIISfinderGreedy(iis, timelim, nodelim, removebounds, silent, 1e+20, FALSE, TRUE, TRUE, TRUE, -1L, 1, 1.0, &result) );
-      assert( result == SCIP_SUCCESS || result == SCIP_DIDNOTFIND || result == SCIP_DIDNOTRUN );
+      SCIP_CALL( SCIPiisGreedyMinimize(iis) );
    }
 
    /* Remove redundant constraints that potentially are left over from indicator constraints,
@@ -456,6 +452,7 @@ SCIP_RETCODE SCIPiisGenerate(
       }
    }
 
+   SCIP_CALL( SCIPgetBoolParam(set->scip, "iis/silent", &silent) );
    if( !silent )
       SCIPiisfinderInfoMessage(iis, FALSE);