Changeset 1203 for stable/2.3

Timestamp:

Jul 28, 2009 8:37:29 AM (11 years ago)

Author:

tkr

Message:

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

Location:

stable/2.3/Cbc

Files:

• . (modified) (1 prop)
• configure (modified) (15 diffs)
• src/CbcModel.cpp (modified) (1 diff)
• src/ClpAmplStuff.cpp (modified) (4 diffs)

stable/2.3/Cbc/configure

@@ -1709 +1709 @@
 
 
+# As backup, we make sure we don't loose an FLIBS if it has been set
+# by the user
+save_FLIBS="$FLIBS"
+
 # Initialize the FADDLIBS variable (which is to be used with a fortran
 # compiler and will not include FLIBS)
@@ -5815 +5819 @@
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5817 "configure"' > conftest.$ac_ext
+  echo '#line 5821 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -6949 +6953 @@
 
 # Provide some information about the compiler.
-echo "$as_me:6951:" \
+echo "$as_me:6955:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
@@ -8016 +8020 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8018: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8022: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8022: \$? = $ac_status" >&5
+   echo "$as_me:8026: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -8284 +8288 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8286: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8290: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8290: \$? = $ac_status" >&5
+   echo "$as_me:8294: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -8388 +8392 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8390: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8394: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8394: \$? = $ac_status" >&5
+   echo "$as_me:8398: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -10733 +10737 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10735 "configure"
+#line 10739 "configure"
 #include "confdefs.h"
 
@@ -10833 +10837 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10835 "configure"
+#line 10839 "configure"
 #include "confdefs.h"
 
@@ -13177 +13181 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13179: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13183: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13183: \$? = $ac_status" >&5
+   echo "$as_me:13187: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -13281 +13285 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13283: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13287: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13287: \$? = $ac_status" >&5
+   echo "$as_me:13291: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -14851 +14855 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14853: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14857: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14857: \$? = $ac_status" >&5
+   echo "$as_me:14861: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -14955 +14959 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14957: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14961: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14961: \$? = $ac_status" >&5
+   echo "$as_me:14965: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -17162 +17166 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17164: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17168: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17168: \$? = $ac_status" >&5
+   echo "$as_me:17172: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -17430 +17434 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17432: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17436: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17436: \$? = $ac_status" >&5
+   echo "$as_me:17440: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -17534 +17538 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17536: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17540: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17540: \$? = $ac_status" >&5
+   echo "$as_me:17544: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then

stable/2.3/Cbc/src/CbcModel.cpp

@@ -1030 +1030 @@
     }
     delete [] coeffMultiplier;
-    increment *= scaleFactor;
+    increment = (int)(increment * scaleFactor);
 /*
   If the increment beats the current value for objective change, install it.

stable/2.3/Cbc/src/ClpAmplStuff.cpp

@@ -107 +107 @@
 CbcAmpl::solve(CbcSolver * controlModel, const char * options)
 {
-  CbcModel * model = controlModel->model();
-  assert (model);
+  assert (controlModel->model());
   //OsiClpSolverInterface * clpSolver = dynamic_cast< OsiClpSolverInterface*> (model->solver());
   //ClpSimplex * lpSolver = clpSolver->getModelPtr();
@@ -691 +690 @@
 {
   CbcAmplInfo * info = (CbcAmplInfo *) amplInfo;
-  ASL_pfgh* asl = info->asl_;
+#ifndef NDEBUG
+  ASL_pfgh* asl = info->asl_;
+#endif
+  // warning: n_var is a macro that assumes we have a variable called asl
   assert(n == n_var);
   
@@ -1153 +1155 @@
   amplInfo_ = amplInfo;
   CbcAmplInfo * info = (CbcAmplInfo *) amplInfo_;
-  ASL_pfgh* asl = info->asl_;
+#ifndef NDEBUG
+  ASL_pfgh* asl = info->asl_;
+#endif
+  // warning: nlc is a macro that assumes we have a variable called asl
   assert (rowNumber_<nlc);
   numberCoefficients_ = info->rowStart_[rowNumber_+1]-info->rowStart_[rowNumber_];
@@ -1231 +1236 @@
       lastGradient_ = new double[numberColumns];
     CoinZeroN(lastGradient_,numberColumns);
-    bool scaling=(model&&model->rowScale()&&useScaling);
-    assert (!scaling);
+    assert (!(model&&model->rowScale()&&useScaling));
     int i;
     int start = info->rowStart_[rowNumber_];