Ignore:
Timestamp:
Jun 19, 2011 12:27:26 PM (9 years ago)
Author:
stefan
Message:

sync with trunk rev1751

Location:
stable/1.14
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/1.14

    • 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/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
        5 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
        6 Osi  https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
         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/stable/1.8
         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/stable/2.8/CoinUtils
         10Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
    • Property svn:mergeinfo changed
      /trunk (added)merged: 1670-1671,​1675-1685,​1687-1711,​1716-1727,​1729-1735,​1737-1748,​1750-1752
  • stable/1.14/Clp/examples/Makefile.in

    r1655 r1753  
    9393else
    9494  ifeq ($(COIN_CXX_IS_CL), TRUE)
    95     LIBS = /link /libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@
     95    LIBS = -link -libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@
    9696  else
    9797    LIBS = -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@
  • stable/1.14/Clp/examples/testBarrier.cpp

    r1662 r1753  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
     6// @TODO the ifdef WSSMP_BARRIER currently does not work - the define is never set
     7// best would be if one could tell ClpModel to use the wssmp factorization code, if available, without having to check for some define
     8
    69#include "ClpInterior.hpp"
    710#include "ClpSimplex.hpp"
     11#ifdef WSSMP_BARRIER
    812#include "ClpCholeskyWssmp.hpp"
     13#endif
    914#include "ClpCholeskyDense.hpp"
    1015int main(int argc, const char *argv[])
Note: See TracChangeset for help on using the changeset viewer.