Permalink
Browse files

Prepare release v3.1.1

  • Loading branch information...
fdabrandao committed May 12, 2016
1 parent c63cf19 commit dbb7c4f85855ef50374852d90923dc57dcb461c8
Showing with 41 additions and 41 deletions.
  1. +10 −10 configure
  2. +1 −1 configure.ac
  3. +13 −13 examples/notebooks/example_mvp.ipynb
  4. +13 −13 examples/notebooks/example_vbp.ipynb
  5. +1 −1 pyvpsolver/__init__.py
  6. +3 −3 src/config.hpp
View
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for VPSolver 3.1.1b0.
# Generated by GNU Autoconf 2.69 for VPSolver 3.1.1.
#
# Report bugs to <fdabrandao@dcc.fc.up.pt>.
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='VPSolver'
PACKAGE_TARNAME='vpsolver'
PACKAGE_VERSION='3.1.1b0'
PACKAGE_STRING='VPSolver 3.1.1b0'
PACKAGE_VERSION='3.1.1'
PACKAGE_STRING='VPSolver 3.1.1'
PACKAGE_BUGREPORT='fdabrandao@dcc.fc.up.pt'
PACKAGE_URL='http://vpsolver.dcc.fc.up.pt/'
@@ -1232,7 +1232,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures VPSolver 3.1.1b0 to adapt to many kinds of systems.
\`configure' configures VPSolver 3.1.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1298,7 +1298,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of VPSolver 3.1.1b0:";;
short | recursive ) echo "Configuration of VPSolver 3.1.1:";;
esac
cat <<\_ACEOF
@@ -1389,7 +1389,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
VPSolver configure 3.1.1b0
VPSolver configure 3.1.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1444,7 +1444,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by VPSolver $as_me 3.1.1b0, which was
It was created by VPSolver $as_me 3.1.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2317,7 +2317,7 @@ fi
# Define the identity of the package.
PACKAGE='vpsolver'
VERSION='3.1.1b0'
VERSION='3.1.1'
cat >>confdefs.h <<_ACEOF
@@ -3671,7 +3671,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by VPSolver $as_me 3.1.1b0, which was
This file was extended by VPSolver $as_me 3.1.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3738,7 +3738,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
VPSolver config.status 3.1.1b0
VPSolver config.status 3.1.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
View
@@ -1,6 +1,6 @@
# autoreconf -i (to update)
# Initialize autoconf.
AC_INIT([VPSolver], [3.1.1b0], [fdabrandao@dcc.fc.up.pt],
AC_INIT([VPSolver], [3.1.1], [fdabrandao@dcc.fc.up.pt],
[vpsolver], [http://vpsolver.dcc.fc.up.pt/])
# Force autoconf to be at least this version number:
AC_PREREQ([2.68])
@@ -81,7 +81,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"VPSolver 3.1.0b0, Copyright (C) 2013-2016, Filipe Brandao\n",
"VPSolver 3.1.1, Copyright (C) 2013-2016, Filipe Brandao\n",
"Build (method = -3)\n",
" #dp: 6\n",
" Step-3' Graph: 7 vertices and 15 arcs (0.00s)\n",
@@ -482,7 +482,7 @@
"Copyright (C) 2013-2016, Filipe Brandao\n",
"\n",
">>> vbp2afg...\n",
"VPSolver 3.1.0b0, Copyright (C) 2013-2016, Filipe Brandao\n",
"VPSolver 3.1.1, Copyright (C) 2013-2016, Filipe Brandao\n",
"Build (method = -3)\n",
" #dp: 6\n",
" Step-3' Graph: 7 vertices and 15 arcs (0.00s)\n",
@@ -492,15 +492,15 @@
"Ready! (0.00s)\n",
"\n",
">>> afg2mps...\n",
"VPSolver 3.1.0b0, Copyright (C) 2013-2016, Filipe Brandao\n",
"VPSolver 3.1.1, Copyright (C) 2013-2016, Filipe Brandao\n",
"Generating the .MPS model...DONE!\n",
"\n",
">>> solving the MIP model using GLPK...\n",
"Note: different parameter settings may improve the performance substantially!\n",
"GLPSOL: GLPK LP/MIP Solver, v4.52\n",
"Parameter(s) specified in the command line:\n",
" --mps /tmp/85yEdQEXXj/model.mps --seed 1234 -o /tmp/85yEdQEXXj/sol.out\n",
"Reading problem data from `/tmp/85yEdQEXXj/model.mps'...\n",
" --mps /tmp/ilJgnzAJNd/model.mps --seed 1234 -o /tmp/ilJgnzAJNd/sol.out\n",
"Reading problem data from `/tmp/ilJgnzAJNd/model.mps'...\n",
"Problem: ARCFLOW\n",
"Objective: OBJ\n",
"9 rows, 11 columns, 28 non-zeros\n",
@@ -531,10 +531,10 @@
"INTEGER OPTIMAL SOLUTION FOUND\n",
"Time used: 0.0 secs\n",
"Memory used: 0.1 Mb (54700 bytes)\n",
"Writing MIP solution to `/tmp/85yEdQEXXj/sol.out'...\n",
"Writing MIP solution to `/tmp/ilJgnzAJNd/sol.out'...\n",
"\n",
">>> vbpsol...\n",
"VPSolver 3.1.0b0, Copyright (C) 2013-2016, Filipe Brandao\n",
"VPSolver 3.1.1, Copyright (C) 2013-2016, Filipe Brandao\n",
"Objective: 5\n",
"Solution:\n",
"Bins of type 1: 1\n",
@@ -641,7 +641,7 @@
"Copyright (C) 2013-2016, Filipe Brandao\n",
"\n",
">>> vbp2afg...\n",
"VPSolver 3.1.0b0, Copyright (C) 2013-2016, Filipe Brandao\n",
"VPSolver 3.1.1, Copyright (C) 2013-2016, Filipe Brandao\n",
"Build (method = -3)\n",
" #dp: 6\n",
" Step-3' Graph: 7 vertices and 15 arcs (0.00s)\n",
@@ -651,15 +651,15 @@
"Ready! (0.00s)\n",
"\n",
">>> afg2mps...\n",
"VPSolver 3.1.0b0, Copyright (C) 2013-2016, Filipe Brandao\n",
"VPSolver 3.1.1, Copyright (C) 2013-2016, Filipe Brandao\n",
"Generating the .MPS model...DONE!\n",
"\n",
">>> solving the MIP model using GLPK...\n",
"Note: different parameter settings may improve the performance substantially!\n",
"GLPSOL: GLPK LP/MIP Solver, v4.52\n",
"Parameter(s) specified in the command line:\n",
" --mps /tmp/FSigKqCHaY/model.mps --seed 1234 -o /tmp/FSigKqCHaY/sol.out\n",
"Reading problem data from `/tmp/FSigKqCHaY/model.mps'...\n",
" --mps /tmp/oeNOraU7j2/model.mps --seed 1234 -o /tmp/oeNOraU7j2/sol.out\n",
"Reading problem data from `/tmp/oeNOraU7j2/model.mps'...\n",
"Problem: ARCFLOW\n",
"Objective: OBJ\n",
"9 rows, 11 columns, 28 non-zeros\n",
@@ -690,10 +690,10 @@
"INTEGER OPTIMAL SOLUTION FOUND\n",
"Time used: 0.0 secs\n",
"Memory used: 0.1 Mb (54700 bytes)\n",
"Writing MIP solution to `/tmp/FSigKqCHaY/sol.out'...\n",
"Writing MIP solution to `/tmp/oeNOraU7j2/sol.out'...\n",
"\n",
">>> vbpsol...\n",
"VPSolver 3.1.0b0, Copyright (C) 2013-2016, Filipe Brandao\n",
"VPSolver 3.1.1, Copyright (C) 2013-2016, Filipe Brandao\n",
"Objective: 5\n",
"Solution:\n",
"Bins of type 1: 1\n",
@@ -76,7 +76,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"VPSolver 3.1.0b0, Copyright (C) 2013-2016, Filipe Brandao\n",
"VPSolver 3.1.1, Copyright (C) 2013-2016, Filipe Brandao\n",
"Build (method = -3)\n",
" #dp: 140\n",
" Step-3' Graph: 40 vertices and 131 arcs (0.00s)\n",
@@ -2610,7 +2610,7 @@
"Copyright (C) 2013-2016, Filipe Brandao\n",
"\n",
">>> vbp2afg...\n",
"VPSolver 3.1.0b0, Copyright (C) 2013-2016, Filipe Brandao\n",
"VPSolver 3.1.1, Copyright (C) 2013-2016, Filipe Brandao\n",
"Build (method = -3)\n",
" #dp: 140\n",
" Step-3' Graph: 40 vertices and 131 arcs (0.00s)\n",
@@ -2620,15 +2620,15 @@
"Ready! (0.00s)\n",
"\n",
">>> afg2mps...\n",
"VPSolver 3.1.0b0, Copyright (C) 2013-2016, Filipe Brandao\n",
"VPSolver 3.1.1, Copyright (C) 2013-2016, Filipe Brandao\n",
"Generating the .MPS model...DONE!\n",
"\n",
">>> solving the MIP model using GLPK...\n",
"Note: different parameter settings may improve the performance substantially!\n",
"GLPSOL: GLPK LP/MIP Solver, v4.52\n",
"Parameter(s) specified in the command line:\n",
" --mps /tmp/HYoo95hMvR/model.mps --seed 1234 -o /tmp/HYoo95hMvR/sol.out\n",
"Reading problem data from `/tmp/HYoo95hMvR/model.mps'...\n",
" --mps /tmp/GaGjU4PdGl/model.mps --seed 1234 -o /tmp/GaGjU4PdGl/sol.out\n",
"Reading problem data from `/tmp/GaGjU4PdGl/model.mps'...\n",
"Problem: ARCFLOW\n",
"Objective: OBJ\n",
"36 rows, 109 columns, 282 non-zeros\n",
@@ -2660,10 +2660,10 @@
"INTEGER OPTIMAL SOLUTION FOUND\n",
"Time used: 0.0 secs\n",
"Memory used: 0.2 Mb (186829 bytes)\n",
"Writing MIP solution to `/tmp/HYoo95hMvR/sol.out'...\n",
"Writing MIP solution to `/tmp/GaGjU4PdGl/sol.out'...\n",
"\n",
">>> vbpsol...\n",
"VPSolver 3.1.0b0, Copyright (C) 2013-2016, Filipe Brandao\n",
"VPSolver 3.1.1, Copyright (C) 2013-2016, Filipe Brandao\n",
"Objective: 33\n",
"Solution:\n",
"2 x [i=1, i=1, i=2, i=3, i=6]\n",
@@ -2778,7 +2778,7 @@
"Copyright (C) 2013-2016, Filipe Brandao\n",
"\n",
">>> vbp2afg...\n",
"VPSolver 3.1.0b0, Copyright (C) 2013-2016, Filipe Brandao\n",
"VPSolver 3.1.1, Copyright (C) 2013-2016, Filipe Brandao\n",
"Build (method = -3)\n",
" #dp: 140\n",
" Step-3' Graph: 40 vertices and 131 arcs (0.00s)\n",
@@ -2788,15 +2788,15 @@
"Ready! (0.00s)\n",
"\n",
">>> afg2mps...\n",
"VPSolver 3.1.0b0, Copyright (C) 2013-2016, Filipe Brandao\n",
"VPSolver 3.1.1, Copyright (C) 2013-2016, Filipe Brandao\n",
"Generating the .MPS model...DONE!\n",
"\n",
">>> solving the MIP model using GLPK...\n",
"Note: different parameter settings may improve the performance substantially!\n",
"GLPSOL: GLPK LP/MIP Solver, v4.52\n",
"Parameter(s) specified in the command line:\n",
" --mps /tmp/FT17SM0F09/model.mps --seed 1234 -o /tmp/FT17SM0F09/sol.out\n",
"Reading problem data from `/tmp/FT17SM0F09/model.mps'...\n",
" --mps /tmp/Gy5XAxEJD6/model.mps --seed 1234 -o /tmp/Gy5XAxEJD6/sol.out\n",
"Reading problem data from `/tmp/Gy5XAxEJD6/model.mps'...\n",
"Problem: ARCFLOW\n",
"Objective: OBJ\n",
"36 rows, 109 columns, 282 non-zeros\n",
@@ -2828,10 +2828,10 @@
"INTEGER OPTIMAL SOLUTION FOUND\n",
"Time used: 0.0 secs\n",
"Memory used: 0.2 Mb (186829 bytes)\n",
"Writing MIP solution to `/tmp/FT17SM0F09/sol.out'...\n",
"Writing MIP solution to `/tmp/Gy5XAxEJD6/sol.out'...\n",
"\n",
">>> vbpsol...\n",
"VPSolver 3.1.0b0, Copyright (C) 2013-2016, Filipe Brandao\n",
"VPSolver 3.1.1, Copyright (C) 2013-2016, Filipe Brandao\n",
"Objective: 33\n",
"Solution:\n",
"2 x [i=1, i=1, i=2, i=3, i=6]\n",
View
@@ -19,7 +19,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
__version__ = "3.1.1b0"
__version__ = "3.1.1"
from .afgraph import AFGraph
from .vpsolver import VPSolver, VBP, MVP, AFG, MPS, LP
View
@@ -11,7 +11,7 @@
#define PACKAGE_NAME "VPSolver"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "VPSolver 3.1.1b0"
#define PACKAGE_STRING "VPSolver 3.1.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "vpsolver"
@@ -20,7 +20,7 @@
#define PACKAGE_URL "http://vpsolver.dcc.fc.up.pt/"
/* Define to the version of this package. */
#define PACKAGE_VERSION "3.1.1b0"
#define PACKAGE_VERSION "3.1.1"
/* Version number of package */
#define VERSION "3.1.1b0"
#define VERSION "3.1.1"

0 comments on commit dbb7c4f

Please sign in to comment.