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

CHANGELOG

@@ -160,7 +160,8 @@ Fixed bugs
 - fixed write of strings with at least 1024 characters when compiling with MSVS 2015 (14.0) or later (still an issue with earlier MSVS, which will not be fixed)
 - keep epsilon coefficients in applyFixings() of cons_linear.c until multiples are merged to avoid loss of relevant contributions
 - fixed that some variable type changes were not accounted correctly in presolve of linear constraints
-- fix constraint sorting in pp-orbitope upgrade in symmetry code
+- fix constraint sorting in setpp-orbitope upgrade in symmetry code
+- fixed that SCIPnodeGetConsProps() also counted bound changes from propagators
 
 Performance improvements
 ------------------------

src/scip/tree.c

@@ -7967,28 +7967,27 @@ void SCIPnodeGetConsProps(
 
    first_dual = i;
 
-   /* count the number of bound changes because of constraint propagation and propagation */
-   for(i = nskip; i < first_dual; i++)
+   /* count the number of bound changes because of constraint propagation */
+   for( i = nskip; i < first_dual; i++ )
    {
       assert(boundchgs[i].boundchgtype != SCIP_BOUNDCHGTYPE_BRANCHING);
 
-      if( (boundchgs[i].boundchgtype == SCIP_BOUNDCHGTYPE_CONSINFER && boundchgs[i].data.inferencedata.reason.cons != NULL)
-       || (boundchgs[i].boundchgtype == SCIP_BOUNDCHGTYPE_PROPINFER && boundchgs[i].data.inferencedata.reason.prop != NULL) )
+      if( (boundchgs[i].boundchgtype == SCIP_BOUNDCHGTYPE_CONSINFER && boundchgs[i].data.inferencedata.reason.cons != NULL) )
       {
          if( boundchgs[i].var->vartype != SCIP_VARTYPE_CONTINUOUS )
             (*nconspropvars)++;
       }
       else if( (boundchgs[i].boundchgtype == SCIP_BOUNDCHGTYPE_CONSINFER && boundchgs[i].data.inferencedata.reason.cons == NULL)
-            || (boundchgs[i].boundchgtype == SCIP_BOUNDCHGTYPE_PROPINFER && boundchgs[i].data.inferencedata.reason.prop == NULL))
+            || (boundchgs[i].boundchgtype == SCIP_BOUNDCHGTYPE_PROPINFER && boundchgs[i].data.inferencedata.reason.prop == NULL) )
          break;
    }
 
-   /* if the arrays have enough space store the branching decisions */
+   /* if the arrays have enough space store the constraint propagations */
    if( conspropvarssize >= *nconspropvars )
    {
       int pos;
 
-      for(i = nskip, pos = 0; i < first_dual; i++)
+      for( i = nskip, pos = 0; i < first_dual; i++ )
       {
          if( boundchgs[i].boundchgtype == SCIP_BOUNDCHGTYPE_CONSINFER && boundchgs[i].data.inferencedata.reason.cons != NULL )
          {