Changeset 470


Ignore:
Timestamp:
Aug 19, 2005 4:57:40 PM (14 years ago)
Author:
andreasw
Message:
  • added LICENSE file
  • corrected check for GNU make in configure
  • made documentation compile
  • corrected error messages from doxygen
Location:
branches/dev
Files:
1 added
2 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • branches/dev/Apps/AmplSolver/AmplTNLP.cpp

    r465 r470  
    601601
    602602  void AmplTNLP::get_scaling_parameters(Number& obj_scaling,
    603                                         Index n, double* x_scaling,
    604                                         Index m, double* g_scaling)
     603                                        Index n, Number* x_scaling,
     604                                        Index m, Number* g_scaling)
    605605  {
    606606    DBG_ASSERT(IsValid(suffix_handler_));
  • branches/dev/Apps/AmplSolver/AmplTNLP.hpp

    r465 r470  
    9292                        Index* jCol, Number* values);
    9393
     94    /** retrieve the scaling parameters for the variables, objective
     95     *  function, and constraints. */
    9496    virtual void get_scaling_parameters(Number& obj_scaling,
    9597                                        Index n, Number* x_scaling,
  • branches/dev/Common/IpJournalist.hpp

    r438 r470  
    1 // Copyright (C) 2004, International Business Machines and others.
     1// Copyright (C) 2004, 2005 International Business Machines and others.
    22// All Rights Reserved.
    33// This code is published under the Common Public License.
     
    387387    /** FILE pointer for the output destination */
    388388    FILE* file_;
    389     //@}
    390389  };
    391390}
  • branches/dev/Common/IpRegOptions.hpp

    r465 r470  
    1 // Copyright (C) 2004, International Business Machines and others.
     1// Copyright (C) 2004, 2005 International Business Machines and others.
    22// All Rights Reserved.
    33// This code is published under the Common Public License.
     
    144144    //@}
    145145
    146     /** Get / Set methods valid for specific types - NOTE: the Type
     146    /** @name Get / Set methods valid for specific types - NOTE: the Type
    147147     *  must be set before calling these methods.
    148148     */
     
    338338    /** output a more concise version */
    339339    void OutputShortDescription(const Journalist& jnlst) const;
    340     //@}
    341340
    342341  private:
  • branches/dev/Docs/documentation.tex

    r464 r470  
    13451345and allocate space for the constraint bounds. The first constraint has
    13461346a lower bound of $25$ and no upper bound.  Here we set the upper bound
    1347 to 2e19. Ipopt interprets any number greater than nlp_upper_bound_inf
    1348 as infinity. The default value of nlp_upper_bound_inf and
    1349 nlp_lower_bound_inf is 1e19 and can be changed through ipopt options.
     1347to \texttt{2e19}. Ipopt interprets any number greater than \texttt{nlp\_upper\_bound\_inf}
     1348as infinity. The default value of \texttt{nlp\_upper\_bound\_inf} and
     1349\texttt{nlp\_lower\_bound\_inf} is \texttt{1e19} and can be changed through ipopt options.
    13501350The second constraint is an equality, so we set both the upper and the
    13511351lower bound to $40$.
     
    13561356nele\_hess} are the number of elements in Jacobian and the Hessian
    13571357respectively. See appendix \ref{app.triplet} for a description of the
    1358 sparse matrix format. The {\tt index_style} argument specifies whether
     1358sparse matrix format. The {\tt index\_style} argument specifies whether
    13591359we want to use C style indexing for the row and column indices of the
    13601360matrices or Fortran style indexing. Here, we set it to {\tt 0} to
     
    13851385
    13861386The return code is an ApplicationReturnStatus enumeration, see {\tt
    1387 Interfaces/ReturnCodes_inc.h}.
     1387Interfaces/ReturnCodes\_inc.h}.
    13881388
    13891389After the problem has solved, we check the status and print the solution if
  • branches/dev/LinAlg/IpBlas.hpp

    r430 r470  
    1 // Copyright (C) 2004, International Business Machines and others.
     1// Copyright (C) 2004, 2005 International Business Machines and others.
    22// All Rights Reserved.
    33// This code is published under the Common Public License.
  • branches/dev/configure

    r468 r470  
    11#! /bin/sh
    2 # From configure.ac beta.
     2# From configure.ac 3.0.-1.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.59 for Ipopt 3.0beta.
     4# Generated by GNU Autoconf 2.59 for Ipopt 3.0.-1.
    55#
    66# Report bugs to <coin-ipopt@www-124.ibm.com>.
     
    277277PACKAGE_NAME='Ipopt'
    278278PACKAGE_TARNAME='ipopt'
    279 PACKAGE_VERSION='3.0beta'
    280 PACKAGE_STRING='Ipopt 3.0beta'
     279PACKAGE_VERSION='3.0.-1'
     280PACKAGE_STRING='Ipopt 3.0.-1'
    281281PACKAGE_BUGREPORT='coin-ipopt@www-124.ibm.com'
    282282
     
    829829  # This message is too long to be a string in the A/UX 3.1 sh.
    830830  cat <<_ACEOF
    831 \`configure' configures Ipopt 3.0beta to adapt to many kinds of systems.
     831\`configure' configures Ipopt 3.0.-1 to adapt to many kinds of systems.
    832832
    833833Usage: $0 [OPTION]... [VAR=VALUE]...
     
    894894if test -n "$ac_init_help"; then
    895895  case $ac_init_help in
    896      short | recursive ) echo "Configuration of Ipopt 3.0beta:";;
     896     short | recursive ) echo "Configuration of Ipopt 3.0.-1:";;
    897897   esac
    898898  cat <<\_ACEOF
     
    10391039if $ac_init_version; then
    10401040  cat <<\_ACEOF
    1041 Ipopt configure 3.0beta
     1041Ipopt configure 3.0.-1
    10421042generated by GNU Autoconf 2.59
    10431043
     
    10591059running configure, to aid debugging if configure makes a mistake.
    10601060
    1061 It was created by Ipopt $as_me 3.0beta, which was
     1061It was created by Ipopt $as_me 3.0.-1, which was
    10621062generated by GNU Autoconf 2.59.  Invocation command line was
    10631063
     
    60206020# Define the identity of the package.
    60216021 PACKAGE='ipopt'
    6022  VERSION='3.0beta'
     6022 VERSION='3.0.-1'
    60236023
    60246024
     
    99769976    echo "$as_me:$LINENO: checking whether MA27 is threadsafe" >&5
    99779977echo $ECHO_N "checking whether MA27 is threadsafe... $ECHO_C" >&6
    9978     if grep MA27UD $hslsrcdir/ma27ad.f >&5 ; then
     9978    if $EGREP MA27UD $hslsrcdir/ma27ad.f >&5 ; then
    99799979      echo "$as_me:$LINENO: result: yes" >&5
    99809980echo "${ECHO_T}yes" >&6
     
    1051210512    echo "$as_me:$LINENO: checking whether $am_make is the GNU make" >&5
    1051310513echo $ECHO_N "checking whether $am_make is the GNU make... $ECHO_C" >&6
    10514     if $am_make -v | grep GNU >&5 ; then
     10514    rm -f conftest.mak
     10515    ($am_make -v -f conftest.mak > conftest.grp) 2>&5
     10516    if $EGREP GNU conftest.grp >&5 ; then
    1051510517      echo "$as_me:$LINENO: result: yes" >&5
    1051610518echo "${ECHO_T}yes" >&6
    1051710519      ASLMAKEFLAGS="-j 1 $ASLMAKEFLAGS"
    1051810520    else
    10519       echo "$as_me:$LINENO: result: yes" >&5
    10520 echo "${ECHO_T}yes" >&6
     10521      echo "$as_me:$LINENO: result: no" >&5
     10522echo "${ECHO_T}no" >&6
    1052110523    fi
     10524    rm -f conftest.mak conftest.grp
    1052210525
    1052310526#    if test $USE_MAINTAINER_MODE = 'yes'; then
     
    1133911342cat >&5 <<_CSEOF
    1134011343
    11341 This file was extended by Ipopt $as_me 3.0beta, which was
     11344This file was extended by Ipopt $as_me 3.0.-1, which was
    1134211345generated by GNU Autoconf 2.59.  Invocation command line was
    1134311346
     
    1140511408cat >>$CONFIG_STATUS <<_ACEOF
    1140611409ac_cs_version="\\
    11407 Ipopt config.status 3.0beta
     11410Ipopt config.status 3.0.-1
    1140811411configured by $0, generated by GNU Autoconf 2.59,
    1140911412  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • branches/dev/configure.ac

    r468 r470  
    1414AC_PREREQ(2.59)
    1515
    16 AC_INIT([Ipopt],[3.0beta],[coin-ipopt@www-124.ibm.com])
     16AC_INIT([Ipopt],[3.0.-1],[coin-ipopt@www-124.ibm.com])
    1717
    1818AC_COPYRIGHT([
     
    2222under the Common Public License.])
    2323
    24 AC_REVISION(beta)
     24AC_REVISION(3.0.-1)
    2525
    2626AC_CONFIG_SRCDIR(Common/IpDebug.hpp)
     
    10041004  if test "$use_MA27" = BUILD; then
    10051005    AC_MSG_CHECKING([whether MA27 is threadsafe])
    1006     if grep MA27UD $hslsrcdir/ma27ad.f >&5 ; then
     1006    if $EGREP MA27UD $hslsrcdir/ma27ad.f >&5 ; then
    10071007      AC_MSG_RESULT(yes)
    10081008    else
     
    11461146
    11471147    AC_MSG_CHECKING([whether $am_make is the GNU make])
    1148     if $am_make -v | grep GNU >&5 ; then
     1148    rm -f conftest.mak
     1149    ($am_make -v -f conftest.mak > conftest.grp) 2>&5
     1150    if $EGREP GNU conftest.grp >&5 ; then
    11491151      AC_MSG_RESULT([yes])
    11501152      ASLMAKEFLAGS="-j 1 $ASLMAKEFLAGS"
    11511153    else
    1152       AC_MSG_RESULT([yes])
     1154      AC_MSG_RESULT([no])
    11531155    fi
     1156    rm -f conftest.mak conftest.grp
    11541157
    11551158#    if test $USE_MAINTAINER_MODE = 'yes'; then
Note: See TracChangeset for help on using the changeset viewer.