Changeset 1133


Ignore:
Timestamp:
Mar 16, 2009 1:08:05 PM (10 years ago)
Author:
forrest
Message:

fix bug in gamstest

Location:
trunk/Cbc
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/Makefile.in

    r876 r1133  
    172172CPP = @CPP@
    173173CPPFLAGS = @CPPFLAGS@
     174CPXDOCDIR = @CPXDOCDIR@
    174175CPXINCDIR = @CPXINCDIR@
    175176CPXLIB = @CPXLIB@
     177CPXOBJDIR = @CPXOBJDIR@
     178CPXSRCDIR = @CPXSRCDIR@
    176179CXX = @CXX@
    177180CXXCPP = @CXXCPP@
  • trunk/Cbc/configure

    r1131 r1133  
    473473#endif"
    474474
    475 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS CBCSRCDIR CBCOBJDIR CBCDOCDIR COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE CGLSRCDIR CGLOBJDIR CGLDOCDIR COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE CLPSRCDIR CLPOBJDIR CLPDOCDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE COINUTILSSRCDIR COINUTILSOBJDIR COINUTILSDOCDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE DYLPSRCDIR DYLPOBJDIR DYLPDOCDIR COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE OSISRCDIR OSIOBJDIR OSIDOCDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE VOLSRCDIR VOLOBJDIR VOLDOCDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE SYMPHONYSRCDIR SYMPHONYOBJDIR SYMPHONYDOCDIR COIN_HAS_SYMPHONY_TRUE COIN_HAS_SYMPHONY_FALSE CPXINCDIR CPXLIB COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE FMPINCDIR FMPLIB COIN_HAS_FMP_TRUE COIN_HAS_FMP_FALSE MSKINCDIR MSKLIB COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE OSLINCDIR OSLLIB COIN_HAS_OSL_TRUE COIN_HAS_OSL_FALSE SPXINCDIR SPXLIB COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPRINCDIR XPRLIB COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE GLPKINCDIR GLPKLIB COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE COIN_BUILD_GLPK_TRUE COIN_BUILD_GLPK_FALSE ASLLIB ASL_CPPFLAGS COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE CBC_BUILD_CBC_GENERIC_TRUE CBC_BUILD_CBC_GENERIC_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
     475ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS CBCSRCDIR CBCOBJDIR CBCDOCDIR COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE CGLSRCDIR CGLOBJDIR CGLDOCDIR COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE CLPSRCDIR CLPOBJDIR CLPDOCDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE COINUTILSSRCDIR COINUTILSOBJDIR COINUTILSDOCDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE DYLPSRCDIR DYLPOBJDIR DYLPDOCDIR COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE OSISRCDIR OSIOBJDIR OSIDOCDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE VOLSRCDIR VOLOBJDIR VOLDOCDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE SYMPHONYSRCDIR SYMPHONYOBJDIR SYMPHONYDOCDIR COIN_HAS_SYMPHONY_TRUE COIN_HAS_SYMPHONY_FALSE CPXSRCDIR CPXOBJDIR CPXDOCDIR COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE CPXINCDIR CPXLIB FMPINCDIR FMPLIB COIN_HAS_FMP_TRUE COIN_HAS_FMP_FALSE MSKINCDIR MSKLIB COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE OSLINCDIR OSLLIB COIN_HAS_OSL_TRUE COIN_HAS_OSL_FALSE SPXINCDIR SPXLIB COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPRINCDIR XPRLIB COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE GLPKINCDIR GLPKLIB COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE COIN_BUILD_GLPK_TRUE COIN_BUILD_GLPK_FALSE ASLLIB ASL_CPPFLAGS COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE CBC_BUILD_CBC_GENERIC_TRUE CBC_BUILD_CBC_GENERIC_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    2089120891echo "${ECHO_T}$coin_has_symphony" >&6
    2089220892
     20893echo "$as_me:$LINENO: checking for COIN project Cpx" >&5
     20894echo $ECHO_N "checking for COIN project Cpx... $ECHO_C" >&6
     20895
     20896# First check, if the sub-project is actually available (ToDo: allow
     20897# other locations)
     20898
     20899coin_has_cpx=unavailable
     20900if test x"$COIN_SKIP_PROJECTS" != x; then
     20901  for dir in $COIN_SKIP_PROJECTS; do
     20902    if test $dir = Cpx; then
     20903      coin_has_cpx=skipping
     20904    fi
     20905  done
     20906fi
     20907
     20908if test $coin_has_cpx != skipping; then
     20909  if test $PACKAGE_TARNAME = cpx; then
     20910    coin_has_cpx=.
     20911  else
     20912    if test -d $srcdir/../Cpx; then
     20913      coin_has_cpx=../Cpx
     20914    fi
     20915  fi
     20916fi
     20917
     20918if test $coin_has_cpx != unavailable &&
     20919   test $coin_has_cpx != skipping; then
     20920  # Set the #define if the component is available
     20921
     20922cat >>confdefs.h <<\_ACEOF
     20923#define COIN_HAS_CPX 1
     20924_ACEOF
     20925
     20926
     20927  # Set the variables for source and object code location
     20928
     20929  CPXSRCDIR=`cd $srcdir/$coin_has_cpx; pwd`
     20930
     20931  CPXOBJDIR=`pwd`/$coin_has_cpx
     20932
     20933  CPXDOCDIR=$abs_lib_dir/../share/doc/coin/Cpx
     20934fi
     20935
     20936  # Define the Makefile conditional
     20937
     20938
     20939if test $coin_has_cpx != unavailable &&
     20940                test $coin_has_cpx != skipping; then
     20941  COIN_HAS_CPX_TRUE=
     20942  COIN_HAS_CPX_FALSE='#'
     20943else
     20944  COIN_HAS_CPX_TRUE='#'
     20945  COIN_HAS_CPX_FALSE=
     20946fi
     20947
     20948echo "$as_me:$LINENO: result: $coin_has_cpx" >&5
     20949echo "${ECHO_T}$coin_has_cpx" >&6
     20950
    2089320951
    2089420952#############################################################################
     
    2281322871Usually this means the macro was only invoked conditionally." >&5
    2281422872echo "$as_me: error: conditional \"COIN_HAS_SYMPHONY\" was never defined.
     22873Usually this means the macro was only invoked conditionally." >&2;}
     22874   { (exit 1); exit 1; }; }
     22875fi
     22876if test -z "${COIN_HAS_CPX_TRUE}" && test -z "${COIN_HAS_CPX_FALSE}"; then
     22877  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_CPX\" was never defined.
     22878Usually this means the macro was only invoked conditionally." >&5
     22879echo "$as_me: error: conditional \"COIN_HAS_CPX\" was never defined.
    2281522880Usually this means the macro was only invoked conditionally." >&2;}
    2281622881   { (exit 1); exit 1; }; }
     
    2356823633s,@COIN_HAS_SYMPHONY_TRUE@,$COIN_HAS_SYMPHONY_TRUE,;t t
    2356923634s,@COIN_HAS_SYMPHONY_FALSE@,$COIN_HAS_SYMPHONY_FALSE,;t t
     23635s,@CPXSRCDIR@,$CPXSRCDIR,;t t
     23636s,@CPXOBJDIR@,$CPXOBJDIR,;t t
     23637s,@CPXDOCDIR@,$CPXDOCDIR,;t t
     23638s,@COIN_HAS_CPX_TRUE@,$COIN_HAS_CPX_TRUE,;t t
     23639s,@COIN_HAS_CPX_FALSE@,$COIN_HAS_CPX_FALSE,;t t
    2357023640s,@CPXINCDIR@,$CPXINCDIR,;t t
    2357123641s,@CPXLIB@,$CPXLIB,;t t
    23572 s,@COIN_HAS_CPX_TRUE@,$COIN_HAS_CPX_TRUE,;t t
    23573 s,@COIN_HAS_CPX_FALSE@,$COIN_HAS_CPX_FALSE,;t t
    2357423642s,@FMPINCDIR@,$FMPINCDIR,;t t
    2357523643s,@FMPLIB@,$FMPLIB,;t t
  • trunk/Cbc/configure.ac

    r1131 r1133  
    6565AC_COIN_HAS_PROJECT(Vol)
    6666AC_COIN_HAS_PROJECT(SYMPHONY)
     67AC_COIN_HAS_PROJECT(Cpx)
    6768
    6869#############################################################################
  • trunk/Cbc/src/CbcNode.cpp

    r1132 r1133  
    13751375  branch_=NULL;
    13761376  OsiSolverInterface * solver = model->solver();
     1377# ifdef COIN_HAS_CLP
     1378  OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (solver);
     1379  int saveClpOptions=0;
     1380  if (osiclp) {
     1381    // for faster hot start
     1382    saveClpOptions = osiclp->specialOptions();
     1383    osiclp->setSpecialOptions(saveClpOptions|8192);
     1384  }
     1385# else
     1386  OsiSolverInterface *osiclp = NULL ;
     1387# endif
    13771388  double saveObjectiveValue = solver->getObjValue();
    13781389  double objectiveValue = CoinMax(solver->getObjSense()*saveObjectiveValue,objectiveValue_);
     
    17021713       On entry newLower[i] is new lower bound, on exit obj change
    17031714      */
    1704       OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (solver);
    17051715      ClpSimplex * clp=NULL;
    17061716      double * newLower = NULL;
     
    23392349  solver->setColSolution(saveSolution);
    23402350  delete [] saveSolution;
     2351# ifdef COIN_HAS_CLP
     2352  if (osiclp)
     2353    osiclp->setSpecialOptions(saveClpOptions);
     2354# endif
    23412355  return anyAction;
    23422356}
     
    25772591  }
    25782592# else
    2579   OsiSolverInterface *osiclp = 0 ;
     2593  OsiSolverInterface *osiclp = NULL ;
    25802594# endif
    25812595  const CglTreeProbingInfo * probingInfo = NULL; //model->probingInfo();
  • trunk/Cbc/test/Makefile.in

    r1052 r1133  
    245245CPP = @CPP@
    246246CPPFLAGS = @CPPFLAGS@
     247CPXDOCDIR = @CPXDOCDIR@
    247248CPXINCDIR = @CPXINCDIR@
    248249CPXLIB = @CPXLIB@
     250CPXOBJDIR = @CPXOBJDIR@
     251CPXSRCDIR = @CPXSRCDIR@
    249252CXX = @CXX@
    250253CXXCPP = @CXXCPP@
Note: See TracChangeset for help on using the changeset viewer.