summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2016-04-12 21:40:47 +0000
committeradam <adam@pkgsrc.org>2016-04-12 21:40:47 +0000
commit0c709c1f007aa7be572fdef94343e55f1a10db4d (patch)
treeff6e789113cf8da9f34613a9cb6e2d9d9b91cccb
parent45164e613a7bc3e6284f3bbce700d4d956a39a88 (diff)
downloadpkgsrc-0c709c1f007aa7be572fdef94343e55f1a10db4d.tar.gz
GLPK 4.60:
Some improvements were made in the primal and dual simplex solvers to make the solution process more numerically stable. An experimental long-step ratio test feature was added to the dual simplex. On API level this feature is available thru the GLP_RT_FLIP option. For glpsol it is available thru the options --flip (for MIP) or --flip and --dual (for LP). This feature is not documented yet. Additional check was added to reject wrong solutions sometimes reported by the PROXY heuristic. A bug (memory leak) was fixed in the FPUMP heuristic routine. The header sql.h was renamed to avoid conflicts with standard ODBC headers.
-rw-r--r--math/glpk/Makefile4
-rw-r--r--math/glpk/distinfo12
-rw-r--r--math/glpk/patches/patch-src_Makefile.in20
3 files changed, 18 insertions, 18 deletions
diff --git a/math/glpk/Makefile b/math/glpk/Makefile
index acea5d7f64d..0e522a21f97 100644
--- a/math/glpk/Makefile
+++ b/math/glpk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2015/11/27 21:00:28 adam Exp $
+# $NetBSD: Makefile,v 1.43 2016/04/12 21:40:47 adam Exp $
-DISTNAME= glpk-4.57
+DISTNAME= glpk-4.60
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GNU:=glpk/}
diff --git a/math/glpk/distinfo b/math/glpk/distinfo
index 19aa475af10..26ed86eb9b7 100644
--- a/math/glpk/distinfo
+++ b/math/glpk/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.36 2015/11/27 21:00:28 adam Exp $
+$NetBSD: distinfo,v 1.37 2016/04/12 21:40:47 adam Exp $
-SHA1 (glpk-4.57.tar.gz) = d2df2de59798c35024df8d140a53453e29a095be
-RMD160 (glpk-4.57.tar.gz) = 10cbe9f5c681d5893739cde1fd9d8c16cf468c73
-SHA512 (glpk-4.57.tar.gz) = 1979e59b96ce359168a81b720207045916f66c5755023b02c2e197e5a713d456165d94f1e40830547dc072de865f94e3b3a4d8e66d5d15aeb93f304f1893fe48
-Size (glpk-4.57.tar.gz) = 3782998 bytes
-SHA1 (patch-src_Makefile.in) = 277e8df4b63147b8bd9c637589df1491d2fa5189
+SHA1 (glpk-4.60.tar.gz) = 4e55a3d2aa38b19c5bdd8a195738dbaf44e91e90
+RMD160 (glpk-4.60.tar.gz) = a1fb4b2730c5f2faad47b9014e2e70c384f63db9
+SHA512 (glpk-4.60.tar.gz) = 521bc48c588318fe6075eb66b1c43465200039f64b105b4a24f9f6eb9bb4742c7ebc96750ce999f64c60d6531486476386467dd41e949f1a00cba0cf00fbe20a
+Size (glpk-4.60.tar.gz) = 4160915 bytes
+SHA1 (patch-src_Makefile.in) = 8acd8cdf567d4e391a4c775b8d9a6ca3f2dba13b
diff --git a/math/glpk/patches/patch-src_Makefile.in b/math/glpk/patches/patch-src_Makefile.in
index ff91a75f514..a34b01b9397 100644
--- a/math/glpk/patches/patch-src_Makefile.in
+++ b/math/glpk/patches/patch-src_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_Makefile.in,v 1.3 2015/11/27 21:00:28 adam Exp $
+$NetBSD: patch-src_Makefile.in,v 1.4 2016/04/12 21:40:47 adam Exp $
Use external zlib.
---- src/Makefile.in.orig 2015-11-08 07:00:00.000000000 +0000
+--- src/Makefile.in.orig 2016-04-01 07:00:00.000000000 +0000
+++ src/Makefile.in
@@ -94,7 +94,7 @@ am__uninstall_files_from_dir = { \
}
@@ -10,10 +10,10 @@ Use external zlib.
LTLIBRARIES = $(lib_LTLIBRARIES)
-libglpk_la_LIBADD =
+libglpk_la_LIBADD = -lz
- am_libglpk_la_OBJECTS = libglpk_la-avl.lo libglpk_la-bfd.lo \
- libglpk_la-bfx.lo libglpk_la-glpapi01.lo \
- libglpk_la-glpapi02.lo libglpk_la-glpapi03.lo \
-@@ -154,14 +154,7 @@ am_libglpk_la_OBJECTS = libglpk_la-avl.l
+ am_libglpk_la_OBJECTS = libglpk_la-bfd.lo libglpk_la-bfx.lo \
+ libglpk_la-glpapi01.lo libglpk_la-glpapi02.lo \
+ libglpk_la-glpapi03.lo libglpk_la-glpapi04.lo \
+@@ -163,14 +163,7 @@ am_libglpk_la_OBJECTS = libglpk_la-bfd.l
libglpk_la-spxchuzc.lo libglpk_la-spxchuzr.lo \
libglpk_la-spxlp.lo libglpk_la-spxnt.lo libglpk_la-spxprim.lo \
libglpk_la-spxprob.lo libglpk_la-spychuzc.lo \
@@ -29,17 +29,17 @@ Use external zlib.
libglpk_la_OBJECTS = $(am_libglpk_la_OBJECTS)
libglpk_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-@@ -315,8 +308,7 @@ libglpk_la_CPPFLAGS = \
- -I$(srcdir)/minisat \
+@@ -327,8 +320,7 @@ libglpk_la_CPPFLAGS = \
-I$(srcdir)/misc \
+ -I$(srcdir)/mpl \
-I$(srcdir)/proxy \
--I$(srcdir)/simplex \
--I$(srcdir)/zlib
+-I$(srcdir)/simplex
libglpk_la_LDFLAGS = \
- -version-info 38:0:2 \
-@@ -459,22 +451,7 @@ simplex/spxprim.c \
+ -version-info 41:0:1 \
+@@ -506,22 +498,7 @@ simplex/spxprim.c \
simplex/spxprob.c \
simplex/spychuzc.c \
simplex/spychuzr.c \