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

Author: scip-ci

CHANGELOG

@@ -71,6 +71,8 @@ Fixed bugs
 - avoid crash when initial IIS solve fails while reporting errors explicitly
 - fixed failure in nl writing on big endian machines
 - correct memory reallocation in storeSubproblemMasterVar() of benders.c to avoid freeing errors
+- also set real solution in SCIPsolSetValExact() to maintain approximation
+- handle exact solutions in SCIPsolCheckOrig(), SCIPcheckSolOrig(), and SCIPrecomputeSolObj() to correctly check exact initial solutions in SCIPtransformProb()
 
 Miscellaneous
 -------------

src/scip/scip_sol.c

@@ -2069,6 +2069,7 @@ void SCIPgetSolTransObjExact(
  *          SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.
  *
  *  @pre This method can be called if SCIP is in one of the following stages:
+ *       - \ref SCIP_STAGE_TRANSFORMED
  *       - \ref SCIP_STAGE_PRESOLVING
  *       - \ref SCIP_STAGE_SOLVING
  *
@@ -2082,9 +2083,12 @@ SCIP_RETCODE SCIPrecomputeSolObj(
    assert(sol != NULL);
    assert(sol->scip == scip);
 
-   SCIP_CALL( SCIPcheckStage(scip, "SCIPrecomputeSolObj", FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE) );
+   SCIP_CALL( SCIPcheckStage(scip, "SCIPrecomputeSolObj", FALSE, FALSE, FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE) );
 
-   SCIPsolRecomputeObj(sol, scip->set, scip->stat, scip->origprob);
+   if( SCIPsolIsExact(sol) )
+      SCIPsolRecomputeInternObjExact(sol, scip->set, scip->stat, scip->origprob);
+   else
+      SCIPsolRecomputeObj(sol, scip->set, scip->stat, scip->origprob);
 
    return SCIP_OKAY;
 }

src/scip/scip_sol.h

@@ -802,6 +802,7 @@ void SCIPgetSolTransObjExact(
  *          SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.
  *
  *  @pre This method can be called if SCIP is in one of the following stages:
+ *       - \ref SCIP_STAGE_TRANSFORMED
  *       - \ref SCIP_STAGE_PRESOLVING
  *       - \ref SCIP_STAGE_SOLVING
  *

src/scip/scip_solve.c

@@ -322,7 +322,7 @@ SCIP_RETCODE SCIPtransformProb(
          sol =  scip->origprimal->sols[s];
 
          /* recompute objective function, since the objective might have changed in the meantime */
-         SCIPsolRecomputeObj(sol, scip->set, scip->stat, scip->origprob);
+         SCIP_CALL( SCIPrecomputeSolObj(scip, sol) );
 
          /* SCIPprimalTrySol() can only be called on transformed solutions; therefore check solutions in original problem
           * including modifiable constraints
@@ -333,27 +333,20 @@ SCIP_RETCODE SCIPtransformProb(
 
          if( feasible )
          {
-            SCIP_Real abssolobj;
+            SCIP_SOL* bestsol = SCIPgetBestSol(scip);
+            SCIP_Bool stored;
 
-            abssolobj = REALABS(SCIPsolGetObj(sol, scip->set, scip->transprob, scip->origprob));
+            /* add primal solution to solution storage by copying it */
+            SCIP_CALL( SCIPprimalAddSol(scip->primal, scip->mem->probmem, scip->set, scip->messagehdlr, scip->stat,
+                  scip->origprob, scip->transprob, scip->tree, scip->reopt, scip->lp, scip->eventqueue,
+                  scip->eventfilter, sol, &stored) );
 
-            /* we do not want to add solutions with objective value +infinity */
-            if( !SCIPisInfinity(scip, abssolobj) )
+            if( stored )
             {
-               SCIP_SOL* bestsol = SCIPgetBestSol(scip);
-               SCIP_Bool stored;
+               nfeassols++;
 
-               /* add primal solution to solution storage by copying it */
-               SCIP_CALL( SCIPprimalAddSol(scip->primal, scip->mem->probmem, scip->set, scip->messagehdlr, scip->stat, scip->origprob, scip->transprob,
-                     scip->tree, scip->reopt, scip->lp, scip->eventqueue, scip->eventfilter, sol, &stored) );
-
-               if( stored )
-               {
-                  nfeassols++;
-
-                  if( bestsol != SCIPgetBestSol(scip) )
-                     SCIPstoreSolutionGap(scip);
-               }
+               if( bestsol != SCIPgetBestSol(scip) )
+                  SCIPstoreSolutionGap(scip);
             }
          }
 

src/scip/sol.c

@@ -1755,7 +1755,7 @@ SCIP_RETCODE SCIPsolSetValExact(
          }
 
          SCIPrationalFreeBuffer(set->buffer, &oldval);
-         return SCIP_OKAY;
+         break;
       }
       else
          return SCIPsolSetValExact(sol, set, stat, tree, SCIPvarGetTransVar(var), val);
@@ -1777,7 +1777,7 @@ SCIP_RETCODE SCIPsolSetValExact(
       }
 
       SCIPrationalFreeBuffer(set->buffer, &oldval);
-      return SCIP_OKAY;
+      break;
 
    case SCIP_VARSTATUS_FIXED:
       assert(sol->solorigin != SCIP_SOLORIGIN_ORIGINAL);
@@ -1787,7 +1787,7 @@ SCIP_RETCODE SCIPsolSetValExact(
             SCIPvarGetName(var), SCIPrationalGetReal(SCIPvarGetLbGlobalExact(var)), SCIPrationalGetReal(val));
          return SCIP_INVALIDDATA;
       }
