Changeset 1043


Ignore:
Timestamp:
Jan 4, 2014 8:28:56 AM (6 years ago)
Author:
pbelotti
Message:

merged change to implied bound in exprPow from trunk

Location:
stable/0.4
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4

  • stable/0.4/Couenne

  • stable/0.4/Couenne/configure

    r1040 r1043  
    51745174      coin_disable_shared=yes
    51755175      if test x"$enable_shared" = xyes; then
    5176         case "$CC" in
     5176        case "$CXX" in
    51775177          clang* )
    51785178            { echo "$as_me:$LINENO: WARNING: DLL building not supported. I'm disabling your choice." >&5
     
    51825182            { echo "$as_me:$LINENO: DLL building not supported, but will build with -MD(d) instead of -MT(d)." >&5
    51835183echo "$as_me: DLL building not supported, but will build with -MD(d) instead of -MT(d)." >&6;}
    5184             ;;
    5185           *gcc*)
    5186             if test x"$enable_dependency_linking" = xyes; then
    5187               coin_disable_shared=no
    5188             else
    5189               { echo "$as_me:$LINENO: WARNING: To build shared libraries with gcc on CYGWIN or MSys, use --enable-dependency-linking" >&5
    5190 echo "$as_me: WARNING: To build shared libraries with gcc on CYGWIN or MSys, use --enable-dependency-linking" >&2;}
    5191             fi
    51925184            ;;
    51935185          *)
     
    69206912*-*-irix6*)
    69216913  # Find out which ABI we are using.
    6922   echo '#line 6922 "configure"' > conftest.$ac_ext
     6914  echo '#line 6914 "configure"' > conftest.$ac_ext
    69236915  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    69246916  (eval $ac_compile) 2>&5
     
    80548046
    80558047# Provide some information about the compiler.
    8056 echo "$as_me:8056:" \
     8048echo "$as_me:8048:" \
    80578049     "checking for Fortran 77 compiler version" >&5
    80588050ac_compiler=`set X $ac_compile; echo $2`
     
    91219113   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    91229114   -e 's:$: $lt_compiler_flag:'`
    9123    (eval echo "\"\$as_me:9123: $lt_compile\"" >&5)
     9115   (eval echo "\"\$as_me:9115: $lt_compile\"" >&5)
    91249116   (eval "$lt_compile" 2>conftest.err)
    91259117   ac_status=$?
    91269118   cat conftest.err >&5
    9127    echo "$as_me:9127: \$? = $ac_status" >&5
     9119   echo "$as_me:9119: \$? = $ac_status" >&5
    91289120   if (exit $ac_status) && test -s "$ac_outfile"; then
    91299121     # The compiler can only warn and ignore the option if not recognized
     
    93899381   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    93909382   -e 's:$: $lt_compiler_flag:'`
    9391    (eval echo "\"\$as_me:9391: $lt_compile\"" >&5)
     9383   (eval echo "\"\$as_me:9383: $lt_compile\"" >&5)
    93929384   (eval "$lt_compile" 2>conftest.err)
    93939385   ac_status=$?
    93949386   cat conftest.err >&5
    9395    echo "$as_me:9395: \$? = $ac_status" >&5
     9387   echo "$as_me:9387: \$? = $ac_status" >&5
    93969388   if (exit $ac_status) && test -s "$ac_outfile"; then
    93979389     # The compiler can only warn and ignore the option if not recognized
     
    94939485   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    94949486   -e 's:$: $lt_compiler_flag:'`
    9495    (eval echo "\"\$as_me:9495: $lt_compile\"" >&5)
     9487   (eval echo "\"\$as_me:9487: $lt_compile\"" >&5)
    94969488   (eval "$lt_compile" 2>out/conftest.err)
    94979489   ac_status=$?
    94989490   cat out/conftest.err >&5
    9499    echo "$as_me:9499: \$? = $ac_status" >&5
     9491   echo "$as_me:9491: \$? = $ac_status" >&5
    95009492   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    95019493   then
     
    1183811830  lt_status=$lt_dlunknown
    1183911831  cat > conftest.$ac_ext <<EOF
    11840 #line 11840 "configure"
     11832#line 11832 "configure"
    1184111833#include "confdefs.h"
    1184211834
     
    1193811930  lt_status=$lt_dlunknown
    1193911931  cat > conftest.$ac_ext <<EOF
    11940 #line 11940 "configure"
     11932#line 11932 "configure"
    1194111933#include "confdefs.h"
    1194211934
     
    1428214274   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1428314275   -e 's:$: $lt_compiler_flag:'`
    14284    (eval echo "\"\$as_me:14284: $lt_compile\"" >&5)
     14276   (eval echo "\"\$as_me:14276: $lt_compile\"" >&5)
    1428514277   (eval "$lt_compile" 2>conftest.err)
    1428614278   ac_status=$?
    1428714279   cat conftest.err >&5
    14288    echo "$as_me:14288: \$? = $ac_status" >&5
     14280   echo "$as_me:14280: \$? = $ac_status" >&5
    1428914281   if (exit $ac_status) && test -s "$ac_outfile"; then
    1429014282     # The compiler can only warn and ignore the option if not recognized
     
    1438614378   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1438714379   -e 's:$: $lt_compiler_flag:'`
    14388    (eval echo "\"\$as_me:14388: $lt_compile\"" >&5)
     14380   (eval echo "\"\$as_me:14380: $lt_compile\"" >&5)
    1438914381   (eval "$lt_compile" 2>out/conftest.err)
    1439014382   ac_status=$?
    1439114383   cat out/conftest.err >&5
    14392    echo "$as_me:14392: \$? = $ac_status" >&5
     14384   echo "$as_me:14384: \$? = $ac_status" >&5
    1439314385   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1439414386   then
     
    1595615948   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1595715949   -e 's:$: $lt_compiler_flag:'`
    15958    (eval echo "\"\$as_me:15958: $lt_compile\"" >&5)
     15950   (eval echo "\"\$as_me:15950: $lt_compile\"" >&5)
    1595915951   (eval "$lt_compile" 2>conftest.err)
    1596015952   ac_status=$?
    1596115953   cat conftest.err >&5
    15962    echo "$as_me:15962: \$? = $ac_status" >&5
     15954   echo "$as_me:15954: \$? = $ac_status" >&5
    1596315955   if (exit $ac_status) && test -s "$ac_outfile"; then
    1596415956     # The compiler can only warn and ignore the option if not recognized
     
    1606016052   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1606116053   -e 's:$: $lt_compiler_flag:'`
    16062    (eval echo "\"\$as_me:16062: $lt_compile\"" >&5)
     16054   (eval echo "\"\$as_me:16054: $lt_compile\"" >&5)
    1606316055   (eval "$lt_compile" 2>out/conftest.err)
    1606416056   ac_status=$?
    1606516057   cat out/conftest.err >&5
    16066    echo "$as_me:16066: \$? = $ac_status" >&5
     16058   echo "$as_me:16058: \$? = $ac_status" >&5
    1606716059   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1606816060   then
     
    1826718259   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1826818260   -e 's:$: $lt_compiler_flag:'`
    18269    (eval echo "\"\$as_me:18269: $lt_compile\"" >&5)
     18261   (eval echo "\"\$as_me:18261: $lt_compile\"" >&5)
    1827018262   (eval "$lt_compile" 2>conftest.err)
    1827118263   ac_status=$?
    1827218264   cat conftest.err >&5
    18273    echo "$as_me:18273: \$? = $ac_status" >&5
     18265   echo "$as_me:18265: \$? = $ac_status" >&5
    1827418266   if (exit $ac_status) && test -s "$ac_outfile"; then
    1827518267     # The compiler can only warn and ignore the option if not recognized
     
    1853518527   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1853618528   -e 's:$: $lt_compiler_flag:'`
    18537    (eval echo "\"\$as_me:18537: $lt_compile\"" >&5)
     18529   (eval echo "\"\$as_me:18529: $lt_compile\"" >&5)
    1853818530   (eval "$lt_compile" 2>conftest.err)
    1853918531   ac_status=$?
    1854018532   cat conftest.err >&5
    18541    echo "$as_me:18541: \$? = $ac_status" >&5
     18533   echo "$as_me:18533: \$? = $ac_status" >&5
    1854218534   if (exit $ac_status) && test -s "$ac_outfile"; then
    1854318535     # The compiler can only warn and ignore the option if not recognized
     
    1863918631   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1864018632   -e 's:$: $lt_compiler_flag:'`
    18641    (eval echo "\"\$as_me:18641: $lt_compile\"" >&5)
     18633   (eval echo "\"\$as_me:18633: $lt_compile\"" >&5)
    1864218634   (eval "$lt_compile" 2>out/conftest.err)
    1864318635   ac_status=$?
    1864418636   cat out/conftest.err >&5
    18645    echo "$as_me:18645: \$? = $ac_status" >&5
     18637   echo "$as_me:18637: \$? = $ac_status" >&5
    1864618638   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1864718639   then
  • stable/0.4/Couenne/src

  • stable/0.4/Couenne/src/bound_tightening

  • stable/0.4/Couenne/src/bound_tightening/operators/impliedBounds-exprPow.cpp

    r835 r1043  
    116116      }
    117117
    118       if (lb > 0. || k > 0.) resL = updateBound (-1, l + index, safe_pow (lb, 1./k));
     118      if ((lb > 0. || k > 0.) &&
     119          (sign != expression::AUX_GEQ))
     120        resL = updateBound (-1, l + index, safe_pow (lb, 1./k));
    119121
    120       if ((fabs (ub) < COUENNE_INFINITY) && (ub > 0 || k > 0.))
     122      if ((fabs (ub) < COUENNE_INFINITY) &&
     123          (ub > 0 || k > 0.) &&
     124          (sign != expression::AUX_LEQ))
    121125        resU = updateBound (+1, u + index, safe_pow (ub, 1./k));
    122126      //else                  resU = updateBound (+1, u + index, COUENNE_INFINITY);
  • stable/0.4/Couenne/src/branch

  • stable/0.4/Couenne/src/expression/operators/exprGroup.cpp

  • stable/0.4/Couenne/src/heuristics/BonNlpHeuristic.cpp

  • stable/0.4/configure

    r1040 r1043  
    47174717      coin_disable_shared=yes
    47184718      if test x"$enable_shared" = xyes; then
    4719         case "$CC" in
     4719        case "$CXX" in
    47204720          clang* )
    47214721            { echo "$as_me:$LINENO: WARNING: DLL building not supported. I'm disabling your choice." >&5
     
    47254725            { echo "$as_me:$LINENO: DLL building not supported, but will build with -MD(d) instead of -MT(d)." >&5
    47264726echo "$as_me: DLL building not supported, but will build with -MD(d) instead of -MT(d)." >&6;}
    4727             ;;
    4728           *gcc*)
    4729             if test x"$enable_dependency_linking" = xyes; then
    4730               coin_disable_shared=no
    4731             else
    4732               { echo "$as_me:$LINENO: WARNING: To build shared libraries with gcc on CYGWIN or MSys, use --enable-dependency-linking" >&5
    4733 echo "$as_me: WARNING: To build shared libraries with gcc on CYGWIN or MSys, use --enable-dependency-linking" >&2;}
    4734             fi
    47354727            ;;
    47364728          *)
     
    64636455*-*-irix6*)
    64646456  # Find out which ABI we are using.
    6465   echo '#line 6465 "configure"' > conftest.$ac_ext
     6457  echo '#line 6457 "configure"' > conftest.$ac_ext
    64666458  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    64676459  (eval $ac_compile) 2>&5
     
    84278419   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84288420   -e 's:$: $lt_compiler_flag:'`
    8429    (eval echo "\"\$as_me:8429: $lt_compile\"" >&5)
     8421   (eval echo "\"\$as_me:8421: $lt_compile\"" >&5)
    84308422   (eval "$lt_compile" 2>conftest.err)
    84318423   ac_status=$?
    84328424   cat conftest.err >&5
    8433    echo "$as_me:8433: \$? = $ac_status" >&5
     8425   echo "$as_me:8425: \$? = $ac_status" >&5
    84348426   if (exit $ac_status) && test -s "$ac_outfile"; then
    84358427     # The compiler can only warn and ignore the option if not recognized
     
    86958687   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    86968688   -e 's:$: $lt_compiler_flag:'`
    8697    (eval echo "\"\$as_me:8697: $lt_compile\"" >&5)
     8689   (eval echo "\"\$as_me:8689: $lt_compile\"" >&5)
    86988690   (eval "$lt_compile" 2>conftest.err)
    86998691   ac_status=$?
    87008692   cat conftest.err >&5
    8701    echo "$as_me:8701: \$? = $ac_status" >&5
     8693   echo "$as_me:8693: \$? = $ac_status" >&5
    87028694   if (exit $ac_status) && test -s "$ac_outfile"; then
    87038695     # The compiler can only warn and ignore the option if not recognized
     
    87998791   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    88008792   -e 's:$: $lt_compiler_flag:'`
    8801    (eval echo "\"\$as_me:8801: $lt_compile\"" >&5)
     8793   (eval echo "\"\$as_me:8793: $lt_compile\"" >&5)
    88028794   (eval "$lt_compile" 2>out/conftest.err)
    88038795   ac_status=$?
    88048796   cat out/conftest.err >&5
    8805    echo "$as_me:8805: \$? = $ac_status" >&5
     8797   echo "$as_me:8797: \$? = $ac_status" >&5
    88068798   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    88078799   then
     
    1114411136  lt_status=$lt_dlunknown
    1114511137  cat > conftest.$ac_ext <<EOF
    11146 #line 11146 "configure"
     11138#line 11138 "configure"
    1114711139#include "confdefs.h"
    1114811140
     
    1124411236  lt_status=$lt_dlunknown
    1124511237  cat > conftest.$ac_ext <<EOF
    11246 #line 11246 "configure"
     11238#line 11238 "configure"
    1124711239#include "confdefs.h"
    1124811240
     
    1358813580   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1358913581   -e 's:$: $lt_compiler_flag:'`
    13590    (eval echo "\"\$as_me:13590: $lt_compile\"" >&5)
     13582   (eval echo "\"\$as_me:13582: $lt_compile\"" >&5)
    1359113583   (eval "$lt_compile" 2>conftest.err)
    1359213584   ac_status=$?
    1359313585   cat conftest.err >&5
    13594    echo "$as_me:13594: \$? = $ac_status" >&5
     13586   echo "$as_me:13586: \$? = $ac_status" >&5
    1359513587   if (exit $ac_status) && test -s "$ac_outfile"; then
    1359613588     # The compiler can only warn and ignore the option if not recognized
     
    1369213684   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1369313685   -e 's:$: $lt_compiler_flag:'`
    13694    (eval echo "\"\$as_me:13694: $lt_compile\"" >&5)
     13686   (eval echo "\"\$as_me:13686: $lt_compile\"" >&5)
    1369513687   (eval "$lt_compile" 2>out/conftest.err)
    1369613688   ac_status=$?
    1369713689   cat out/conftest.err >&5
    13698    echo "$as_me:13698: \$? = $ac_status" >&5
     13690   echo "$as_me:13690: \$? = $ac_status" >&5
    1369913691   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1370013692   then
     
    1526215254   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1526315255   -e 's:$: $lt_compiler_flag:'`
    15264    (eval echo "\"\$as_me:15264: $lt_compile\"" >&5)
     15256   (eval echo "\"\$as_me:15256: $lt_compile\"" >&5)
    1526515257   (eval "$lt_compile" 2>conftest.err)
    1526615258   ac_status=$?
    1526715259   cat conftest.err >&5
    15268    echo "$as_me:15268: \$? = $ac_status" >&5
     15260   echo "$as_me:15260: \$? = $ac_status" >&5
    1526915261   if (exit $ac_status) && test -s "$ac_outfile"; then
    1527015262     # The compiler can only warn and ignore the option if not recognized
     
    1536615358   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1536715359   -e 's:$: $lt_compiler_flag:'`
    15368    (eval echo "\"\$as_me:15368: $lt_compile\"" >&5)
     15360   (eval echo "\"\$as_me:15360: $lt_compile\"" >&5)
    1536915361   (eval "$lt_compile" 2>out/conftest.err)
    1537015362   ac_status=$?
    1537115363   cat out/conftest.err >&5
    15372    echo "$as_me:15372: \$? = $ac_status" >&5
     15364   echo "$as_me:15364: \$? = $ac_status" >&5
    1537315365   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1537415366   then
     
    1757317565   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1757417566   -e 's:$: $lt_compiler_flag:'`
    17575    (eval echo "\"\$as_me:17575: $lt_compile\"" >&5)
     17567   (eval echo "\"\$as_me:17567: $lt_compile\"" >&5)
    1757617568   (eval "$lt_compile" 2>conftest.err)
    1757717569   ac_status=$?
    1757817570   cat conftest.err >&5
    17579    echo "$as_me:17579: \$? = $ac_status" >&5
     17571   echo "$as_me:17571: \$? = $ac_status" >&5
    1758017572   if (exit $ac_status) && test -s "$ac_outfile"; then
    1758117573     # The compiler can only warn and ignore the option if not recognized
     
    1784117833   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1784217834   -e 's:$: $lt_compiler_flag:'`
    17843    (eval echo "\"\$as_me:17843: $lt_compile\"" >&5)
     17835   (eval echo "\"\$as_me:17835: $lt_compile\"" >&5)
    1784417836   (eval "$lt_compile" 2>conftest.err)
    1784517837   ac_status=$?
    1784617838   cat conftest.err >&5
    17847    echo "$as_me:17847: \$? = $ac_status" >&5
     17839   echo "$as_me:17839: \$? = $ac_status" >&5
    1784817840   if (exit $ac_status) && test -s "$ac_outfile"; then
    1784917841     # The compiler can only warn and ignore the option if not recognized
     
    1794517937   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1794617938   -e 's:$: $lt_compiler_flag:'`
    17947    (eval echo "\"\$as_me:17947: $lt_compile\"" >&5)
     17939   (eval echo "\"\$as_me:17939: $lt_compile\"" >&5)
    1794817940   (eval "$lt_compile" 2>out/conftest.err)
    1794917941   ac_status=$?
    1795017942   cat out/conftest.err >&5
    17951    echo "$as_me:17951: \$? = $ac_status" >&5
     17943   echo "$as_me:17943: \$? = $ac_status" >&5
    1795217944   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1795317945   then
Note: See TracChangeset for help on using the changeset viewer.