Ignore:
Timestamp:
Jun 26, 2007 3:00:48 AM (12 years ago)
Author:
forrest
Message:

moving branches/devel to trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        11MSVisualStudio   https://projects.coin-or.org/svn/MSVisualStudio/trunk/ExternalsDirs/Clp
        22BuildTools    https://projects.coin-or.org/svn/BuildTools/trunk
        3 Data/Netlib   https://projects.coin-or.org/svn/Data/trunk/Netlib
        4 Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
        5 CoinUtils     https://projects.coin-or.org/svn/CoinUtils/stable/2.0/CoinUtils
         3ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
         5Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
         6Data/Sample   https://projects.coin-or.org/svn/Data/stable/1.0/Sample
         7CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
  • trunk/Clp/src/ClpPresolve.cpp

    r850 r1034  
    1313
    1414#include "CoinPackedMatrix.hpp"
     15#include "ClpPackedMatrix.hpp"
    1516#include "ClpSimplex.hpp"
    1617#ifndef SLIM_CLP
     
    481482    }
    482483
     484    if ((presolveActions_&16384)!=0)
     485      prob->setPresolveOptions(prob->presolveOptions()|16384);
    483486    // Check number rows dropped
    484487    int lastDropped=0;
     
    14321435  // Messages
    14331436  CoinMessages messages = originalModel->coinMessages();
     1437  // Only go round 100 times even if integer preprocessing
     1438  int totalPasses=100;
    14341439  while (result==-1) {
    14351440
     
    14561461    if (!keepIntegers)
    14571462      presolvedModel_->deleteIntegerInformation();
     1463    totalPasses--;
    14581464
    14591465    double ratio=2.0;
     
    16331639        }
    16341640        presolvedModel_->copyNames(rowNames,columnNames);
     1641      } else {
     1642        presolvedModel_->setLengthNames(0);
    16351643      }
    16361644#endif
     
    16961704                                                       <<numberChanges
    16971705                                                       <<CoinMessageEol;
    1698           if (!result) {
     1706          if (!result&&totalPasses>0) {
    16991707            result = -1; // round again
    17001708          }
Note: See TracChangeset for help on using the changeset viewer.