-      return SCIP_OKAY;
+      break;
 
    case SCIP_VARSTATUS_AGGREGATED: /* x = a*y + c  =>  y = (x-c)/a */
       assert(!SCIPrationalIsZero(SCIPvarGetAggrScalarExact(var)));
@@ -1819,13 +1819,17 @@ SCIP_RETCODE SCIPsolSetValExact(
 
    case SCIP_VARSTATUS_NEGATED:
       assert(!SCIPsetIsInfinity(set, SCIPvarGetNegationConstant(var)) && !SCIPsetIsInfinity(set, -SCIPvarGetNegationConstant(var)));
-
       return SCIPsolSetValExact(sol, set, stat, tree, SCIPvarGetNegationVar(var), val);
 
    default:
       SCIPerrorMessage("unknown variable status\n");
       return SCIP_INVALIDDATA;
    }
+
+   /* set real approximation */
+   SCIP_CALL( SCIPsolSetVal(sol, set, stat, tree, var, SCIPrationalGetReal(val)) );
+
+   return SCIP_OKAY;
 }
 
 /** increases value of variable in primal CIP solution */
@@ -2390,7 +2394,6 @@ SCIP_RETCODE solCheckExact(
    int h;
 
    assert(sol != NULL);
-   assert(!SCIPsolIsOriginal(sol));
    assert(set != NULL);
    assert(prob != NULL);
    assert(feasible != NULL);
@@ -2530,6 +2533,15 @@ SCIP_RETCODE SCIPsolCheckOrig(
    assert(!prob->transformed);
    assert(feasible != NULL);
 
+   /* have to check bounds without tolerances in exact solving mode */
+   if( set->exact_enable )
+   {
+      SCIP_CALL( solCheckExact(sol, set, messagehdlr, blkmem, stat, prob, printreason,
+            completely, checklprows, feasible) );
+
+      return SCIP_OKAY;
+   }
+
    *feasible = TRUE;
 
    SCIPsolResetViolations(sol);
@@ -2693,15 +2705,17 @@ SCIP_RETCODE SCIPsolCheck(
    SCIPsetDebugMsg(set, "checking solution with objective value %g (nodenum=%" SCIP_LONGINT_FORMAT ", origin=%d)\n",
       sol->obj, sol->nodenum, sol->solorigin);
 
-   *feasible = TRUE;
-
    /* have to check bounds without tolerances in exact solving mode */
    if( set->exact_enable )
    {
       SCIP_CALL( solCheckExact(sol, set, messagehdlr, blkmem, stat, prob, printreason,
             completely, checklprows, feasible) );
+
+      return SCIP_OKAY;
    }
 
+   *feasible = TRUE;
+
    SCIPsolResetViolations(sol);
 
    if( !printreason )
@@ -3232,6 +3246,7 @@ void SCIPsolRecomputeObj(
 
    assert(sol != NULL);
    assert(SCIPsolIsOriginal(sol));
+   assert(!SCIPsolIsExact(sol));
    assert(origprob != NULL);
 
    vars = origprob->vars;