Changes from releases/0.9.11 at r1207 to releases/0.9.12 at r1588


Ignore:
Location:
releases
Files:
1 added
3 deleted
29 edited

Legend:

Unmodified
Added
Removed
  • releases/0.9.12/Dip/Makefile.in

    r1207 r1588  
    7171        $(srcdir)/Makefile.in $(srcdir)/dip-uninstalled.pc.in \
    7272        $(srcdir)/dip.pc.in $(top_srcdir)/configure \
    73         $(top_srcdir)/examples/AP3/Makefile.in \
    74         $(top_srcdir)/examples/AP3/ap3.parm.in \
    7573        $(top_srcdir)/examples/ATM/Makefile.in \
    7674        $(top_srcdir)/examples/ATM/atm.parm.in \
     
    8886        $(top_srcdir)/examples/GAP/gap.parm.in \
    8987        $(top_srcdir)/examples/GAP/get_pisinger.sh.in \
    90         $(top_srcdir)/examples/MAD/Makefile.in \
    91         $(top_srcdir)/examples/MAD/mad.parm.in \
    9288        $(top_srcdir)/examples/MCF/Makefile.in \
    9389        $(top_srcdir)/examples/MCF/README.txt.in \
     
    10298        $(top_srcdir)/examples/MILP/data_extract.sh.in \
    10399        $(top_srcdir)/examples/MILP/milp.parm.in \
    104         $(top_srcdir)/examples/MILPBlock/Makefile.in \
    105         $(top_srcdir)/examples/MILPBlock/README.txt.in \
    106         $(top_srcdir)/examples/MILPBlock/data_extract.sh.in \
    107         $(top_srcdir)/examples/MILPBlock/milpblock.parm.in \
    108         $(top_srcdir)/examples/MILPBlock/milpblock.parm2.in \
    109         $(top_srcdir)/examples/MILPBlock/test.sh.in \
    110100        $(top_srcdir)/examples/MMKP/Makefile.in \
    111101        $(top_srcdir)/examples/MMKP/README.txt.in \
     
    128118        $(top_srcdir)/examples/TSP/tsp.parm.in \
    129119        $(top_srcdir)/examples/VRP/Makefile.in \
     120        $(top_srcdir)/examples/VRP/data_extract.sh.in \
    130121        $(top_srcdir)/examples/VRP/get_boost.sh.in \
    131122        $(top_srcdir)/examples/VRP/get_concorde.sh.in \
     
    153144        examples/MILP/Makefile examples/MILP/milp.parm \
    154145        examples/MILP/data_extract.sh examples/MILP/README.txt \
    155         examples/MILPBlock/Makefile examples/MILPBlock/milpblock.parm \
    156         examples/MILPBlock/milpblock.parm2 \
    157         examples/MILPBlock/data_extract.sh \
    158         examples/MILPBlock/README.txt examples/MILPBlock/test.sh \
    159         examples/AP3/Makefile examples/AP3/ap3.parm \
    160146        examples/GAP/Makefile examples/GAP/gap.parm \
    161147        examples/GAP/data_extract.sh examples/GAP/get_pisinger.sh \
    162         examples/GAP/README.txt examples/MAD/Makefile \
    163         examples/MAD/mad.parm examples/MCF/Makefile \
     148        examples/GAP/README.txt examples/MCF/Makefile \
    164149        examples/MCF/mcf.parm examples/MCF/data_extract.sh \
    165150        examples/MCF/README.txt examples/MMKP/Makefile \
     
    167152        examples/MMKP/get_pisinger.sh examples/MMKP/README.txt \
    168153        examples/VRP/Makefile examples/VRP/vrp.parm \
    169         examples/VRP/get_boost.sh examples/VRP/get_concorde.sh \
    170         examples/VRP/get_cvrpsep.sh examples/ATM/Makefile \
    171         examples/ATM/atm.parm examples/ATM/data_extract.sh \
    172         examples/SDPUC/Makefile examples/SDPUC/sdpuc.parm \
    173         examples/SDPUC/data_extract.sh examples/SDPUC/README.txt \
     154        examples/VRP/data_extract.sh examples/VRP/get_boost.sh \
     155        examples/VRP/get_concorde.sh examples/VRP/get_cvrpsep.sh \
     156        examples/ATM/Makefile examples/ATM/atm.parm \
     157        examples/ATM/data_extract.sh examples/SDPUC/Makefile \
     158        examples/SDPUC/sdpuc.parm examples/SDPUC/data_extract.sh \
     159        examples/SDPUC/README.txt \
    174160        examples/ExternalSolvers/Knapsack/Pisinger/Makefile \
    175161        examples/ExternalSolvers/Knapsack/Pisinger/get.pisinger \
     
    551537examples/MILP/README.txt: $(top_builddir)/config.status $(top_srcdir)/examples/MILP/README.txt.in
    552538        cd $(top_builddir) && $(SHELL) ./config.status $@
    553 examples/MILPBlock/Makefile: $(top_builddir)/config.status $(top_srcdir)/examples/MILPBlock/Makefile.in
    554         cd $(top_builddir) && $(SHELL) ./config.status $@
    555 examples/MILPBlock/milpblock.parm: $(top_builddir)/config.status $(top_srcdir)/examples/MILPBlock/milpblock.parm.in
    556         cd $(top_builddir) && $(SHELL) ./config.status $@
    557 examples/MILPBlock/milpblock.parm2: $(top_builddir)/config.status $(top_srcdir)/examples/MILPBlock/milpblock.parm2.in
    558         cd $(top_builddir) && $(SHELL) ./config.status $@
    559 examples/MILPBlock/data_extract.sh: $(top_builddir)/config.status $(top_srcdir)/examples/MILPBlock/data_extract.sh.in
    560         cd $(top_builddir) && $(SHELL) ./config.status $@
    561 examples/MILPBlock/README.txt: $(top_builddir)/config.status $(top_srcdir)/examples/MILPBlock/README.txt.in
    562         cd $(top_builddir) && $(SHELL) ./config.status $@
    563 examples/MILPBlock/test.sh: $(top_builddir)/config.status $(top_srcdir)/examples/MILPBlock/test.sh.in
    564         cd $(top_builddir) && $(SHELL) ./config.status $@
    565 examples/AP3/Makefile: $(top_builddir)/config.status $(top_srcdir)/examples/AP3/Makefile.in
    566         cd $(top_builddir) && $(SHELL) ./config.status $@
    567 examples/AP3/ap3.parm: $(top_builddir)/config.status $(top_srcdir)/examples/AP3/ap3.parm.in
    568         cd $(top_builddir) && $(SHELL) ./config.status $@
    569539examples/GAP/Makefile: $(top_builddir)/config.status $(top_srcdir)/examples/GAP/Makefile.in
    570540        cd $(top_builddir) && $(SHELL) ./config.status $@
     
    577547examples/GAP/README.txt: $(top_builddir)/config.status $(top_srcdir)/examples/GAP/README.txt.in
    578548        cd $(top_builddir) && $(SHELL) ./config.status $@
    579 examples/MAD/Makefile: $(top_builddir)/config.status $(top_srcdir)/examples/MAD/Makefile.in
    580         cd $(top_builddir) && $(SHELL) ./config.status $@
    581 examples/MAD/mad.parm: $(top_builddir)/config.status $(top_srcdir)/examples/MAD/mad.parm.in
    582         cd $(top_builddir) && $(SHELL) ./config.status $@
    583549examples/MCF/Makefile: $(top_builddir)/config.status $(top_srcdir)/examples/MCF/Makefile.in
    584550        cd $(top_builddir) && $(SHELL) ./config.status $@
     
    602568        cd $(top_builddir) && $(SHELL) ./config.status $@
    603569examples/VRP/vrp.parm: $(top_builddir)/config.status $(top_srcdir)/examples/VRP/vrp.parm.in
     570        cd $(top_builddir) && $(SHELL) ./config.status $@
     571examples/VRP/data_extract.sh: $(top_builddir)/config.status $(top_srcdir)/examples/VRP/data_extract.sh.in
    604572        cd $(top_builddir) && $(SHELL) ./config.status $@
    605573examples/VRP/get_boost.sh: $(top_builddir)/config.status $(top_srcdir)/examples/VRP/get_boost.sh.in
     
    804772        $(am__remove_distdir)
    805773        mkdir $(distdir)
    806         $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/examples $(distdir)/examples/AP3 $(distdir)/examples/ATM $(distdir)/examples/ExternalSolvers/Graph $(distdir)/examples/ExternalSolvers/Knapsack/Pisinger $(distdir)/examples/ExternalSolvers/TSP $(distdir)/examples/ExternalSolvers/VRP $(distdir)/examples/GAP $(distdir)/examples/MAD $(distdir)/examples/MCF $(distdir)/examples/MILP $(distdir)/examples/MILPBlock $(distdir)/examples/MMKP $(distdir)/examples/SDPUC $(distdir)/examples/SmallIP $(distdir)/examples/TSP $(distdir)/examples/VRP
     774        $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/examples $(distdir)/examples/ATM $(distdir)/examples/ExternalSolvers/Graph $(distdir)/examples/ExternalSolvers/Knapsack/Pisinger $(distdir)/examples/ExternalSolvers/TSP $(distdir)/examples/ExternalSolvers/VRP $(distdir)/examples/GAP $(distdir)/examples/MCF $(distdir)/examples/MILP $(distdir)/examples/MMKP $(distdir)/examples/SDPUC $(distdir)/examples/SmallIP $(distdir)/examples/TSP $(distdir)/examples/VRP
    807775        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    808776        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  • releases/0.9.12/Dip/configure

    r1207 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.11.
     3# Generated by GNU Autoconf 2.59 for Dip 0.9.12.
    44#
    55# Report bugs to <dip@lists.coin-or.org>.
     
    441441PACKAGE_NAME='Dip'
    442442PACKAGE_TARNAME='dip'
    443 PACKAGE_VERSION='0.9.11'
    444 PACKAGE_STRING='Dip 0.9.11'
     443PACKAGE_VERSION='0.9.12'
     444PACKAGE_STRING='Dip 0.9.12'
    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.11 to adapt to many kinds of systems.
     1019\`configure' configures Dip 0.9.12 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.11:";;
     1085     short | recursive ) echo "Configuration of Dip 0.9.12:";;
    10861086   esac
    10871087  cat <<\_ACEOF
     
    12881288if $ac_init_version; then
    12891289  cat <<\_ACEOF
    1290 Dip configure 0.9.11
     1290Dip configure 0.9.12
    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.11, which was
     1321It was created by Dip $as_me 0.9.12, 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:11:1
     1847 coin_libversion=2:12:1
    18481848
    18491849
     
    20862086             fi
    20872087             ;;
     2088  *-*-darwin*) comps="clang gcc cc" ;;
    20882089  *-linux-gnu*) comps="gcc cc pgcc icc xlc" ;;
    20892090  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
     
    32423243  *-*-solaris*)
    32433244             comps="CC xlC_r aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
    3244   *-darwin*) comps="g++ c++ CC" ;;
     3245  *-darwin*) comps="clang++ g++ c++ CC" ;;
    32453246  *-linux-gnu*)
    32463247             comps="g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC xlC_r aCC CC" ;;
     
    36793680# It seems that we need to cleanup something here for the Windows
    36803681case "$CXX" in
    3681   clang* ) ;;
     3682  clang* | */clang*) ;;
    36823683  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    36833684    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
     
    45754576# Define the identity of the package.
    45764577 PACKAGE='dip'
    4577  VERSION='0.9.11'
     4578 VERSION='0.9.12'
    45784579
    45794580
     
    58715872*-*-irix6*)
    58725873  # Find out which ABI we are using.
    5873   echo '#line 5873 "configure"' > conftest.$ac_ext
     5874  echo '#line 5874 "configure"' > conftest.$ac_ext
    58745875  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    58755876  (eval $ac_compile) 2>&5
     
    70057006
    70067007# Provide some information about the compiler.
    7007 echo "$as_me:7007:" \
     7008echo "$as_me:7008:" \
    70087009     "checking for Fortran 77 compiler version" >&5
    70097010ac_compiler=`set X $ac_compile; echo $2`
     
    80728073   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80738074   -e 's:$: $lt_compiler_flag:'`
    8074    (eval echo "\"\$as_me:8074: $lt_compile\"" >&5)
     8075   (eval echo "\"\$as_me:8075: $lt_compile\"" >&5)
    80758076   (eval "$lt_compile" 2>conftest.err)
    80768077   ac_status=$?
    80778078   cat conftest.err >&5
    8078    echo "$as_me:8078: \$? = $ac_status" >&5
     8079   echo "$as_me:8079: \$? = $ac_status" >&5
    80798080   if (exit $ac_status) && test -s "$ac_outfile"; then
    80808081     # The compiler can only warn and ignore the option if not recognized
     
    83408341   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83418342   -e 's:$: $lt_compiler_flag:'`
    8342    (eval echo "\"\$as_me:8342: $lt_compile\"" >&5)
     8343   (eval echo "\"\$as_me:8343: $lt_compile\"" >&5)
    83438344   (eval "$lt_compile" 2>conftest.err)
    83448345   ac_status=$?
    83458346   cat conftest.err >&5
    8346    echo "$as_me:8346: \$? = $ac_status" >&5
     8347   echo "$as_me:8347: \$? = $ac_status" >&5
    83478348   if (exit $ac_status) && test -s "$ac_outfile"; then
    83488349     # The compiler can only warn and ignore the option if not recognized
     
    84448445   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84458446   -e 's:$: $lt_compiler_flag:'`
    8446    (eval echo "\"\$as_me:8446: $lt_compile\"" >&5)
     8447   (eval echo "\"\$as_me:8447: $lt_compile\"" >&5)
    84478448   (eval "$lt_compile" 2>out/conftest.err)
    84488449   ac_status=$?
    84498450   cat out/conftest.err >&5
    8450    echo "$as_me:8450: \$? = $ac_status" >&5
     8451   echo "$as_me:8451: \$? = $ac_status" >&5
    84518452   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84528453   then
     
    1078910790  lt_status=$lt_dlunknown
    1079010791  cat > conftest.$ac_ext <<EOF
    10791 #line 10791 "configure"
     10792#line 10792 "configure"
    1079210793#include "confdefs.h"
    1079310794
     
    1088910890  lt_status=$lt_dlunknown
    1089010891  cat > conftest.$ac_ext <<EOF
    10891 #line 10891 "configure"
     10892#line 10892 "configure"
    1089210893#include "confdefs.h"
    1089310894
     
    1323313234   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1323413235   -e 's:$: $lt_compiler_flag:'`
    13235    (eval echo "\"\$as_me:13235: $lt_compile\"" >&5)
     13236   (eval echo "\"\$as_me:13236: $lt_compile\"" >&5)
    1323613237   (eval "$lt_compile" 2>conftest.err)
    1323713238   ac_status=$?
    1323813239   cat conftest.err >&5
    13239    echo "$as_me:13239: \$? = $ac_status" >&5
     13240   echo "$as_me:13240: \$? = $ac_status" >&5
    1324013241   if (exit $ac_status) && test -s "$ac_outfile"; then
    1324113242     # The compiler can only warn and ignore the option if not recognized
     
    1333713338   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1333813339   -e 's:$: $lt_compiler_flag:'`
    13339    (eval echo "\"\$as_me:13339: $lt_compile\"" >&5)
     13340   (eval echo "\"\$as_me:13340: $lt_compile\"" >&5)
    1334013341   (eval "$lt_compile" 2>out/conftest.err)
    1334113342   ac_status=$?
    1334213343   cat out/conftest.err >&5
    13343    echo "$as_me:13343: \$? = $ac_status" >&5
     13344   echo "$as_me:13344: \$? = $ac_status" >&5
    1334413345   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1334513346   then
     
    1490714908   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1490814909   -e 's:$: $lt_compiler_flag:'`
    14909    (eval echo "\"\$as_me:14909: $lt_compile\"" >&5)
     14910   (eval echo "\"\$as_me:14910: $lt_compile\"" >&5)
    1491014911   (eval "$lt_compile" 2>conftest.err)
    1491114912   ac_status=$?
    1491214913   cat conftest.err >&5
    14913    echo "$as_me:14913: \$? = $ac_status" >&5
     14914   echo "$as_me:14914: \$? = $ac_status" >&5
    1491414915   if (exit $ac_status) && test -s "$ac_outfile"; then
    1491514916     # The compiler can only warn and ignore the option if not recognized
     
    1501115012   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1501215013   -e 's:$: $lt_compiler_flag:'`
    15013    (eval echo "\"\$as_me:15013: $lt_compile\"" >&5)
     15014   (eval echo "\"\$as_me:15014: $lt_compile\"" >&5)
    1501415015   (eval "$lt_compile" 2>out/conftest.err)
    1501515016   ac_status=$?
    1501615017   cat out/conftest.err >&5
    15017    echo "$as_me:15017: \$? = $ac_status" >&5
     15018   echo "$as_me:15018: \$? = $ac_status" >&5
    1501815019   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1501915020   then
     
    1721817219   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1721917220   -e 's:$: $lt_compiler_flag:'`
    17220    (eval echo "\"\$as_me:17220: $lt_compile\"" >&5)
     17221   (eval echo "\"\$as_me:17221: $lt_compile\"" >&5)
    1722117222   (eval "$lt_compile" 2>conftest.err)
    1722217223   ac_status=$?
    1722317224   cat conftest.err >&5
    17224    echo "$as_me:17224: \$? = $ac_status" >&5
     17225   echo "$as_me:17225: \$? = $ac_status" >&5
    1722517226   if (exit $ac_status) && test -s "$ac_outfile"; then
    1722617227     # The compiler can only warn and ignore the option if not recognized
     
    1748617487   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1748717488   -e 's:$: $lt_compiler_flag:'`
    17488    (eval echo "\"\$as_me:17488: $lt_compile\"" >&5)
     17489   (eval echo "\"\$as_me:17489: $lt_compile\"" >&5)
    1748917490   (eval "$lt_compile" 2>conftest.err)
    1749017491   ac_status=$?
    1749117492   cat conftest.err >&5
    17492    echo "$as_me:17492: \$? = $ac_status" >&5
     17493   echo "$as_me:17493: \$? = $ac_status" >&5
    1749317494   if (exit $ac_status) && test -s "$ac_outfile"; then
    1749417495     # The compiler can only warn and ignore the option if not recognized
     
    1759017591   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1759117592   -e 's:$: $lt_compiler_flag:'`
    17592    (eval echo "\"\$as_me:17592: $lt_compile\"" >&5)
     17593   (eval echo "\"\$as_me:17593: $lt_compile\"" >&5)
    1759317594   (eval "$lt_compile" 2>out/conftest.err)
    1759417595   ac_status=$?
    1759517596   cat out/conftest.err >&5
    17596    echo "$as_me:17596: \$? = $ac_status" >&5
     17597   echo "$as_me:17597: \$? = $ac_status" >&5
    1759717598   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1759817599   then
     
    2075820759COINDEPEND_PCLIBS=
    2075920760COINDEPEND_PCREQUIRES=
    20760 COINDEPEND_DATA=
    2076120761
    2076220762
     
    2127521275CLP_PCLIBS=
    2127621276CLP_PCREQUIRES=
    21277 CLP_DATA=
    2127821277
    2127921278
     
    2178621785SAMPLE_PCLIBS=
    2178721786SAMPLE_PCREQUIRES=
    21788 SAMPLE_DATA=
    2178921787
    2179021788
     
    2226722265CGL_PCLIBS=
    2226822266CGL_PCREQUIRES=
    22269 CGL_DATA=
    2227022267
    2227122268
     
    2277822775CBC_PCLIBS=
    2277922776CBC_PCREQUIRES=
    22780 CBC_DATA=
    2278122777
    2278222778
     
    2329623292CPX_PCLIBS=
    2329723293CPX_PCREQUIRES=
    23298 CPX_DATA=
    2329923294
    2330023295
     
    2381423809ASL_PCLIBS=
    2381523810ASL_PCREQUIRES=
    23816 ASL_DATA=
    2381723811
    2381823812
     
    2507725071# Here list all the files that configure should create (except for the
    2507825072# configuration header file)
    25079                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       ac_config_files="$ac_config_files Makefile src/Makefile src/dippy/Makefile examples/Makefile.Examples examples/TSP/Makefile examples/TSP/tsp.parm examples/TSP/data_extract.sh examples/TSP/get_boost.sh examples/TSP/get_concorde.sh examples/SmallIP/Makefile examples/SmallIP/smallip.parm examples/SmallIP/README.txt examples/SmallIP/test.sh examples/MILP/Makefile examples/MILP/milp.parm examples/MILP/data_extract.sh examples/MILP/README.txt examples/MILPBlock/Makefile examples/MILPBlock/milpblock.parm examples/MILPBlock/milpblock.parm2 examples/MILPBlock/data_extract.sh examples/MILPBlock/README.txt examples/MILPBlock/test.sh examples/AP3/Makefile examples/AP3/ap3.parm examples/GAP/Makefile examples/GAP/gap.parm examples/GAP/data_extract.sh examples/GAP/get_pisinger.sh examples/GAP/README.txt examples/MAD/Makefile examples/MAD/mad.parm examples/MCF/Makefile examples/MCF/mcf.parm examples/MCF/data_extract.sh examples/MCF/README.txt examples/MMKP/Makefile examples/MMKP/mmkp.parm examples/MMKP/data_extract.sh examples/MMKP/get_pisinger.sh examples/MMKP/README.txt examples/VRP/Makefile examples/VRP/vrp.parm examples/VRP/get_boost.sh examples/VRP/get_concorde.sh examples/VRP/get_cvrpsep.sh examples/ATM/Makefile examples/ATM/atm.parm examples/ATM/data_extract.sh examples/SDPUC/Makefile examples/SDPUC/sdpuc.parm examples/SDPUC/data_extract.sh examples/SDPUC/README.txt examples/ExternalSolvers/Knapsack/Pisinger/Makefile examples/ExternalSolvers/Knapsack/Pisinger/get.pisinger examples/ExternalSolvers/Knapsack/Pisinger/patch.pisinger examples/ExternalSolvers/Knapsack/Pisinger/mcknap.h examples/ExternalSolvers/VRP/get.cvrpsep examples/ExternalSolvers/Graph/get.boost examples/ExternalSolvers/TSP/get.concorde test/Makefile dip.pc dip-uninstalled.pc"
     25073                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ac_config_files="$ac_config_files Makefile src/Makefile src/dippy/Makefile examples/Makefile.Examples examples/TSP/Makefile examples/TSP/tsp.parm examples/TSP/data_extract.sh examples/TSP/get_boost.sh examples/TSP/get_concorde.sh examples/SmallIP/Makefile examples/SmallIP/smallip.parm examples/SmallIP/README.txt examples/SmallIP/test.sh examples/MILP/Makefile examples/MILP/milp.parm examples/MILP/data_extract.sh examples/MILP/README.txt examples/GAP/Makefile examples/GAP/gap.parm examples/GAP/data_extract.sh examples/GAP/get_pisinger.sh examples/GAP/README.txt examples/MCF/Makefile examples/MCF/mcf.parm examples/MCF/data_extract.sh examples/MCF/README.txt examples/MMKP/Makefile examples/MMKP/mmkp.parm examples/MMKP/data_extract.sh examples/MMKP/get_pisinger.sh examples/MMKP/README.txt examples/VRP/Makefile examples/VRP/vrp.parm examples/VRP/data_extract.sh examples/VRP/get_boost.sh examples/VRP/get_concorde.sh examples/VRP/get_cvrpsep.sh examples/ATM/Makefile examples/ATM/atm.parm examples/ATM/data_extract.sh examples/SDPUC/Makefile examples/SDPUC/sdpuc.parm examples/SDPUC/data_extract.sh examples/SDPUC/README.txt examples/ExternalSolvers/Knapsack/Pisinger/Makefile examples/ExternalSolvers/Knapsack/Pisinger/get.pisinger examples/ExternalSolvers/Knapsack/Pisinger/patch.pisinger examples/ExternalSolvers/Knapsack/Pisinger/mcknap.h examples/ExternalSolvers/VRP/get.cvrpsep examples/ExternalSolvers/Graph/get.boost examples/ExternalSolvers/TSP/get.concorde test/Makefile dip.pc dip-uninstalled.pc"
    2508025074
    2508125075
     
    2571225706cat >&5 <<_CSEOF
    2571325707
    25714 This file was extended by Dip $as_me 0.9.11, which was
     25708This file was extended by Dip $as_me 0.9.12, which was
    2571525709generated by GNU Autoconf 2.59.  Invocation command line was
    2571625710
     
    2577825772cat >>$CONFIG_STATUS <<_ACEOF
    2577925773ac_cs_version="\\
    25780 Dip config.status 0.9.11
     25774Dip config.status 0.9.12
    2578125775configured by $0, generated by GNU Autoconf 2.59,
    2578225776  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
     
    2590525899  "examples/MILP/data_extract.sh" ) CONFIG_FILES="$CONFIG_FILES examples/MILP/data_extract.sh" ;;
    2590625900  "examples/MILP/README.txt" ) CONFIG_FILES="$CONFIG_FILES examples/MILP/README.txt" ;;
    25907   "examples/MILPBlock/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/MILPBlock/Makefile" ;;
    25908   "examples/MILPBlock/milpblock.parm" ) CONFIG_FILES="$CONFIG_FILES examples/MILPBlock/milpblock.parm" ;;
    25909   "examples/MILPBlock/milpblock.parm2" ) CONFIG_FILES="$CONFIG_FILES examples/MILPBlock/milpblock.parm2" ;;
    25910   "examples/MILPBlock/data_extract.sh" ) CONFIG_FILES="$CONFIG_FILES examples/MILPBlock/data_extract.sh" ;;
    25911   "examples/MILPBlock/README.txt" ) CONFIG_FILES="$CONFIG_FILES examples/MILPBlock/README.txt" ;;
    25912   "examples/MILPBlock/test.sh" ) CONFIG_FILES="$CONFIG_FILES examples/MILPBlock/test.sh" ;;
    25913   "examples/AP3/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/AP3/Makefile" ;;
    25914   "examples/AP3/ap3.parm" ) CONFIG_FILES="$CONFIG_FILES examples/AP3/ap3.parm" ;;
    2591525901  "examples/GAP/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/GAP/Makefile" ;;
    2591625902  "examples/GAP/gap.parm" ) CONFIG_FILES="$CONFIG_FILES examples/GAP/gap.parm" ;;
     
    2591825904  "examples/GAP/get_pisinger.sh" ) CONFIG_FILES="$CONFIG_FILES examples/GAP/get_pisinger.sh" ;;
    2591925905  "examples/GAP/README.txt" ) CONFIG_FILES="$CONFIG_FILES examples/GAP/README.txt" ;;
    25920   "examples/MAD/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/MAD/Makefile" ;;
    25921   "examples/MAD/mad.parm" ) CONFIG_FILES="$CONFIG_FILES examples/MAD/mad.parm" ;;
    2592225906  "examples/MCF/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/MCF/Makefile" ;;
    2592325907  "examples/MCF/mcf.parm" ) CONFIG_FILES="$CONFIG_FILES examples/MCF/mcf.parm" ;;
     
    2593125915  "examples/VRP/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/VRP/Makefile" ;;
    2593225916  "examples/VRP/vrp.parm" ) CONFIG_FILES="$CONFIG_FILES examples/VRP/vrp.parm" ;;
     25917  "examples/VRP/data_extract.sh" ) CONFIG_FILES="$CONFIG_FILES examples/VRP/data_extract.sh" ;;
    2593325918  "examples/VRP/get_boost.sh" ) CONFIG_FILES="$CONFIG_FILES examples/VRP/get_boost.sh" ;;
    2593425919  "examples/VRP/get_concorde.sh" ) CONFIG_FILES="$CONFIG_FILES examples/VRP/get_concorde.sh" ;;
  • releases/0.9.12/Dip/configure.ac

    r1207 r1588  
    2121
    2222# name of project, version number, contact info
    23 AC_INIT([Dip],[0.9.11],[dip@lists.coin-or.org])
     23AC_INIT([Dip],[0.9.12],[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:11:1)
     63AC_COIN_PROJECTDIR_INIT(Dip,2:12:1)
    6464
    6565# Check if user wants to produce debugging code
     
    323323                 examples/MILP/data_extract.sh
    324324                 examples/MILP/README.txt
    325                  examples/MILPBlock/Makefile
    326                  examples/MILPBlock/milpblock.parm
    327                  examples/MILPBlock/milpblock.parm2
    328                  examples/MILPBlock/data_extract.sh
    329                  examples/MILPBlock/README.txt
    330                  examples/MILPBlock/test.sh
    331                  examples/AP3/Makefile
    332                  examples/AP3/ap3.parm
    333325                 examples/GAP/Makefile
    334326                 examples/GAP/gap.parm
     
    336328                 examples/GAP/get_pisinger.sh
    337329                 examples/GAP/README.txt
    338                  examples/MAD/Makefile
    339                  examples/MAD/mad.parm
    340330                 examples/MCF/Makefile
    341331                 examples/MCF/mcf.parm
     
    349339                 examples/VRP/Makefile
    350340                 examples/VRP/vrp.parm                 
     341                 examples/VRP/data_extract.sh
    351342                 examples/VRP/get_boost.sh
    352343                 examples/VRP/get_concorde.sh
  • releases/0.9.12/Dip/data/MMKP/hifi/get.data

    r1207 r1588  
    1 wget http://www.laria.u-picardie.fr/hifi/OR-Benchmark/MMKP/MMKP.html
    2 wget http://www.laria.u-picardie.fr/hifi/OR-Benchmark/MMKP/A_Readme_first
     1wget ftp://cermsem.univ-paris1.fr/pub/CERMSEM/hifi/MMKP/MMKP.html
    32
    4 for i in `seq 13`
     3for i in 09 11 13
    54do
    6   wget http://www.laria.u-picardie.fr/hifi/OR-Benchmark/MMKP/I${i}
     5  wget ftp://cermsem.univ-paris1.fr/pub/CERMSEM/hifi/MMKP/I${i}
    76done
    8 
    9 for i in `seq 9`
    10 do
    11   wget http://www.laria.u-picardie.fr/hifi/OR-Benchmark/MMKP/INST0${i}
    12 done
    13 
    14 for i in `seq 11 20`
    15 do
    16   wget http://www.laria.u-picardie.fr/hifi/OR-Benchmark/MMKP/INST${i}
    17 done
    18 
    19 wget http://www.laria.u-picardie.fr/hifi/OR-Benchmark/MMKP/Instance8
    20 mv Instance8 I8
    217
    228for i in I*
  • releases/0.9.12/Dip/examples/ATM/ATM_DecompApp.h

    r1207 r1588  
    188188   /** Default constructor. Takes an instance of UtilParameters */
    189189   ATM_DecompApp(UtilParameters & utilParam) :
    190       DecompApp   (utilParam),
     190      DecompApp   (),
    191191      m_classTag  ("ATM-APP"),
    192192      m_objective (NULL)
     
    196196   
    197197   virtual ~ATM_DecompApp() {
    198       UTIL_DELARR(m_objective);
     198      //UTIL_DELARR(m_objective);
    199199      UtilDeleteVectorPtr(m_models);
    200200   };
  • releases/0.9.12/Dip/examples/Dippy/cflp/facility_location.py

    r1207 r1588  
    2222tol = pow(pow(2, -24), 2.0 / 3.0)
    2323
    24 from facility_ex2 import REQUIREMENT, PRODUCTS
    25 from facility_ex2 import LOCATIONS, CAPACITY
     24from facility_ex1 import REQUIREMENT, PRODUCTS
     25from facility_ex1 import LOCATIONS, CAPACITY
    2626try:
    27     from facility_ex2 import FIXED_COST
     27    from facility_ex1 import FIXED_COST
    2828except ImportError:
    2929    FIXED_COST = [1 for i in LOCATIONS]
    3030
    3131try:
    32     from facility_ex2 import ASSIGNMENTS
     32    from facility_ex1 import ASSIGNMENTS
    3333except ImportError:
    3434    ASSIGNMENTS = [(i, j) for i in LOCATIONS for j in PRODUCTS]
    3535
    3636try:
    37     from facility_ex2 import ASSIGNMENT_COSTS
     37    from facility_ex1 import ASSIGNMENT_COSTS
    3838except ImportError:
    3939    ASSIGNMENT_COSTS = dict((i, 0) for i in ASSIGNMENTS)
  • releases/0.9.12/Dip/examples/GAP/GAP_DecompApp.cpp

    r1207 r1588  
    247247GAP_DecompApp::solveRelaxed(const int             whichBlock,
    248248                            const double        * redCostX,
    249                             const double          convexDual,
    250249                            list<DecompVar*>    & vars){
    251250
     
    292291   
    293292   UTIL_DEBUG(m_appParam.LogLevel, 4,
    294               printf("PUSH var with RC = %g\n", varRedCost - convexDual);
     293              printf("PUSH var with RC = %g\n", varRedCost);
    295294              );
    296295   
    297296   DecompVar * var = new DecompVar(solInd, solEls,
    298                                    varRedCost - convexDual, varOrigCost);
     297                                   varRedCost, varOrigCost);
    299298   var->setBlockId(whichBlock);
    300299   vars.push_back(var);
  • releases/0.9.12/Dip/examples/GAP/GAP_DecompApp.h

    r1207 r1588  
    6161   DecompSolverStatus solveRelaxed(const int             whichBlock,
    6262                                   const double        * redCostX,
    63                                    const double          convexDual,
    6463                                   list<DecompVar*>    & vars);   
    6564
     
    120119   /** Default constructor. Takes an instance of UtilParameters */
    121120   GAP_DecompApp(UtilParameters & utilParam) :
    122       DecompApp   (utilParam),
     121      DecompApp   (),
    123122      m_classTag  ("GAP-APP"),
    124123      m_objective (NULL)
     
    129128   virtual ~GAP_DecompApp() {
    130129      UtilDeleteVectorPtr(m_knap);
    131       UTIL_DELARR(m_objective);
     130      //UTIL_DELARR(m_objective);
    132131      UtilDeleteMapPtr(m_models);
    133132   };
  • releases/0.9.12/Dip/examples/GAP/GAP_Main.cpp

    r1207 r1588  
    2828
    2929//===========================================================================//
    30 int main(int argc, char ** argv){
     30int main(int argc, char ** argv)
     31{
    3132   try{
    3233
     
    3536      //---
    3637      UtilParameters utilParam(argc, argv); 
     38
     39      utilParam.Add("DECOMP", "BranchEnforceInMaster", "1");
     40      utilParam.Add("DECOMP", "BranchEnforceInSubProb", "0");
    3741
    3842      bool doCut          = utilParam.GetSetting("doCut",          true);
  • releases/0.9.12/Dip/examples/MCF/MCF_DecompApp.h

    r1207 r1588  
    7070   /** Default constructor. Takes an instance of UtilParameters */
    7171   MCF_DecompApp(UtilParameters & utilParam) :
    72       DecompApp   (utilParam),
     72      DecompApp   (),
    7373      m_classTag  ("MCF-APP"),
    7474      m_objective (NULL)
     
    7878   
    7979   virtual ~MCF_DecompApp() {
    80       UTIL_DELARR(m_objective);
     80      //UTIL_DELARR(m_objective);
    8181      UtilDeleteVectorPtr(m_models);
    8282   };
  • releases/0.9.12/Dip/examples/MCF/mcf.parm.in

    r1207 r1588  
    1616#############################################################################
    1717[DECOMP]
     18
     19SolveMasterAsIp = 0
    1820
    1921#############################################################################
  • releases/0.9.12/Dip/examples/MILP/MILP_DecompApp.cpp

    r1207 r1588  
    3232   string fileName;
    3333   if (m_appParam.DataDir != "") {
    34       fileName = m_appParam.DataDir + UtilDirSlash() + m_param.Instance;
     34      fileName = m_appParam.DataDir + UtilDirSlash() + m_appParam.Instance;
    3535   } else {
    3636      fileName = m_appParam.Instance;
  • releases/0.9.12/Dip/examples/MILP/MILP_DecompApp.h

    r1207 r1588  
    5959   /** @name Constructor and Destructor */
    6060   MILP_DecompApp(UtilParameters & utilParam) :
    61       DecompApp  (utilParam),
     61      DecompApp  (),
    6262      m_classTag ("MILP-APP"),
    6363      m_objective(NULL)
     
    6767   
    6868   virtual ~MILP_DecompApp() {
    69       UTIL_DELARR(m_objective);
     69      //UTIL_DELARR(m_objective);
    7070   }
    7171};
  • releases/0.9.12/Dip/examples/MMKP/MMKP_DecompApp.h

    r1207 r1588  
    106106   /** Default constructor. Takes an instance of UtilParameters */
    107107   MMKP_DecompApp(UtilParameters & utilParam) :
    108       DecompApp   (utilParam),
     108      DecompApp   (),
    109109      m_classTag  ("MMKP-APP"),
    110110      m_mcknap    (),
     
    118118      UtilDeleteVectorPtr(m_mcknap);
    119119      UtilDeleteVectorPtr(m_models);
    120       UTIL_DELARR(m_objective);
     120      //UTIL_DELARR(m_objective);
    121121   };
    122122};
  • releases/0.9.12/Dip/examples/MMKP/mmkp.parm.in

    r1207 r1588  
    4444[MMKP]
    4545# Log level for messages from application.
    46 LogLevel       = 2
     46LogLevel       = 0
    4747
    4848# Path to instance data.
     
    5151
    5252# Name of file for instance (assumed to be in DataDir).
    53 Instance        = I2
     53Instance        = I09
    5454ModelNameCore   = MDKP0
    5555ModelNameRelax  = MCKP0
  • releases/0.9.12/Dip/examples/SDPUC/SDPUC_DecompApp.h

    r1207 r1588  
    7979   /** Default constructor. Takes an instance of UtilParameters */
    8080   SDPUC_DecompApp(UtilParameters & utilParam) :
    81       DecompApp   (utilParam),
     81      DecompApp   (),
    8282      m_classTag  ("SDPUC-APP"),
    8383      m_objective (NULL)
     
    8787   
    8888   virtual ~SDPUC_DecompApp() {
    89       UTIL_DELARR(m_objective);
     89      //UTIL_DELARR(m_objective);
    9090      UtilDeleteVectorPtr(m_models);
    9191   };
  • releases/0.9.12/Dip/examples/SmallIP/SmallIP_DecompApp.h

    r1207 r1588  
    5353public:
    5454   SmallIP_DecompApp(UtilParameters & utilParam) :
    55       DecompApp  (utilParam),
     55      DecompApp  (),
    5656      m_classTag ("SMALL-APP"),
    5757      m_objective(NULL)
     
    6161 
    6262   virtual ~SmallIP_DecompApp() {
    63       UTIL_DELARR(m_objective);
     63      //UTIL_DELARR(m_objective);
    6464   };
    6565};
  • releases/0.9.12/Dip/examples/TSP/Makefile.in

    r1207 r1588  
    4343SRCDIR = @srcdir@
    4444VPATH = @srcdir@
     45BUILDDIR = @abs_top_builddir@
    4546
    4647###########################################################################
     
    7778$(CONCORDE_DIR)/$(CONCORDE_LIB).a:
    7879        (cd $(CONCORDE_DIR)   && \
    79         ./configure           && \
     80        ./configure \
     81        --with-qsopt=$(BUILDDIR)/examples/ExternalSolvers/TSP && \
    8082        ${MAKE})
    8183
  • releases/0.9.12/Dip/examples/TSP/TSP_DecompApp.cpp

    r1207 r1588  
    252252TSP_DecompApp::solveRelaxed(const int          whichBlock,
    253253                            const double     * redCostX,
    254                             const double       convexDual,
    255254                            DecompVarList    & varList){
    256255   
     
    275274         }
    276275      }   
    277       solveOneTree(redCostX, convexDual, edge_cost, varList, cgV);     
     276      solveOneTree(redCostX, edge_cost, varList, cgV);     
    278277      solverStatus = DecompSolStatOptimal;
    279278   }
     
    286285//===========================================================================//
    287286void TSP_DecompApp::solveOneTree(const double               * cost,
    288                                  const double                 alpha,
    289287                                 vector< pair<int,double> > & edge_cost,
    290288                                 DecompVarList              & vars,
     
    412410         UtilPrintEdge((*vpi).first);
    413411         (*m_osLog) << " -> " << cost[(*vpi).first] << " rc : " << rc << endl;
    414          (*m_osLog) << "Creating var with reduced = " << rc - alpha
     412         (*m_osLog) << "Creating var with reduced = " << rc
    415413                    << " obj = " << obj << endl;
    416414      }
    417415
    418       DecompVar * oneTree = new DecompVar(inds, els, rc - alpha, obj);
     416      DecompVar * oneTree = new DecompVar(inds, els, rc, obj);
    419417      //oneTree->setBlockId(0);//this will happen by default
    420418      vars.push_back(oneTree);
  • releases/0.9.12/Dip/examples/TSP/TSP_DecompApp.h

    r1207 r1588  
    5454   virtual DecompSolverStatus solveRelaxed(const int          whichBlock,
    5555                                           const double     * redCostX,
    56                                            const double       convexDual,
    5756                                           DecompVarList    & varList);
    5857   
     
    8584
    8685   void solveOneTree(const double               * cost,
    87                      const double                 alpha,
    8886                     vector< pair<int,double> > & edge_cost,
    8987                     DecompVarList              & vars,
     
    9593   /** Default constructor. Takes an instance of UtilParameters */
    9694   TSP_DecompApp(UtilParameters & utilParam) :
    97       DecompApp(utilParam),
     95      DecompApp(),
    9896      m_classTag("TSP-APP"),
    9997      m_objective(NULL)
     
    104102   virtual ~TSP_DecompApp() {
    105103      UtilDeleteVectorPtr(m_models);
    106       UTIL_DELARR(m_objective);
     104      //UTIL_DELARR(m_objective);
    107105   };
    108106};
  • releases/0.9.12/Dip/examples/VRP/Makefile.in

    r1207 r1588  
    4747SRCDIR = @srcdir@
    4848VPATH  = @srcdir@
     49BUILDDIR = @abs_top_builddir@
    4950
    5051###########################################################################
     
    8384
    8485$(CONCORDE_DIR)/$(CONCORDE_LIB).a:
    85         (cd ${CONCORDE_DIR} \
    86         && ./configure --with-qsopt=@abs_lib_dir@/../Dip/examples/ExternalSolvers/TSP \
     86        (cd ${CONCORDE_DIR} && \
     87        ./configure \
     88        --with-qsopt=$(BUILDDIR)/examples/ExternalSolvers/TSP && \
    8789        && make)
    8890
  • releases/0.9.12/Dip/examples/VRP/VRP_DecompApp.cpp

    r1207 r1588  
    341341DecompSolverStatus VRP_DecompApp::solveRelaxed(const int          whichBlock,
    342342                                               const double     * redCostX,
    343                                                const double       convexDual,
    344343                                               DecompVarList    & varList){
    345344
     
    378377      }
    379378      UTIL_DEBUG(m_appParam.LogLevel, 5,
    380                  (*m_osLog) << "VAR varRedCost=" << varRedCost-convexDual;
     379                 (*m_osLog) << "VAR varRedCost=" << varRedCost;
    381380                 (*m_osLog) << "varOrigCost=" << varOrigCost << endl;
    382381                 );
     
    384383      DecompVar * var = new DecompVar(vrpRouteInd,
    385384                                      vrpRouteEls,
    386                                       varRedCost - convexDual,
     385                                      varRedCost,
    387386                                      varOrigCost);
    388387      var->setBlockId(0);
  • releases/0.9.12/Dip/examples/VRP/VRP_DecompApp.h

    r1207 r1588  
    7373   virtual DecompSolverStatus solveRelaxed(const int          whichBlock,
    7474                                           const double     * redCostX,
    75                                            const double       convexDual,
    7675                                           DecompVarList    & varList);
    7776
     
    116115   /** Default constructor. Takes an instance of UtilParameters */
    117116   VRP_DecompApp(UtilParameters & utilParam) :
    118       DecompApp(utilParam),
     117      DecompApp(),
    119118      m_classTag("VRP-APP"),
    120119        m_objective(NULL),
     
    126125   virtual ~VRP_DecompApp() {
    127126      UtilDeleteVectorPtr(m_models);
    128       UTIL_DELARR(m_objective);
     127      //UTIL_DELARR(m_objective);
    129128   };
    130129};
  • releases/0.9.12/Dip/examples/VRP/vrp.parm.in

    r1207 r1588  
    2929[VRP]
    3030LogLevel  = 0
    31 DataDir   = ../../../../Decomp/data/VRP/vrplib
     31DataDir   = ../../../../Dip/data/VRP/vrplib
    3232Instance  = E-n13-k4
    3333NumRoutes = 4
  • releases/0.9.12/Dip/setup.py

    r1207 r1588  
    88
    99PROJECT = 'coinor.dippy'
    10 VERSION = '1.9.9'
     10VERSION = '1.9.12'
    1111URL = 'https://projects.coin-or.org/Dip/wiki/Dippy'
    1212AUTHOR_EMAIL = u''
  • releases/0.9.12/Dip/src/DecompApp.cpp

    r1207 r1588  
    304304
    305305   if (m_param.DataDir != "") {
    306       fileName = m_param.DataDir + UtilDirSlash() + m_param.Instance;
     306      fileName = m_param.DataDir + UtilDirSlash() + m_param.BlockFile;
    307307   } else {
    308308      fileName = m_param.BlockFile;
  • releases/0.9.12/Dip/src/config_dip_default.h

    r1207 r1588  
    2020
    2121/* Version number of project */
    22 #define DIP_VERSION "0.9.11"
     22#define DIP_VERSION "0.9.12"
    2323
    2424/* Major Version number of project */
     
    2929
    3030/* Release Version number of project */
    31 #define DIP_VERSION_RELEASE 11
     31#define DIP_VERSION_RELEASE 12
    3232
  • releases/0.9.12/configure

    r1207 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.11.
     4# Generated by GNU Autoconf 2.59 for Dip 0.9.12.
    55#
    66# Report bugs to <dip@lists.coin-or.org>.
     
    442442PACKAGE_NAME='Dip'
    443443PACKAGE_TARNAME='dip'
    444 PACKAGE_VERSION='0.9.11'
    445 PACKAGE_STRING='Dip 0.9.11'
     444PACKAGE_VERSION='0.9.12'
     445PACKAGE_STRING='Dip 0.9.12'
    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.11 to adapt to many kinds of systems.
     1048\`configure' configures Dip 0.9.12 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.11:";;
     1114     short | recursive ) echo "Configuration of Dip 0.9.12:";;
    11151115   esac
    11161116  cat <<\_ACEOF
     
    13211321if $ac_init_version; then
    13221322  cat <<\_ACEOF
    1323 Dip configure 0.9.11
     1323Dip configure 0.9.12
    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.11, which was
     1354It was created by Dip $as_me 0.9.12, which was
    13551355generated by GNU Autoconf 2.59.  Invocation command line was
    13561356
     
    19531953             fi
    19541954             ;;
     1955  *-*-darwin*) comps="clang gcc cc" ;;
    19551956  *-linux-gnu*) comps="gcc cc pgcc icc xlc" ;;
    19561957  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
     
    31113112  *-*-solaris*)
    31123113             comps="CC xlC_r aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
    3113   *-darwin*) comps="g++ c++ CC" ;;
     3114  *-darwin*) comps="clang++ g++ c++ CC" ;;
    31143115  *-linux-gnu*)
    31153116             comps="g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC xlC_r aCC CC" ;;
     
    35483549# It seems that we need to cleanup something here for the Windows
    35493550case "$CXX" in
    3550   clang* ) ;;
     3551  clang* | */clang*) ;;
    35513552  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    35523553    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
     
    41924193
    41934194# Provide some information about the compiler.
    4194 echo "$as_me:4194:" \
     4195echo "$as_me:4195:" \
    41954196     "checking for Fortran 77 compiler version" >&5
    41964197ac_compiler=`set X $ac_compile; echo $2`
     
    51215122# Define the identity of the package.
    51225123 PACKAGE='dip'
    5123  VERSION='0.9.11'
     5124 VERSION='0.9.12'
    51245125
    51255126
     
    64176418*-*-irix6*)
    64186419  # Find out which ABI we are using.
    6419   echo '#line 6419 "configure"' > conftest.$ac_ext
     6420  echo '#line 6420 "configure"' > conftest.$ac_ext
    64206421  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    64216422  (eval $ac_compile) 2>&5
     
    83818382   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83828383   -e 's:$: $lt_compiler_flag:'`
    8383    (eval echo "\"\$as_me:8383: $lt_compile\"" >&5)
     8384   (eval echo "\"\$as_me:8384: $lt_compile\"" >&5)
    83848385   (eval "$lt_compile" 2>conftest.err)
    83858386   ac_status=$?
    83868387   cat conftest.err >&5
    8387    echo "$as_me:8387: \$? = $ac_status" >&5
     8388   echo "$as_me:8388: \$? = $ac_status" >&5
    83888389   if (exit $ac_status) && test -s "$ac_outfile"; then
    83898390     # The compiler can only warn and ignore the option if not recognized
     
    86498650   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    86508651   -e 's:$: $lt_compiler_flag:'`
    8651    (eval echo "\"\$as_me:8651: $lt_compile\"" >&5)
     8652   (eval echo "\"\$as_me:8652: $lt_compile\"" >&5)
    86528653   (eval "$lt_compile" 2>conftest.err)
    86538654   ac_status=$?
    86548655   cat conftest.err >&5
    8655    echo "$as_me:8655: \$? = $ac_status" >&5
     8656   echo "$as_me:8656: \$? = $ac_status" >&5
    86568657   if (exit $ac_status) && test -s "$ac_outfile"; then
    86578658     # The compiler can only warn and ignore the option if not recognized
     
    87538754   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    87548755   -e 's:$: $lt_compiler_flag:'`
    8755    (eval echo "\"\$as_me:8755: $lt_compile\"" >&5)
     8756   (eval echo "\"\$as_me:8756: $lt_compile\"" >&5)
    87568757   (eval "$lt_compile" 2>out/conftest.err)
    87578758   ac_status=$?
    87588759   cat out/conftest.err >&5
    8759    echo "$as_me:8759: \$? = $ac_status" >&5
     8760   echo "$as_me:8760: \$? = $ac_status" >&5
    87608761   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    87618762   then
     
    1109811099  lt_status=$lt_dlunknown
    1109911100  cat > conftest.$ac_ext <<EOF
    11100 #line 11100 "configure"
     11101#line 11101 "configure"
    1110111102#include "confdefs.h"
    1110211103
     
    1119811199  lt_status=$lt_dlunknown
    1119911200  cat > conftest.$ac_ext <<EOF
    11200 #line 11200 "configure"
     11201#line 11201 "configure"
    1120111202#include "confdefs.h"
    1120211203
     
    1354213543   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1354313544   -e 's:$: $lt_compiler_flag:'`
    13544    (eval echo "\"\$as_me:13544: $lt_compile\"" >&5)
     13545   (eval echo "\"\$as_me:13545: $lt_compile\"" >&5)
    1354513546   (eval "$lt_compile" 2>conftest.err)
    1354613547   ac_status=$?
    1354713548   cat conftest.err >&5
    13548    echo "$as_me:13548: \$? = $ac_status" >&5
     13549   echo "$as_me:13549: \$? = $ac_status" >&5
    1354913550   if (exit $ac_status) && test -s "$ac_outfile"; then
    1355013551     # The compiler can only warn and ignore the option if not recognized
     
    1364613647   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1364713648   -e 's:$: $lt_compiler_flag:'`
    13648    (eval echo "\"\$as_me:13648: $lt_compile\"" >&5)
     13649   (eval echo "\"\$as_me:13649: $lt_compile\"" >&5)
    1364913650   (eval "$lt_compile" 2>out/conftest.err)
    1365013651   ac_status=$?
    1365113652   cat out/conftest.err >&5
    13652    echo "$as_me:13652: \$? = $ac_status" >&5
     13653   echo "$as_me:13653: \$? = $ac_status" >&5
    1365313654   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1365413655   then
     
    1521615217   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1521715218   -e 's:$: $lt_compiler_flag:'`
    15218    (eval echo "\"\$as_me:15218: $lt_compile\"" >&5)
     15219   (eval echo "\"\$as_me:15219: $lt_compile\"" >&5)
    1521915220   (eval "$lt_compile" 2>conftest.err)
    1522015221   ac_status=$?
    1522115222   cat conftest.err >&5
    15222    echo "$as_me:15222: \$? = $ac_status" >&5
     15223   echo "$as_me:15223: \$? = $ac_status" >&5
    1522315224   if (exit $ac_status) && test -s "$ac_outfile"; then
    1522415225     # The compiler can only warn and ignore the option if not recognized
     
    1532015321   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1532115322   -e 's:$: $lt_compiler_flag:'`
    15322    (eval echo "\"\$as_me:15322: $lt_compile\"" >&5)
     15323   (eval echo "\"\$as_me:15323: $lt_compile\"" >&5)
    1532315324   (eval "$lt_compile" 2>out/conftest.err)
    1532415325   ac_status=$?
    1532515326   cat out/conftest.err >&5
    15326    echo "$as_me:15326: \$? = $ac_status" >&5
     15327   echo "$as_me:15327: \$? = $ac_status" >&5
    1532715328   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1532815329   then
     
    1752717528   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1752817529   -e 's:$: $lt_compiler_flag:'`
    17529    (eval echo "\"\$as_me:17529: $lt_compile\"" >&5)
     17530   (eval echo "\"\$as_me:17530: $lt_compile\"" >&5)
    1753017531   (eval "$lt_compile" 2>conftest.err)
    1753117532   ac_status=$?
    1753217533   cat conftest.err >&5
    17533    echo "$as_me:17533: \$? = $ac_status" >&5
     17534   echo "$as_me:17534: \$? = $ac_status" >&5
    1753417535   if (exit $ac_status) && test -s "$ac_outfile"; then
    1753517536     # The compiler can only warn and ignore the option if not recognized
     
    1779517796   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1779617797   -e 's:$: $lt_compiler_flag:'`
    17797    (eval echo "\"\$as_me:17797: $lt_compile\"" >&5)
     17798   (eval echo "\"\$as_me:17798: $lt_compile\"" >&5)
    1779817799   (eval "$lt_compile" 2>conftest.err)
    1779917800   ac_status=$?
    1780017801   cat conftest.err >&5
    17801    echo "$as_me:17801: \$? = $ac_status" >&5
     17802   echo "$as_me:17802: \$? = $ac_status" >&5
    1780217803   if (exit $ac_status) && test -s "$ac_outfile"; then
    1780317804     # The compiler can only warn and ignore the option if not recognized
     
    1789917900   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1790017901   -e 's:$: $lt_compiler_flag:'`
    17901    (eval echo "\"\$as_me:17901: $lt_compile\"" >&5)
     17902   (eval echo "\"\$as_me:17902: $lt_compile\"" >&5)
    1790217903   (eval "$lt_compile" 2>out/conftest.err)
    1790317904   ac_status=$?
    1790417905   cat out/conftest.err >&5
    17905    echo "$as_me:17905: \$? = $ac_status" >&5
     17906   echo "$as_me:17906: \$? = $ac_status" >&5
    1790617907   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1790717908   then
     
    2106021061
    2106121062
    21062   if test $coin_has_lapack != skipping; then
     21063  if test $coin_has_lapack != no; then
    2106321064    #--with-lapack can overwrite --with-lapack-lib, and can be set to BUILD to enforce building lapack
    2106421065
     
    2276122762cat >&5 <<_CSEOF
    2276222763
    22763 This file was extended by Dip $as_me 0.9.11, which was
     22764This file was extended by Dip $as_me 0.9.12, which was
    2276422765generated by GNU Autoconf 2.59.  Invocation command line was
    2276522766
     
    2281922820cat >>$CONFIG_STATUS <<_ACEOF
    2282022821ac_cs_version="\\
    22821 Dip config.status 0.9.11
     22822Dip config.status 0.9.12
    2282222823configured by $0, generated by GNU Autoconf 2.59,
    2282322824  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/0.9.12/configure.ac

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