Changeset 2220 for stable


Ignore:
Timestamp:
Jul 4, 2016 5:03:56 AM (3 years ago)
Author:
forrest
Message:

minor tweak for decomposition

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/1.16/Clp/src/ClpSolver.cpp

    r2135 r2220  
    36273627           }
    36283628         }
     3629         // If wanted minimize master rows
     3630         if (model->logLevel()==18)
     3631           thisBestBreak= (increment>0) ? thisBestBreak :
     3632             numberRows-thisBestBreak;
    36293633         if (thisBestBreak==stop)
    36303634           thisBestValue=COIN_DBL_MAX;
     
    36383642             lastMaster=bestBreak;
    36393643           } else {
    3640              firstMaster=thisBestBreak; // ? +1
     3644             firstMaster=thisBestBreak+1;
    36413645             lastMaster=numberRows;
    36423646           }
    36433647         }
    36443648       }
    3645        if (firstMaster<lastMaster) {
     3649       if (firstMaster<=lastMaster) {
     3650         if (firstMaster==lastMaster)
     3651           printf("Total decomposition! - ");
    36463652         printf("%d master rows %d <= < %d\n",lastMaster-firstMaster,
    36473653                firstMaster,lastMaster);
     
    37623768         assert (numberWritten==numberColumns);
    37633769         fclose(fpBlocks);
    3764          if (model->logLevel() == 17) {
     3770         if (model->logLevel() == 17 || model->logLevel() == 18) {
    37653771           int * whichRows=new int[numberRows+numberColumns];
    37663772           int * whichColumns=whichRows+numberRows;
Note: See TracChangeset for help on using the changeset viewer.