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

Author: scip-ci

src/scip/primal.c

@@ -938,7 +938,7 @@ SCIP_RETCODE primalAddSol(
       (void*)sol, obj, insertpos, replace);
 
    /* make sure that the primal bound is at least the lower bound */
-   if( ! SCIPsetIsInfinity(set, obj) && ! SCIPsetIsInfinity(set, -SCIPgetLowerbound(set->scip)) && SCIPsetIsFeasGT(set, SCIPgetLowerbound(set->scip), obj) )
+   if( !SCIPsetIsInfinity(set, obj) && !SCIPsetIsInfinity(set, -SCIPgetLowerbound(set->scip)) && SCIPsetIsFeasGT(set, SCIPgetLowerbound(set->scip), obj) )
    {
       if( SCIPprobGetObjsense(origprob) == SCIP_OBJSENSE_MINIMIZE )
       {
@@ -950,8 +950,20 @@ SCIP_RETCODE primalAddSol(
          SCIPmessagePrintWarning(messagehdlr, "Dual bound %g is smaller than the objective of the primal solution %g. The solution might not be optimal.\n",
             SCIPprobExternObjval(transprob, origprob, set, SCIPgetLowerbound(set->scip)), SCIPprobExternObjval(transprob, origprob, set, obj));
       }
+
 #ifdef WITH_DEBUG_SOLUTION
-      SCIPABORT();
+      /* check for missed debugsol cutoff */
+      if( SCIPdebugSolIsEnabled(set->scip) )
+      {
+         SCIP_SOL* debugsol;
+
+         SCIPdebugGetSol(set->scip, &debugsol);
+
+         if( SCIPprobGetObjsense(origprob) == SCIP_OBJSENSE_MINIMIZE )
+            assert(SCIPsetIsFeasLE(set, SCIPgetDualbound(set->scip), SCIPsolGetOrigObj(debugsol)));
+         else
+            assert(SCIPsetIsFeasGE(set, SCIPgetDualbound(set->scip), SCIPsolGetOrigObj(debugsol)));
+      }
 #endif
    }