Changeset 377


Ignore:
Timestamp:
May 27, 2004 2:16:08 PM (14 years ago)
Author:
forrest
Message:

mods for idiot

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpSolve.cpp

    r373 r377  
    352352      if (doIdiot>0) {
    353353        nPasses=max(nPasses,doIdiot);
    354         if (nPasses>70)
     354        if (nPasses>70) {
    355355          info.setStartingWeight(1.0e3);
     356          info.setDropEnoughFeasibility(0.01);
     357        }
    356358      }
    357359      if (nPasses) {
     
    893895  } else if (method==ClpSolve::useBarrier) {
    894896    //printf("***** experimental pretty crude barrier\n");
     897    //#define BORROW
     898#ifdef BORROW
     899    ClpInterior barrier;
     900    barrier.borrowModel(*model2);
     901#else
    895902    ClpInterior barrier(*model2);
     903#endif
    896904    if (interrupt)
    897905      currentModel2 = &barrier;
    898906#ifdef REAL_BARRIER
    899907    // uncomment this if you have Anshul Gupta's wsmp package
    900     ClpCholeskyWssmp * cholesky = new ClpCholeskyWssmp(max(100,model2->numberRows()/10));
    901     //ClpCholeskyWssmp * cholesky = new ClpCholeskyWssmp();
     908    //ClpCholeskyWssmp * cholesky = new ClpCholeskyWssmp(max(100,model2->numberRows()/10));
     909    ClpCholeskyWssmp * cholesky = new ClpCholeskyWssmp();
    902910    //ClpCholeskyWssmpKKT * cholesky = new ClpCholeskyWssmpKKT(max(100,model2->numberRows()/10));
    903911    // uncomment this if you have Sivan Toledo's Taucs package
     
    905913    barrier.setCholesky(cholesky);
    906914#endif
    907     //#define SAVEIT 2
     915    //#define SAVEIT 1
    908916#ifndef SAVEIT
    909917    barrier.primalDual();
     
    10691077      model2->dual();
    10701078    }
     1079#ifdef BORROW
     1080    barrier.returnModel(*model2);
     1081#endif
    10711082    model2->setPerturbation(savePerturbation);
    10721083    time2 = CoinCpuTime();
Note: See TracChangeset for help on using the changeset viewer.