Changeset 2431 for stable/1.17


Ignore:
Timestamp:
Mar 15, 2019 11:56:51 AM (7 months ago)
Author:
stefan
Message:

sync with trunk

Location:
stable/1.17
Files:
1 deleted
16 edited
2 copied

Legend:

Unmodified
Added
Removed
  • stable/1.17

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.8.8/
        2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.4.1/
        3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.4.7/
        4 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.6.0/
        5 ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.3.7/
        6 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.6.1/
        7 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/releases/1.10.6/
        8 Data/Netlib  https://projects.coin-or.org/svn/Data/Netlib/releases/1.2.7/
        9 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/releases/1.2.11/
        10 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.11.0/CoinUtils
        11 Osi  https://projects.coin-or.org/svn/Osi/releases/0.108.0/Osi
        12 
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.8
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.4
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.6
         5ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.3
         6ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.6
         7ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
         8Data/Netlib       https://projects.coin-or.org/svn/Data/Netlib/stable/1.2
         9Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
         10CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.11/CoinUtils
         11Osi               https://projects.coin-or.org/svn/Osi/stable/0.108/Osi
    • Property svn:mergeinfo changed
      /trunk (added)merged: 2396,​2405-2409,​2422-2430
  • stable/1.17/Clp

  • stable/1.17/Clp/README

    r1088 r2431  
    1 NOTE: The information in this file might not yet include the changes introduced with the switch to the autotools.
     1This is the Clp project. For information on the purpose of
     2this project please visit https://github.com/coin-or/Clp
    23
    3 To build Clp see INSTALL file
    4 
    5 To use Clp you need the Clp and Coin libraries
    6 
    7 To make standalone executable do 'make Clp' in the Clp directory.
    8 This creates an executable clp in Clp/src.
    9 
    10 To run unitTest do 'make unitTest' in the Clp directory. This will
    11 do some minimal testing.
    12 
    13 To run clp on all netlib problems do 'make unitTest NETLIBDIR=<dirname>'
    14 dirname should be the path to the directory containing all the
    15 netlib files. If you have compiled Clp without zlib support then the
    16 files must be uncompressed.
     4The information below should be migrated into ../README.md or the User's Guide.
    175
    186Running clp gives you some hints.  It can do a unit test (clp -unitTest) and solve netlib
  • stable/1.17/Clp/examples/addRows.cpp

    r2278 r2431  
    232232               value = columnPrimal[iColumn];
    233233               if (fabs(value) < 1.0e5)
    234                     std::cout << setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
    235                else
    236                     std::cout << setiosflags(std::ios::scientific) << std::setw(14) << value;
     234                    std::cout << std::setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
     235               else
     236                    std::cout << std::setiosflags(std::ios::scientific) << std::setw(14) << value;
    237237               value = columnDual[iColumn];
    238238               if (fabs(value) < 1.0e5)
    239                     std::cout << setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
    240                else
    241                     std::cout << setiosflags(std::ios::scientific) << std::setw(14) << value;
     239                    std::cout << std::setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
     240               else
     241                    std::cout << std::setiosflags(std::ios::scientific) << std::setw(14) << value;
    242242               value = columnLower[iColumn];
    243243               if (fabs(value) < 1.0e5)
    244                     std::cout << setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
    245                else
    246                     std::cout << setiosflags(std::ios::scientific) << std::setw(14) << value;
     244                    std::cout << std::setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
     245               else
     246                    std::cout << std::setiosflags(std::ios::scientific) << std::setw(14) << value;
    247247               value = columnUpper[iColumn];
    248248               if (fabs(value) < 1.0e5)
    249                     std::cout << setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
    250                else
    251                     std::cout << setiosflags(std::ios::scientific) << std::setw(14) << value;
     249                    std::cout << std::setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
     250               else
     251                    std::cout << std::setiosflags(std::ios::scientific) << std::setw(14) << value;
    252252               value = columnObjective[iColumn];
    253253               if (fabs(value) < 1.0e5)
    254                     std::cout << setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
    255                else
    256                     std::cout << setiosflags(std::ios::scientific) << std::setw(14) << value;
     254                    std::cout << std::setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
     255               else
     256                    std::cout << std::setiosflags(std::ios::scientific) << std::setw(14) << value;
    257257
    258258               std::cout << std::endl;
  • stable/1.17/Clp/examples/driver3.cpp

    r2030 r2431  
    9191    double value=solution[iColumn];
    9292    if (fabs(value)>1.0e-7)
    93       std::cout<<std::setw(6)<<iColumn<<" "<<std::setw(8)<<setiosflags(std::ios::left)<<model.getColumnName(iColumn)
    94                <<resetiosflags(std::ios::adjustfield)<<std::setw(14)<<" "<<value<<std::endl;
     93      std::cout<<std::setw(6)<<iColumn<<" "<<std::setw(8)<<std::setiosflags(std::ios::left)<<model.getColumnName(iColumn)
     94               <<std::resetiosflags(std::ios::adjustfield)<<std::setw(14)<<" "<<value<<std::endl;
    9595  }
    9696  std::cout<<"--------------------------------------"<<std::endl;
  • stable/1.17/Clp/src

  • stable/1.17/Clp/src/AbcDualRowSteepest.cpp

    r2385 r2431  
    178178{
    179179  cilk::reducer_max_index< int, double > maximumIndex(chosenRow, largest);
    180 #pragma cilk_grainsize = 128
     180#pragma cilk grainsize = 128
    181181  cilk_for(int i = 0; i < n; i++)
    182182  {
  • stable/1.17/Clp/src/AbcSimplex.cpp

    r2385 r2431  
    364364    abcDualRowPivot_ = new AbcDualRowSteepest();
    365365    abcPrimalColumnPivot_ = new AbcPrimalColumnSteepest();
    366     internalStatus_ = newArray(reinterpret_cast< unsigned char * >(NULL),
     366    internalStatus_ = newArray((unsigned char *)NULL,
    367367      sizeArray + maximumNumberTotal_);
    368     abcLower_ = newArray(reinterpret_cast< double * >(NULL), sizeArray);
    369     abcUpper_ = newArray(reinterpret_cast< double * >(NULL), sizeArray);
    370     abcCost_ = newArray(reinterpret_cast< double * >(NULL), sizeArray + maximumNumberTotal_);
    371     abcDj_ = newArray(reinterpret_cast< double * >(NULL), sizeArray);
    372     abcSolution_ = newArray(reinterpret_cast< double * >(NULL), sizeArray + maximumNumberTotal_);
    373     //fromExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray);
    374     //toExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray);
    375     scaleFromExternal_ = newArray(reinterpret_cast< double * >(NULL), sizeArray);
    376     offset_ = newArray(reinterpret_cast< double * >(NULL), sizeArray);
    377     abcPerturbation_ = newArray(reinterpret_cast< double * >(NULL), sizeArray);
    378     abcPivotVariable_ = newArray(reinterpret_cast< int * >(NULL), maximumAbcNumberRows_);
     368    abcLower_ = newArray((double *)NULL, sizeArray);
     369    abcUpper_ = newArray((double *)NULL, sizeArray);
     370    abcCost_ = newArray((double *)NULL, sizeArray + maximumNumberTotal_);
     371    abcDj_ = newArray((double *)NULL, sizeArray);
     372    abcSolution_ = newArray((double *)NULL, sizeArray + maximumNumberTotal_);
     373    //fromExternal_ = newArray((int *)NULL,sizeArray);
     374    //toExternal_ = newArray((int *)NULL,sizeArray);
     375    scaleFromExternal_ = newArray((double *)NULL, sizeArray);
     376    offset_ = newArray((double *)NULL, sizeArray);
     377    abcPerturbation_ = newArray((double *)NULL, sizeArray);
     378    abcPivotVariable_ = newArray((int *)NULL, maximumAbcNumberRows_);
    379379    // Fill perturbation array
    380380    setupPointers(maximumAbcNumberRows_, maximumAbcNumberColumns_);
     
    548548  subProblem->numberTotalWithoutFixed_ = subProblem->numberTotal_;
    549549  int sizeArray = 2 * subProblem->maximumNumberTotal_ + maximumAbcNumberRows_;
    550   subProblem->internalStatus_ = newArray(reinterpret_cast< unsigned char * >(NULL),
     550  subProblem->internalStatus_ = newArray((unsigned char *)NULL,
    551551    sizeArray + subProblem->maximumNumberTotal_);
    552   subProblem->abcLower_ = newArray(reinterpret_cast< double * >(NULL), sizeArray);
    553   subProblem->abcUpper_ = newArray(reinterpret_cast< double * >(NULL), sizeArray);
    554   subProblem->abcCost_ = newArray(reinterpret_cast< double * >(NULL), sizeArray + subProblem->maximumNumberTotal_);
    555   subProblem->abcDj_ = newArray(reinterpret_cast< double * >(NULL), sizeArray);
    556   subProblem->abcSolution_ = newArray(reinterpret_cast< double * >(NULL), sizeArray + subProblem->maximumNumberTotal_);
    557   //fromExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray);
    558   //toExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray);
    559   subProblem->scaleFromExternal_ = newArray(reinterpret_cast< double * >(NULL), sizeArray);
    560   subProblem->offset_ = newArray(reinterpret_cast< double * >(NULL), sizeArray);
    561   subProblem->abcPerturbation_ = newArray(reinterpret_cast< double * >(NULL), sizeArray);
    562   subProblem->abcPivotVariable_ = newArray(reinterpret_cast< int * >(NULL), maximumAbcNumberRows_);
     552  subProblem->abcLower_ = newArray((double *)NULL, sizeArray);
     553  subProblem->abcUpper_ = newArray((double *)NULL, sizeArray);
     554  subProblem->abcCost_ = newArray((double *)NULL, sizeArray + subProblem->maximumNumberTotal_);
     555  subProblem->abcDj_ = newArray((double *)NULL, sizeArray);
     556  subProblem->abcSolution_ = newArray((double *)NULL, sizeArray + subProblem->maximumNumberTotal_);
     557  //fromExternal_ = newArray((int *)NULL,sizeArray);
     558  //toExternal_ = newArray((int *)NULL,sizeArray);
     559  subProblem->scaleFromExternal_ = newArray((double *)NULL, sizeArray);
     560  subProblem->offset_ = newArray((double *)NULL, sizeArray);
     561  subProblem->abcPerturbation_ = newArray((double *)NULL, sizeArray);
     562  subProblem->abcPivotVariable_ = newArray((int *)NULL, maximumAbcNumberRows_);
    563563  subProblem->setupPointers(maximumAbcNumberRows_, numberColumns);
    564564  // could use arrays - but for now be safe
  • stable/1.17/Clp/src/ClpMain.cpp

    r2385 r2431  
    363363  //cv.start();
    364364#if 1
    365   //#pragma cilk_grainsize=CILK_FOR_GRAINSIZE
     365  //#pragma cilk grainsize = CILK_FOR_GRAINSIZE
    366366  cilk_for(unsigned int i = 0; i < n; ++i)
    367367  {
  • stable/1.17/Clp/src/ClpModel.cpp

    r2385 r2431  
    37733773    getColLower(), getColUpper(),
    37743774    objective,
    3775     reinterpret_cast< const char * >(NULL) /*integrality*/,
     3775    (const char *)NULL /*integrality*/,
    37763776    getRowLower(), getRowUpper(),
    37773777    columnNames, rowNames);
  • stable/1.17/Clp/src/ClpPrimalColumnSteepest.cpp

    r2385 r2431  
    42754275  // This probably should be fixed
    42764276  int startR[4];
    4277   const int *which = infeasible_->getIndices();
    4278   int nSlacks = infeasible_->getNumElements();
    4279   startR[1] = nSlacks;
    4280   startR[2] = 0;
     4277  int numberRows = model_->numberRows();
     4278  startR[1] = numberColumns+numberRows;
     4279  startR[2] = numberColumns;
    42814280  double randomR = model_->randomNumberGenerator()->randomDouble();
    4282   double dstart = static_cast< double >(nSlacks) * randomR;
    4283   startR[0] = static_cast< int >(dstart);
     4281  double dstart = static_cast<double> (numberRows) * randomR;
     4282  startR[0] = numberColumns + static_cast<int> (dstart);
    42844283  startR[3] = startR[0];
    42854284  double startC[4];
     
    42924291  int sequenceOut = model_->sequenceOut();
    42934292  double *duals2 = duals - numberColumns;
    4294   int chunk = CoinMin(1024, (numberColumns + nSlacks) / 32);
     4293  int chunk = CoinMin(1024, (numberColumns + numberRows) / 32);
    42954294#ifdef COIN_DETAIL
    42964295  if (model_->numberIterations() % 1000 == 0 && model_->logLevel() > 1) {
     
    43144313      int start = startR[iPassR];
    43154314      int end = CoinMin(startR[iPassR + 1], start + chunk / 2);
    4316       int jSequence;
    4317       for (jSequence = start; jSequence < end; jSequence++) {
    4318         int iSequence = which[jSequence];
     4315      int iSequence;
     4316      for (iSequence = start; iSequence < end; iSequence++) {
    43194317        if (iSequence != sequenceOut) {
    43204318          double value;
     
    43974395      doingR = false;
    43984396      // update start
    4399       startR[iPassR] = jSequence;
    4400       if (jSequence >= startR[iPassR + 1]) {
     4397      startR[iPassR] = iSequence;
     4398      if (iSequence >= startR[iPassR + 1]) {
    44014399        if (iPassR)
    44024400          finishedR = true;
  • stable/1.17/Clp/src/OsiClp

  • stable/1.17/Clp/src/OsiClp/OsiClpSolverInterface.cpp

    r2386 r2431  
    14401440    CoinMessages *messagesPointer = modelPtr_->messagesPointer();
    14411441    // won't even build messages
    1442     messagesPointer->setDetailMessages(100, 10000, reinterpret_cast< int * >(NULL));
     1442    messagesPointer->setDetailMessages(100, 10000, (int*)NULL);
    14431443  }
    14441444#endif
  • stable/1.17/Dependencies

    r2394 r2431  
    1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.8
    2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.4
    3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
    4 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.6
     1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.8
     2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.4
     3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
     4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.6
    55ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.3
    66ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.6
    7 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
    8 Data/Netlib  https://projects.coin-or.org/svn/Data/Netlib/stable/1.2
    9 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
    10 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.11/CoinUtils
    11 Osi  https://projects.coin-or.org/svn/Osi/stable/0.108/Osi
     7ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
     8Data/Netlib       https://projects.coin-or.org/svn/Data/Netlib/stable/1.2
     9Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
     10CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.11/CoinUtils
     11Osi               https://projects.coin-or.org/svn/Osi/stable/0.108/Osi
  • stable/1.17/INSTALL

    r1148 r2431  
     1The instructions here are somewhat outdated. See also README.md.
     2
    13These instructions are for UNIX-like systems (including Linux, Cygwin
    24and MSys) only.  If Microsoft Developer Studio projects are
  • stable/1.17/README

    r818 r2431  
    1 
    2 To install this package, please look at the INSTALL file.
     1To install this package, please look at the INSTALL and README.md files.
    32
    43This package contains several subdirectories corresponding to COIN-OR
Note: See TracChangeset for help on using the changeset viewer.