Changeset 2312


Ignore:
Timestamp:
Dec 1, 2016 10:08:48 AM (19 months ago)
Author:
stefan
Message:

merge r2311 from trunk

Location:
stable/2.9/Cbc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/2.9/Cbc

  • stable/2.9/Cbc/src

  • stable/2.9/Cbc/src/CbcModel.cpp

    r2267 r2312  
    34133413        cpxSolver.switchToMIP();
    34143414        if (bestSolution_) {
     3415#if 0
    34153416            CPXcopymipstart(env, lpPtr, numberIntegers_, setVar, setSol);
     3417#else
     3418            int zero = 0;
     3419            CPXaddmipstarts(env, lpPtr, 1, numberIntegers_, &zero, setVar, setSol, NULL, NULL);
     3420#endif
    34163421        }
    34173422        if (clpSolver->getNumRows() > continuousSolver_->getNumRows() && false) {
     
    1642316428                        cpxSolver.switchToMIP();
    1642416429                        if (bestSolution_) {
     16430#if 0
    1642516431                            CPXcopymipstart(env, lpPtr, numberIntegers_, setVar, setSol);
     16432#else
     16433                            int zero = 0;
     16434                            CPXaddmipstarts(env, lpPtr, 1, numberIntegers_, &zero, setVar, setSol, NULL, NULL);
     16435#endif
    1642616436                        }
    1642716437                        if (getCutoff() < 1.0e50) {
Note: See TracChangeset for help on using the changeset viewer.