Merge branch 'fix-var-exact' into 'master'

Initialize real values

See merge request integer/scip!3820

Author: ambros-gleixner

check/CMakeLists.txt

@@ -831,7 +831,6 @@ set(basenames_opb_wrongformat
     flugpl_rational.mps
     gt2.mps
     lseu_dcmulti.cip
-    MANN_a9.clq.lp
     misc03.mps
     misc03.zpl
     rgn.mps

src/scip/cons_indicator.c

@@ -776,8 +776,8 @@ SCIP_DECL_EVENTEXEC(eventExecIndicatorRestart)
       SCIP_Real oldbound;
       SCIP_Real newbound;
 
-      assert( SCIPvarGetType(SCIPeventGetVar(event)) == SCIP_VARTYPE_BINARY &&
-            !SCIPvarIsImpliedIntegral(SCIPeventGetVar(event)) );
+      assert( SCIPvarIsBinary(SCIPeventGetVar(event)) );
+      assert( !SCIPvarIsImpliedIntegral(SCIPeventGetVar(event)) );
       oldbound = SCIPeventGetOldbound(event);
       newbound = SCIPeventGetNewbound(event);
       assert( SCIPisIntegral(scip, oldbound) );
@@ -3411,7 +3411,7 @@ SCIP_RETCODE consdataCreate(
          (*consdata)->binvar = var;
 
          /* check type */
-         if ( SCIPvarGetType(var) != SCIP_VARTYPE_BINARY || SCIPvarIsImpliedIntegral(var) )
+         if ( !SCIPvarIsBinary(var) || SCIPvarIsImpliedIntegral(var) )
          {
             SCIPerrorMessage("Indicator variable <%s> is not binary %d.\n", SCIPvarGetName(var), SCIPvarGetType(var));
             return SCIP_ERROR;
@@ -4639,11 +4639,8 @@ SCIP_RETCODE separateIISRounding(
 
          /* check whether complementary (negated) variable is present as well */
          binvarneg = SCIPvarGetNegatedVar(consdata->binvar);
-         assert( binvarneg != NULL );
-
-         /* negated variable is present as well */
          assert( conshdlrdata->binvarhash != NULL );
-         if ( SCIPhashmapExists(conshdlrdata->binvarhash, (void*) binvarneg) )
+         if ( binvarneg != NULL && SCIPhashmapExists(conshdlrdata->binvarhash, (void*) binvarneg) )
          {
             SCIP_Real binvarnegval = SCIPgetVarSol(scip, binvarneg);
 
@@ -8956,7 +8953,7 @@ SCIP_RETCODE SCIPsetBinaryVarIndicator(
    assert( consdata != NULL );
 
    /* check type */
-   if ( SCIPvarGetType(binvar) != SCIP_VARTYPE_BINARY || SCIPvarIsImpliedIntegral(binvar) )
+   if ( !SCIPvarIsBinary(binvar) || SCIPvarIsImpliedIntegral(binvar) )
    {
       SCIPerrorMessage("Indicator variable <%s> is not binary %d.\n", SCIPvarGetName(binvar), SCIPvarGetType(binvar));
       return SCIP_ERROR;

src/scip/cons_xor.c

@@ -1074,26 +1074,9 @@ SCIP_RETCODE applyFixings(
 
             if( aggregated )
             {
-               (*naggrvars)++;
-
-               if( SCIPvarIsActive(newvar) )
-               {
-                  SCIP_CALL( setIntvar(scip, cons, newvar) );
-                  SCIP_CALL( SCIPreleaseVar(scip, &newvar) );
-               }
-               /* the new variable should only by inactive if it was fixed due to the aggregation, so also the old variable
-                * should be fixed now.
-                *
-                * @todo if newvar is not active we may want to transform the xor into a linear constraint
-                */
-               else
-               {
-                  assert(SCIPvarGetStatus(newvar) == SCIP_VARSTATUS_FIXED);
-                  assert(SCIPisEQ(scip, SCIPvarGetLbGlobal(consdata->intvar), SCIPvarGetUbGlobal(consdata->intvar)));
-
-                  SCIP_CALL( setIntvar(scip, cons, newvar) );
-                  SCIP_CALL( SCIPreleaseVar(scip, &newvar) );
-               }
+               ++(*naggrvars);
+               SCIP_CALL( setIntvar(scip, cons, newvar) );
+               SCIP_CALL( SCIPreleaseVar(scip, &newvar) );
             }
             else
             {
@@ -4306,7 +4289,7 @@ SCIP_RETCODE preprocessConstraintPairs(
 
                   if( aggregated )
                   {
-                     (*naggrvars)++;
+                     ++(*naggrvars);
                      assert(SCIPvarIsActive(consdata0->intvar));
                   }
                   else
@@ -4460,7 +4443,7 @@ SCIP_RETCODE preprocessConstraintPairs(
 
          *cutoff = *cutoff || infeasible;
          if( aggregated )
-            (*naggrvars)++;
+            ++(*naggrvars);
 
          if( redundant )
          {
@@ -4483,7 +4466,7 @@ SCIP_RETCODE preprocessConstraintPairs(
 
                   *cutoff = *cutoff || infeasible;
                   if( aggregated )
-                     (*naggrvars)++;
+                     ++(*naggrvars);
                }
             }
          }
@@ -5415,7 +5398,7 @@ SCIP_DECL_CONSPRESOL(consPresolXor)
             if( aggregated )
             {
                assert(redundant);
-               (*naggrvars)++;
+               ++(*naggrvars);
             }
 
             /* the constraint can be deleted if the intvar is fixed or NULL */

src/scip/reader_opb.c

@@ -4613,23 +4613,29 @@ SCIP_RETCODE SCIPwriteOpb(
    SCIP_CONSHDLR* indicatorhdlr = SCIPfindConshdlr(scip, "indicator");
    SCIP_Bool existands;
    SCIP_Bool existandconshdlr;
+   SCIP_Bool ispseudoboolean;
    SCIP_RETCODE retcode = SCIP_OKAY;
    int* nandvars;
-   int nresvars;
+   int nintegralvars = nvars - ncontvars;
    int nindicatorconss = indicatorhdlr != NULL ? SCIPconshdlrGetNConss(indicatorhdlr) : 0;
+   int nresvars;
    int v;
 
-   /* computes all and-resultants and their corresponding constraint variables */
-   /* coverity[leaked_storage] */
-   SCIP_CALL( computeAndConstraintInfos(scip, transformed, &resvars, &nresvars, &andvars, &nandvars, &existandconshdlr, &existands) );
-
-   if( nintvars > 0 || ncontvars > nindicatorconss )
+   /* check whether problem is pseudoboolean */
+   ispseudoboolean = (ncontvars <= nindicatorconss);
+   for( v = nbinvars; v < nintegralvars && ispseudoboolean; ++v )
    {
-      SCIPwarningMessage(scip, "only binary problems can be written in OPB format.\n");
-      *result = SCIP_DIDNOTRUN;
+      if( !SCIPvarIsBinary(vars[v])
+         && ( SCIPvarGetType(vars[v]) == SCIP_VARTYPE_INTEGER || ++ncontvars > nindicatorconss ) )
+         ispseudoboolean = FALSE;
    }
-   else
+
+   if( ispseudoboolean )
    {
+      /* computes all and-resultants and their corresponding constraint variables */
+      /* coverity[leaked_storage] */
+      SCIP_CALL( computeAndConstraintInfos(scip, transformed, &resvars, &nresvars, &andvars, &nandvars, &existandconshdlr, &existands) );
+
       if( genericnames )
       {
 #ifndef NDEBUG
@@ -4733,25 +4739,30 @@ SCIP_RETCODE SCIPwriteOpb(
          }
       }
 
-      *result = SCIP_SUCCESS;
-   }
+      if( existands )
+      {
+         /* free temporary buffers */
+         assert(resvars != NULL);
+         assert(andvars != NULL);
+         assert(nandvars != NULL);
 
-   if( existands )
-   {
-      /* free temporary buffers */
-      assert(resvars != NULL);
-      assert(andvars != NULL);
-      assert(nandvars != NULL);
+         for( v = nresvars - 1; v >= 0; --v )
+         {
+            assert(andvars[v] != NULL);
+            SCIPfreeMemoryArray(scip, &andvars[v]);
+         }
 
-      for( v = nresvars - 1; v >= 0; --v )
-      {
-         assert(andvars[v] != NULL);
-         SCIPfreeMemoryArray(scip, &andvars[v]);
+         SCIPfreeMemoryArray(scip, &nandvars);
+         SCIPfreeMemoryArray(scip, &andvars);
+         SCIPfreeMemoryArray(scip, &resvars);
       }
 
-      SCIPfreeMemoryArray(scip, &nandvars);
-      SCIPfreeMemoryArray(scip, &andvars);
-      SCIPfreeMemoryArray(scip, &resvars);
+      *result = SCIP_SUCCESS;
+   }
+   else
+   {
+      SCIPwarningMessage(scip, "only binary problems can be written in OPB format.\n");
+      *result = SCIP_DIDNOTRUN;
    }
 
    if( retcode == SCIP_INVALIDDATA )