Changeset 248 for stable/0.2/Couenne


Ignore:
Timestamp:
Jul 30, 2009 11:05:34 AM (11 years ago)
Author:
pbelotti
Message:

merged changes from BSP

Location:
stable/0.2
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • stable/0.2

  • stable/0.2/Couenne/configure

    r207 r248  
    16771677
    16781678
     1679# As backup, we make sure we don't loose an FLIBS if it has been set
     1680# by the user
     1681save_FLIBS="$FLIBS"
     1682
    16791683# Initialize the FADDLIBS variable (which is to be used with a fortran
    16801684# compiler and will not include FLIBS)
     
    68556859*-*-irix6*)
    68566860  # Find out which ABI we are using.
    6857   echo '#line 6857 "configure"' > conftest.$ac_ext
     6861  echo '#line 6861 "configure"' > conftest.$ac_ext
    68586862  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    68596863  (eval $ac_compile) 2>&5
     
    79897993
    79907994# Provide some information about the compiler.
    7991 echo "$as_me:7991:" \
     7995echo "$as_me:7995:" \
    79927996     "checking for Fortran 77 compiler version" >&5
    79937997ac_compiler=`set X $ac_compile; echo $2`
     
    90569060   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    90579061   -e 's:$: $lt_compiler_flag:'`
    9058    (eval echo "\"\$as_me:9058: $lt_compile\"" >&5)
     9062   (eval echo "\"\$as_me:9062: $lt_compile\"" >&5)
    90599063   (eval "$lt_compile" 2>conftest.err)
    90609064   ac_status=$?
    90619065   cat conftest.err >&5
    9062    echo "$as_me:9062: \$? = $ac_status" >&5
     9066   echo "$as_me:9066: \$? = $ac_status" >&5
    90639067   if (exit $ac_status) && test -s "$ac_outfile"; then
    90649068     # The compiler can only warn and ignore the option if not recognized
     
    93249328   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    93259329   -e 's:$: $lt_compiler_flag:'`
    9326    (eval echo "\"\$as_me:9326: $lt_compile\"" >&5)
     9330   (eval echo "\"\$as_me:9330: $lt_compile\"" >&5)
    93279331   (eval "$lt_compile" 2>conftest.err)
    93289332   ac_status=$?
    93299333   cat conftest.err >&5
    9330    echo "$as_me:9330: \$? = $ac_status" >&5
     9334   echo "$as_me:9334: \$? = $ac_status" >&5
    93319335   if (exit $ac_status) && test -s "$ac_outfile"; then
    93329336     # The compiler can only warn and ignore the option if not recognized
     
    94289432   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    94299433   -e 's:$: $lt_compiler_flag:'`
    9430    (eval echo "\"\$as_me:9430: $lt_compile\"" >&5)
     9434   (eval echo "\"\$as_me:9434: $lt_compile\"" >&5)
    94319435   (eval "$lt_compile" 2>out/conftest.err)
    94329436   ac_status=$?
    94339437   cat out/conftest.err >&5
    9434    echo "$as_me:9434: \$? = $ac_status" >&5
     9438   echo "$as_me:9438: \$? = $ac_status" >&5
    94359439   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    94369440   then
     
    1177311777  lt_status=$lt_dlunknown
    1177411778  cat > conftest.$ac_ext <<EOF
    11775 #line 11775 "configure"
     11779#line 11779 "configure"
    1177611780#include "confdefs.h"
    1177711781
     
    1187311877  lt_status=$lt_dlunknown
    1187411878  cat > conftest.$ac_ext <<EOF
    11875 #line 11875 "configure"
     11879#line 11879 "configure"
    1187611880#include "confdefs.h"
    1187711881
     
    1421714221   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1421814222   -e 's:$: $lt_compiler_flag:'`
    14219    (eval echo "\"\$as_me:14219: $lt_compile\"" >&5)
     14223   (eval echo "\"\$as_me:14223: $lt_compile\"" >&5)
    1422014224   (eval "$lt_compile" 2>conftest.err)
    1422114225   ac_status=$?
    1422214226   cat conftest.err >&5
    14223    echo "$as_me:14223: \$? = $ac_status" >&5
     14227   echo "$as_me:14227: \$? = $ac_status" >&5
    1422414228   if (exit $ac_status) && test -s "$ac_outfile"; then
    1422514229     # The compiler can only warn and ignore the option if not recognized
     
    1432114325   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1432214326   -e 's:$: $lt_compiler_flag:'`
    14323    (eval echo "\"\$as_me:14323: $lt_compile\"" >&5)
     14327   (eval echo "\"\$as_me:14327: $lt_compile\"" >&5)
    1432414328   (eval "$lt_compile" 2>out/conftest.err)
    1432514329   ac_status=$?
    1432614330   cat out/conftest.err >&5
    14327    echo "$as_me:14327: \$? = $ac_status" >&5
     14331   echo "$as_me:14331: \$? = $ac_status" >&5
    1432814332   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1432914333   then
     
    1589115895   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1589215896   -e 's:$: $lt_compiler_flag:'`
    15893    (eval echo "\"\$as_me:15893: $lt_compile\"" >&5)
     15897   (eval echo "\"\$as_me:15897: $lt_compile\"" >&5)
    1589415898   (eval "$lt_compile" 2>conftest.err)
    1589515899   ac_status=$?
    1589615900   cat conftest.err >&5
    15897    echo "$as_me:15897: \$? = $ac_status" >&5
     15901   echo "$as_me:15901: \$? = $ac_status" >&5
    1589815902   if (exit $ac_status) && test -s "$ac_outfile"; then
    1589915903     # The compiler can only warn and ignore the option if not recognized
     
    1599515999   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1599616000   -e 's:$: $lt_compiler_flag:'`
    15997    (eval echo "\"\$as_me:15997: $lt_compile\"" >&5)
     16001   (eval echo "\"\$as_me:16001: $lt_compile\"" >&5)
    1599816002   (eval "$lt_compile" 2>out/conftest.err)
    1599916003   ac_status=$?
    1600016004   cat out/conftest.err >&5
    16001    echo "$as_me:16001: \$? = $ac_status" >&5
     16005   echo "$as_me:16005: \$? = $ac_status" >&5
    1600216006   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1600316007   then
     
    1820218206   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1820318207   -e 's:$: $lt_compiler_flag:'`
    18204    (eval echo "\"\$as_me:18204: $lt_compile\"" >&5)
     18208   (eval echo "\"\$as_me:18208: $lt_compile\"" >&5)
    1820518209   (eval "$lt_compile" 2>conftest.err)
    1820618210   ac_status=$?
    1820718211   cat conftest.err >&5
    18208    echo "$as_me:18208: \$? = $ac_status" >&5
     18212   echo "$as_me:18212: \$? = $ac_status" >&5
    1820918213   if (exit $ac_status) && test -s "$ac_outfile"; then
    1821018214     # The compiler can only warn and ignore the option if not recognized
     
    1847018474   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1847118475   -e 's:$: $lt_compiler_flag:'`
    18472    (eval echo "\"\$as_me:18472: $lt_compile\"" >&5)
     18476   (eval echo "\"\$as_me:18476: $lt_compile\"" >&5)
    1847318477   (eval "$lt_compile" 2>conftest.err)
    1847418478   ac_status=$?
    1847518479   cat conftest.err >&5
    18476    echo "$as_me:18476: \$? = $ac_status" >&5
     18480   echo "$as_me:18480: \$? = $ac_status" >&5
    1847718481   if (exit $ac_status) && test -s "$ac_outfile"; then
    1847818482     # The compiler can only warn and ignore the option if not recognized
     
    1857418578   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1857518579   -e 's:$: $lt_compiler_flag:'`
    18576    (eval echo "\"\$as_me:18576: $lt_compile\"" >&5)
     18580   (eval echo "\"\$as_me:18580: $lt_compile\"" >&5)
    1857718581   (eval "$lt_compile" 2>out/conftest.err)
    1857818582   ac_status=$?
    1857918583   cat out/conftest.err >&5
    18580    echo "$as_me:18580: \$? = $ac_status" >&5
     18584   echo "$as_me:18584: \$? = $ac_status" >&5
    1858118585   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1858218586   then
  • stable/0.2/Couenne/src/problem/CouenneLPtightenBounds.cpp

    r201 r248  
    9393    }
    9494
    95     const double
    96       *newerLower = cutgen_ -> Problem () -> Lb (),
    97       *newerUpper = cutgen_ -> Problem () -> Ub ();
    98 
     95//    const double
     96//      *newerLower = cutgen_ -> Problem () -> Lb (),
     97//      *newerUpper = cutgen_ -> Problem () -> Ub ();
     98//
    9999//     printf ("-------- BOUNDS AFTER ------------\n  ");
    100100//     for (int i=0; i < ncols; i++) {
  • stable/0.2/Couenne/src/problem/CouenneLPtightenBoundsCLP-light.cpp

    r201 r248  
    2222  int
    2323    numberRows    = getNumRows(),
    24     numberColumns = getNumCols(),
    25     iRow, iColumn;
     24    numberColumns = getNumCols();
    2625
    2726  const double * columnUpper = getColUpper();
     
    3534  const CoinBigIndex * columnStart = getMatrixByCol()->getVectorStarts();
    3635  const int * columnLength = getMatrixByCol()->getVectorLengths();
    37   const double *objective = getObjCoefficients() ;
    3836
    39   double direction = getObjSense();
    4037  double * down = new double [numberRows];
    4138
Note: See TracChangeset for help on using the changeset viewer.