Changeset 135


Ignore:
Timestamp:
Nov 27, 2006 9:10:13 PM (13 years ago)
Author:
pbonami
Message:

Apparently long forgotten commit with Externals and updates to documentation

Location:
stable/0.1
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • stable/0.1

    • Property svn:externals
      •  

        old new  
        1 BuildTools    https://projects.coin-or.org/svn/BuildTools/releases/0.5.1
        2 ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.0.0
         1BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.5
         2ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        33ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        4 ThirdParty/HSL https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/releases/1.0.0
        5 ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.0.0
        6 Data/Netlib   https://projects.coin-or.org/svn/Data/releases/1.0.0/Netlib
        7 Data/Sample   https://projects.coin-or.org/svn/Data/releases/1.0.0/Sample
        8 Data/miplib3  https://projects.coin-or.org/svn/Data/releases/1.0.0/miplib3
        9 CoinUtils     https://projects.coin-or.org/svn/CoinUtils/releases/1.0.0/CoinUtils
        10 Cbc           https://projects.coin-or.org/svn/Cbc/releases/1.1.0/Cbc
        11 Cgl           https://projects.coin-or.org/svn/Cgl/releases/0.5.0/Cgl
        12 Clp           https://projects.coin-or.org/svn/Clp/releases/1.3.3/Clp
        13 Ipopt         https://projects.coin-or.org/svn/Ipopt/releases/3.2.2/Ipopt
        14 Osi           https://projects.coin-or.org/svn/Osi/releases/0.95.0/Osi
         4ThirdParty/HSL https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/stable/1.0
         5ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
         6Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
         7Data/Sample   https://projects.coin-or.org/svn/Data/stable/1.0/Sample
         8Data/miplib3  https://projects.coin-or.org/svn/Data/stable/1.0/miplib3
         9CoinUtils     https://projects.coin-or.org/svn/CoinUtils/stable/1.0/CoinUtils
         10Cbc           https://projects.coin-or.org/svn/Cbc/stable/1.1/Cbc
         11Cgl           https://projects.coin-or.org/svn/Cgl/stable/0.5/Cgl
         12Clp           https://projects.coin-or.org/svn/Clp/stable/1.3/Clp
         13Ipopt         https://projects.coin-or.org/svn/Ipopt/stable/3.2/Ipopt
         14Osi           https://projects.coin-or.org/svn/Osi/stable/0.95/Osi
  • stable/0.1/Bonmin/Makefile.am

    r1 r135  
    1414
    1515# Here list all subdirectories into which to recurse
    16 SUBDIRS = src/IpoptInterface \
    17         src/BonminAmplInterface \
    18         src/OaInterface \
     16SUBDIRS = src/IpoptInterface
     17
     18if COIN_HAS_ASL
     19SUBDIRS += src/BonminAmplInterface
     20endif
     21
     22SUBDIRS +=      src/OaInterface \
    1923        src/CbcBonmin \
    2024        src/Apps
  • stable/0.1/Bonmin/Makefile.in

    r13 r135  
    5252build_triplet = @build@
    5353host_triplet = @host@
    54 @BUILD_FP_TRUE@am__append_1 = experimental/FP
    55 @COIN_HAS_BCP_TRUE@am__append_2 = experimental/Bcp
     54@COIN_HAS_ASL_TRUE@am__append_1 = src/BonminAmplInterface
     55@BUILD_FP_TRUE@am__append_2 = experimental/FP
     56@COIN_HAS_BCP_TRUE@am__append_3 = experimental/Bcp
    5657
    5758# We don't want to compile the test subdirectory, unless the test target is
    5859# specified.  But we need to list it as subdirectory to make sure that it is
    5960# included in the tarball
    60 @ALWAYS_FALSE@am__append_3 = test
     61@ALWAYS_FALSE@am__append_4 = test
    6162DIST_COMMON = README $(am__configure_deps) \
    6263        $(srcdir)/../BuildTools/Makemain.inc $(srcdir)/../config.guess \
     
    7071        $(top_srcdir)/examples/CppExample/MyTMINLP.hpp \
    7172        $(top_srcdir)/inc/config_bonmin.h.in AUTHORS INSTALL
    72 @HAVE_EXTERNALS_TRUE@am__append_4 = Externals
    73 @HAVE_EXTERNALS_TRUE@am__append_5 = .Externals-stamp
     73@HAVE_EXTERNALS_TRUE@am__append_5 = Externals
     74@HAVE_EXTERNALS_TRUE@am__append_6 = .Externals-stamp
    7475subdir = .
    7576ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    321322
    322323# Here list all subdirectories into which to recurse
    323 SUBDIRS = src/IpoptInterface src/BonminAmplInterface src/OaInterface \
    324         src/CbcBonmin src/Apps $(am__append_1) $(am__append_2) \
    325         $(am__append_3)
     324SUBDIRS = src/IpoptInterface $(am__append_1) src/OaInterface \
     325        src/CbcBonmin src/Apps $(am__append_2) $(am__append_3) \
     326        $(am__append_4)
    326327
    327328########################################################################
     
    334335        doc/BOUM_Intro.tex doc/options.tex test/InterfaceTest.cpp \
    335336        test/CppExample/MyTMINLP.hpp test/CppExample/MyTMINLP.cpp \
    336         test/CppExample/MyBonmin.cpp test/mytoy.nl $(am__append_4)
     337        test/CppExample/MyBonmin.cpp test/mytoy.nl $(am__append_5)
    337338
    338339########################################################################
     
    344345        Test/CppExample/*.$(OBJEXT) \
    345346        Test/CppExample/CppExample$(EXEEXT) Test/testtoy.nl \
    346         $(am__append_5) $(VPATH_DISTCLEANFILES)
     347        $(am__append_6) $(VPATH_DISTCLEANFILES)
    347348all: all-recursive
    348349
  • stable/0.1/Bonmin/doc/BOUM_Install.tex

    r5 r135  
    111111\begin{verbatim}
    112112
    113 ../coin-Bonmin/configure -C
     113../Bonmin-0.1/configure -C
    114114
    115115\end{verbatim}
  • stable/0.1/Bonmin/doc/BOUM_Obtain.tex

    r11 r135  
    1111
    1212
    13 You can obtain the \Bonmin\ package by using
    14 \link{http://subversion.tigris.org/}{subversion}.
    1513
    1614The \Bonmin\ package consists of the source code for the \Bonmin\
     
    2927libraries of problems to test the codes.\\
    3028
     29
     30Before downloading \Bonmin\ you need to know which branch of Bonmin you want to download.
     31In particular you need to know if you want to download the latest version from:
     32\begin{itemize}
     33    \item the Stable branch, or from
     34    \item the Released branch.
     35\end{itemize}
     36These different version are made according to the guidelines of COIN-OR. The interpretation of these guidelines for the Bonmin project is explained on the wiki pages of Bonmin.
     37
     38The main distinction between the Stable and Release branch is that a stable version that we propose to download may evolve over time to include bug fixes while a released version will never change. The released versions present an advantage in particular if you want to make experiments which you want to be able to reproduce the stable version presents the advantage that it is less work for you to update in the event where we fix a bug.
     39
     40The easiest way to obtain the released version is by downloading a compressed archive. The latest release is Bonmin-0.1.0.
     41
     42The only way to obain one of the stable versions is through subversion.
     43
    3144In Unix\footnote{UNIX is a registered trademark of The Open
    32 Group.}-like environments, to download the code in a sub-directory, say {\tt coin-Bonmin} issue the following
    33 command:
     45Group.}-like environments, to download the latest stable version of Bonmin (0.1) in a sub-directory, say {\tt Bonmin-0.1}
     46issue the following command
    3447%\begin{verbatim}
    3548\break
    3649
    37  \noindent {\tt  svn co
    38 https://projects.coin-or.org/svn/Bonmin/trunk~coin-Bonmin }
     50 \noindent {\ttsvn co
     51https://projects.coin-or.org/svn/Bonmin/stable/0.1 Bonmin-0.1 }
    3952
    40 %\end{verbatim}
     53This copies all the necessary COIN-OR files to compile Bonmin to Bonmin-0.1.
     54You can obtain the \Bonmin\ package by using
     55\link{http://subversion.tigris.org/}{subversion}.
     56
    4157\noindent This copies all the necessary COIN-OR files to compile \Bonmin\ to
    42 {\tt coin-Bonmin}. To download \Bonmin\ using svn on Windows,
     58{\tt Bonmin-0.1}. To download \Bonmin\ using svn on Windows,
    4359follow the instructions provided at
    4460\link{http://www.coin-or.org/faqs.html\#q4}{COIN-OR}.
  • stable/0.1/Bonmin/src/Apps/bonmin.cpp

    r14 r135  
    1414#  pragma warning(disable:4786)
    1515#endif
     16
    1617#include <iomanip>
    1718#include <fstream>
     
    2223#include "CbcBonmin.hpp"
    2324
     25#ifndef COIN_HAS_ASL
     26#error "Ampl Solver Library (ASL) is not properly configured."
     27#error "Can not compile bonmin executable."
     28#error "Please check that you have the file asl.h in ThirdPary/ASL subdirectory"
     29#error "See documentation for instuctions on installing ASL."
     30#error "And rerun the configure script."
     31#endif
    2432
    2533
  • stable/0.1/Externals

    r133 r135  
    1 BuildTools    https://projects.coin-or.org/svn/BuildTools/releases/0.5.1
    2 ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.0.0
     1BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.5
     2ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
    33ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
    4 ThirdParty/HSL https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/releases/1.0.0
    5 ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.0.0
    6 Data/Netlib   https://projects.coin-or.org/svn/Data/releases/1.0.0/Netlib
    7 Data/Sample   https://projects.coin-or.org/svn/Data/releases/1.0.0/Sample
    8 Data/miplib3  https://projects.coin-or.org/svn/Data/releases/1.0.0/miplib3
    9 CoinUtils     https://projects.coin-or.org/svn/CoinUtils/releases/1.0.0/CoinUtils
    10 Cbc           https://projects.coin-or.org/svn/Cbc/releases/1.1.0/Cbc
    11 Cgl           https://projects.coin-or.org/svn/Cgl/releases/0.5.0/Cgl
    12 Clp           https://projects.coin-or.org/svn/Clp/releases/1.3.3/Clp
    13 Ipopt         https://projects.coin-or.org/svn/Ipopt/releases/3.2.2/Ipopt
    14 Osi           https://projects.coin-or.org/svn/Osi/releases/0.95.0/Osi
     4ThirdParty/HSL https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/stable/1.0
     5ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
     6Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
     7Data/Sample   https://projects.coin-or.org/svn/Data/stable/1.0/Sample
     8Data/miplib3  https://projects.coin-or.org/svn/Data/stable/1.0/miplib3
     9CoinUtils     https://projects.coin-or.org/svn/CoinUtils/stable/1.0/CoinUtils
     10Cbc           https://projects.coin-or.org/svn/Cbc/stable/1.1/Cbc
     11Cgl           https://projects.coin-or.org/svn/Cgl/stable/0.5/Cgl
     12Clp           https://projects.coin-or.org/svn/Clp/stable/1.3/Clp
     13Ipopt         https://projects.coin-or.org/svn/Ipopt/stable/3.2/Ipopt
     14Osi           https://projects.coin-or.org/svn/Osi/stable/0.95/Osi
     15
Note: See TracChangeset for help on using the changeset viewer.