Ignore:
Timestamp:
Mar 5, 2011 12:06:15 PM (9 years ago)
Author:
stefan
Message:

check for AMD and CHOLMOD and GLPK's AMD in configure; compile ClpCholeskyUfl? only if AMD, CHOLMOD, or GLPK available

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.7
        2 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
        3 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
        4 Data/Netlib  https://projects.coin-or.org/svn/Data/Netlib/stable/1.2
        5 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
        6 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
        7 Osi  https://projects.coin-or.org/svn/Osi/trunk/Osi
        8 
         1BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.7
         2ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
         3ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
         4ThirdParty/Metis https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
         5ThirdParty/Mumps https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
         6ThirdParty/Glpk https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
         7Data/Netlib   https://projects.coin-or.org/svn/Data/Netlib/stable/1.2
         8Data/Sample   https://projects.coin-or.org/svn/Data/Sample/stable/1.2
         9CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
         10Osi           https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
  • trunk/Clp/src/ClpCholeskyUfl.hpp

    r1665 r1691  
    66#ifndef ClpCholeskyUfl_H
    77#define ClpCholeskyUfl_H
     8
    89#include "ClpCholeskyBase.hpp"
    9 #ifdef __cplusplus
    10 extern "C" {
    11 #endif
    12 #ifndef CLP_USE_CHOLMOD
    13 #include "amd.h"
    14 #else
    15 #include "cholmod.h"
    16 #endif
    17 #ifdef __cplusplus
    18 }
    19 #endif
     10
    2011class ClpMatrixBase;
    2112class ClpCholeskyDense;
     13
     14typedef struct cholmod_factor_struct cholmod_factor;
     15typedef struct cholmod_common_struct cholmod_common;
    2216
    2317/** Ufl class for Clp Cholesky factorization
     
    4438      Returns non-zero if not enough memory */
    4539     virtual int order(ClpInterior * model) ;
    46 #ifdef CLP_USE_CHOLMOD
    47      /** Does Symbolic factorization given permutation.
     40     /** Does Symbolic factorization given permutation using CHOLMOD (if available).
    4841         This is called immediately after order.  If user provides this then
    4942         user must provide factorize and solve.  Otherwise the default factorization is used
    50          returns non-zero if not enough memory */
     43         returns non-zero if not enough memory. */
    5144     virtual int symbolic();
    52      /** Factorize - filling in rowsDropped and returning number dropped.
     45     /** Factorize - filling in rowsDropped and returning number dropped using CHOLMOD (if available).
    5346         If return code negative then out of memory */
    5447     virtual int factorize(const double * diagonal, int * rowsDropped) ;
    55      /** Uses factorization to solve. */
     48     /** Uses factorization to solve. Uses CHOLMOD (if available). */
    5649     virtual void solve (double * region) ;
    57 #endif
    5850     //@}
    5951
     
    6658     /** Destructor  */
    6759     virtual ~ClpCholeskyUfl();
    68      // Copy
    69      ClpCholeskyUfl(const ClpCholeskyUfl&);
    70      // Assignment
    71      ClpCholeskyUfl& operator=(const ClpCholeskyUfl&);
    7260     /// Clone
    7361     virtual ClpCholeskyBase * clone() const ;
     
    7664
    7765private:
    78 #ifdef CLP_USE_CHOLMOD
    7966     cholmod_factor * L_ ;
    80      cholmod_common c_ ;
    81 #endif
     67     cholmod_common * c_ ;
     68
     69     // Copy
     70     ClpCholeskyUfl(const ClpCholeskyUfl&);
     71     // Assignment
     72     ClpCholeskyUfl& operator=(const ClpCholeskyUfl&);
    8273};
    8374
Note: See TracChangeset for help on using the changeset viewer.