Changeset 1203


Ignore:
Timestamp:
Jul 28, 2009 8:37:29 AM (10 years ago)
Author:
tkr
Message:

Merging r1179:1197 from stable/BSP/ stable/2.3

Location:
stable/2.3/Cbc
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/2.3/Cbc

  • stable/2.3/Cbc/configure

    r1172 r1203  
    17091709
    17101710
     1711# As backup, we make sure we don't loose an FLIBS if it has been set
     1712# by the user
     1713save_FLIBS="$FLIBS"
     1714
    17111715# Initialize the FADDLIBS variable (which is to be used with a fortran
    17121716# compiler and will not include FLIBS)
     
    58155819*-*-irix6*)
    58165820  # Find out which ABI we are using.
    5817   echo '#line 5817 "configure"' > conftest.$ac_ext
     5821  echo '#line 5821 "configure"' > conftest.$ac_ext
    58185822  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    58195823  (eval $ac_compile) 2>&5
     
    69496953
    69506954# Provide some information about the compiler.
    6951 echo "$as_me:6951:" \
     6955echo "$as_me:6955:" \
    69526956     "checking for Fortran 77 compiler version" >&5
    69536957ac_compiler=`set X $ac_compile; echo $2`
     
    80168020   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80178021   -e 's:$: $lt_compiler_flag:'`
    8018    (eval echo "\"\$as_me:8018: $lt_compile\"" >&5)
     8022   (eval echo "\"\$as_me:8022: $lt_compile\"" >&5)
    80198023   (eval "$lt_compile" 2>conftest.err)
    80208024   ac_status=$?
    80218025   cat conftest.err >&5
    8022    echo "$as_me:8022: \$? = $ac_status" >&5
     8026   echo "$as_me:8026: \$? = $ac_status" >&5
    80238027   if (exit $ac_status) && test -s "$ac_outfile"; then
    80248028     # The compiler can only warn and ignore the option if not recognized
     
    82848288   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82858289   -e 's:$: $lt_compiler_flag:'`
    8286    (eval echo "\"\$as_me:8286: $lt_compile\"" >&5)
     8290   (eval echo "\"\$as_me:8290: $lt_compile\"" >&5)
    82878291   (eval "$lt_compile" 2>conftest.err)
    82888292   ac_status=$?
    82898293   cat conftest.err >&5
    8290    echo "$as_me:8290: \$? = $ac_status" >&5
     8294   echo "$as_me:8294: \$? = $ac_status" >&5
    82918295   if (exit $ac_status) && test -s "$ac_outfile"; then
    82928296     # The compiler can only warn and ignore the option if not recognized
     
    83888392   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83898393   -e 's:$: $lt_compiler_flag:'`
    8390    (eval echo "\"\$as_me:8390: $lt_compile\"" >&5)
     8394   (eval echo "\"\$as_me:8394: $lt_compile\"" >&5)
    83918395   (eval "$lt_compile" 2>out/conftest.err)
    83928396   ac_status=$?
    83938397   cat out/conftest.err >&5
    8394    echo "$as_me:8394: \$? = $ac_status" >&5
     8398   echo "$as_me:8398: \$? = $ac_status" >&5
    83958399   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    83968400   then
     
    1073310737  lt_status=$lt_dlunknown
    1073410738  cat > conftest.$ac_ext <<EOF
    10735 #line 10735 "configure"
     10739#line 10739 "configure"
    1073610740#include "confdefs.h"
    1073710741
     
    1083310837  lt_status=$lt_dlunknown
    1083410838  cat > conftest.$ac_ext <<EOF
    10835 #line 10835 "configure"
     10839#line 10839 "configure"
    1083610840#include "confdefs.h"
    1083710841
     
    1317713181   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1317813182   -e 's:$: $lt_compiler_flag:'`
    13179    (eval echo "\"\$as_me:13179: $lt_compile\"" >&5)
     13183   (eval echo "\"\$as_me:13183: $lt_compile\"" >&5)
    1318013184   (eval "$lt_compile" 2>conftest.err)
    1318113185   ac_status=$?
    1318213186   cat conftest.err >&5
    13183    echo "$as_me:13183: \$? = $ac_status" >&5
     13187   echo "$as_me:13187: \$? = $ac_status" >&5
    1318413188   if (exit $ac_status) && test -s "$ac_outfile"; then
    1318513189     # The compiler can only warn and ignore the option if not recognized
     
    1328113285   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1328213286   -e 's:$: $lt_compiler_flag:'`
    13283    (eval echo "\"\$as_me:13283: $lt_compile\"" >&5)
     13287   (eval echo "\"\$as_me:13287: $lt_compile\"" >&5)
    1328413288   (eval "$lt_compile" 2>out/conftest.err)
    1328513289   ac_status=$?
    1328613290   cat out/conftest.err >&5
    13287    echo "$as_me:13287: \$? = $ac_status" >&5
     13291   echo "$as_me:13291: \$? = $ac_status" >&5
    1328813292   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1328913293   then
     
    1485114855   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1485214856   -e 's:$: $lt_compiler_flag:'`
    14853    (eval echo "\"\$as_me:14853: $lt_compile\"" >&5)
     14857   (eval echo "\"\$as_me:14857: $lt_compile\"" >&5)
    1485414858   (eval "$lt_compile" 2>conftest.err)
    1485514859   ac_status=$?
    1485614860   cat conftest.err >&5
    14857    echo "$as_me:14857: \$? = $ac_status" >&5
     14861   echo "$as_me:14861: \$? = $ac_status" >&5
    1485814862   if (exit $ac_status) && test -s "$ac_outfile"; then
    1485914863     # The compiler can only warn and ignore the option if not recognized
     
    1495514959   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1495614960   -e 's:$: $lt_compiler_flag:'`
    14957    (eval echo "\"\$as_me:14957: $lt_compile\"" >&5)
     14961   (eval echo "\"\$as_me:14961: $lt_compile\"" >&5)
    1495814962   (eval "$lt_compile" 2>out/conftest.err)
    1495914963   ac_status=$?
    1496014964   cat out/conftest.err >&5
    14961    echo "$as_me:14961: \$? = $ac_status" >&5
     14965   echo "$as_me:14965: \$? = $ac_status" >&5
    1496214966   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1496314967   then
     
    1716217166   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1716317167   -e 's:$: $lt_compiler_flag:'`
    17164    (eval echo "\"\$as_me:17164: $lt_compile\"" >&5)
     17168   (eval echo "\"\$as_me:17168: $lt_compile\"" >&5)
    1716517169   (eval "$lt_compile" 2>conftest.err)
    1716617170   ac_status=$?
    1716717171   cat conftest.err >&5
    17168    echo "$as_me:17168: \$? = $ac_status" >&5
     17172   echo "$as_me:17172: \$? = $ac_status" >&5
    1716917173   if (exit $ac_status) && test -s "$ac_outfile"; then
    1717017174     # The compiler can only warn and ignore the option if not recognized
     
    1743017434   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1743117435   -e 's:$: $lt_compiler_flag:'`
    17432    (eval echo "\"\$as_me:17432: $lt_compile\"" >&5)
     17436   (eval echo "\"\$as_me:17436: $lt_compile\"" >&5)
    1743317437   (eval "$lt_compile" 2>conftest.err)
    1743417438   ac_status=$?
    1743517439   cat conftest.err >&5
    17436    echo "$as_me:17436: \$? = $ac_status" >&5
     17440   echo "$as_me:17440: \$? = $ac_status" >&5
    1743717441   if (exit $ac_status) && test -s "$ac_outfile"; then
    1743817442     # The compiler can only warn and ignore the option if not recognized
     
    1753417538   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1753517539   -e 's:$: $lt_compiler_flag:'`
    17536    (eval echo "\"\$as_me:17536: $lt_compile\"" >&5)
     17540   (eval echo "\"\$as_me:17540: $lt_compile\"" >&5)
    1753717541   (eval "$lt_compile" 2>out/conftest.err)
    1753817542   ac_status=$?
    1753917543   cat out/conftest.err >&5
    17540    echo "$as_me:17540: \$? = $ac_status" >&5
     17544   echo "$as_me:17544: \$? = $ac_status" >&5
    1754117545   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1754217546   then
  • stable/2.3/Cbc/src/CbcModel.cpp

    r1177 r1203  
    10301030    }
    10311031    delete [] coeffMultiplier;
    1032     increment *= scaleFactor;
     1032    increment = (int)(increment * scaleFactor);
    10331033/*
    10341034  If the increment beats the current value for objective change, install it.
  • stable/2.3/Cbc/src/ClpAmplStuff.cpp

    r838 r1203  
    107107CbcAmpl::solve(CbcSolver * controlModel, const char * options)
    108108{
    109   CbcModel * model = controlModel->model();
    110   assert (model);
     109  assert (controlModel->model());
    111110  //OsiClpSolverInterface * clpSolver = dynamic_cast< OsiClpSolverInterface*> (model->solver());
    112111  //ClpSimplex * lpSolver = clpSolver->getModelPtr();
     
    691690{
    692691  CbcAmplInfo * info = (CbcAmplInfo *) amplInfo;
    693   ASL_pfgh* asl = info->asl_;
     692#ifndef NDEBUG
     693  ASL_pfgh* asl = info->asl_;
     694#endif
     695  // warning: n_var is a macro that assumes we have a variable called asl
    694696  assert(n == n_var);
    695697 
     
    11531155  amplInfo_ = amplInfo;
    11541156  CbcAmplInfo * info = (CbcAmplInfo *) amplInfo_;
    1155   ASL_pfgh* asl = info->asl_;
     1157#ifndef NDEBUG
     1158  ASL_pfgh* asl = info->asl_;
     1159#endif
     1160  // warning: nlc is a macro that assumes we have a variable called asl
    11561161  assert (rowNumber_<nlc);
    11571162  numberCoefficients_ = info->rowStart_[rowNumber_+1]-info->rowStart_[rowNumber_];
     
    12311236      lastGradient_ = new double[numberColumns];
    12321237    CoinZeroN(lastGradient_,numberColumns);
    1233     bool scaling=(model&&model->rowScale()&&useScaling);
    1234     assert (!scaling);
     1238    assert (!(model&&model->rowScale()&&useScaling));
    12351239    int i;
    12361240    int start = info->rowStart_[rowNumber_];
Note: See TracChangeset for help on using the changeset viewer.