Ignore:
Timestamp:
Jun 19, 2011 1:23:14 PM (8 years ago)
Author:
stefan
Message:

sync with trunk rev1674

Location:
stable/2.7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/2.7

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.7
        2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
        3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
        4 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
        5 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
        6 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
        7 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
        8 Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
        9 Clp  https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
        10 Osi  https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.7
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
         6ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
         7ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
         8Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
         9Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
         10CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
         11Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
         12Clp               https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
         13Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
    • Property svn:mergeinfo changed
      /trunk (added)merged: 1578,​1582-1587,​1589-1600,​1603-1614,​1620-1626,​1631-1633,​1635-1636,​1638-1646,​1650-1652,​1654-1658,​1660-1663,​1665-1671,​1673-1674
  • stable/2.7/Cbc

  • stable/2.7/Cbc/src/CbcHeuristicPivotAndFix.cpp

    r1573 r1675  
    397397                    }
    398398                }
    399                 printf("numFixed: %d\n", numFixed);
    400                 printf("fixThreshold: %f\n", fixThreshold);
    401                 printf("numInt: %d\n", numInt);
     399                COIN_DETAIL_PRINT(printf("numFixed: %d\n", numFixed));
     400                COIN_DETAIL_PRINT(printf("fixThreshold: %f\n", fixThreshold));
     401                COIN_DETAIL_PRINT(printf("numInt: %d\n", numInt));
    402402                double *newSolution = new double[numCols];
    403403                double newSolutionValue;
     
    415415                    for (int m = 0; m < numCols; m++)
    416416                        betterSolution[m] = newSolution[m];
    417                     printf("cutoff: %f\n", newSolutionValue);
    418                     printf("time: %.2lf\n", CoinCpuTime() - start);
     417                    COIN_DETAIL_PRINT(printf("cutoff: %f\n", newSolutionValue));
     418                    COIN_DETAIL_PRINT(printf("time: %.2lf\n", CoinCpuTime() - start));
    419419                }
    420420                didMiniBB = 1;
    421                 printf("returnCode: %d\n", returnCode);
     421                COIN_DETAIL_PRINT(printf("returnCode: %d\n", returnCode));
    422422
    423423                //Update sumReturnCode array
     
    435435                    cutoff = newSolutionValue;
    436436                    clpSolver->addRow(numCols, addRowIndex, originalObjCoeff, -COIN_DBL_MAX, cutoff);
    437                     printf("******************\n\n*****************\n");
     437                    COIN_DETAIL_PRINT(printf("******************\n\n*****************\n"));
    438438                }
    439439                break;
     
    497497        clpSolver->getModelPtr()->primal(1);
    498498        //        simplex->setMaximumIterations(100000);
     499#ifdef COIN_DETAIL
    499500        printf("cutoff: %f\n", cutoff);
    500501        printf("time: %.2f\n", CoinCpuTime() - start);
     
    504505        printf("numInt: %d\n", numInt);
    505506        printf("\n---------------------------------------------------------------- %d\n", i);
     507#endif
    506508
    507509        //temp:
     
    510512    }
    511513
    512     printf("Best Feasible Found: %f\n", cutoff);
    513     printf("Total time: %.2f\n", CoinCpuTime() - start);
     514    COIN_DETAIL_PRINT(printf("Best Feasible Found: %f\n", cutoff));
     515    COIN_DETAIL_PRINT(printf("Total time: %.2f\n", CoinCpuTime() - start));
    514516
    515517    if (numFeasibles == 0) {
Note: See TracChangeset for help on using the changeset viewer.