Changes from releases/0.9.3 at r1588 to releases/0.9.4 at r1588


Ignore:
Location:
releases/0.9.4
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • releases/0.9.4/Dip

  • releases/0.9.4/Dip/configure

    r1588 r1588  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Dip 0.9.3.
     3# Generated by GNU Autoconf 2.59 for Dip 0.9.4.
    44#
    55# Report bugs to <dip@lists.coin-or.org>.
     
    441441PACKAGE_NAME='Dip'
    442442PACKAGE_TARNAME='dip'
    443 PACKAGE_VERSION='0.9.3'
    444 PACKAGE_STRING='Dip 0.9.3'
     443PACKAGE_VERSION='0.9.4'
     444PACKAGE_STRING='Dip 0.9.4'
    445445PACKAGE_BUGREPORT='dip@lists.coin-or.org'
    446446
     
    10171017  # This message is too long to be a string in the A/UX 3.1 sh.
    10181018  cat <<_ACEOF
    1019 \`configure' configures Dip 0.9.3 to adapt to many kinds of systems.
     1019\`configure' configures Dip 0.9.4 to adapt to many kinds of systems.
    10201020
    10211021Usage: $0 [OPTION]... [VAR=VALUE]...
     
    10831083if test -n "$ac_init_help"; then
    10841084  case $ac_init_help in
    1085      short | recursive ) echo "Configuration of Dip 0.9.3:";;
     1085     short | recursive ) echo "Configuration of Dip 0.9.4:";;
    10861086   esac
    10871087  cat <<\_ACEOF
     
    12881288if $ac_init_version; then
    12891289  cat <<\_ACEOF
    1290 Dip configure 0.9.3
     1290Dip configure 0.9.4
    12911291generated by GNU Autoconf 2.59
    12921292
     
    13191319running configure, to aid debugging if configure makes a mistake.
    13201320
    1321 It was created by Dip $as_me 0.9.3, which was
     1321It was created by Dip $as_me 0.9.4, which was
    13221322generated by GNU Autoconf 2.59.  Invocation command line was
    13231323
     
    18451845
    18461846# Capture libtool library version, if given.
    1847  coin_libversion=2:3:1
     1847 coin_libversion=2:4:1
    18481848
    18491849
     
    46334633# Define the identity of the package.
    46344634 PACKAGE='dip'
    4635  VERSION='0.9.3'
     4635 VERSION='0.9.4'
    46364636
    46374637
     
    2573925739cat >&5 <<_CSEOF
    2574025740
    25741 This file was extended by Dip $as_me 0.9.3, which was
     25741This file was extended by Dip $as_me 0.9.4, which was
    2574225742generated by GNU Autoconf 2.59.  Invocation command line was
    2574325743
     
    2580525805cat >>$CONFIG_STATUS <<_ACEOF
    2580625806ac_cs_version="\\
    25807 Dip config.status 0.9.3
     25807Dip config.status 0.9.4
    2580825808configured by $0, generated by GNU Autoconf 2.59,
    2580925809  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/0.9.4/Dip/configure.ac

    r1588 r1588  
    2121
    2222# name of project, version number, contact info
    23 AC_INIT([Dip],[0.9.3],[dip@lists.coin-or.org])
     23AC_INIT([Dip],[0.9.4],[dip@lists.coin-or.org])
    2424
    2525# copyright for configure script
     
    6161# externals.  The following macro ensures that those externals are
    6262# retrieved by svn if they are not there yet.
    63 AC_COIN_PROJECTDIR_INIT(Dip,2:3:1)
     63AC_COIN_PROJECTDIR_INIT(Dip,2:4:1)
    6464
    6565# Check if user wants to produce debugging code
  • releases/0.9.4/Dip/src

  • releases/0.9.4/Dip/src/DecompAlgo.cpp

    r1588 r1588  
    48754875      //---
    48764876      if (m_param.SubProbParallel == true) {
    4877 #if defined(_OPENMP) && defined(__DECOMP_IP_CBC__)
    4878          omp_set_num_threads(1);
    4879          std::cout << "hello thread " << std::endl;
    4880 #elif _OPENMP
     4877#ifdef _OPENMP
    48814878         printf("===== START Threaded solve of subproblems. =====\n");
    48824879#endif
     
    49344931         */
    49354932#ifdef _OPENMP
     4933         omp_set_num_threads(m_param.ConcurrentThreadsNum);
    49364934         #pragma omp parallel for schedule(dynamic, m_param.SubProbParallelChunksize)
    49374935#endif
  • releases/0.9.4/Dip/src/DecompModel.cpp

    r1588 r1588  
    235235   //TODO: what exactly does this do? make copy of entire model!?
    236236   CbcModel cbc(*m_osi);
     237#if 0
    237238   CbcMain0(cbc);
    238239   //int i;
     
    318319    *   (5  event user programmed event occurred)
    319320   */
     321   #endif
     322   cbc.setLogLevel(0);
     323   cbc.branchAndBound();
    320324   const int statusSet[2] = {0, 1};
    321325   result->m_solStatus    = cbc.status();
  • releases/0.9.4/Dip/src/config_dip_default.h

    r1588 r1588  
    2020
    2121/* Version number of project */
    22 #define DIP_VERSION "0.9.3"
     22#define DIP_VERSION "0.9.4"
    2323
    2424/* Major Version number of project */
     
    2929
    3030/* Release Version number of project */
    31 #define DIP_VERSION_RELEASE 3
     31#define DIP_VERSION_RELEASE 4
    3232
  • releases/0.9.4/configure

    r1588 r1588  
    22# From configure.ac 0.8.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.59 for Dip 0.9.3.
     4# Generated by GNU Autoconf 2.59 for Dip 0.9.4.
    55#
    66# Report bugs to <dip@lists.coin-or.org>.
     
    442442PACKAGE_NAME='Dip'
    443443PACKAGE_TARNAME='dip'
    444 PACKAGE_VERSION='0.9.3'
    445 PACKAGE_STRING='Dip 0.9.3'
     444PACKAGE_VERSION='0.9.4'
     445PACKAGE_STRING='Dip 0.9.4'
    446446PACKAGE_BUGREPORT='dip@lists.coin-or.org'
    447447
     
    10461046  # This message is too long to be a string in the A/UX 3.1 sh.
    10471047  cat <<_ACEOF
    1048 \`configure' configures Dip 0.9.3 to adapt to many kinds of systems.
     1048\`configure' configures Dip 0.9.4 to adapt to many kinds of systems.
    10491049
    10501050Usage: $0 [OPTION]... [VAR=VALUE]...
     
    11121112if test -n "$ac_init_help"; then
    11131113  case $ac_init_help in
    1114      short | recursive ) echo "Configuration of Dip 0.9.3:";;
     1114     short | recursive ) echo "Configuration of Dip 0.9.4:";;
    11151115   esac
    11161116  cat <<\_ACEOF
     
    13211321if $ac_init_version; then
    13221322  cat <<\_ACEOF
    1323 Dip configure 0.9.3
     1323Dip configure 0.9.4
    13241324generated by GNU Autoconf 2.59
    13251325
     
    13521352running configure, to aid debugging if configure makes a mistake.
    13531353
    1354 It was created by Dip $as_me 0.9.3, which was
     1354It was created by Dip $as_me 0.9.4, which was
    13551355generated by GNU Autoconf 2.59.  Invocation command line was
    13561356
     
    52095209# Define the identity of the package.
    52105210 PACKAGE='dip'
    5211  VERSION='0.9.3'
     5211 VERSION='0.9.4'
    52125212
    52135213
     
    2281822818cat >&5 <<_CSEOF
    2281922819
    22820 This file was extended by Dip $as_me 0.9.3, which was
     22820This file was extended by Dip $as_me 0.9.4, which was
    2282122821generated by GNU Autoconf 2.59.  Invocation command line was
    2282222822
     
    2287622876cat >>$CONFIG_STATUS <<_ACEOF
    2287722877ac_cs_version="\\
    22878 Dip config.status 0.9.3
     22878Dip config.status 0.9.4
    2287922879configured by $0, generated by GNU Autoconf 2.59,
    2288022880  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/0.9.4/configure.ac

    r1588 r1588  
    2121
    2222# name of project, version number, contact info
    23 AC_INIT([Dip],[0.9.3],[dip@lists.coin-or.org])
     23AC_INIT([Dip],[0.9.4],[dip@lists.coin-or.org])
    2424
    2525# copyright for configure script
Note: See TracChangeset for help on using the changeset viewer.