Merge remote-tracking branch 'origin/v10-minor'

Author: scip-ci

CHANGELOG

@@ -80,6 +80,8 @@ Fixed bugs
 - fixed bug with changing the type of the slack variable in indicator constraints while copying
 - removed unnecessary explicit linking against gmp for unittests for exact solving mode
 - fixed that parameters passed on as variadic arguments to SCIPsolveNLP() and SCIPsolveNlpi() were ignored when compiling with MS compilers without -Zc:preprocessor
+- make more CONOPT output available when verbosity level is set to 2
+- turn off detection of definitional constraints in CONOPT for now, to work around a related issue in CONOPT 4.39.0
 
 Miscellaneous
 -------------

src/scip/nlpi_conopt.c

@@ -226,7 +226,7 @@ static int COI_CALLCONV ReadMatrix(
    int                   VSTA[],             /**< initial status values for the variable (used if coidef_inistat() was called with IniStat = 1 or 2) */
    int                   TYPE[],             /**< constraint types (equation, inequality, free) */
    double                RHS[],              /**< right hand sides values of constraints (default is zero) */
-   int                   ESTA[],             /**<initial status values for constraint slacks (used if coidef_inistat() was called with IniStat = 1 or 2) */
+   int                   ESTA[],             /**< initial status values for constraint slacks (used if coidef_inistat() was called with IniStat = 1 or 2) */
    int                   COLSTA[],           /**< starting indices of Jacobian columns in ROWNO */
    int                   ROWNO[],            /**< row numbers of Jacobian nonzeros */
    double                VALUE[],            /**< values of the Jacobian elements (defined for all constant Jacobian elements) */
@@ -469,28 +469,37 @@ static int COI_CALLCONV ReadMatrix(
 
 #ifdef STRUCTURE_DEBUG
    SCIPdebugMsg(scip, "Jacobian structure information:\n");
-   SCIPdebugMsg(scip, "COLSTA =\n");
+   SCIPdebugMsg(scip, "COLSTA = ");
    for( int i = 0; i <= NUMVAR; i++ )
-      printf("%d, ", COLSTA[i]);
-   printf("\n");
+      SCIPdebugMsgPrint(scip, "%d, ", i, COLSTA[i]);
+   SCIPdebugMsgPrint(scip, "\n");
 
-   SCIPdebugMsg(scip, "ROWNO =\n");
+   SCIPdebugMsg(scip, "ROWNO = ");
    for( int i = 0; i < NUMNZ; i++ )
-      printf("%d, ", ROWNO[i]);
-   printf("\n");
+      SCIPdebugMsgPrint(scip, "%d, ", i, ROWNO[i]);
+   SCIPdebugMsgPrint(scip, "\n");
 
-   SCIPdebugMsg(scip, "NLFLAG =\n");
+   SCIPdebugMsg(scip, "NLFLAG = ");
    for( int i = 0; i < NUMNZ; i++ )
-      printf("%d, ", NLFLAG[i]);
-   printf("\n");
+      SCIPdebugMsgPrint(scip, "%d, ", NLFLAG[i]);
+   SCIPdebugMsgPrint(scip, "\n");
 
-   SCIPdebugMsg(scip, "VALUE =\n");
+   SCIPdebugMsg(scip, "VALUE = ");
    for( int i = 0; i < NUMNZ; i++ )
-      if( SCIPisInfinity(scip, VALUE[i]) )
-         printf("inf, ");
+      if( VALUE[i] == 1.234e34 )  /*lint !e777*/  /* CONOPT's special value for "undefined" */
+         SCIPdebugMsgPrint(scip, "undef, ");
       else
-         printf("%g, ", VALUE[i]);
-   printf("\n");
+         SCIPdebugMsgPrint(scip, "%g, ", VALUE[i]);
+   SCIPdebugMsgPrint(scip, "\n");
+   /*
+   for( int i = 0; i < NUMVAR; i++ )
+   {
+      SCIPdebugMsg(scip, "var %d:", i);
+      for( int j = COLSTA[i]; j < COLSTA[i+1]; ++j )
+         SCIPdebugMsgPrint(scip, " %d", ROWNO[j]);
+      SCIPdebugMsgPrint(scip, "\n");
+   }
+   */
    fflush(stdout);
 #endif
 
@@ -510,11 +519,20 @@ static int COI_CALLCONV Message(
 
    assert(problem != NULL);
    assert(problem->scip != NULL);
+   assert(NMSG <= DMSG);  /* conopt docu says that NMSG is always <= DMSG */
 
-   if( problem->verblevel > 0 )
+   switch( problem->verblevel )
    {
-      for( int i = 0; i < SMSG; i++ )
-         SCIPinfoMessage(problem->scip, NULL, "%s\n", MSGV[i]);
+      case 0:
+         break;
+      case 1:
+         for( int i = 0; i < SMSG; i++ )
+            SCIPinfoMessage(problem->scip, NULL, "%s\n", MSGV[i]);
+         break;
+      default:
+         for( int i = 0; i < SMSG || i < DMSG; i++ )
+            SCIPinfoMessage(problem->scip, NULL, "%s\n", MSGV[i]);
+         break;
    }
 
    return 0;
@@ -748,6 +766,10 @@ static int COI_CALLCONV Option(
          strcpy(NAME, "RTREDG");
          *RVAL = problem->opttol;
          break;
+      case 2: /* turn definitional constraints off for now (conopt#103) */
+         strcpy(NAME, "Flg_NoDefc");
+         *LVAL = 1;
+         break;
       default:
          *NAME = '\0';
    }

src/scip/presol_milp.cpp

@@ -428,9 +428,6 @@ SCIP_RETCODE setupPresolve(
    }
 #endif
 
-
-
-
    /* exhaustive presolvers*/
    presolve.addPresolveMethod( uptr( new ImplIntDetection<T>() ) );
    if( data->enabledualinfer )
@@ -447,7 +444,7 @@ SCIP_RETCODE setupPresolve(
       {
          probing->set_max_badge_size( data->maxbadgesizepar );
       }
-#if PAPILO_API_VERSION >= 12
+#if PAPILO_APIVERSION >= 12
       // TODO: enable this after performance test. On MIPLIB this brought 3% on instances with cliques.
       probing->set_numcliquefails(0);
 #endif

src/scip/scip_iisfinder.c

@@ -208,7 +208,7 @@ SCIP_RETCODE SCIPsetIISfinderPriority(
    return SCIP_OKAY;
 }
 
-/** Gets the IIS.
+/** Gets the IIS storage.
  *
  *  @return the \ref SCIP_IIS iis storage.
  *