Ignore:
Timestamp:
Sep 23, 2008 6:06:00 AM (11 years ago)
Author:
forrest
Message:

allow coinsimpfactorization

File:
1 edited

Legend:

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

    r1266 r1284  
    1111class ClpSimplex;
    1212class ClpNetworkBasis;
    13 #define CLP_MULTIPLE_FACTORIZATIONS   
    14 #ifdef CLP_MULTIPLE_FACTORIZATIONS   
     13#ifndef CLP_MULTIPLE_FACTORIZATIONS
     14#define CLP_MULTIPLE_FACTORIZATIONS 1
     15#endif   
     16#if CLP_MULTIPLE_FACTORIZATIONS == 1
    1517#include "CoinDenseFactorization.hpp"
     18typedef CoinDenseFactorization CoinOtherFactorization;
     19#elif CLP_MULTIPLE_FACTORIZATIONS == 2
     20#include "CoinSimpFactorization.hpp"
     21typedef CoinSimpFactorization CoinOtherFactorization;
    1622#endif
    1723
     
    5965   ClpFactorization(const CoinFactorization&);
    6066#ifdef CLP_MULTIPLE_FACTORIZATIONS   
    61    /** The copy constructor from an CoinDenseFactorization. */
    62    ClpFactorization(const CoinDenseFactorization&);
     67   /** The copy constructor from an CoinOtherFactorization. */
     68   ClpFactorization(const CoinOtherFactorization&);
    6369#endif
    6470   ClpFactorization& operator=(const ClpFactorization&);
     
    327333  /// Pointer to CoinFactorization
    328334  CoinFactorization * coinFactorizationA_;
    329   /// Pointer to CoinDenseFactorization
    330   CoinDenseFactorization * coinFactorizationB_;
     335  /// Pointer to CoinOtherFactorization
     336  CoinOtherFactorization * coinFactorizationB_;
    331337  /// Switch to dense if number rows <= this
    332338  int goDenseThreshold_;
Note: See TracChangeset for help on using the changeset viewer.