From 1cf6544afd24e3a8247ba987a87bfa29ffdc34b6 Mon Sep 17 00:00:00 2001 From: Stuart Mitchell Date: Fri, 25 Dec 2015 15:12:31 +0900 Subject: [PATCH] version bump --- HISTORY | 2 ++ README.md | 14 +++++++------- src/pulp/constants.py | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/HISTORY b/HISTORY index 1403cec..75f4724 100644 --- a/HISTORY +++ b/HISTORY @@ -1,6 +1,8 @@ # PuLP, Copyright J.S. Roy (js@jeannot.org), 2002-2005 # Copyright S.A.Mitchell (s.mitchell@auckland.ac.nz), 2007- # See the LICENSE file for copyright information. +1.6.1, 2015-12-25 + Fix for dummy variables 1.5.4, 2013-03-18 Added cbc support for osx (hopefully) 1.4.9, 2011-03-30 diff --git a/README.md b/README.md index 9d4c529..41d636e 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ The easiest way to install pulp is via [PyPi](https://pypi.python.org/pypi/PuLP) If pip is available on your system $pip install pulp - + Otherwise follow the download instructions on the PyPi page On Linux and OSX systems the tests must be run to make the default solver executable. @@ -43,7 +43,7 @@ Use LpProblem() to create new problems. Create "myProblem" >>> prob = LpProblem("myProblem", LpMinimize) Combine variables to create expressions and constraints and add them to the -problem. +problem. >>> prob += x + y <= 2 @@ -55,7 +55,7 @@ become the objective. To solve with the default included solver >>> status = prob.solve() - + To use another sovler to solve the problem. >>> status = prob.solve(GLPK(msg = 0)) @@ -74,18 +74,18 @@ Exported Classes: * LpProblem -- Container class for a Linear programming problem * LpVariable -- Variables that are added to constraints in the LP -* LpConstraint -- A constraint of the general form +* LpConstraint -- A constraint of the general form - a1x1+a2x2 ...anxn (<=, =, >=) b + a1x1+a2x2 ...anxn (<=, =, >=) b * LpConstraintVar -- Used to construct a column of the model in column-wise modelling Exported Functions: * value() -- Finds the value of a variable or expression -* lpSum() -- given a list of the form [a1*x1, a2x2, ..., anxn] will construct +* lpSum() -- given a list of the form [a1*x1, a2x2, ..., anxn] will construct a linear expression to be used as a constraint or variable -* lpDot() --given two lists of the form [a1, a2, ..., an] and +* lpDot() --given two lists of the form [a1, a2, ..., an] and [ x1, x2, ..., xn] will construct a linear epression to be used as a constraint or variable diff --git a/src/pulp/constants.py b/src/pulp/constants.py index 18bb1ef..20c56d3 100644 --- a/src/pulp/constants.py +++ b/src/pulp/constants.py @@ -27,7 +27,7 @@ This file contains the constant definitions for PuLP Note that hopefully these will be changed into something more pythonic """ -VERSION = '1.6.0' +VERSION = '1.6.1' EPS = 1e-7 # variable categories