Ignore:
Timestamp:
Jun 12, 2009 12:29:04 PM (10 years ago)
Author:
forrest
Message:

changes to try and make faster

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpFactorization.hpp

    r1370 r1371  
    1313class ClpNetworkBasis;
    1414#ifndef CLP_MULTIPLE_FACTORIZATIONS
     15#ifdef CLP_OSL
     16#define CLP_MULTIPLE_FACTORIZATIONS 4
     17#else
    1518#define CLP_MULTIPLE_FACTORIZATIONS 3
     19#endif
    1620#endif   
    1721#if CLP_MULTIPLE_FACTORIZATIONS == 1
    1822#include "CoinDenseFactorization.hpp"
    1923typedef CoinDenseFactorization CoinSmallFactorization;
     24typedef CoinOslFactorization CoinSmallFactorization;
    2025#elif CLP_MULTIPLE_FACTORIZATIONS == 2
    2126#include "CoinSimpFactorization.hpp"
    2227typedef CoinSimpFactorization CoinSmallFactorization;
     28typedef CoinOslFactorization CoinSmallFactorization;
    2329#elif CLP_MULTIPLE_FACTORIZATIONS == 3
    2430#include "CoinDenseFactorization.hpp"
    2531#include "CoinSimpFactorization.hpp"
     32#define CoinOslFactorization CoinDenseFactorization
     33#elif CLP_MULTIPLE_FACTORIZATIONS == 4
     34#include "CoinDenseFactorization.hpp"
     35#include "CoinSimpFactorization.hpp"
     36#include "CoinOslFactorization.hpp"
    2637#endif
    2738
     
    275286    }
    276287  }
     288  /// If nonzero force use of 1,dense 2,small 3,osl
     289  void forceOtherFactorization(int which);
     290  /// Get switch to osl if number rows <= this
     291  inline int goOslThreshold() const
     292  { return goOslThreshold_;}
     293  /// Set switch to osl if number rows <= this
     294  inline void setGoOslThreshold(int value)
     295  { goOslThreshold_ = value;}
    277296  /// Get switch to dense if number rows <= this
    278297  inline int goDenseThreshold() const
     
    289308  /// Go over to dense or small code if small enough
    290309  void goDenseOrSmall(int numberRows) ;
     310  /// Sets factorization
     311  void setFactorization(ClpFactorization & factorization);
    291312  /// Return 1 if dense code
    292313  inline int isDenseOrSmall() const
     
    347368  /// Pointer to CoinSmallFactorization
    348369  CoinSmallFactorization * coinFactorizationB_;
     370  /// If nonzero force use of 1,dense 2,small 3,osl
     371  int forceB_;
     372  /// Switch to osl if number rows <= this
     373  int goOslThreshold_;
    349374  /// Switch to small if number rows <= this
    350375  int goSmallThreshold_;
Note: See TracChangeset for help on using the changeset viewer.