Changeset 2221


Ignore:
Timestamp:
Feb 23, 2019 3:15:28 PM (20 months ago)
Author:
tkr
Message:

Merging trunk at r2220

Location:
stable/0.108
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • stable/0.108

  • stable/0.108/Dependencies

    r2209 r2221  
    1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.8
    2 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
    3 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.6
    4 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
    5 ThirdParty/SoPlex  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SoPlex/stable/1.6
    6 Data/Netlib  https://projects.coin-or.org/svn/Data/Netlib/stable/1.2
    7 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
    8 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.11/CoinUtils
     1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.8
     2ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
     3ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.6
     4ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
     5ThirdParty/SoPlex https://projects.coin-or.org/svn/BuildTools/ThirdParty/SoPlex/stable/1.6
     6Data/Netlib       https://projects.coin-or.org/svn/Data/Netlib/stable/1.2
     7Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
     8CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
  • stable/0.108/Osi

  • stable/0.108/Osi/CHANGELOG

    r2201 r2221  
     122/02/2019 OsiSolverInterfaceTest
     2  - remove nonsense test for whether a column solution exists *before* solve
     3
    1423/01/2018 OsiMsk
    25  - add compatibility with Mosek 9.0 beta
  • stable/0.108/Osi/configure

    r2220 r2221  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Osi 0.108.
     3# Generated by GNU Autoconf 2.59 for Osi trunk.
    44#
    55# Report bugs to <osi@list.coin-or.org>.
     
    430430PACKAGE_NAME='Osi'
    431431PACKAGE_TARNAME='osi'
    432 PACKAGE_VERSION='0.108'
    433 PACKAGE_STRING='Osi 0.108'
     432PACKAGE_VERSION='trunk'
     433PACKAGE_STRING='Osi trunk'
    434434PACKAGE_BUGREPORT='osi@list.coin-or.org'
    435435
     
    10061006  # This message is too long to be a string in the A/UX 3.1 sh.
    10071007  cat <<_ACEOF
    1008 \`configure' configures Osi 0.108 to adapt to many kinds of systems.
     1008\`configure' configures Osi trunk to adapt to many kinds of systems.
    10091009
    10101010Usage: $0 [OPTION]... [VAR=VALUE]...
     
    10721072if test -n "$ac_init_help"; then
    10731073  case $ac_init_help in
    1074      short | recursive ) echo "Configuration of Osi 0.108:";;
     1074     short | recursive ) echo "Configuration of Osi trunk:";;
    10751075   esac
    10761076  cat <<\_ACEOF
     
    12801280if $ac_init_version; then
    12811281  cat <<\_ACEOF
    1282 Osi configure 0.108
     1282Osi configure trunk
    12831283generated by GNU Autoconf 2.59
    12841284
     
    13001300running configure, to aid debugging if configure makes a mistake.
    13011301
    1302 It was created by Osi $as_me 0.108, which was
     1302It was created by Osi $as_me trunk, which was
    13031303generated by GNU Autoconf 2.59.  Invocation command line was
    13041304
     
    45304530# Define the identity of the package.
    45314531 PACKAGE='osi'
    4532  VERSION='0.108'
     4532 VERSION='trunk'
    45334533
    45344534
     
    2587525875cat >&5 <<_CSEOF
    2587625876
    25877 This file was extended by Osi $as_me 0.108, which was
     25877This file was extended by Osi $as_me trunk, which was
    2587825878generated by GNU Autoconf 2.59.  Invocation command line was
    2587925879
     
    2593825938cat >>$CONFIG_STATUS <<_ACEOF
    2593925939ac_cs_version="\\
    25940 Osi config.status 0.108
     25940Osi config.status trunk
    2594125941configured by $0, generated by GNU Autoconf 2.59,
    2594225942  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • stable/0.108/Osi/configure.ac

    r2220 r2221  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Osi],[0.108],[osi@list.coin-or.org])
     15AC_INIT([Osi],[trunk],[osi@list.coin-or.org])
    1616
    1717AC_COPYRIGHT([
  • stable/0.108/Osi/src/Osi/config_osi_default.h

    r2220 r2221  
    66
    77/* Version number of project */
    8 #define OSI_VERSION "0.108"
     8#define OSI_VERSION      "trunk"
    99
    1010/* Major Version number of project */
    11 #define OSI_VERSION_MAJOR 0
     11#define OSI_VERSION_MAJOR   9999
    1212
    1313/* Minor Version number of project */
    14 #define OSI_VERSION_MINOR 108
     14#define OSI_VERSION_MINOR   9999
    1515
    1616/* Release Version number of project */
  • stable/0.108/Osi/src/OsiCommonTest/OsiSolverInterfaceTest.cpp

    r2208 r2221  
    40034003    OSIUNITTEST_ASSERT_ERROR(eq(objCoef[7], -1.0), {}, *exmip1Si, "problem read correctly: objective coefficients");
    40044004
    4005     // make sure col solution is something reasonable,
    4006     // that is between upper and lower bounds
    4007     const double *cs = exmip1Si->getColSolution();
    4008     int c;
    4009     bool okColSol = true;
    4010     //double inf = exmip1Si->getInfinity();
    4011     for (c = 0; c < nc; c++) {
    4012       // if colSol is not between column bounds then
    4013       // colSol is unreasonable.
    4014       if (!(cl[c] <= cs[c] && cs[c] <= cu[c]))
    4015         okColSol = false;
    4016       // if at least one column bound is not infinite,
    4017       // then it is unreasonable to have colSol as infinite
    4018       // FIXME: temporarily commented out pending some group thought on the
    4019       //        semantics of this test. -- lh, 03.04.29 --
    4020       // if ( (cl[c]<inf || cu[c]<inf) && cs[c]>=inf ) okColSol=false;
    4021     }
    4022     OSIUNITTEST_ASSERT_WARNING(okColSol, {}, *exmip1Si, "column solution before solve");
    4023 
    4024     // Test that objective value is correct
    4025     // FIXME: the test checks the primal value. vol fails this, because vol
    4026     // considers the dual value to be the objective value
    4027     /*
    4028        gurobi fails this, because gurobi does not have a solution before a
    4029        model is solved (which makes sense, I (SV) think)
    4030 
    4031        Eh, well, you can argue the point, but the current OSI spec requires
    4032        that there be a valid solution from the point that the problem is
    4033        loaded. Nothing says it needs to be a good solution. -- lh, 100826 --
    4034     */
    4035     double correctObjValue = CoinPackedVector(nc, objCoef).dotProduct(cs);
    4036     double siObjValue = exmip1Si->getObjValue();
    4037     OSIUNITTEST_ASSERT_SEVERITY_EXPECTED(eq(correctObjValue, siObjValue), {}, *exmip1Si, "solution value before solve", TestOutcome::WARNING, solverName == "Vol");
    40384005  }
    40394006
     
    41424109    OSIUNITTEST_ASSERT_ERROR(eq(ru[4], 15.), {}, solverName, "problem cloned: rows upper bounds");
    41434110
    4144     const double *objCoef = exmip1Si->getObjCoefficients();
     4111    const double *objCoef = si2->getObjCoefficients();
    41454112    OSIUNITTEST_ASSERT_ERROR(eq(objCoef[0], 1.0), {}, solverName, "problem cloned: objective coefficients");
    41464113    OSIUNITTEST_ASSERT_ERROR(eq(objCoef[1], 0.0), {}, solverName, "problem cloned: objective coefficients");
     
    41514118    OSIUNITTEST_ASSERT_ERROR(eq(objCoef[6], 0.0), {}, solverName, "problem cloned: objective coefficients");
    41524119    OSIUNITTEST_ASSERT_ERROR(eq(objCoef[7], -1.0), {}, solverName, "problem cloned: objective coefficients");
    4153 
    4154     // make sure col solution is something reasonable,
    4155     // that is between upper and lower bounds
    4156     const double *cs = exmip1Si->getColSolution();
    4157     int c;
    4158     bool okColSol = true;
    4159     //double inf = exmip1Si->getInfinity();
    4160     for (c = 0; c < nc; c++) {
    4161       // if colSol is not between column bounds then
    4162       // colSol is unreasonable.
    4163       if (!(cl[c] <= cs[c] && cs[c] <= cu[c]))
    4164         okColSol = false;
    4165       // if at least one column bound is not infinite,
    4166       // then it is unreasonable to have colSol as infinite
    4167       // FIXME: temporarily commented out pending some group thought on the
    4168       //        semantics of this test. -- lh, 03.04.29 --
    4169       // if ( (cl[c]<inf || cu[c]<inf) && cs[c]>=inf ) okColSol=false;
    4170     }
    4171     OSIUNITTEST_ASSERT_WARNING(okColSol, {}, solverName, "problem cloned: column solution before solve");
    41724120
    41734121    // Test getting of objective offset
  • stable/0.108/configure

    r2220 r2221  
    22# From configure.ac 0.9.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.59 for Osi 0.108.
     4# Generated by GNU Autoconf 2.59 for Osi trunk.
    55#
    66# Report bugs to <osi@lists.coin-or.org>.
     
    431431PACKAGE_NAME='Osi'
    432432PACKAGE_TARNAME='osi'
    433 PACKAGE_VERSION='0.108'
    434 PACKAGE_STRING='Osi 0.108'
     433PACKAGE_VERSION='trunk'
     434PACKAGE_STRING='Osi trunk'
    435435PACKAGE_BUGREPORT='osi@lists.coin-or.org'
    436436
     
    10311031  # This message is too long to be a string in the A/UX 3.1 sh.
    10321032  cat <<_ACEOF
    1033 \`configure' configures Osi 0.108 to adapt to many kinds of systems.
     1033\`configure' configures Osi trunk to adapt to many kinds of systems.
    10341034
    10351035Usage: $0 [OPTION]... [VAR=VALUE]...
     
    10971097if test -n "$ac_init_help"; then
    10981098  case $ac_init_help in
    1099      short | recursive ) echo "Configuration of Osi 0.108:";;
     1099     short | recursive ) echo "Configuration of Osi trunk:";;
    11001100   esac
    11011101  cat <<\_ACEOF
     
    12991299if $ac_init_version; then
    13001300  cat <<\_ACEOF
    1301 Osi configure 0.108
     1301Osi configure trunk
    13021302generated by GNU Autoconf 2.59
    13031303
     
    13191319running configure, to aid debugging if configure makes a mistake.
    13201320
    1321 It was created by Osi $as_me 0.108, which was
     1321It was created by Osi $as_me trunk, which was
    13221322generated by GNU Autoconf 2.59.  Invocation command line was
    13231323
     
    44914491# Try if FFLAGS works
    44924492if test "$F77" != "unavailable" ; then
     4493  orig_FFLAGS="FFLAGS"
    44934494  cat >conftest.$ac_ext <<_ACEOF
    44944495      program main
     
    45284529      conftest$ac_exeext conftest.$ac_ext
    45294530  if test -z "$FFLAGS"; then
    4530     { echo "$as_me:$LINENO: WARNING: The flags FFLAGS=\"$FFLAGS\" do not work.  I will now just try '-O', but you might want to set FFLAGS manually." >&5
    4531 echo "$as_me: WARNING: The flags FFLAGS=\"$FFLAGS\" do not work.  I will now just try '-O', but you might want to set FFLAGS manually." >&2;}
     4531    { echo "$as_me:$LINENO: WARNING: The flags FFLAGS=\"$orig_FFLAGS\" do not work.  I will now just try '-O', but you might want to set FFLAGS manually." >&5
     4532echo "$as_me: WARNING: The flags FFLAGS=\"$orig_FFLAGS\" do not work.  I will now just try '-O', but you might want to set FFLAGS manually." >&2;}
    45324533    FFLAGS='-O'
    45334534    cat >conftest.$ac_ext <<_ACEOF
     
    45684569      conftest$ac_exeext conftest.$ac_ext
    45694570    if test -z "$FFLAGS"; then
    4570       { echo "$as_me:$LINENO: WARNING: This value for FFLAGS does not work. I will continue with empty FFLAGS, but you might want to set FFLAGS manually." >&5
    4571 echo "$as_me: WARNING: This value for FFLAGS does not work. I will continue with empty FFLAGS, but you might want to set FFLAGS manually." >&2;}
     4571      { echo "$as_me:$LINENO: WARNING: The flags FFLAGS=-O do not work. I will continue with empty FFLAGS, but you might want to set FFLAGS manually." >&5
     4572echo "$as_me: WARNING: The flags FFLAGS=-O do not work. I will continue with empty FFLAGS, but you might want to set FFLAGS manually." >&2;}
    45724573    fi
    45734574  fi
     
    50755076# Define the identity of the package.
    50765077 PACKAGE='osi'
    5077  VERSION='0.108'
     5078 VERSION='trunk'
    50785079
    50795080
     
    63716372*-*-irix6*)
    63726373  # Find out which ABI we are using.
    6373   echo '#line 6373 "configure"' > conftest.$ac_ext
     6374  echo '#line 6374 "configure"' > conftest.$ac_ext
    63746375  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    63756376  (eval $ac_compile) 2>&5
     
    83358336   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83368337   -e 's:$: $lt_compiler_flag:'`
    8337    (eval echo "\"\$as_me:8337: $lt_compile\"" >&5)
     8338   (eval echo "\"\$as_me:8338: $lt_compile\"" >&5)
    83388339   (eval "$lt_compile" 2>conftest.err)
    83398340   ac_status=$?
    83408341   cat conftest.err >&5
    8341    echo "$as_me:8341: \$? = $ac_status" >&5
     8342   echo "$as_me:8342: \$? = $ac_status" >&5
    83428343   if (exit $ac_status) && test -s "$ac_outfile"; then
    83438344     # The compiler can only warn and ignore the option if not recognized
     
    86038604   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    86048605   -e 's:$: $lt_compiler_flag:'`
    8605    (eval echo "\"\$as_me:8605: $lt_compile\"" >&5)
     8606   (eval echo "\"\$as_me:8606: $lt_compile\"" >&5)
    86068607   (eval "$lt_compile" 2>conftest.err)
    86078608   ac_status=$?
    86088609   cat conftest.err >&5
    8609    echo "$as_me:8609: \$? = $ac_status" >&5
     8610   echo "$as_me:8610: \$? = $ac_status" >&5
    86108611   if (exit $ac_status) && test -s "$ac_outfile"; then
    86118612     # The compiler can only warn and ignore the option if not recognized
     
    87078708   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    87088709   -e 's:$: $lt_compiler_flag:'`
    8709    (eval echo "\"\$as_me:8709: $lt_compile\"" >&5)
     8710   (eval echo "\"\$as_me:8710: $lt_compile\"" >&5)
    87108711   (eval "$lt_compile" 2>out/conftest.err)
    87118712   ac_status=$?
    87128713   cat out/conftest.err >&5
    8713    echo "$as_me:8713: \$? = $ac_status" >&5
     8714   echo "$as_me:8714: \$? = $ac_status" >&5
    87148715   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    87158716   then
     
    1105211053  lt_status=$lt_dlunknown
    1105311054  cat > conftest.$ac_ext <<EOF
    11054 #line 11054 "configure"
     11055#line 11055 "configure"
    1105511056#include "confdefs.h"
    1105611057
     
    1115211153  lt_status=$lt_dlunknown
    1115311154  cat > conftest.$ac_ext <<EOF
    11154 #line 11154 "configure"
     11155#line 11155 "configure"
    1115511156#include "confdefs.h"
    1115611157
     
    1349613497   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1349713498   -e 's:$: $lt_compiler_flag:'`
    13498    (eval echo "\"\$as_me:13498: $lt_compile\"" >&5)
     13499   (eval echo "\"\$as_me:13499: $lt_compile\"" >&5)
    1349913500   (eval "$lt_compile" 2>conftest.err)
    1350013501   ac_status=$?
    1350113502   cat conftest.err >&5
    13502    echo "$as_me:13502: \$? = $ac_status" >&5
     13503   echo "$as_me:13503: \$? = $ac_status" >&5
    1350313504   if (exit $ac_status) && test -s "$ac_outfile"; then
    1350413505     # The compiler can only warn and ignore the option if not recognized
     
    1360013601   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1360113602   -e 's:$: $lt_compiler_flag:'`
    13602    (eval echo "\"\$as_me:13602: $lt_compile\"" >&5)
     13603   (eval echo "\"\$as_me:13603: $lt_compile\"" >&5)
    1360313604   (eval "$lt_compile" 2>out/conftest.err)
    1360413605   ac_status=$?
    1360513606   cat out/conftest.err >&5
    13606    echo "$as_me:13606: \$? = $ac_status" >&5
     13607   echo "$as_me:13607: \$? = $ac_status" >&5
    1360713608   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1360813609   then
     
    1517015171   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1517115172   -e 's:$: $lt_compiler_flag:'`
    15172    (eval echo "\"\$as_me:15172: $lt_compile\"" >&5)
     15173   (eval echo "\"\$as_me:15173: $lt_compile\"" >&5)
    1517315174   (eval "$lt_compile" 2>conftest.err)
    1517415175   ac_status=$?
    1517515176   cat conftest.err >&5
    15176    echo "$as_me:15176: \$? = $ac_status" >&5
     15177   echo "$as_me:15177: \$? = $ac_status" >&5
    1517715178   if (exit $ac_status) && test -s "$ac_outfile"; then
    1517815179     # The compiler can only warn and ignore the option if not recognized
     
    1527415275   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1527515276   -e 's:$: $lt_compiler_flag:'`
    15276    (eval echo "\"\$as_me:15276: $lt_compile\"" >&5)
     15277   (eval echo "\"\$as_me:15277: $lt_compile\"" >&5)
    1527715278   (eval "$lt_compile" 2>out/conftest.err)
    1527815279   ac_status=$?
    1527915280   cat out/conftest.err >&5
    15280    echo "$as_me:15280: \$? = $ac_status" >&5
     15281   echo "$as_me:15281: \$? = $ac_status" >&5
    1528115282   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1528215283   then
     
    1748117482   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1748217483   -e 's:$: $lt_compiler_flag:'`
    17483    (eval echo "\"\$as_me:17483: $lt_compile\"" >&5)
     17484   (eval echo "\"\$as_me:17484: $lt_compile\"" >&5)
    1748417485   (eval "$lt_compile" 2>conftest.err)
    1748517486   ac_status=$?
    1748617487   cat conftest.err >&5
    17487    echo "$as_me:17487: \$? = $ac_status" >&5
     17488   echo "$as_me:17488: \$? = $ac_status" >&5
    1748817489   if (exit $ac_status) && test -s "$ac_outfile"; then
    1748917490     # The compiler can only warn and ignore the option if not recognized
     
    1774917750   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1775017751   -e 's:$: $lt_compiler_flag:'`
    17751    (eval echo "\"\$as_me:17751: $lt_compile\"" >&5)
     17752   (eval echo "\"\$as_me:17752: $lt_compile\"" >&5)
    1775217753   (eval "$lt_compile" 2>conftest.err)
    1775317754   ac_status=$?
    1775417755   cat conftest.err >&5
    17755    echo "$as_me:17755: \$? = $ac_status" >&5
     17756   echo "$as_me:17756: \$? = $ac_status" >&5
    1775617757   if (exit $ac_status) && test -s "$ac_outfile"; then
    1775717758     # The compiler can only warn and ignore the option if not recognized
     
    1785317854   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1785417855   -e 's:$: $lt_compiler_flag:'`
    17855    (eval echo "\"\$as_me:17855: $lt_compile\"" >&5)
     17856   (eval echo "\"\$as_me:17856: $lt_compile\"" >&5)
    1785617857   (eval "$lt_compile" 2>out/conftest.err)
    1785717858   ac_status=$?
    1785817859   cat out/conftest.err >&5
    17859    echo "$as_me:17859: \$? = $ac_status" >&5
     17860   echo "$as_me:17860: \$? = $ac_status" >&5
    1786017861   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1786117862   then
     
    2255922560cat >&5 <<_CSEOF
    2256022561
    22561 This file was extended by Osi $as_me 0.108, which was
     22562This file was extended by Osi $as_me trunk, which was
    2256222563generated by GNU Autoconf 2.59.  Invocation command line was
    2256322564
     
    2261722618cat >>$CONFIG_STATUS <<_ACEOF
    2261822619ac_cs_version="\\
    22619 Osi config.status 0.108
     22620Osi config.status trunk
    2262022621configured by $0, generated by GNU Autoconf 2.59,
    2262122622  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • stable/0.108/configure.ac

    r2220 r2221  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Osi],[0.108],[osi@lists.coin-or.org])
     15AC_INIT([Osi],[trunk],[osi@lists.coin-or.org])
    1616
    1717AC_COPYRIGHT([
Note: See TracChangeset for help on using the changeset viewer.