Changeset 369 for trunk/ClpSolve.cpp


Ignore:
Timestamp:
May 18, 2004 10:06:56 AM (16 years ago)
Author:
forrest
Message:

improving interior point code

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpSolve.cpp

    r340 r369  
    892892    model2->setNumberIterations(model2->numberIterations()+totalIterations);
    893893  } else if (method==ClpSolve::useBarrier) {
    894     printf("***** experimental pretty crude barrier\n");
     894    //printf("***** experimental pretty crude barrier\n");
    895895    ClpInterior barrier(*model2);
    896896    if (interrupt)
     
    898898#ifdef REAL_BARRIER
    899899    // 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();
     900    ClpCholeskyWssmp * cholesky = new ClpCholeskyWssmp(max(100,model2->numberRows()/10));
     901    //ClpCholeskyWssmp * cholesky = new ClpCholeskyWssmp();
    902902    barrier.setCholesky(cholesky);
    903903    //ClpCholeskyWssmpKKT * cholesky = new ClpCholeskyWssmpKKT(max(100,model2->numberRows()/10));
     
    910910#ifndef SAVEIT
    911911    barrier.primalDual();
     912    //printf("********** Stopping as this is debug run\n");
     913    //exit(99);
    912914#elif SAVEIT==1
    913915    barrier.primalDual();
     
    930932      <<CoinMessageEol;
    931933    timeX=time2;
    932     if (barrier.maximumBarrierIterations()&&barrier.status()!=4) {
     934    if (barrier.maximumBarrierIterations()&&barrier.status()<4) {
    933935      printf("***** crossover - needs more thought on difficult models\n");
    934936      // move solutions
Note: See TracChangeset for help on using the changeset viewer.