diff options
| author | adam <adam> | 2006-05-23 10:17:20 +0000 |
|---|---|---|
| committer | adam <adam> | 2006-05-23 10:17:20 +0000 |
| commit | dc9d00c878e33444caaa823f4249b29cc79ac60e (patch) | |
| tree | d6b056017abf53d4d068d81251c9d607e58c8b54 /math/glpk/patches | |
| parent | 70b2f34764845510aa72d32558a210a04c884ef3 (diff) | |
| download | pkgsrc-dc9d00c878e33444caaa823f4249b29cc79ac60e.tar.gz | |
Changes 4.10:
Cutting planes of two new classes were implemented: mixed cover
cuts and clique cuts. On API level this feature can be enabled
by setting control parameter LPX_K_USECUTS passed to the routine
lpx_intopt. In glpsol this feature is available through the
command-line options --cover and --clique. For more details see
the reference manual.
Now the routines lpx_read_mps and lpx_read_freemps support LI
bound type. It is similar to LO, however, indicates the column
as of integer kind.
Diffstat (limited to 'math/glpk/patches')
| -rw-r--r-- | math/glpk/patches/patch-aa | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/math/glpk/patches/patch-aa b/math/glpk/patches/patch-aa index 0bacebe55e2..d5f77382c3c 100644 --- a/math/glpk/patches/patch-aa +++ b/math/glpk/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.2 2006/02/04 11:54:51 markd Exp $ +$NetBSD: patch-aa,v 1.3 2006/05/23 10:17:20 adam Exp $ ---- src/Makefile.in.orig 2006-01-17 22:00:00.000000000 +1300 +--- src/Makefile.in.orig 2006-05-11 10:00:00.000000000 +0200 +++ src/Makefile.in @@ -65,7 +65,7 @@ VERSION = @VERSION@ @@ -9,10 +9,10 @@ $NetBSD: patch-aa,v 1.2 2006/02/04 11:54:51 markd Exp $ -lib_LIBRARIES = libglpk.a +lib_LIBRARIES = libglpk.la - libglpk_a_SOURCES = glpavl.c glpdmp.c glphbm.c glpiet.c glpinv.c glpios1.c glpios2.c glpios3.c glpipm.c glpipp1.c glpipp2.c glplib1a.c glplib1b.c glplib2.c glplib3.c glplib4.c glplpp1.c glplpp2.c glplpx1.c glplpx2.c glplpx3.c glplpx4.c glplpx5.c glplpx6a.c glplpx6b.c glplpx6c.c glplpx6d.c glplpx7.c glplpx7a.c glplpx8a.c glplpx8b.c glplpx8c.c glplpx8d.c glplpx8e.c glpluf.c glpmat.c glpmip1.c glpmip2.c glpmpl1.c glpmpl2.c glpmpl3.c glpmpl4.c glpqmd.c glprng.c glpspx1.c glpspx2.c glpstr.c glptsp.c + libglpk_a_SOURCES = glpavl.c glpbfi.c glpdmp.c glphbm.c glpiet.c glpinv.c glpios1.c glpios2.c glpios3.c glpipm.c glpipp1.c glpipp2.c glplib1a.c glplib1b.c glplib2.c glplib3.c glplib4.c glplpp1.c glplpp2.c glplpx1.c glplpx2.c glplpx3.c glplpx4.c glplpx5.c glplpx6a.c glplpx6b.c glplpx6c.c glplpx6d.c glplpx7.c glplpx7a.c glplpx7b.c glplpx8a.c glplpx8b.c glplpx8c.c glplpx8d.c glplpx8e.c glpluf.c glpmat.c glpmip1.c glpmip2.c glpmpl1.c glpmpl2.c glpmpl3.c glpmpl4.c glpqmd.c glprng.c glpspx1.c glpspx2.c glpstr.c glptsp.c -@@ -89,9 +89,9 @@ glpmpl1.o glpmpl2.o glpmpl3.o glpmpl4.o - glpspx2.o glpstr.o glptsp.o +@@ -89,9 +89,9 @@ glpmip2.o glpmpl1.o glpmpl2.o glpmpl3.o + glpspx1.o glpspx2.o glpstr.o glptsp.o AR = ar CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.2 2006/02/04 11:54:51 markd Exp $ DIST_COMMON = Makefile.am Makefile.in -@@ -139,15 +139,7 @@ install-libLIBRARIES: $(lib_LIBRARIES) +@@ -140,15 +140,7 @@ install-libLIBRARIES: $(lib_LIBRARIES) $(mkinstalldirs) $(DESTDIR)$(libdir) @list='$(lib_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ @@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.2 2006/02/04 11:54:51 markd Exp $ else :; fi; \ done -@@ -173,10 +165,9 @@ distclean-compile: +@@ -174,10 +166,9 @@ distclean-compile: maintainer-clean-compile: @@ -50,7 +50,7 @@ $NetBSD: patch-aa,v 1.2 2006/02/04 11:54:51 markd Exp $ - $(RANLIB) libglpk.a +libglpk.la: $(libglpk_a_OBJECTS) $(libglpk_a_DEPENDENCIES) + ${LIBTOOL} --mode=link ${CC} -o $@ \ -+ ${libglpk_a_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info 4:9 ++ ${libglpk_a_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info ${subst .,:,${VERSION}} tags: TAGS |