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


Ignore:
Location:
releases
Files:
56 added
10 deleted
18 edited

Legend:

Unmodified
Added
Removed
  • releases/0.91.4/Dip

  • releases/0.91.4/Dip/README

    r1588 r1588  
    3636CHANGELOG
    3737=========
     38
     39## Release 0.91.4
     40 * Updates to dependencies
     41 * All examples fixed
     42 * DipPy examples moved into package source subdirectory
     43 * Samll bug fixes
     44
     45## Release 0.91.3
     46 * Fixes for correctly producing Doxygen documentation
    3847
    3948## Release 0.91.2
  • releases/0.91.4/Dip/README.rst

    r1588 r1588  
    11Dippy is a Python extension module that allows the COIN `DIP framework
    2 <https://projects.coin-or.org/Dip>`_ (Decomposition in Integer Programming, formerly
    3 known as DECOMP) to be used with `PuLP
     2<https://projects.coin-or.org/Dip>`_ (Decomposition in Integer Programming,
     3formerly known as DECOMP) to be used with `PuLP
    44<https://projects.coin-or.org/PuLP>`_, a Python LP modeler.
    55
  • 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.3.
     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.3'
    444 PACKAGE_STRING='Dip 0.91.3'
     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.3 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.3:";;
     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.3
     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.3, 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:3:5
     1856 coin_libversion=6:4:5
    18571857
    18581858
     
    45844584# Define the identity of the package.
    45854585 PACKAGE='dip'
    4586  VERSION='0.91.3'
     4586 VERSION='0.91.4'
    45874587
    45884588
     
    2655326553cat >&5 <<_CSEOF
    2655426554
    26555 This file was extended by Dip $as_me 0.91.3, 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.3
     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.3],[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:3: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.2'
     10VERSION = '1.91.3'
    1111URL = 'https://projects.coin-or.org/Dip/wiki/DipPy'
    1212AUTHOR_EMAIL = u''
  • releases/0.91.4/Dip/src

  • releases/0.91.4/Dip/src/AlpsDecompTreeNode.cpp

    r1588 r1588  
    367367   } else {
    368368      status = chooseBranchingObject(model);
    369       decompAlgo->postProcessBranch(decompStatus);
     369      if (getStatus() == AlpsNodeStatusPregnant){
     370         decompAlgo->postProcessBranch(decompStatus);
     371      }
    370372   }
    371373
  • releases/0.91.4/Dip/src/DecompAlgo.cpp

    r1588 r1588  
    67576757      if (solveResult->m_nSolutions) {
    67586758         int k;
    6759 
    6760          for (k = 0; k < solveResult->m_nSolutions; k++) {
     6759         int nSol = std::min<int>(solveResult->m_nSolutions,
     6760                                  m_param.SubProbNumSolLimit);
     6761         for (k = 0; k < nSol; k++) {
    67616762            const double* milpSolution = solveResult->getSolution(k);
    67626763            //---
  • releases/0.91.4/Dip/src/DecompModel.cpp

    r1588 r1588  
    375375         result->m_solution.push_back(solVec);
    376376      }else{
    377          for (int i = 0; i < result->m_nSolutions; i++){
     377         int nSols = std::min<int>(result->m_nSolutions,
     378                                  param.SubProbNumSolLimit);
     379         for (int i = 0; i < nSols; i++){
    378380            status = sym_get_sp_solution(env, i, solution, &objval);
    379381            /*
     
    385387            vector<double> solVec(solution, solution + numCols);
    386388            result->m_solution.push_back(solVec);
    387          }
    388       }
     389         }     
     390      } 
    389391   } else {
    390392      if (sym_is_proven_primal_infeasible(env)) {
     
    397399      }
    398400   }
    399 
     401   std::cout << "bye" << std::endl;
    400402   /*
    401403   if (!param.WarmStart) {
     
    590592   //---
    591593   result->m_objLB = cbc.getBestPossibleObjValue();
    592 
    593    for (int i = 0; i < result->m_nSolutions; i++){
     594   int nSols = std::min<int>(result->m_nSolutions,
     595                             param.SubProbNumSolLimit);
     596   for(int i = 0; i < nSols; i++){
    594597      //result->m_objUB = cbc.getObjValue();
    595598      const double* solDbl = cbc.savedSolution(i);
  • releases/0.91.4/Dip/src/config_dip_default.h

    r1588 r1588  
    2020
    2121/* Version number of project */
    22 #define DIP_VERSION "0.91.3"
     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 3
     31#define DIP_VERSION_RELEASE 4
    3232
  • releases/0.91.4/Dip/src/dippy/DippyDecompAlgo.cpp

    r1588 r1588  
    4343      // if chooseBranchSet returns None, do default branching for this algo
    4444      ret_val = algo->DecompAlgo::chooseBranchSet(downBranchLB, downBranchUB, upBranchLB, upBranchUB);
     45     
     46      // No branching set was returned. This shouldn't happen
     47      assert(ret_val == true);
    4548
     49      if (!ret_val){
     50         throw UtilException("No branch set found in prob.chooseBranchSet()",
     51                             "chooseBranchSet", "DippyDecompAlgo");
     52      }
    4653      if (downBranchUB.size() > 0) {
    4754         PyObject* downBranchVar, * upBranchVar;
     
    5764         pUpUB = PyDict_New(); // Up branch UBs is an empty dictionary
    5865         assert(downBranchVar == upBranchVar);
     66      }else{
     67         //No branching set was returned. Zero out pointers to old branching
     68         //sets
     69         assert(ret_val == false);
     70         pDownLB = NULL;
     71         pDownUB = NULL;
     72         pUpLB = NULL;
     73         pUpUB = NULL;
    5974      }
    60 
    6175      return ret_val;
    6276   } else {
  • releases/0.91.4/Dip/src/dippy/dippy.py

    r1588 r1588  
    445445        for k in self.constraints:
    446446            f.write(self.constraints[k].asCplexLpConstraint(k))
     447        blockId = 0
    447448        for r in self.relaxation.dict:
    448449            rname = asCplexName(str(r))
    449             b.write("BLOCK %s\n" % rname)
     450            b.write("BLOCK %d\n" % blockId)
    450451            for k in self.relaxation.dict[r].constraints:
    451452                f.write(self.relaxation.dict[r].constraints[k].asCplexLpConstraint(str(k)+'_'+rname))
    452453                b.write(str(k)+'_'+rname+'\n')
     454            blockId += 1
    453455        vs = list(self.variables())
    454456        # check if any names are longer than 100 characters
  • releases/0.91.4/Makefile.am

    r1588 r1588  
    5757unitTests: tests
    5858
    59 .PHONY: test tests unitTests doxydoc doxydocd
     59.PHONY: test tests unitTests doxydoc
    6060
    6161########################################################################
  • releases/0.91.4/Makefile.in

    r1588 r1588  
    710710unitTests: tests
    711711
    712 .PHONY: test tests unitTests doxydoc doxydocd
     712.PHONY: test tests unitTests doxydoc
    713713
    714714doxygen-docs:
  • releases/0.91.4/README.md

    r1588 r1588  
    3232
    3333# CHANGELOG
     34
     35## Release 0.91.4
     36 * Updates to dependencies
     37 * All examples fixed
     38 * DipPy examples moved into package source subdirectory
     39 * Samll bug fixes
     40
     41## Release 0.91.3
     42 * Fixes for correctly producing Doxygen documentation
    3443
    3544## Release 0.91.2
  • 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.3.
     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.3'
    445 PACKAGE_STRING='Dip 0.91.3'
     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.3 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.3:";;
     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.3
     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.3, 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
     
    51215121# Define the identity of the package.
    51225122 PACKAGE='dip'
    5123  VERSION='0.91.3'
     5123 VERSION='0.91.4'
    51245124
    51255125
     
    2267422674cat >&5 <<_CSEOF
    2267522675
    22676 This file was extended by Dip $as_me 0.91.3, which was
     22676This file was extended by Dip $as_me 0.91.4, which was
    2267722677generated by GNU Autoconf 2.59.  Invocation command line was
    2267822678
     
    2273222732cat >>$CONFIG_STATUS <<_ACEOF
    2273322733ac_cs_version="\\
    22734 Dip config.status 0.91.3
     22734Dip config.status 0.91.4
    2273522735configured by $0, generated by GNU Autoconf 2.59,
    2273622736  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.3],[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.