Changeset 1476


Ignore:
Timestamp:
Dec 8, 2009 3:25:27 PM (10 years ago)
Author:
tkr
Message:

Rolling back changes for Cbc 2.4 (r1456:1450) from Clp 1.10

Location:
stable/1.10
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/1.10

    • Property svn:externals
      •  

        old new  
        22ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        33ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        4 Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
        54Data/Sample   https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        65CoinUtils     https://projects.coin-or.org/svn/CoinUtils/stable/2.5/CoinUtils
  • stable/1.10/Clp/src/ClpFactorization.hpp

    r1455 r1476  
    1212class ClpNetworkBasis;
    1313#ifndef CLP_MULTIPLE_FACTORIZATIONS
    14 //#define CLP_MULTIPLE_FACTORIZATIONS 3
     14#define CLP_MULTIPLE_FACTORIZATIONS 3
    1515#endif   
    1616#if CLP_MULTIPLE_FACTORIZATIONS == 1
  • stable/1.10/Clp/src/ClpPresolve.cpp

    r1454 r1476  
    12711271#endif
    12721272
    1273   presolve_make_memlists(hincol_, clink_, ncols_);
    1274   presolve_make_memlists(hinrow_, rlink_, nrows_);
     1273  presolve_make_memlists(mcstrt_, hincol_, clink_, ncols_);
     1274  presolve_make_memlists(mrstrt_, hinrow_, rlink_, nrows_);
    12751275
    12761276  // this allows last col/row to expand up to bufsize-1 (22);
  • stable/1.10/Externals

    r1456 r1476  
    22ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
    33ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
    4 Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
    54Data/Sample   https://projects.coin-or.org/svn/Data/stable/1.0/Sample
    65CoinUtils     https://projects.coin-or.org/svn/CoinUtils/stable/2.5/CoinUtils
Note: See TracChangeset for help on using the changeset viewer.