Changeset 1203 for stable/2.3
- Timestamp:
- Jul 28, 2009 8:37:29 AM (12 years ago)
- Location:
- stable/2.3/Cbc
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
stable/2.3/Cbc
-
Property
svn:mergeinfo
set to
/stable/BSP/Cbc merged eligible
-
Property
svn:mergeinfo
set to
-
stable/2.3/Cbc/configure
r1172 r1203 1709 1709 1710 1710 1711 # As backup, we make sure we don't loose an FLIBS if it has been set 1712 # by the user 1713 save_FLIBS="$FLIBS" 1714 1711 1715 # Initialize the FADDLIBS variable (which is to be used with a fortran 1712 1716 # compiler and will not include FLIBS) … … 5815 5819 *-*-irix6*) 5816 5820 # Find out which ABI we are using. 5817 echo '#line 58 17"configure"' > conftest.$ac_ext5821 echo '#line 5821 "configure"' > conftest.$ac_ext 5818 5822 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 5819 5823 (eval $ac_compile) 2>&5 … … 6949 6953 6950 6954 # Provide some information about the compiler. 6951 echo "$as_me:695 1:" \6955 echo "$as_me:6955:" \ 6952 6956 "checking for Fortran 77 compiler version" >&5 6953 6957 ac_compiler=`set X $ac_compile; echo $2` … … 8016 8020 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8017 8021 -e 's:$: $lt_compiler_flag:'` 8018 (eval echo "\"\$as_me:80 18: $lt_compile\"" >&5)8022 (eval echo "\"\$as_me:8022: $lt_compile\"" >&5) 8019 8023 (eval "$lt_compile" 2>conftest.err) 8020 8024 ac_status=$? 8021 8025 cat conftest.err >&5 8022 echo "$as_me:802 2: \$? = $ac_status" >&58026 echo "$as_me:8026: \$? = $ac_status" >&5 8023 8027 if (exit $ac_status) && test -s "$ac_outfile"; then 8024 8028 # The compiler can only warn and ignore the option if not recognized … … 8284 8288 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8285 8289 -e 's:$: $lt_compiler_flag:'` 8286 (eval echo "\"\$as_me:82 86: $lt_compile\"" >&5)8290 (eval echo "\"\$as_me:8290: $lt_compile\"" >&5) 8287 8291 (eval "$lt_compile" 2>conftest.err) 8288 8292 ac_status=$? 8289 8293 cat conftest.err >&5 8290 echo "$as_me:829 0: \$? = $ac_status" >&58294 echo "$as_me:8294: \$? = $ac_status" >&5 8291 8295 if (exit $ac_status) && test -s "$ac_outfile"; then 8292 8296 # The compiler can only warn and ignore the option if not recognized … … 8388 8392 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8389 8393 -e 's:$: $lt_compiler_flag:'` 8390 (eval echo "\"\$as_me:839 0: $lt_compile\"" >&5)8394 (eval echo "\"\$as_me:8394: $lt_compile\"" >&5) 8391 8395 (eval "$lt_compile" 2>out/conftest.err) 8392 8396 ac_status=$? 8393 8397 cat out/conftest.err >&5 8394 echo "$as_me:839 4: \$? = $ac_status" >&58398 echo "$as_me:8398: \$? = $ac_status" >&5 8395 8399 if (exit $ac_status) && test -s out/conftest2.$ac_objext 8396 8400 then … … 10733 10737 lt_status=$lt_dlunknown 10734 10738 cat > conftest.$ac_ext <<EOF 10735 #line 1073 5"configure"10739 #line 10739 "configure" 10736 10740 #include "confdefs.h" 10737 10741 … … 10833 10837 lt_status=$lt_dlunknown 10834 10838 cat > conftest.$ac_ext <<EOF 10835 #line 1083 5"configure"10839 #line 10839 "configure" 10836 10840 #include "confdefs.h" 10837 10841 … … 13177 13181 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 13178 13182 -e 's:$: $lt_compiler_flag:'` 13179 (eval echo "\"\$as_me:131 79: $lt_compile\"" >&5)13183 (eval echo "\"\$as_me:13183: $lt_compile\"" >&5) 13180 13184 (eval "$lt_compile" 2>conftest.err) 13181 13185 ac_status=$? 13182 13186 cat conftest.err >&5 13183 echo "$as_me:1318 3: \$? = $ac_status" >&513187 echo "$as_me:13187: \$? = $ac_status" >&5 13184 13188 if (exit $ac_status) && test -s "$ac_outfile"; then 13185 13189 # The compiler can only warn and ignore the option if not recognized … … 13281 13285 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 13282 13286 -e 's:$: $lt_compiler_flag:'` 13283 (eval echo "\"\$as_me:1328 3: $lt_compile\"" >&5)13287 (eval echo "\"\$as_me:13287: $lt_compile\"" >&5) 13284 13288 (eval "$lt_compile" 2>out/conftest.err) 13285 13289 ac_status=$? 13286 13290 cat out/conftest.err >&5 13287 echo "$as_me:132 87: \$? = $ac_status" >&513291 echo "$as_me:13291: \$? = $ac_status" >&5 13288 13292 if (exit $ac_status) && test -s out/conftest2.$ac_objext 13289 13293 then … … 14851 14855 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 14852 14856 -e 's:$: $lt_compiler_flag:'` 14853 (eval echo "\"\$as_me:1485 3: $lt_compile\"" >&5)14857 (eval echo "\"\$as_me:14857: $lt_compile\"" >&5) 14854 14858 (eval "$lt_compile" 2>conftest.err) 14855 14859 ac_status=$? 14856 14860 cat conftest.err >&5 14857 echo "$as_me:148 57: \$? = $ac_status" >&514861 echo "$as_me:14861: \$? = $ac_status" >&5 14858 14862 if (exit $ac_status) && test -s "$ac_outfile"; then 14859 14863 # The compiler can only warn and ignore the option if not recognized … … 14955 14959 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 14956 14960 -e 's:$: $lt_compiler_flag:'` 14957 (eval echo "\"\$as_me:149 57: $lt_compile\"" >&5)14961 (eval echo "\"\$as_me:14961: $lt_compile\"" >&5) 14958 14962 (eval "$lt_compile" 2>out/conftest.err) 14959 14963 ac_status=$? 14960 14964 cat out/conftest.err >&5 14961 echo "$as_me:1496 1: \$? = $ac_status" >&514965 echo "$as_me:14965: \$? = $ac_status" >&5 14962 14966 if (exit $ac_status) && test -s out/conftest2.$ac_objext 14963 14967 then … … 17162 17166 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17163 17167 -e 's:$: $lt_compiler_flag:'` 17164 (eval echo "\"\$as_me:1716 4: $lt_compile\"" >&5)17168 (eval echo "\"\$as_me:17168: $lt_compile\"" >&5) 17165 17169 (eval "$lt_compile" 2>conftest.err) 17166 17170 ac_status=$? 17167 17171 cat conftest.err >&5 17168 echo "$as_me:171 68: \$? = $ac_status" >&517172 echo "$as_me:17172: \$? = $ac_status" >&5 17169 17173 if (exit $ac_status) && test -s "$ac_outfile"; then 17170 17174 # The compiler can only warn and ignore the option if not recognized … … 17430 17434 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17431 17435 -e 's:$: $lt_compiler_flag:'` 17432 (eval echo "\"\$as_me:1743 2: $lt_compile\"" >&5)17436 (eval echo "\"\$as_me:17436: $lt_compile\"" >&5) 17433 17437 (eval "$lt_compile" 2>conftest.err) 17434 17438 ac_status=$? 17435 17439 cat conftest.err >&5 17436 echo "$as_me:174 36: \$? = $ac_status" >&517440 echo "$as_me:17440: \$? = $ac_status" >&5 17437 17441 if (exit $ac_status) && test -s "$ac_outfile"; then 17438 17442 # The compiler can only warn and ignore the option if not recognized … … 17534 17538 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17535 17539 -e 's:$: $lt_compiler_flag:'` 17536 (eval echo "\"\$as_me:175 36: $lt_compile\"" >&5)17540 (eval echo "\"\$as_me:17540: $lt_compile\"" >&5) 17537 17541 (eval "$lt_compile" 2>out/conftest.err) 17538 17542 ac_status=$? 17539 17543 cat out/conftest.err >&5 17540 echo "$as_me:1754 0: \$? = $ac_status" >&517544 echo "$as_me:17544: \$? = $ac_status" >&5 17541 17545 if (exit $ac_status) && test -s out/conftest2.$ac_objext 17542 17546 then -
stable/2.3/Cbc/src/CbcModel.cpp
r1177 r1203 1030 1030 } 1031 1031 delete [] coeffMultiplier; 1032 increment *= scaleFactor;1032 increment = (int)(increment * scaleFactor); 1033 1033 /* 1034 1034 If the increment beats the current value for objective change, install it. -
stable/2.3/Cbc/src/ClpAmplStuff.cpp
r838 r1203 107 107 CbcAmpl::solve(CbcSolver * controlModel, const char * options) 108 108 { 109 CbcModel * model = controlModel->model(); 110 assert (model); 109 assert (controlModel->model()); 111 110 //OsiClpSolverInterface * clpSolver = dynamic_cast< OsiClpSolverInterface*> (model->solver()); 112 111 //ClpSimplex * lpSolver = clpSolver->getModelPtr(); … … 691 690 { 692 691 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 694 696 assert(n == n_var); 695 697 … … 1153 1155 amplInfo_ = amplInfo; 1154 1156 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 1156 1161 assert (rowNumber_<nlc); 1157 1162 numberCoefficients_ = info->rowStart_[rowNumber_+1]-info->rowStart_[rowNumber_]; … … 1231 1236 lastGradient_ = new double[numberColumns]; 1232 1237 CoinZeroN(lastGradient_,numberColumns); 1233 bool scaling=(model&&model->rowScale()&&useScaling); 1234 assert (!scaling); 1238 assert (!(model&&model->rowScale()&&useScaling)); 1235 1239 int i; 1236 1240 int start = info->rowStart_[rowNumber_];
Note: See TracChangeset
for help on using the changeset viewer.