Changeset 2431 for stable/1.17/Clp/src


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

sync with trunk

Location:
stable/1.17
Files:
10 edited

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/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
Note: See TracChangeset for help on using the changeset viewer.