Changes from releases/0.9.8 at r1588 to releases/0.9.9 at r1588


Ignore:
Location:
releases/0.9.9
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • releases/0.9.9/Dip

  • releases/0.9.9/Dip/configure

    r1588 r1588  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Dip 0.9.8.
     3# Generated by GNU Autoconf 2.59 for Dip 0.9.9.
    44#
    55# Report bugs to <dip@lists.coin-or.org>.
     
    441441PACKAGE_NAME='Dip'
    442442PACKAGE_TARNAME='dip'
    443 PACKAGE_VERSION='0.9.8'
    444 PACKAGE_STRING='Dip 0.9.8'
     443PACKAGE_VERSION='0.9.9'
     444PACKAGE_STRING='Dip 0.9.9'
    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.8 to adapt to many kinds of systems.
     1019\`configure' configures Dip 0.9.9 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.8:";;
     1085     short | recursive ) echo "Configuration of Dip 0.9.9:";;
    10861086   esac
    10871087  cat <<\_ACEOF
     
    12881288if $ac_init_version; then
    12891289  cat <<\_ACEOF
    1290 Dip configure 0.9.8
     1290Dip configure 0.9.9
    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.8, which was
     1321It was created by Dip $as_me 0.9.9, 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:8:1
     1847 coin_libversion=2:9:1
    18481848
    18491849
     
    46164616# Define the identity of the package.
    46174617 PACKAGE='dip'
    4618  VERSION='0.9.8'
     4618 VERSION='0.9.9'
    46194619
    46204620
     
    2575325753cat >&5 <<_CSEOF
    2575425754
    25755 This file was extended by Dip $as_me 0.9.8, which was
     25755This file was extended by Dip $as_me 0.9.9, which was
    2575625756generated by GNU Autoconf 2.59.  Invocation command line was
    2575725757
     
    2581925819cat >>$CONFIG_STATUS <<_ACEOF
    2582025820ac_cs_version="\\
    25821 Dip config.status 0.9.8
     25821Dip config.status 0.9.9
    2582225822configured by $0, generated by GNU Autoconf 2.59,
    2582325823  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/0.9.9/Dip/configure.ac

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

    r1588 r1588  
    1 DEBUGGING = False
    2 
    31import sys
    42
    53from pulp import *
    64
    7 if DEBUGGING:
    8 
     5try:
     6    import path
     7except ImportError:
     8    pass
     9       
     10try:
     11    import path
     12except ImportError:
     13    pass
     14       
     15try:
     16    import dippy
     17except ImportError:
    918    try:
    10         import path
     19        import src.dippy as dippy
    1120    except ImportError:
    12         pass
    13     import dippy
    14 else:
    15     import coinor.dippy as dippy
     21        import coinor.dippy as dippy
    1622
    1723from math import floor, ceil
  • releases/0.9.9/Dip/examples/Dippy/cflp/facility_location.py

    r1588 r1588  
    11#!/usr/bin/env python
    22
    3 DEBUGGING = False
    4 
    53import sys
    64
     
    1210    pass
    1311       
    14 if DEBUGGING:
     12try:
     13    import path
     14except ImportError:
     15    pass
     16       
     17try:
    1518    import dippy
    16 else:
    17     import coinor.dippy as dippy
     19except ImportError:
     20    try:
     21        import src.dippy as dippy
     22    except ImportError:
     23        import coinor.dippy as dippy
    1824
    1925from math import floor, ceil
     
    3844    ASSIGNMENT_COSTS = dict((i, 0) for i in ASSIGNMENTS)
    3945
    40 display_mode = 'xdot'
     46display_mode = 'off'
    4147
    4248prob = dippy.DipProblem("Facility Location", display_mode = display_mode,
     
    372378
    373379#prob.branch_method = choose_antisymmetry_branch
    374 #prob.relaxed_solver = solve_subproblem
     380prob.relaxed_solver = solve_subproblem
    375381#prob.init_vars = init_one_each
    376382#prob.init_vars = init_first_fit
     
    383389    'TolZero': '%s' % tol,
    384390    'doPriceCut': '1',
    385     'CutCGL': '0',
     391    'CutCGL': '1',
    386392#    'SolveMasterAsIp': '0',
    387393#    'generateInitVars': '1',
  • releases/0.9.9/Dip/examples/Dippy/gap/gap.py

    r1588 r1588  
    44# argument should be a problem file, see Dip/examples/GAP_Instance.cpp for format
    55# for an e.g. see gap0512-2.dat included in this directory
    6 
    7 DEBUGGING = False
    8 
    9 import sys
    10 
    11 from pulp import *
    126
    137try:
     
    1610    pass
    1711       
    18 if DEBUGGING:
    19     from dippy import dippy
    20 else:
    21     import coinor.dippy as dippy
     12try:
     13    import path
     14except ImportError:
     15    pass
     16       
     17try:
     18    import dippy
     19except ImportError:
     20    try:
     21        import src.dippy as dippy
     22    except ImportError:
     23        import coinor.dippy as dippy
    2224
    2325debug_print = False
  • releases/0.9.9/Dip/setup.py

    r1588 r1588  
    88
    99PROJECT = 'coinor.dippy'
    10 VERSION = '1.9.8'
     10VERSION = '1.9.9'
    1111URL = 'https://projects.coin-or.org/Dip/wiki/Dippy'
    1212AUTHOR_EMAIL = u''
     
    123123      packages=['coinor.dippy', 'coinor'],
    124124      package_dir = {'coinor': 'src'},
    125       install_requires=['coinor.pulp','coinor.gimpy'],
     125      install_requires=['pulp>=1.5.4','coinor.gimpy'],
    126126      ext_modules=modules
    127127     )
  • releases/0.9.9/Dip/src

  • releases/0.9.9/Dip/src/DecompApp.h

    r1588 r1588  
    351351                            DecompCutList& newCuts);
    352352
    353    virtual void solveRelaxedWhich(std::vector<int>&                blocksToSolve,
    354                                   std::map< int, std::vector<double> >& userDualsByBlock) {
     353   virtual void solveRelaxedWhich(std::vector<int>& blocksToSolve,
     354                                  std::map< int,
     355                                  std::vector<double> >& userDualsByBlock) {
    355356   };
    356357
  • releases/0.9.9/Dip/src/config_dip_default.h

    r1588 r1588  
    2020
    2121/* Version number of project */
    22 #define DIP_VERSION "0.9.8"
     22#define DIP_VERSION "0.9.9"
    2323
    2424/* Major Version number of project */
     
    2929
    3030/* Release Version number of project */
    31 #define DIP_VERSION_RELEASE 8
     31#define DIP_VERSION_RELEASE 9
    3232
  • releases/0.9.9/Dip/src/dippy/DippyDecompAlgo.h

    r1588 r1588  
    6565   void postProcessNode(DecompAlgo* algo, DecompStatus decompStatus);
    6666
    67    /**
    68     * Generate Cuts
    69     *
    70     * Call the algorithm's generateCuts method if the 'generateCuts' param is set to
    71     * true.
    72     */
    73    virtual int generateCuts(DecompAlgo* algo, double* xhat, DecompCutList& newCuts) {
    74       bool gen = m_utilParam->GetSetting("generateCuts", true);
    75       bool inPy = m_utilParam->GetSetting("pyGenerateCuts", true);
    76 
    77       if (gen && inPy) {
    78          return algo->DecompAlgo::generateCuts(xhat, newCuts);
    79       }
    80 
    81       return 0;
    82    }
    83 
    84    /**
    85     * Generate Initial Variables
    86     *
    87     * Call the algorithm's generateInitVars method if the 'generateInitVars' param is set to
    88     * true.
    89     */
    90    virtual int generateInitVars(DecompAlgo* algo, DecompVarList& initVars) {
    91       bool gen = m_utilParam->GetSetting("generateInitVars", true);
    92       bool inPy = m_utilParam->GetSetting("pyInitVars", true);
    93 
    94       if (gen && inPy) {
    95          return algo->DecompAlgo::generateInitVars(initVars);
    96       }
    97 
    98       return 0;
    99    }
    10067};
    10168
     
    12895   }
    12996
    130    virtual int generateCuts(double* xhat, DecompCutList& newCuts) {
    131       return DippyAlgoMixin::generateCuts(this, xhat, newCuts);
    132    }
    133 
    134    //    virtual int generateInitVars(DecompVarList & initVars) {
    135    //         return priceInitVars(initVars);
    136    //    }
    13797};
    13898
     
    163123   }
    164124
    165    virtual int generateCuts(double* xhat, DecompCutList& newCuts) {
    166       return DippyAlgoMixin::generateCuts(this, xhat, newCuts);
    167    }
    168 
    169    virtual int generateInitVars(DecompVarList& initVars) {
    170       return DippyAlgoMixin::generateInitVars(this, initVars);
    171    }
    172125};
    173126
     
    198151   }
    199152
    200    virtual int generateCuts(double* xhat, DecompCutList& newCuts) {
    201       return DippyAlgoMixin::generateCuts(this, xhat, newCuts);
    202    }
    203 
    204    virtual int generateInitVars(DecompVarList& initVars) {
    205       return DippyAlgoMixin::generateInitVars(this, initVars);
    206    }
    207153};
    208154
  • releases/0.9.9/Dip/src/dippy/dippy.py

    r1588 r1588  
    1313
    1414try:
    15     from gimpy import BinaryTree
     15    from coinor.gimpy import BinaryTree
    1616except ImportError:
    1717    gimpy_installed = False
     
    2121if gimpy_installed:
    2222    try:
    23         from grumpy import BBTree
     23        from coinor.grumpy import BBTree
    2424    except ImportError:
    2525        grumpy_installed = False
  • releases/0.9.9/configure

    r1588 r1588  
    22# From configure.ac 0.8.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.59 for Dip 0.9.8.
     4# Generated by GNU Autoconf 2.59 for Dip 0.9.9.
    55#
    66# Report bugs to <dip@lists.coin-or.org>.
     
    442442PACKAGE_NAME='Dip'
    443443PACKAGE_TARNAME='dip'
    444 PACKAGE_VERSION='0.9.8'
    445 PACKAGE_STRING='Dip 0.9.8'
     444PACKAGE_VERSION='0.9.9'
     445PACKAGE_STRING='Dip 0.9.9'
    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.8 to adapt to many kinds of systems.
     1048\`configure' configures Dip 0.9.9 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.8:";;
     1114     short | recursive ) echo "Configuration of Dip 0.9.9:";;
    11151115   esac
    11161116  cat <<\_ACEOF
     
    13211321if $ac_init_version; then
    13221322  cat <<\_ACEOF
    1323 Dip configure 0.9.8
     1323Dip configure 0.9.9
    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.8, which was
     1354It was created by Dip $as_me 0.9.9, which was
    13551355generated by GNU Autoconf 2.59.  Invocation command line was
    13561356
     
    51765176# Define the identity of the package.
    51775177 PACKAGE='dip'
    5178  VERSION='0.9.8'
     5178 VERSION='0.9.9'
    51795179
    51805180
     
    2281622816cat >&5 <<_CSEOF
    2281722817
    22818 This file was extended by Dip $as_me 0.9.8, which was
     22818This file was extended by Dip $as_me 0.9.9, which was
    2281922819generated by GNU Autoconf 2.59.  Invocation command line was
    2282022820
     
    2287422874cat >>$CONFIG_STATUS <<_ACEOF
    2287522875ac_cs_version="\\
    22876 Dip config.status 0.9.8
     22876Dip config.status 0.9.9
    2287722877configured by $0, generated by GNU Autoconf 2.59,
    2287822878  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • releases/0.9.9/configure.ac

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