Merge branch 'fix-non-branching' into 'v91-bugfix'

Fix non node strong branching

See merge request integer/scip!3554

Author: GioniMexi

src/scip/branch_allfullstrong.c

@@ -174,12 +174,12 @@ SCIP_RETCODE branch(
          /* update the lower bounds in the children */
          if( allcolsinlp && !exactsolve )
          {
-            if( bestdownvalid )
+            if( downchild != NULL && bestdownvalid )
             {
                SCIP_CALL( SCIPupdateNodeLowerbound(scip, downchild, bestdown) );
                SCIPdebugMsg(scip, " -> down child's lowerbound: %g\n", SCIPnodeGetLowerbound(downchild));
             }
-            if( bestupvalid )
+            if( upchild != NULL && bestupvalid )
             {
                SCIP_CALL( SCIPupdateNodeLowerbound(scip, upchild, bestup) );
                SCIPdebugMsg(scip, " -> up child's lowerbound:   %g\n", SCIPnodeGetLowerbound(upchild));

src/scip/branch_fullstrong.c

@@ -637,25 +637,22 @@ SCIP_DECL_BRANCHEXECLP(branchExeclpFullstrong)
          SCIPdebugMsg(scip, " -> %d candidates, selected candidate %d: variable <%s> (solval=%g, down=%g, up=%g, score=%g)\n",
             nlpcands, bestcand, SCIPvarGetName(var), lpcandssol[bestcand], bestdown, bestup, bestscore);
          SCIP_CALL( SCIPbranchVarVal(scip, var, val, &downchild, NULL, &upchild) );
-         assert(downchild != NULL);
-         assert(upchild != NULL);
 
          /* update the lower bounds in the children */
          if( allcolsinlp && !exactsolve )
          {
-            if( bestdownvalid )
+            if( downchild != NULL && bestdownvalid )
             {
                SCIP_CALL( SCIPupdateNodeLowerbound(scip, downchild, bestdown) );
+               SCIPdebugMsg(scip, " -> down child's lowerbound: %g\n", SCIPnodeGetLowerbound(downchild));
             }
-            if( bestupvalid )
+            if( upchild != NULL && bestupvalid )
             {
                SCIP_CALL( SCIPupdateNodeLowerbound(scip, upchild, bestup) );
+               SCIPdebugMsg(scip, " -> up child's lowerbound: %g\n", SCIPnodeGetLowerbound(upchild));
             }
          }
 
-         SCIPdebugMsg(scip, " -> down child's lowerbound: %g\n", SCIPnodeGetLowerbound(downchild));
-         SCIPdebugMsg(scip, " -> up child's lowerbound: %g\n", SCIPnodeGetLowerbound(upchild));
-
          *result = SCIP_BRANCHED;
       }
    }

src/scip/branch_vanillafullstrong.c

@@ -497,12 +497,12 @@ SCIP_DECL_BRANCHEXECLP(branchExeclpVanillafullstrong)
          /* update the lower bounds in the children */
          if( !branchruledata->idempotent && allcolsinlp && !exactsolve )
          {
-            if( bestdownvalid )
+            if( downchild != NULL && bestdownvalid )
             {
                SCIP_CALL( SCIPupdateNodeLowerbound(scip, downchild, bestdown) );
                SCIPdebugMsg(scip, " -> down child's lowerbound: %g\n", SCIPnodeGetLowerbound(downchild));
             }
-            if( bestupvalid )
+            if( upchild != NULL && bestupvalid )
             {
                SCIP_CALL( SCIPupdateNodeLowerbound(scip, upchild, bestup) );
                SCIPdebugMsg(scip, " -> up child's lowerbound:   %g\n", SCIPnodeGetLowerbound(upchild));