Changeset 2221


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

minor tweak for decomposition

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpSolver.cpp

    r2149 r2221  
    36763676           }
    36773677         }
     3678         // If wanted minimize master rows
     3679         if (model->logLevel()==18)
     3680           thisBestBreak= (increment>0) ? thisBestBreak :
     3681             numberRows-thisBestBreak;
    36783682         if (thisBestBreak==stop)
    36793683           thisBestValue=COIN_DBL_MAX;
     
    36873691             lastMaster=bestBreak;
    36883692           } else {
    3689              firstMaster=thisBestBreak; // ? +1
     3693             firstMaster=thisBestBreak+1;
    36903694             lastMaster=numberRows;
    36913695           }
    36923696         }
    36933697       }
    3694        if (firstMaster<lastMaster) {
     3698       if (firstMaster<=lastMaster) {
     3699         if (firstMaster==lastMaster)
     3700           printf("Total decomposition! - ");
    36953701         printf("%d master rows %d <= < %d\n",lastMaster-firstMaster,
    36963702                firstMaster,lastMaster);
     
    38113817         assert (numberWritten==numberColumns);
    38123818         fclose(fpBlocks);
    3813          if (model->logLevel() == 17) {
     3819         if (model->logLevel() == 17 || model->logLevel() == 18) {
    38143820           int * whichRows=new int[numberRows+numberColumns];
    38153821           int * whichColumns=whichRows+numberRows;
Note: See TracChangeset for help on using the changeset viewer.