Changes from releases/0.91.5 at r1588 to releases/0.91.4 at r1588


Ignore:
Location:
releases/0.91.4
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • releases/0.91.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.91.5.
     3# Generated by GNU Autoconf 2.59 for Dip 0.91.4.
    44#
    55# Report bugs to <dip@lists.coin-or.org>.
     
    441441PACKAGE_NAME='Dip'
    442442PACKAGE_TARNAME='dip'
    443 PACKAGE_VERSION='0.91.5'
    444 PACKAGE_STRING='Dip 0.91.5'
     443PACKAGE_VERSION='0.91.4'
     444PACKAGE_STRING='Dip 0.91.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.91.5 to adapt to many kinds of systems.
     1019\`configure' configures Dip 0.91.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.91.5:";;
     1085     short | recursive ) echo "Configuration of Dip 0.91.4:";;
    10861086   esac
    10871087  cat <<\_ACEOF
     
    12971297if $ac_init_version; then
    12981298  cat <<\_ACEOF
    1299 Dip configure 0.91.5
     1299Dip configure 0.91.4
    13001300generated by GNU Autoconf 2.59
    13011301
     
    13281328running configure, to aid debugging if configure makes a mistake.
    13291329
    1330 It was created by Dip $as_me 0.91.5, which was
     1330It was created by Dip $as_me 0.91.4, which was
    13311331generated by GNU Autoconf 2.59.  Invocation command line was
    13321332
     
    18541854
    18551855# Capture libtool library version, if given.
    1856  coin_libversion=6:5:5
     1856 coin_libversion=6:4:5
    18571857
    18581858
     
    40894089fi
    40904090
    4091 # correct the LD variable in a build with MS or Intel-windows compiler
     4091# correct the LD variable in a build with MS or intel compiler
    40924092case "$CXX" in
    40934093  clang* ) ;;
     
    45844584# Define the identity of the package.
    45854585 PACKAGE='dip'
    4586  VERSION='0.91.5'
     4586 VERSION='0.91.4'
    45874587
    45884588
     
    2655326553cat >&5 <<_CSEOF
    2655426554
    26555 This file was extended by Dip $as_me 0.91.5, which was
     26555This file was extended by Dip $as_me 0.91.4, which was
    2655626556generated by GNU Autoconf 2.59.  Invocation command line was
    2655726557
     
    2661926619cat >>$CONFIG_STATUS <<_ACEOF
    2662026620ac_cs_version="\\
    26621 Dip config.status 0.91.5
     26621Dip config.status 0.91.4
    2662226622configured by $0, generated by GNU Autoconf 2.59,
    2662326623  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/0.91.4/Dip/configure.ac

    r1588 r1588  
    2121
    2222# name of project, version number, contact info
    23 AC_INIT([Dip],[0.91.5],[dip@lists.coin-or.org])
     23AC_INIT([Dip],[0.91.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,6:5:5)
     63AC_COIN_PROJECTDIR_INIT(Dip,6:4:5)
    6464
    6565# Check if user wants to produce debugging code
  • releases/0.91.4/Dip/setup.py

    r1588 r1588  
    88
    99PROJECT = 'coinor.dippy'
    10 VERSION = '1.91.4'
     10VERSION = '1.91.3'
    1111URL = 'https://projects.coin-or.org/Dip/wiki/DipPy'
    1212AUTHOR_EMAIL = u''
     
    121121      license=read_file('LICENSE'),
    122122      namespace_packages=['coinor'],
    123       packages=['coinor.dippy', 'coinor', 'coinor.dippy.examples'],
     123      packages=['coinor.dippy', 'coinor'],
    124124      package_dir = {'coinor': 'src'},
    125125      install_requires=['pulp>=1.5.4','coinor.gimpy'],
  • releases/0.91.4/Dip/src/DecompModel.cpp

    r1588 r1588  
    366366
    367367      double objval;
    368       double* opt_solution = new double[numCols];
    369       int nSols = 0;
    370 
    371       status = sym_get_sp_size(env, &nSols);
    372 
    373       result->m_nSolutions = 1;
    374       status = sym_get_col_solution(env, opt_solution);
    375       vector<double> solVec(opt_solution, opt_solution + numCols);
    376       result->m_solution.push_back(solVec);
    377 
    378       nSols = std::min<int>(nSols, param.SubProbNumSolLimit);
    379      
    380       for (int i = 0; i < nSols; i++){
    381          status = sym_get_sp_solution(env, i, solution, &objval);
    382          /*
    383            for (int i = 0 ; i < numCols; ++i) {
    384            std::cout << "the solution is " << solution[i]
    385            << std::endl;
    386            }
    387          */
    388          //We have to make sure that the solution is not one we already have
    389          if (memcmp(opt_solution, solution, numCols*DSIZE) == 0){
     368      status = sym_get_sp_size(env, &result->m_nSolutions);
     369
     370      if (result->m_nSolutions == 0){
     371         //Solution pool is empty, but we canfetch the optimal solution
     372         result->m_nSolutions = 1;
     373         status = sym_get_col_solution(env, solution);
     374         vector<double> solVec(solution, solution + numCols);
     375         result->m_solution.push_back(solVec);
     376      }else{
     377         int nSols = std::min<int>(result->m_nSolutions,
     378                                  param.SubProbNumSolLimit);
     379         for (int i = 0; i < nSols; i++){
     380            status = sym_get_sp_solution(env, i, solution, &objval);
     381            /*
     382              for (int i = 0 ; i < numCols; ++i) {
     383              std::cout << "the solution is " << solution[i]
     384              << std::endl;
     385              }
     386            */
    390387            vector<double> solVec(solution, solution + numCols);
    391388            result->m_solution.push_back(solVec);
    392             result->m_nSolutions += 1;
    393          }
     389         }     
    394390      }
    395       UTIL_DELARR(opt_solution);     
    396391   } else {
    397392      if (sym_is_proven_primal_infeasible(env)) {
     
    404399      }
    405400   }
     401   std::cout << "bye" << std::endl;
    406402   /*
    407403   if (!param.WarmStart) {
  • releases/0.91.4/Dip/src/config_dip_default.h

    r1588 r1588  
    2020
    2121/* Version number of project */
    22 #define DIP_VERSION "0.91.5"
     22#define DIP_VERSION "0.91.4"
    2323
    2424/* Major Version number of project */
     
    2929
    3030/* Release Version number of project */
    31 #define DIP_VERSION_RELEASE 5
     31#define DIP_VERSION_RELEASE 4
    3232
  • releases/0.91.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.91.5.
     4# Generated by GNU Autoconf 2.59 for Dip 0.91.4.
    55#
    66# Report bugs to <dip@lists.coin-or.org>.
     
    442442PACKAGE_NAME='Dip'
    443443PACKAGE_TARNAME='dip'
    444 PACKAGE_VERSION='0.91.5'
    445 PACKAGE_STRING='Dip 0.91.5'
     444PACKAGE_VERSION='0.91.4'
     445PACKAGE_STRING='Dip 0.91.4'
    446446PACKAGE_BUGREPORT='dip@lists.coin-or.org'
    447447
     
    10451045  # This message is too long to be a string in the A/UX 3.1 sh.
    10461046  cat <<_ACEOF
    1047 \`configure' configures Dip 0.91.5 to adapt to many kinds of systems.
     1047\`configure' configures Dip 0.91.4 to adapt to many kinds of systems.
    10481048
    10491049Usage: $0 [OPTION]... [VAR=VALUE]...
     
    11111111if test -n "$ac_init_help"; then
    11121112  case $ac_init_help in
    1113      short | recursive ) echo "Configuration of Dip 0.91.5:";;
     1113     short | recursive ) echo "Configuration of Dip 0.91.4:";;
    11141114   esac
    11151115  cat <<\_ACEOF
     
    13211321if $ac_init_version; then
    13221322  cat <<\_ACEOF
    1323 Dip configure 0.91.5
     1323Dip configure 0.91.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.91.5, which was
     1354It was created by Dip $as_me 0.91.4, which was
    13551355generated by GNU Autoconf 2.59.  Invocation command line was
    13561356
     
    39493949fi
    39503950
    3951 # correct the LD variable in a build with MS or Intel-windows compiler
     3951# correct the LD variable in a build with MS or intel compiler
    39523952case "$CXX" in
    39533953  clang* ) ;;
     
    46354635
    46364636# correct the LD variable if we use the intel fortran compiler in windows
    4637 case $build in
    4638   *-cygwin* | *-mingw*)
    4639     case "$F77" in
    4640       ifort* | */ifort* | IFORT* | */IFORT*)
    4641         LD=link
    4642       ;;
    4643     esac
    4644   ;;
     4637case "$F77" in
     4638  ifort* | */ifort* | IFORT* | */IFORT*)
     4639    LD=link
     4640    ;;
    46454641esac
    46464642
     
    51255121# Define the identity of the package.
    51265122 PACKAGE='dip'
    5127  VERSION='0.91.5'
     5123 VERSION='0.91.4'
    51285124
    51295125
     
    64216417*-*-irix6*)
    64226418  # Find out which ABI we are using.
    6423   echo '#line 6423 "configure"' > conftest.$ac_ext
     6419  echo '#line 6419 "configure"' > conftest.$ac_ext
    64246420  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    64256421  (eval $ac_compile) 2>&5
     
    83858381   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83868382   -e 's:$: $lt_compiler_flag:'`
    8387    (eval echo "\"\$as_me:8387: $lt_compile\"" >&5)
     8383   (eval echo "\"\$as_me:8383: $lt_compile\"" >&5)
    83888384   (eval "$lt_compile" 2>conftest.err)
    83898385   ac_status=$?
    83908386   cat conftest.err >&5
    8391    echo "$as_me:8391: \$? = $ac_status" >&5
     8387   echo "$as_me:8387: \$? = $ac_status" >&5
    83928388   if (exit $ac_status) && test -s "$ac_outfile"; then
    83938389     # The compiler can only warn and ignore the option if not recognized
     
    86538649   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    86548650   -e 's:$: $lt_compiler_flag:'`
    8655    (eval echo "\"\$as_me:8655: $lt_compile\"" >&5)
     8651   (eval echo "\"\$as_me:8651: $lt_compile\"" >&5)
    86568652   (eval "$lt_compile" 2>conftest.err)
    86578653   ac_status=$?
    86588654   cat conftest.err >&5
    8659    echo "$as_me:8659: \$? = $ac_status" >&5
     8655   echo "$as_me:8655: \$? = $ac_status" >&5
    86608656   if (exit $ac_status) && test -s "$ac_outfile"; then
    86618657     # The compiler can only warn and ignore the option if not recognized
     
    87578753   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    87588754   -e 's:$: $lt_compiler_flag:'`
    8759    (eval echo "\"\$as_me:8759: $lt_compile\"" >&5)
     8755   (eval echo "\"\$as_me:8755: $lt_compile\"" >&5)
    87608756   (eval "$lt_compile" 2>out/conftest.err)
    87618757   ac_status=$?
    87628758   cat out/conftest.err >&5
    8763    echo "$as_me:8763: \$? = $ac_status" >&5
     8759   echo "$as_me:8759: \$? = $ac_status" >&5
    87648760   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    87658761   then
     
    1110211098  lt_status=$lt_dlunknown
    1110311099  cat > conftest.$ac_ext <<EOF
    11104 #line 11104 "configure"
     11100#line 11100 "configure"
    1110511101#include "confdefs.h"
    1110611102
     
    1120211198  lt_status=$lt_dlunknown
    1120311199  cat > conftest.$ac_ext <<EOF
    11204 #line 11204 "configure"
     11200#line 11200 "configure"
    1120511201#include "confdefs.h"
    1120611202
     
    1354613542   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1354713543   -e 's:$: $lt_compiler_flag:'`
    13548    (eval echo "\"\$as_me:13548: $lt_compile\"" >&5)
     13544   (eval echo "\"\$as_me:13544: $lt_compile\"" >&5)
    1354913545   (eval "$lt_compile" 2>conftest.err)
    1355013546   ac_status=$?
    1355113547   cat conftest.err >&5
    13552    echo "$as_me:13552: \$? = $ac_status" >&5
     13548   echo "$as_me:13548: \$? = $ac_status" >&5
    1355313549   if (exit $ac_status) && test -s "$ac_outfile"; then
    1355413550     # The compiler can only warn and ignore the option if not recognized
     
    1365013646   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1365113647   -e 's:$: $lt_compiler_flag:'`
    13652    (eval echo "\"\$as_me:13652: $lt_compile\"" >&5)
     13648   (eval echo "\"\$as_me:13648: $lt_compile\"" >&5)
    1365313649   (eval "$lt_compile" 2>out/conftest.err)
    1365413650   ac_status=$?
    1365513651   cat out/conftest.err >&5
    13656    echo "$as_me:13656: \$? = $ac_status" >&5
     13652   echo "$as_me:13652: \$? = $ac_status" >&5
    1365713653   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1365813654   then
     
    1522015216   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1522115217   -e 's:$: $lt_compiler_flag:'`
    15222    (eval echo "\"\$as_me:15222: $lt_compile\"" >&5)
     15218   (eval echo "\"\$as_me:15218: $lt_compile\"" >&5)
    1522315219   (eval "$lt_compile" 2>conftest.err)
    1522415220   ac_status=$?
    1522515221   cat conftest.err >&5
    15226    echo "$as_me:15226: \$? = $ac_status" >&5
     15222   echo "$as_me:15222: \$? = $ac_status" >&5
    1522715223   if (exit $ac_status) && test -s "$ac_outfile"; then
    1522815224     # The compiler can only warn and ignore the option if not recognized
     
    1532415320   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1532515321   -e 's:$: $lt_compiler_flag:'`
    15326    (eval echo "\"\$as_me:15326: $lt_compile\"" >&5)
     15322   (eval echo "\"\$as_me:15322: $lt_compile\"" >&5)
    1532715323   (eval "$lt_compile" 2>out/conftest.err)
    1532815324   ac_status=$?
    1532915325   cat out/conftest.err >&5
    15330    echo "$as_me:15330: \$? = $ac_status" >&5
     15326   echo "$as_me:15326: \$? = $ac_status" >&5
    1533115327   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1533215328   then
     
    1753117527   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1753217528   -e 's:$: $lt_compiler_flag:'`
    17533    (eval echo "\"\$as_me:17533: $lt_compile\"" >&5)
     17529   (eval echo "\"\$as_me:17529: $lt_compile\"" >&5)
    1753417530   (eval "$lt_compile" 2>conftest.err)
    1753517531   ac_status=$?
    1753617532   cat conftest.err >&5
    17537    echo "$as_me:17537: \$? = $ac_status" >&5
     17533   echo "$as_me:17533: \$? = $ac_status" >&5
    1753817534   if (exit $ac_status) && test -s "$ac_outfile"; then
    1753917535     # The compiler can only warn and ignore the option if not recognized
     
    1779917795   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1780017796   -e 's:$: $lt_compiler_flag:'`
    17801    (eval echo "\"\$as_me:17801: $lt_compile\"" >&5)
     17797   (eval echo "\"\$as_me:17797: $lt_compile\"" >&5)
    1780217798   (eval "$lt_compile" 2>conftest.err)
    1780317799   ac_status=$?
    1780417800   cat conftest.err >&5
    17805    echo "$as_me:17805: \$? = $ac_status" >&5
     17801   echo "$as_me:17801: \$? = $ac_status" >&5
    1780617802   if (exit $ac_status) && test -s "$ac_outfile"; then
    1780717803     # The compiler can only warn and ignore the option if not recognized
     
    1790317899   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1790417900   -e 's:$: $lt_compiler_flag:'`
    17905    (eval echo "\"\$as_me:17905: $lt_compile\"" >&5)
     17901   (eval echo "\"\$as_me:17901: $lt_compile\"" >&5)
    1790617902   (eval "$lt_compile" 2>out/conftest.err)
    1790717903   ac_status=$?
    1790817904   cat out/conftest.err >&5
    17909    echo "$as_me:17909: \$? = $ac_status" >&5
     17905   echo "$as_me:17905: \$? = $ac_status" >&5
    1791017906   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1791117907   then
     
    2267822674cat >&5 <<_CSEOF
    2267922675
    22680 This file was extended by Dip $as_me 0.91.5, which was
     22676This file was extended by Dip $as_me 0.91.4, which was
    2268122677generated by GNU Autoconf 2.59.  Invocation command line was
    2268222678
     
    2273622732cat >>$CONFIG_STATUS <<_ACEOF
    2273722733ac_cs_version="\\
    22738 Dip config.status 0.91.5
     22734Dip config.status 0.91.4
    2273922735configured by $0, generated by GNU Autoconf 2.59,
    2274022736  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/0.91.4/configure.ac

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