Changeset 1069
- Timestamp:
- Sep 16, 2008 7:07:46 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc/configure
r1052 r1069 2884 2884 case "$CC" in 2885 2885 xlc* | */xlc* | mpxlc* | */mpxlc*) 2886 coin_opt_cflags="-O 3-qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"2886 coin_opt_cflags="-O -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1" 2887 2887 coin_add_cflags="-bmaxdata:0x80000000 -qsuppress=1500-036 -qsuppress=1500-029" 2888 2888 coin_dbg_cflags="-g" … … 3541 3541 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 3542 3542 3543 if test -z "$CXX" ; then 3544 { { echo "$as_me:$LINENO: error: Failed to find a C++ compiler!" >&5 3545 echo "$as_me: error: Failed to find a C++ compiler!" >&2;} 3543 3544 #AC_PROG_CXX sets CXX to g++ if it cannot find a working C++ compiler 3545 #thus, we test here whether $CXX is actually working 3546 ac_ext=cc 3547 ac_cpp='$CXXCPP $CPPFLAGS' 3548 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 3549 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 3550 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 3551 3552 echo "$as_me:$LINENO: checking whether C++ compiler $CXX works" >&5 3553 echo $ECHO_N "checking whether C++ compiler $CXX works... $ECHO_C" >&6; 3554 cat >conftest.$ac_ext <<_ACEOF 3555 /* confdefs.h. */ 3556 _ACEOF 3557 cat confdefs.h >>conftest.$ac_ext 3558 cat >>conftest.$ac_ext <<_ACEOF 3559 /* end confdefs.h. */ 3560 3561 int 3562 main () 3563 { 3564 int i=0; 3565 ; 3566 return 0; 3567 } 3568 _ACEOF 3569 rm -f conftest.$ac_objext 3570 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 3571 (eval $ac_compile) 2>conftest.er1 3572 ac_status=$? 3573 grep -v '^ *+' conftest.er1 >conftest.err 3574 rm -f conftest.er1 3575 cat conftest.err >&5 3576 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3577 (exit $ac_status); } && 3578 { ac_try='test -z "$ac_cxx_werror_flag" 3579 || test ! -s conftest.err' 3580 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3581 (eval $ac_try) 2>&5 3582 ac_status=$? 3583 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3584 (exit $ac_status); }; } && 3585 { ac_try='test -s conftest.$ac_objext' 3586 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3587 (eval $ac_try) 2>&5 3588 ac_status=$? 3589 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3590 (exit $ac_status); }; }; then 3591 echo "$as_me:$LINENO: result: yes" >&5 3592 echo "${ECHO_T}yes" >&6 3593 else 3594 echo "$as_me: failed program was:" >&5 3595 sed 's/^/| /' conftest.$ac_ext >&5 3596 3597 echo "$as_me:$LINENO: result: no" >&5 3598 echo "${ECHO_T}no" >&6 3599 { { echo "$as_me:$LINENO: error: failed to find a C++ compiler or C++ compiler $CXX does not work" >&5 3600 echo "$as_me: error: failed to find a C++ compiler or C++ compiler $CXX does not work" >&2;} 3546 3601 { (exit 1); exit 1; }; } 3547 fi 3602 3603 fi 3604 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 3605 ac_ext=cc 3606 ac_cpp='$CXXCPP $CPPFLAGS' 3607 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 3608 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 3609 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 3610 3548 3611 3549 3612 # It seems that we need to cleanup something here for the Windows … … 3739 3802 case "$CXX" in 3740 3803 xlC* | */xlC* | mpxlC* | */mpxlC*) 3741 coin_opt_cxxflags="-O 3-qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"3804 coin_opt_cxxflags="-O -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1" 3742 3805 coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036 -qsuppress=1500-029 -qsourcetype=c++" 3743 3806 coin_dbg_cxxflags="-g" … … 5752 5815 *-*-irix6*) 5753 5816 # Find out which ABI we are using. 5754 echo '#line 5 754"configure"' > conftest.$ac_ext5817 echo '#line 5817 "configure"' > conftest.$ac_ext 5755 5818 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 5756 5819 (eval $ac_compile) 2>&5 … … 6886 6949 6887 6950 # Provide some information about the compiler. 6888 echo "$as_me:6 888:" \6951 echo "$as_me:6951:" \ 6889 6952 "checking for Fortran 77 compiler version" >&5 6890 6953 ac_compiler=`set X $ac_compile; echo $2` … … 7953 8016 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7954 8017 -e 's:$: $lt_compiler_flag:'` 7955 (eval echo "\"\$as_me: 7955: $lt_compile\"" >&5)8018 (eval echo "\"\$as_me:8018: $lt_compile\"" >&5) 7956 8019 (eval "$lt_compile" 2>conftest.err) 7957 8020 ac_status=$? 7958 8021 cat conftest.err >&5 7959 echo "$as_me: 7959: \$? = $ac_status" >&58022 echo "$as_me:8022: \$? = $ac_status" >&5 7960 8023 if (exit $ac_status) && test -s "$ac_outfile"; then 7961 8024 # The compiler can only warn and ignore the option if not recognized … … 8221 8284 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8222 8285 -e 's:$: $lt_compiler_flag:'` 8223 (eval echo "\"\$as_me:82 23: $lt_compile\"" >&5)8286 (eval echo "\"\$as_me:8286: $lt_compile\"" >&5) 8224 8287 (eval "$lt_compile" 2>conftest.err) 8225 8288 ac_status=$? 8226 8289 cat conftest.err >&5 8227 echo "$as_me:82 27: \$? = $ac_status" >&58290 echo "$as_me:8290: \$? = $ac_status" >&5 8228 8291 if (exit $ac_status) && test -s "$ac_outfile"; then 8229 8292 # The compiler can only warn and ignore the option if not recognized … … 8325 8388 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8326 8389 -e 's:$: $lt_compiler_flag:'` 8327 (eval echo "\"\$as_me:83 27: $lt_compile\"" >&5)8390 (eval echo "\"\$as_me:8390: $lt_compile\"" >&5) 8328 8391 (eval "$lt_compile" 2>out/conftest.err) 8329 8392 ac_status=$? 8330 8393 cat out/conftest.err >&5 8331 echo "$as_me:83 31: \$? = $ac_status" >&58394 echo "$as_me:8394: \$? = $ac_status" >&5 8332 8395 if (exit $ac_status) && test -s out/conftest2.$ac_objext 8333 8396 then … … 10670 10733 lt_status=$lt_dlunknown 10671 10734 cat > conftest.$ac_ext <<EOF 10672 #line 10 672"configure"10735 #line 10735 "configure" 10673 10736 #include "confdefs.h" 10674 10737 … … 10770 10833 lt_status=$lt_dlunknown 10771 10834 cat > conftest.$ac_ext <<EOF 10772 #line 10 772"configure"10835 #line 10835 "configure" 10773 10836 #include "confdefs.h" 10774 10837 … … 13114 13177 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 13115 13178 -e 's:$: $lt_compiler_flag:'` 13116 (eval echo "\"\$as_me:131 16: $lt_compile\"" >&5)13179 (eval echo "\"\$as_me:13179: $lt_compile\"" >&5) 13117 13180 (eval "$lt_compile" 2>conftest.err) 13118 13181 ac_status=$? 13119 13182 cat conftest.err >&5 13120 echo "$as_me:131 20: \$? = $ac_status" >&513183 echo "$as_me:13183: \$? = $ac_status" >&5 13121 13184 if (exit $ac_status) && test -s "$ac_outfile"; then 13122 13185 # The compiler can only warn and ignore the option if not recognized … … 13218 13281 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 13219 13282 -e 's:$: $lt_compiler_flag:'` 13220 (eval echo "\"\$as_me:132 20: $lt_compile\"" >&5)13283 (eval echo "\"\$as_me:13283: $lt_compile\"" >&5) 13221 13284 (eval "$lt_compile" 2>out/conftest.err) 13222 13285 ac_status=$? 13223 13286 cat out/conftest.err >&5 13224 echo "$as_me:132 24: \$? = $ac_status" >&513287 echo "$as_me:13287: \$? = $ac_status" >&5 13225 13288 if (exit $ac_status) && test -s out/conftest2.$ac_objext 13226 13289 then … … 14788 14851 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 14789 14852 -e 's:$: $lt_compiler_flag:'` 14790 (eval echo "\"\$as_me:14 790: $lt_compile\"" >&5)14853 (eval echo "\"\$as_me:14853: $lt_compile\"" >&5) 14791 14854 (eval "$lt_compile" 2>conftest.err) 14792 14855 ac_status=$? 14793 14856 cat conftest.err >&5 14794 echo "$as_me:14 794: \$? = $ac_status" >&514857 echo "$as_me:14857: \$? = $ac_status" >&5 14795 14858 if (exit $ac_status) && test -s "$ac_outfile"; then 14796 14859 # The compiler can only warn and ignore the option if not recognized … … 14892 14955 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 14893 14956 -e 's:$: $lt_compiler_flag:'` 14894 (eval echo "\"\$as_me:14 894: $lt_compile\"" >&5)14957 (eval echo "\"\$as_me:14957: $lt_compile\"" >&5) 14895 14958 (eval "$lt_compile" 2>out/conftest.err) 14896 14959 ac_status=$? 14897 14960 cat out/conftest.err >&5 14898 echo "$as_me:14 898: \$? = $ac_status" >&514961 echo "$as_me:14961: \$? = $ac_status" >&5 14899 14962 if (exit $ac_status) && test -s out/conftest2.$ac_objext 14900 14963 then … … 17099 17162 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17100 17163 -e 's:$: $lt_compiler_flag:'` 17101 (eval echo "\"\$as_me:171 01: $lt_compile\"" >&5)17164 (eval echo "\"\$as_me:17164: $lt_compile\"" >&5) 17102 17165 (eval "$lt_compile" 2>conftest.err) 17103 17166 ac_status=$? 17104 17167 cat conftest.err >&5 17105 echo "$as_me:171 05: \$? = $ac_status" >&517168 echo "$as_me:17168: \$? = $ac_status" >&5 17106 17169 if (exit $ac_status) && test -s "$ac_outfile"; then 17107 17170 # The compiler can only warn and ignore the option if not recognized … … 17367 17430 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17368 17431 -e 's:$: $lt_compiler_flag:'` 17369 (eval echo "\"\$as_me:17 369: $lt_compile\"" >&5)17432 (eval echo "\"\$as_me:17432: $lt_compile\"" >&5) 17370 17433 (eval "$lt_compile" 2>conftest.err) 17371 17434 ac_status=$? 17372 17435 cat conftest.err >&5 17373 echo "$as_me:17 373: \$? = $ac_status" >&517436 echo "$as_me:17436: \$? = $ac_status" >&5 17374 17437 if (exit $ac_status) && test -s "$ac_outfile"; then 17375 17438 # The compiler can only warn and ignore the option if not recognized … … 17471 17534 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17472 17535 -e 's:$: $lt_compiler_flag:'` 17473 (eval echo "\"\$as_me:17 473: $lt_compile\"" >&5)17536 (eval echo "\"\$as_me:17536: $lt_compile\"" >&5) 17474 17537 (eval "$lt_compile" 2>out/conftest.err) 17475 17538 ac_status=$? 17476 17539 cat out/conftest.err >&5 17477 echo "$as_me:17 477: \$? = $ac_status" >&517540 echo "$as_me:17540: \$? = $ac_status" >&5 17478 17541 if (exit $ac_status) && test -s out/conftest2.$ac_objext 17479 17542 then … … 22371 22434 if test $ac_cv_lib_rt_clock_gettime = yes; then 22372 22435 ADDLIBS="-lrt $ADDLIBS" 22373 else 22374 { { echo "$as_me:$LINENO: error: --enable-cbc-parallel selected, but -lrt unavailable" >&5 22375 echo "$as_me: error: --enable-cbc-parallel selected, but -lrt unavailable" >&2;} 22376 { (exit 1); exit 1; }; } 22436 22437 cat >>confdefs.h <<\_ACEOF 22438 #define HAVE_CLOCK_GETTIME 1 22439 _ACEOF 22440 22441 else 22442 { echo "$as_me:$LINENO: WARNING: --enable-cbc-parallel selected, but -lrt unavailable; using gettimeofday instead of clock_gettime" >&5 22443 echo "$as_me: WARNING: --enable-cbc-parallel selected, but -lrt unavailable; using gettimeofday instead of clock_gettime" >&2;} 22377 22444 fi 22378 22445 -
trunk/Cbc/configure.ac
r836 r1069 148 148 AC_DEFINE([CBC_THREAD],[1],[Define to 1 if the SMP version of Cbc should be compiled]) 149 149 AC_CHECK_LIB([rt],[clock_gettime], 150 [ADDLIBS="-lrt $ADDLIBS"], 151 [AC_MSG_ERROR([--enable-cbc-parallel selected, but -lrt unavailable])]) 150 [ADDLIBS="-lrt $ADDLIBS" 151 AC_DEFINE([HAVE_CLOCK_GETTIME],[1],[Define if clock_gettime and rt library is available])], 152 [AC_MSG_WARN([--enable-cbc-parallel selected, but -lrt unavailable; using gettimeofday instead of clock_gettime])]) 152 153 AC_CHECK_LIB([pthread],[pthread_create], 153 154 [ADDLIBS="-lpthread $ADDLIBS"], -
trunk/Cbc/inc/config_cbc.h.in
r710 r1069 62 62 #undef COIN_HAS_XPR 63 63 64 /* Define if clock_gettime and rt library is available */ 65 #undef HAVE_CLOCK_GETTIME 66 64 67 /* Define to 1 if you have the <dlfcn.h> header file. */ 65 68 #undef HAVE_DLFCN_H -
trunk/Cbc/src/CbcModel.cpp
r1053 r1069 92 92 #endif 93 93 #include <pthread.h> 94 #ifdef HAVE_CLOCK_GETTIME 95 inline int my_gettime(struct timespec* tp) { 96 return clock_gettime(CLOCK_REALTIME, tp); 97 } 98 #else 99 //struct timespec { 100 // time_t tv_sec; 101 // long tv_nsec; 102 //}; 103 inline int my_gettime(struct timespec* tp) { 104 struct timeval tv; 105 int ret = gettimeofday(&tv, NULL); 106 tp->tv_sec = tv.tv_sec; 107 tp->tv_nsec = tv.tv_usec*1000; 108 return ret; 109 } 110 #endif 94 111 //#include "clocktime.hpp" 95 112 //#undef small … … 2419 2436 pthread_mutex_lock(&condition_mutex); 2420 2437 struct timespec absTime; 2421 clock_gettime(CLOCK_REALTIME,&absTime);2438 my_gettime(&absTime); 2422 2439 double time = absTime.tv_sec+1.0e-9*absTime.tv_nsec; 2423 2440 absTime.tv_nsec += 1000000; // millisecond … … 2427 2444 } 2428 2445 pthread_cond_timedwait(&condition_main,&condition_mutex,&absTime); 2429 clock_gettime(CLOCK_REALTIME,&absTime);2446 my_gettime(&absTime); 2430 2447 double time2 = absTime.tv_sec+1.0e-9*absTime.tv_nsec; 2431 2448 timeWaiting += time2-time; … … 3405 3422 pthread_mutex_lock(&condition_mutex); 3406 3423 struct timespec absTime; 3407 clock_gettime(CLOCK_REALTIME,&absTime);3424 my_gettime(&absTime); 3408 3425 double time = absTime.tv_sec+1.0e-9*absTime.tv_nsec; 3409 3426 absTime.tv_nsec += 1000000; // millisecond … … 3413 3430 } 3414 3431 pthread_cond_timedwait(&condition_main,&condition_mutex,&absTime); 3415 clock_gettime(CLOCK_REALTIME,&absTime);3432 my_gettime(&absTime); 3416 3433 double time2 = absTime.tv_sec+1.0e-9*absTime.tv_nsec; 3417 3434 timeWaiting += time2-time; … … 3467 3484 pthread_mutex_lock(&condition_mutex); 3468 3485 struct timespec absTime; 3469 clock_gettime(CLOCK_REALTIME,&absTime);3486 my_gettime(&absTime); 3470 3487 double time = absTime.tv_sec+1.0e-9*absTime.tv_nsec; 3471 3488 absTime.tv_nsec += 1000000; // millisecond … … 3475 3492 } 3476 3493 pthread_cond_timedwait(&condition_main,&condition_mutex,&absTime); 3477 clock_gettime(CLOCK_REALTIME,&absTime);3494 my_gettime(&absTime); 3478 3495 double time2 = absTime.tv_sec+1.0e-9*absTime.tv_nsec; 3479 3496 timeWaiting += time2-time; … … 3491 3508 pthread_mutex_lock(&condition_mutex); 3492 3509 struct timespec absTime; 3493 clock_gettime(CLOCK_REALTIME,&absTime);3510 my_gettime(&absTime); 3494 3511 double time = absTime.tv_sec+1.0e-9*absTime.tv_nsec; 3495 3512 absTime.tv_nsec += 1000000; // millisecond … … 3499 3516 } 3500 3517 pthread_cond_timedwait(&condition_main,&condition_mutex,&absTime); 3501 clock_gettime(CLOCK_REALTIME,&absTime);3518 my_gettime(&absTime); 3502 3519 double time2 = absTime.tv_sec+1.0e-9*absTime.tv_nsec; 3503 3520 timeWaiting += time2-time; … … 3592 3609 pthread_mutex_lock(&condition_mutex); 3593 3610 struct timespec absTime; 3594 clock_gettime(CLOCK_REALTIME,&absTime);3611 my_gettime(&absTime); 3595 3612 absTime.tv_nsec += 1000000; // millisecond 3596 3613 if (absTime.tv_nsec>=1000000000) { … … 3599 3616 } 3600 3617 pthread_cond_timedwait(&condition_main,&condition_mutex,&absTime); 3601 clock_gettime(CLOCK_REALTIME,&absTime);3618 my_gettime(&absTime); 3602 3619 pthread_mutex_unlock(&condition_mutex); 3603 3620 } … … 7125 7142 pthread_mutex_lock(&condition_mutex); 7126 7143 struct timespec absTime; 7127 clock_gettime(CLOCK_REALTIME,&absTime);7144 my_gettime(&absTime); 7128 7145 absTime.tv_nsec += 1000000; // millisecond 7129 7146 if (absTime.tv_nsec>=1000000000) { … … 7159 7176 pthread_mutex_lock(&condition_mutex); 7160 7177 struct timespec absTime; 7161 clock_gettime(CLOCK_REALTIME,&absTime);7178 my_gettime(&absTime); 7162 7179 absTime.tv_nsec += 1000000; // millisecond 7163 7180 if (absTime.tv_nsec>=1000000000) { … … 8261 8278 pthread_mutex_lock(&condition_mutex); 8262 8279 struct timespec absTime; 8263 clock_gettime(CLOCK_REALTIME,&absTime);8280 my_gettime(&absTime); 8264 8281 absTime.tv_nsec += 1000000; // millisecond 8265 8282 if (absTime.tv_nsec>=1000000000) { … … 8268 8285 } 8269 8286 pthread_cond_timedwait(&condition_main,&condition_mutex,&absTime); 8270 clock_gettime(CLOCK_REALTIME,&absTime);8287 my_gettime(&absTime); 8271 8288 pthread_mutex_unlock(&condition_mutex); 8272 8289 } … … 14563 14580 while (stuff->returnCode) { 14564 14581 struct timespec absTime2; 14565 clock_gettime(CLOCK_REALTIME,&absTime2);14582 my_gettime(&absTime2); 14566 14583 double time2 = absTime2.tv_sec+1.0e-9*absTime2.tv_nsec; 14567 14584 // timed wait as seems to hang on max nodes at times 14568 14585 absTime2.tv_sec += 10; 14569 14586 pthread_cond_timedwait(condition,mutex,&absTime2); 14570 clock_gettime(CLOCK_REALTIME,&stuff->absTime);14587 my_gettime(&stuff->absTime); 14571 14588 double time = stuff->absTime.tv_sec+1.0e-9*stuff->absTime.tv_nsec; 14572 14589 stuff->timeWaitingToStart+=time-time2;; … … 14761 14778 if(!stuff->locked) { 14762 14779 struct timespec absTime2; 14763 clock_gettime(CLOCK_REALTIME,&absTime2);14780 my_gettime(&absTime2); 14764 14781 double time2 = absTime2.tv_sec+1.0e-9*absTime2.tv_nsec; 14765 14782 pthread_mutex_lock (stuff->mutex); 14766 14783 stuff->locked=true; 14767 clock_gettime(CLOCK_REALTIME,&stuff->absTime);14784 my_gettime(&stuff->absTime); 14768 14785 double time = stuff->absTime.tv_sec+1.0e-9*stuff->absTime.tv_nsec; 14769 14786 stuff->timeWaitingToLock+=time-time2;; … … 14837 14854 pthread_mutex_unlock (stuff->mutex); 14838 14855 struct timespec absTime2; 14839 clock_gettime(CLOCK_REALTIME,&absTime2);14856 my_gettime(&absTime2); 14840 14857 double time2 = absTime2.tv_sec+1.0e-9*absTime2.tv_nsec; 14841 14858 double time = stuff->absTime.tv_sec+1.0e-9*stuff->absTime.tv_nsec; -
trunk/Cbc/src/CbcSolver.cpp
r1067 r1069 7832 7832 bestSolution = new double [n]; 7833 7833 OsiClpSolverInterface * clpSolver = dynamic_cast< OsiClpSolverInterface*> (babModel_->solver()); 7834 // Save bounds on processed model 7835 const int * originalColumns = process.originalColumns(); 7836 int numberColumns2 = clpSolver->getNumCols(); 7837 double * solution2 = new double[n]; 7838 double * lower2 = new double [n]; 7839 double * upper2 = new double [n]; 7840 for (int i=0;i<n;i++) { 7841 solution2[i]=COIN_DBL_MAX; 7842 lower2[i]=COIN_DBL_MAX; 7843 upper2[i]=-COIN_DBL_MAX; 7844 } 7845 const double *columnLower = clpSolver->getColLower() ; 7846 const double * columnUpper = clpSolver->getColUpper() ; 7847 const double * solution = babModel_->bestSolution(); 7848 for (int i=0;i<numberColumns2;i++) { 7849 int jColumn = originalColumns[i]; 7850 solution2[jColumn]=solution[i]; 7851 lower2[jColumn]=columnLower[i]; 7852 upper2[jColumn]=columnUpper[i]; 7853 } 7834 7854 ClpSimplex * lpSolver = clpSolver->getModelPtr(); 7835 7855 // Save bounds on processed model -
trunk/Cbc/src/Makefile.in
r1057 r1069 166 166 CbcHeuristicDiveLineSearch.lo CbcHeuristicDivePseudoCost.lo \ 167 167 CbcHeuristicDiveVectorLength.lo CbcHeuristicFPump.lo \ 168 CbcHeuristicGreedy.lo CbcHeuristicLocal.lo CbcHeuristicPivotAndFix.lo\169 CbcHeuristic RandRound.lo CbcHeuristicRINS.lo \170 Cbc Message.lo CbcModel.lo CbcNode.lo CbcStatistics.lo \171 CbcSt rategy.lo CbcTree.lo CbcTreeLocal.lo168 CbcHeuristicGreedy.lo CbcHeuristicLocal.lo \ 169 CbcHeuristicPivotAndFix.lo CbcHeuristicRandRound.lo \ 170 CbcHeuristicRINS.lo CbcMessage.lo CbcModel.lo CbcNode.lo \ 171 CbcStatistics.lo CbcStrategy.lo CbcTree.lo CbcTreeLocal.lo 172 172 libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS) 173 173 libCbcSolver_la_LIBADD = … … 829 829 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicLocal.Plo@am__quote@ 830 830 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicPivotAndFix.Plo@am__quote@ 831 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicRINS.Plo@am__quote@ 831 832 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicRandRound.Plo@am__quote@ 832 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcHeuristicRINS.Plo@am__quote@833 833 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcLinked.Plo@am__quote@ 834 834 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CbcMessage.Plo@am__quote@ -
trunk/configure
r914 r1069 2658 2658 coin_add_cflags="-pipe" 2659 2659 coin_dbg_cflags="-g" 2660 coin_warn_cflags="-pedantic-errors -Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall" 2660 coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas" 2661 case $build in 2662 *-darwin*) 2663 ;; 2664 *) 2665 coin_warn_cflags="-pedantic-errors $coin_warn_cflags" 2666 ;; 2667 esac 2661 2668 case $enable_doscompile in 2662 2669 mingw) … … 2731 2738 case "$CC" in 2732 2739 icc* | */icc*) 2733 coin_opt_cflags="-O3 -ip "2740 coin_opt_cflags="-O3 -ip -mp1" 2734 2741 coin_add_cflags="" 2735 2742 coin_dbg_cflags="-g" … … 2793 2800 case "$CC" in 2794 2801 xlc* | */xlc* | mpxlc* | */mpxlc*) 2795 coin_opt_cflags="-O 3-qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"2802 coin_opt_cflags="-O -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1" 2796 2803 coin_add_cflags="-bmaxdata:0x80000000 -qsuppress=1500-036 -qsuppress=1500-029" 2797 2804 coin_dbg_cflags="-g" … … 3088 3095 fi ;; 3089 3096 *-*-solaris*) 3090 comps="CC xlC aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;3097 comps="CC xlC_r aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;; 3091 3098 *-darwin*) comps="g++ c++ CC" ;; 3092 *) comps="xlC aCC CC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;3099 *) comps="xlC_r aCC CC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;; 3093 3100 esac 3094 3101 … … 3452 3459 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 3453 3460 3454 if test -z "$CXX" ; then 3455 { { echo "$as_me:$LINENO: error: Failed to find a C++ compiler!" >&5 3456 echo "$as_me: error: Failed to find a C++ compiler!" >&2;} 3461 3462 #AC_PROG_CXX sets CXX to g++ if it cannot find a working C++ compiler 3463 #thus, we test here whether $CXX is actually working 3464 ac_ext=cc 3465 ac_cpp='$CXXCPP $CPPFLAGS' 3466 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 3467 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 3468 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 3469 3470 echo "$as_me:$LINENO: checking whether C++ compiler $CXX works" >&5 3471 echo $ECHO_N "checking whether C++ compiler $CXX works... $ECHO_C" >&6; 3472 cat >conftest.$ac_ext <<_ACEOF 3473 /* confdefs.h. */ 3474 _ACEOF 3475 cat confdefs.h >>conftest.$ac_ext 3476 cat >>conftest.$ac_ext <<_ACEOF 3477 /* end confdefs.h. */ 3478 3479 int 3480 main () 3481 { 3482 int i=0; 3483 ; 3484 return 0; 3485 } 3486 _ACEOF 3487 rm -f conftest.$ac_objext 3488 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 3489 (eval $ac_compile) 2>conftest.er1 3490 ac_status=$? 3491 grep -v '^ *+' conftest.er1 >conftest.err 3492 rm -f conftest.er1 3493 cat conftest.err >&5 3494 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3495 (exit $ac_status); } && 3496 { ac_try='test -z "$ac_cxx_werror_flag" 3497 || test ! -s conftest.err' 3498 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3499 (eval $ac_try) 2>&5 3500 ac_status=$? 3501 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3502 (exit $ac_status); }; } && 3503 { ac_try='test -s conftest.$ac_objext' 3504 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3505 (eval $ac_try) 2>&5 3506 ac_status=$? 3507 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3508 (exit $ac_status); }; }; then 3509 echo "$as_me:$LINENO: result: yes" >&5 3510 echo "${ECHO_T}yes" >&6 3511 else 3512 echo "$as_me: failed program was:" >&5 3513 sed 's/^/| /' conftest.$ac_ext >&5 3514 3515 echo "$as_me:$LINENO: result: no" >&5 3516 echo "${ECHO_T}no" >&6 3517 { { echo "$as_me:$LINENO: error: failed to find a C++ compiler or C++ compiler $CXX does not work" >&5 3518 echo "$as_me: error: failed to find a C++ compiler or C++ compiler $CXX does not work" >&2;} 3457 3519 { (exit 1); exit 1; }; } 3458 fi 3520 3521 fi 3522 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 3523 ac_ext=cc 3524 ac_cpp='$CXXCPP $CPPFLAGS' 3525 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 3526 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 3527 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 3528 3459 3529 3460 3530 # It seems that we need to cleanup something here for the Windows … … 3502 3572 coin_add_cxxflags="-pipe" 3503 3573 coin_dbg_cxxflags="-g" 3504 coin_warn_cxxflags="-pedantic-errors -Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion" 3505 case $enable_doscompile in 3506 mingw) 3507 CXXFLAGS="-mno-cygwin" 3508 cat >conftest.$ac_ext <<_ACEOF 3574 coin_warn_cxxflags="-Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wno-unknown-pragmas" 3575 case $build in 3576 *-darwin*) 3577 ;; 3578 *) 3579 coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags" 3580 ;; 3581 esac 3582 3583 case $enable_doscompile in 3584 mingw) 3585 CXXFLAGS="-mno-cygwin" 3586 cat >conftest.$ac_ext <<_ACEOF 3509 3587 /* confdefs.h. */ 3510 3588 _ACEOF … … 3551 3629 rm -f conftest.err conftest.$ac_objext \ 3552 3630 conftest$ac_exeext conftest.$ac_ext 3553 3554 3555 3631 CXXFLAGS= 3632 ;; 3633 esac 3556 3634 esac 3557 3635 fi … … 3580 3658 case "$CXX" in 3581 3659 icpc* | */icpc*) 3582 coin_opt_cxxflags="-O3 -ip "3660 coin_opt_cxxflags="-O3 -ip -mp1" 3583 3661 coin_add_cxxflags="" 3584 3662 coin_dbg_cxxflags="-g" … … 3642 3720 case "$CXX" in 3643 3721 xlC* | */xlC* | mpxlC* | */mpxlC*) 3644 coin_opt_cxxflags="-O 3-qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"3645 coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036 -qsuppress=1500-029 "3722 coin_opt_cxxflags="-O -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1" 3723 coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036 -qsuppress=1500-029 -qsourcetype=c++" 3646 3724 coin_dbg_cxxflags="-g" 3647 3725 ;; … … 3922 4000 fi ;; 3923 4001 *-*-solaris*) 3924 coin_f77_comps="f95 f90 f77 xlf fort77 gfortran g77 pgf90 pgf77 ifort ifc frt af77" ;;3925 *) coin_f77_comps="xlf fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc frt af77" ;;4002 coin_f77_comps="f95 f90 f77 xlf_r fort77 gfortran g77 pgf90 pgf77 ifort ifc frt af77" ;; 4003 *) coin_f77_comps="xlf_r fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc frt af77" ;; 3926 4004 esac 3927 4005 … … 4094 4172 4095 4173 # Provide some information about the compiler. 4096 echo "$as_me:4 096:" \4174 echo "$as_me:4174:" \ 4097 4175 "checking for Fortran 77 compiler version" >&5 4098 4176 ac_compiler=`set X $ac_compile; echo $2` … … 4309 4387 case $F77 in 4310 4388 ifort* | */ifort* | IFORT* | */IFORT* ) 4311 coin_opt_fflags='- O3'4312 coin_add_fflags='-fpp -nologo -MT'4313 coin_dbg_fflags='- debug'4389 coin_opt_fflags='-MT -O3' 4390 coin_add_fflags='-fpp -nologo' 4391 coin_dbg_fflags='-MTd -debug' 4314 4392 ;; 4315 4393 compile_f2c*) … … 4375 4453 case "$F77" in 4376 4454 xlf* | */xlf* | mpxlf* | */mpxlf* ) 4377 coin_opt_fflags="-O 3-qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"4455 coin_opt_fflags="-O -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1" 4378 4456 coin_add_fflags="-bmaxdata:0x80000000 -qsuppress=1500-036 -qsuppress=1500-029" 4379 4457 coin_dbg_fflags="-g -C" … … 6353 6431 *-*-irix6*) 6354 6432 # Find out which ABI we are using. 6355 echo '#line 6 355"configure"' > conftest.$ac_ext6433 echo '#line 6433 "configure"' > conftest.$ac_ext 6356 6434 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 6357 6435 (eval $ac_compile) 2>&5 … … 8317 8395 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8318 8396 -e 's:$: $lt_compiler_flag:'` 8319 (eval echo "\"\$as_me:83 19: $lt_compile\"" >&5)8397 (eval echo "\"\$as_me:8397: $lt_compile\"" >&5) 8320 8398 (eval "$lt_compile" 2>conftest.err) 8321 8399 ac_status=$? 8322 8400 cat conftest.err >&5 8323 echo "$as_me:8 323: \$? = $ac_status" >&58401 echo "$as_me:8401: \$? = $ac_status" >&5 8324 8402 if (exit $ac_status) && test -s "$ac_outfile"; then 8325 8403 # The compiler can only warn and ignore the option if not recognized … … 8585 8663 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8586 8664 -e 's:$: $lt_compiler_flag:'` 8587 (eval echo "\"\$as_me:8 587: $lt_compile\"" >&5)8665 (eval echo "\"\$as_me:8665: $lt_compile\"" >&5) 8588 8666 (eval "$lt_compile" 2>conftest.err) 8589 8667 ac_status=$? 8590 8668 cat conftest.err >&5 8591 echo "$as_me:8 591: \$? = $ac_status" >&58669 echo "$as_me:8669: \$? = $ac_status" >&5 8592 8670 if (exit $ac_status) && test -s "$ac_outfile"; then 8593 8671 # The compiler can only warn and ignore the option if not recognized … … 8689 8767 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8690 8768 -e 's:$: $lt_compiler_flag:'` 8691 (eval echo "\"\$as_me:8 691: $lt_compile\"" >&5)8769 (eval echo "\"\$as_me:8769: $lt_compile\"" >&5) 8692 8770 (eval "$lt_compile" 2>out/conftest.err) 8693 8771 ac_status=$? 8694 8772 cat out/conftest.err >&5 8695 echo "$as_me:8 695: \$? = $ac_status" >&58773 echo "$as_me:8773: \$? = $ac_status" >&5 8696 8774 if (exit $ac_status) && test -s out/conftest2.$ac_objext 8697 8775 then … … 11034 11112 lt_status=$lt_dlunknown 11035 11113 cat > conftest.$ac_ext <<EOF 11036 #line 11 036"configure"11114 #line 11114 "configure" 11037 11115 #include "confdefs.h" 11038 11116 … … 11134 11212 lt_status=$lt_dlunknown 11135 11213 cat > conftest.$ac_ext <<EOF 11136 #line 11 136"configure"11214 #line 11214 "configure" 11137 11215 #include "confdefs.h" 11138 11216 … … 13478 13556 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 13479 13557 -e 's:$: $lt_compiler_flag:'` 13480 (eval echo "\"\$as_me:13 480: $lt_compile\"" >&5)13558 (eval echo "\"\$as_me:13558: $lt_compile\"" >&5) 13481 13559 (eval "$lt_compile" 2>conftest.err) 13482 13560 ac_status=$? 13483 13561 cat conftest.err >&5 13484 echo "$as_me:13 484: \$? = $ac_status" >&513562 echo "$as_me:13562: \$? = $ac_status" >&5 13485 13563 if (exit $ac_status) && test -s "$ac_outfile"; then 13486 13564 # The compiler can only warn and ignore the option if not recognized … … 13582 13660 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 13583 13661 -e 's:$: $lt_compiler_flag:'` 13584 (eval echo "\"\$as_me:13 584: $lt_compile\"" >&5)13662 (eval echo "\"\$as_me:13662: $lt_compile\"" >&5) 13585 13663 (eval "$lt_compile" 2>out/conftest.err) 13586 13664 ac_status=$? 13587 13665 cat out/conftest.err >&5 13588 echo "$as_me:13 588: \$? = $ac_status" >&513666 echo "$as_me:13666: \$? = $ac_status" >&5 13589 13667 if (exit $ac_status) && test -s out/conftest2.$ac_objext 13590 13668 then … … 15152 15230 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 15153 15231 -e 's:$: $lt_compiler_flag:'` 15154 (eval echo "\"\$as_me:15 154: $lt_compile\"" >&5)15232 (eval echo "\"\$as_me:15232: $lt_compile\"" >&5) 15155 15233 (eval "$lt_compile" 2>conftest.err) 15156 15234 ac_status=$? 15157 15235 cat conftest.err >&5 15158 echo "$as_me:15 158: \$? = $ac_status" >&515236 echo "$as_me:15236: \$? = $ac_status" >&5 15159 15237 if (exit $ac_status) && test -s "$ac_outfile"; then 15160 15238 # The compiler can only warn and ignore the option if not recognized … … 15256 15334 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 15257 15335 -e 's:$: $lt_compiler_flag:'` 15258 (eval echo "\"\$as_me:15 258: $lt_compile\"" >&5)15336 (eval echo "\"\$as_me:15336: $lt_compile\"" >&5) 15259 15337 (eval "$lt_compile" 2>out/conftest.err) 15260 15338 ac_status=$? 15261 15339 cat out/conftest.err >&5 15262 echo "$as_me:15 262: \$? = $ac_status" >&515340 echo "$as_me:15340: \$? = $ac_status" >&5 15263 15341 if (exit $ac_status) && test -s out/conftest2.$ac_objext 15264 15342 then … … 17463 17541 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17464 17542 -e 's:$: $lt_compiler_flag:'` 17465 (eval echo "\"\$as_me:17 465: $lt_compile\"" >&5)17543 (eval echo "\"\$as_me:17543: $lt_compile\"" >&5) 17466 17544 (eval "$lt_compile" 2>conftest.err) 17467 17545 ac_status=$? 17468 17546 cat conftest.err >&5 17469 echo "$as_me:17 469: \$? = $ac_status" >&517547 echo "$as_me:17547: \$? = $ac_status" >&5 17470 17548 if (exit $ac_status) && test -s "$ac_outfile"; then 17471 17549 # The compiler can only warn and ignore the option if not recognized … … 17731 17809 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17732 17810 -e 's:$: $lt_compiler_flag:'` 17733 (eval echo "\"\$as_me:17 733: $lt_compile\"" >&5)17811 (eval echo "\"\$as_me:17811: $lt_compile\"" >&5) 17734 17812 (eval "$lt_compile" 2>conftest.err) 17735 17813 ac_status=$? 17736 17814 cat conftest.err >&5 17737 echo "$as_me:17 737: \$? = $ac_status" >&517815 echo "$as_me:17815: \$? = $ac_status" >&5 17738 17816 if (exit $ac_status) && test -s "$ac_outfile"; then 17739 17817 # The compiler can only warn and ignore the option if not recognized … … 17835 17913 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17836 17914 -e 's:$: $lt_compiler_flag:'` 17837 (eval echo "\"\$as_me:17 837: $lt_compile\"" >&5)17915 (eval echo "\"\$as_me:17915: $lt_compile\"" >&5) 17838 17916 (eval "$lt_compile" 2>out/conftest.err) 17839 17917 ac_status=$? 17840 17918 cat out/conftest.err >&5 17841 echo "$as_me:17 841: \$? = $ac_status" >&517919 echo "$as_me:17919: \$? = $ac_status" >&5 17842 17920 if (exit $ac_status) && test -s out/conftest2.$ac_objext 17843 17921 then
Note: See TracChangeset
for help on using the changeset viewer.