Changes from releases/0.9.10 at r1163 to releases/0.9.11 at r1588


Ignore:
Location:
releases/0.9.11
Files:
18 added
15 edited

Legend:

Unmodified
Added
Removed
  • releases/0.9.11/Dip

  • releases/0.9.11/Dip/configure

    r1163 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.10.
     3# Generated by GNU Autoconf 2.59 for Dip 0.9.11.
    44#
    55# Report bugs to <dip@lists.coin-or.org>.
     
    441441PACKAGE_NAME='Dip'
    442442PACKAGE_TARNAME='dip'
    443 PACKAGE_VERSION='0.9.10'
    444 PACKAGE_STRING='Dip 0.9.10'
     443PACKAGE_VERSION='0.9.11'
     444PACKAGE_STRING='Dip 0.9.11'
    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.10 to adapt to many kinds of systems.
     1019\`configure' configures Dip 0.9.11 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.10:";;
     1085     short | recursive ) echo "Configuration of Dip 0.9.11:";;
    10861086   esac
    10871087  cat <<\_ACEOF
     
    12881288if $ac_init_version; then
    12891289  cat <<\_ACEOF
    1290 Dip configure 0.9.10
     1290Dip configure 0.9.11
    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.10, which was
     1321It was created by Dip $as_me 0.9.11, 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:10:1
     1847 coin_libversion=2:11:1
    18481848
    18491849
     
    45754575# Define the identity of the package.
    45764576 PACKAGE='dip'
    4577  VERSION='0.9.10'
     4577 VERSION='0.9.11'
    45784578
    45794579
     
    2571225712cat >&5 <<_CSEOF
    2571325713
    25714 This file was extended by Dip $as_me 0.9.10, which was
     25714This file was extended by Dip $as_me 0.9.11, which was
    2571525715generated by GNU Autoconf 2.59.  Invocation command line was
    2571625716
     
    2577825778cat >>$CONFIG_STATUS <<_ACEOF
    2577925779ac_cs_version="\\
    25780 Dip config.status 0.9.10
     25780Dip config.status 0.9.11
    2578125781configured by $0, generated by GNU Autoconf 2.59,
    2578225782  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/0.9.11/Dip/configure.ac

    r1163 r1588  
    2121
    2222# name of project, version number, contact info
    23 AC_INIT([Dip],[0.9.10],[dip@lists.coin-or.org])
     23AC_INIT([Dip],[0.9.11],[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:10:1)
     63AC_COIN_PROJECTDIR_INIT(Dip,2:11:1)
    6464
    6565# Check if user wants to produce debugging code
  • releases/0.9.11/Dip/examples/Dippy/bpp/bin_pack_func.py

    r1163 r1588  
    11import sys
    22
    3 from pulp import *
    4 
    5 try:
    6     import path
    7 except ImportError:
    8     pass
    9        
     3from pulp import LpVariable, lpSum, LpBinary, LpStatusOptimal
     4
    105try:
    116    import path
     
    6964
    7065def my_branch(prob, sol):
    71     bounds = None
    7266   
    7367    bounds = symmetry(prob, sol)
     
    10599 
    106100    dippyOpts = {'doPriceCut' : '1',
    107                  'CutCGL': '0',
     101                 'CutCGL': '1',
    108102#                'SolveMasterAsIp': '0'
    109103#                'generateInitVars': '1',
  • releases/0.9.11/Dip/examples/Dippy/bpp/bin_pack_instance.py

    r1163 r1588  
    2222    if prob.display_mode != 'off':
    2323        numNodes = len(prob.Tree.get_node_list())
    24         if (prob.Tree.display_mode == 'pygame') or (prob.Tree.display_mode == 'xdot'):
     24        if (prob.Tree.attr['display'] == 'pygame') or (prob.Tree.attr['display'] == 'xdot'):
    2525            prob.Tree.display()
    2626
  • releases/0.9.11/Dip/examples/Dippy/cflp/facility_location.py

    r1163 r1588  
    33import sys
    44
    5 from pulp import *
     5from pulp import LpVariable, LpBinary, lpSum, value, LpProblem, LpMaximize, LpAffineExpression
    66
    77try:
     
    99except ImportError:
    1010    pass
    11        
    12 try:
    13     import path
    14 except ImportError:
    15     pass
    16        
     11               
    1712try:
    1813    import dippy
     
    4439    ASSIGNMENT_COSTS = dict((i, 0) for i in ASSIGNMENTS)
    4540
    46 display_mode = 'off'
     41display_mode = 'xdot'
    4742
    4843prob = dippy.DipProblem("Facility Location", display_mode = display_mode,
     
    114109    var_values[use_vars[loc]] = 1
    115110
    116     cost = FIXED_COST[loc] + sum([ASSIGNMENT_COSTS[(loc, PRODUCTS[j])] for j in solution])   
     111    cost = FIXED_COST[loc] + sum([ASSIGNMENT_COSTS[(loc, PRODUCTS[j])]
     112                                  for j in solution])
    117113    var_tuple = (cost, rc, var_values)
    118114    rcCheck = 0.0
     
    120116        rcCheck += redCosts[v] * var_values[v]
    121117    if debug_print:
    122         print "Checking rc calc", rc, rcCheck
     118        print "Checking rc calc", redCosts[use_vars[loc]] - z, rcCheck
    123119        print var_tuple
    124120    return [var_tuple]
     
    136132
    137133    if (debug_subproblem):
    138         relaxation = pulp.LpProblem('relaxation', pulp.LpMaximize)
     134        relaxation = LpProblem('relaxation', LpMaximize)
    139135        relax_vars = [str(i) for i in range(n)]
    140136        var_dict   = LpVariable.dicts("", relax_vars, 0, 1, LpBinary)
     
    377373prob.writeFull('facility.lp', 'facility.dec')
    378374
    379 #prob.branch_method = choose_antisymmetry_branch
    380 prob.relaxed_solver = solve_subproblem
     375#prob.relaxed_solver = solve_subproblem
    381376#prob.init_vars = init_one_each
    382377#prob.init_vars = init_first_fit
     
    400395if prob.display_mode != 'off':
    401396    numNodes = len(prob.Tree.get_node_list())
    402     if prob.Tree.attr['display'] == 'svg':
    403         prob.Tree.write_as_svg(filename = "facility_node%d" % (numNodes + 1),
    404                                prevfile = "facility_node%d" % numNodes)
    405     prob.Tree.display()
     397    if prob.Tree.attr['display'] == 'pygame' or prob.Tree.attr['display'] == 'xdot':
     398        prob.Tree.display()
    406399
    407400# print solution
  • releases/0.9.11/Dip/examples/Dippy/gap/gap.py

    r1163 r1588  
    55# for an e.g. see gap0512-2.dat included in this directory
    66
    7 try:
    8     import path
    9 except ImportError:
    10     pass
    11        
     7import sys
     8
     9from pulp import LpVariable, LpBinary, lpSum, value, LpProblem, LpMaximize
     10
    1211try:
    1312    import path
     
    137136
    138137    if (debug_subproblem):
    139         relaxation = pulp.LpProblem('relaxation', pulp.LpMaximize)
     138        relaxation = LpProblem('relaxation', LpMaximize)
    140139        relax_vars = [str(i) for i in range(n)]
    141140        var_dict   = LpVariable.dicts("", relax_vars, 0, 1, LpBinary)
     
    183182dippy.Solve(prob, {
    184183    'TolZero': '%s' % tol,
    185     'doCut': '1',
     184    'doPriceCut': '1',
     185    'CutCGL' : '1',
    186186#    'logLevel': '3',
    187187})
  • releases/0.9.11/Dip/src

  • releases/0.9.11/Dip/src/DecompApp.cpp

    r1163 r1588  
    589589      cerr << "Error: BlockFileFormat = "
    590590           << m_param.BlockFileFormat
    591            << " is an invalid type. Valid types = (List,ZIBlist,Pair,PairName)."
     591           << " is an invalid type. Valid types = (List, ZIBList, Pair, PairName)."
    592592           << endl;
    593593      throw UtilException("Invalid Parameter.",
  • releases/0.9.11/Dip/src/config_dip_default.h

    r1163 r1588  
    2020
    2121/* Version number of project */
    22 #define DIP_VERSION "0.9.10"
     22#define DIP_VERSION "0.9.11"
    2323
    2424/* Major Version number of project */
     
    2929
    3030/* Release Version number of project */
    31 #define DIP_VERSION_RELEASE 10
     31#define DIP_VERSION_RELEASE 11
    3232
  • releases/0.9.11/Dip/src/dippy/DippyDecompAlgo.cpp

    r1163 r1588  
    1111 * which define the branch.
    1212 */
    13 bool DippyAlgoMixin::chooseBranchSet(DecompAlgo* algo, std::vector< std::pair<int, double> >& downBranchLB,
     13bool DippyAlgoMixin::chooseBranchSet(DecompAlgo* algo,
     14                                     std::vector< std::pair<int, double> >& downBranchLB,
    1415                                     std::vector< std::pair<int, double> >& downBranchUB,
    1516                                     std::vector< std::pair<int, double> >& upBranchLB,
     
    1920
    2021   if (!m_utilParam->GetSetting("pyBranchMethod", true)) {
    21       return algo->DecompAlgo::chooseBranchSet(downBranchLB, downBranchUB, upBranchLB, upBranchUB);
     22      return algo->DecompAlgo::chooseBranchSet(downBranchLB, downBranchUB,
     23                                               upBranchLB, upBranchUB);
    2224   }
    2325
     
    2729   PyObject* pSolutionList = pyTupleList_FromDoubleArray(xhat, app->m_colList);
    2830   // try to call chooseBranchSet on the DipProblem python object
    29    PyObject* pResult = PyObject_CallMethod(m_pProb, "chooseBranchSet", "O", pSolutionList);
     31   PyObject* pResult = PyObject_CallMethod(m_pProb, "chooseBranchSet", "O",
     32                                           pSolutionList);
    3033
    3134   if (pResult == NULL) {
    32       //something's gone wrong with the function call, a Python exception has been set
    33       throw UtilException("Error calling method prob.chooseBranchSet()", "chooseBranchSet", "DippyDecompAlgo");
     35      //something's gone wrong with the function call, a Python exception has
     36      //been set
     37      throw UtilException("Error calling method prob.chooseBranchSet()",
     38                          "chooseBranchSet", "DippyDecompAlgo");
    3439   }
    3540
     
    4449         pDownUB = PyDict_New();
    4550         downBranchVar = PyList_GetItem(app->m_colList, downBranchUB[0].first);
    46          PyDict_SetItem(pDownUB, downBranchVar, PyInt_FromLong(static_cast<int>(round(downBranchUB[0].second))));
     51         PyDict_SetItem(pDownUB, downBranchVar,
     52                        PyInt_FromLong(static_cast<int>(round(downBranchUB[0].second))));
    4753         pUpLB = PyDict_New();
    4854         upBranchVar = PyList_GetItem(app->m_colList, upBranchLB[0].first);
    49          PyDict_SetItem(pUpLB, upBranchVar, PyInt_FromLong(static_cast<int>(round(upBranchLB[0].second))));
     55         PyDict_SetItem(pUpLB, upBranchVar,
     56                        PyInt_FromLong(static_cast<int>(round(upBranchLB[0].second))));
    5057         pUpUB = PyDict_New(); // Up branch UBs is an empty dictionary
    5158         assert(downBranchVar == upBranchVar);
     
    6875}
    6976
    70 void DippyAlgoMixin::postProcessBranch(DecompAlgo* algo, DecompStatus decompStatus)
     77void DippyAlgoMixin::postProcessBranch(DecompAlgo* algo,
     78                                       DecompStatus decompStatus)
    7179{
    7280   PyObject* pOutput = PyList_New(0);
  • releases/0.9.11/Dip/src/dippy/DippyDecompAlgo.h

    r1163 r1588  
    1515 * Mixin class for Dip Algorithms
    1616 *
    17  * This is a helper class for interfacing Dip Algo classes with Python. To add Python support
    18  * to a standard DecompAlgo, create a subclass which also inherits from DippyAlgoMixin and
    19  * override the virtual methods to call those provided by the Mixin class. See DippyAlgoC
    20  * for an example.
     17 * This is a helper class for interfacing Dip Algo classes with Python.
     18 * To add Python support to a standard DecompAlgo, create a subclass which
     19 * also inherits from DippyAlgoMixin and override the virtual methods to call
     20 * those provided by the Mixin class. See DippyAlgoC for an example.
    2121 */
    2222class DippyAlgoMixin {
  • releases/0.9.11/Dip/src/dippy/dippy.py

    r1163 r1588  
    1212from _dippy import *
    1313
     14gimpy_installed = True
    1415try:
    15     from coinor.gimpy import BinaryTree
     16    from src.gimpy import BinaryTree
    1617except ImportError:
    17     gimpy_installed = False
    18 else:
    19     gimpy_installed = True
     18    try:
     19        from coinor.gimpy import BinaryTree
     20    except ImportError:
     21        gimpy_installed = False
    2022
    2123if gimpy_installed:
  • releases/0.9.11/configure

    r1163 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.10.
     4# Generated by GNU Autoconf 2.59 for Dip 0.9.11.
    55#
    66# Report bugs to <dip@lists.coin-or.org>.
     
    442442PACKAGE_NAME='Dip'
    443443PACKAGE_TARNAME='dip'
    444 PACKAGE_VERSION='0.9.10'
    445 PACKAGE_STRING='Dip 0.9.10'
     444PACKAGE_VERSION='0.9.11'
     445PACKAGE_STRING='Dip 0.9.11'
    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.10 to adapt to many kinds of systems.
     1048\`configure' configures Dip 0.9.11 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.10:";;
     1114     short | recursive ) echo "Configuration of Dip 0.9.11:";;
    11151115   esac
    11161116  cat <<\_ACEOF
     
    13211321if $ac_init_version; then
    13221322  cat <<\_ACEOF
    1323 Dip configure 0.9.10
     1323Dip configure 0.9.11
    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.10, which was
     1354It was created by Dip $as_me 0.9.11, 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.9.10'
     5123 VERSION='0.9.11'
    51245124
    51255125
     
    2276122761cat >&5 <<_CSEOF
    2276222762
    22763 This file was extended by Dip $as_me 0.9.10, which was
     22763This file was extended by Dip $as_me 0.9.11, which was
    2276422764generated by GNU Autoconf 2.59.  Invocation command line was
    2276522765
     
    2281922819cat >>$CONFIG_STATUS <<_ACEOF
    2282022820ac_cs_version="\\
    22821 Dip config.status 0.9.10
     22821Dip config.status 0.9.11
    2282222822configured by $0, generated by GNU Autoconf 2.59,
    2282322823  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/0.9.11/configure.ac

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