Changeset 1212 for ThirdParty/Glpk/trunk


Ignore:
Timestamp:
Oct 24, 2008 11:01:09 AM (11 years ago)
Author:
stefan
Message:

update to glpk 4.32

Location:
ThirdParty/Glpk/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/INSTALL.Glpk

    r1176 r1212  
    1414You may download
    1515
    16 ftp://ftp.gnu.org/gnu/glpk/glpk-4.31.tar.gz
     16ftp://ftp.gnu.org/gnu/glpk/glpk-4.32.tar.gz
    1717
    1818and unpack it in this directory:
    1919
    20 gunzip glpk-4.31.tar.gz
    21 tar xf glpk-4.31.tar
     20gunzip glpk-4.32.tar.gz
     21tar xf glpk-4.32.tar
    2222
    2323Then you need to rename the directory
    24   glpk-4.31
     24  glpk-4.32
    2525into
    2626  glpk
  • ThirdParty/Glpk/trunk/Makefile.am

    r1176 r1212  
    3737$(GLPKDIR)/src/glpbfx.c \
    3838$(GLPKDIR)/src/glpcli.c \
     39$(GLPKDIR)/src/glpcpx.c \
    3940$(GLPKDIR)/src/glpdmp.c \
    4041$(GLPKDIR)/src/glpfhv.c \
     
    4950$(GLPKDIR)/src/glpios05.c \
    5051$(GLPKDIR)/src/glpios06.c \
     52$(GLPKDIR)/src/glpios07.c \
     53$(GLPKDIR)/src/glpios08.c \
    5154$(GLPKDIR)/src/glpipm.c \
    5255$(GLPKDIR)/src/glpipp01.c \
     
    8184$(GLPKDIR)/src/glplpx13.c \
    8285$(GLPKDIR)/src/glplpx14.c \
    83 $(GLPKDIR)/src/glplpx15.c \
    84 $(GLPKDIR)/src/glplpx16.c \
    85 $(GLPKDIR)/src/glplpx17.c \
    8686$(GLPKDIR)/src/glpluf.c \
    8787$(GLPKDIR)/src/glplux.c \
     
    9292$(GLPKDIR)/src/glpmpl04.c \
    9393$(GLPKDIR)/src/glpmpl05.c \
     94$(GLPKDIR)/src/glpmps01.c \
     95$(GLPKDIR)/src/glpmps02.c \
    9496$(GLPKDIR)/src/glppds.c \
    9597$(GLPKDIR)/src/glpqmd.c \
     98$(GLPKDIR)/src/glprgr.c \
    9699$(GLPKDIR)/src/glprng01.c \
    97100$(GLPKDIR)/src/glprng02.c \
    98 $(GLPKDIR)/src/glprgr.c \
    99101$(GLPKDIR)/src/glpscf.c \
    100102$(GLPKDIR)/src/glpscg.c \
  • ThirdParty/Glpk/trunk/Makefile.in

    r1176 r1212  
    7676        glpapi09.lo glpapi10.lo glpapi11.lo glpapi12.lo glpapi13.lo \
    7777        glpapi14.lo glpapi15.lo glpavl.lo glpbfd.lo glpbfx.lo \
    78         glpcli.lo glpdmp.lo glpfhv.lo glpgmp.lo glphbm.lo glpini01.lo \
    79         glpini02.lo glpios01.lo glpios02.lo glpios03.lo glpios04.lo \
    80         glpios05.lo glpios06.lo glpipm.lo glpipp01.lo glpipp02.lo \
    81         glplib01.lo glplib02.lo glplib03.lo glplib04.lo glplib05.lo \
    82         glplib06.lo glplib07.lo glplib08.lo glplib09.lo glplib10.lo \
    83         glplib11.lo glplib12.lo glplpf.lo glplpp01.lo glplpp02.lo \
    84         glplpx01.lo glplpx02.lo glplpx03.lo glplpx04.lo glplpx05.lo \
    85         glplpx06.lo glplpx07.lo glplpx08.lo glplpx09.lo glplpx10.lo \
    86         glplpx11.lo glplpx12.lo glplpx13.lo glplpx14.lo glplpx15.lo \
    87         glplpx16.lo glplpx17.lo glpluf.lo glplux.lo glpmat.lo \
     78        glpcli.lo glpcpx.lo glpdmp.lo glpfhv.lo glpgmp.lo glphbm.lo \
     79        glpini01.lo glpini02.lo glpios01.lo glpios02.lo glpios03.lo \
     80        glpios04.lo glpios05.lo glpios06.lo glpios07.lo glpios08.lo \
     81        glpipm.lo glpipp01.lo glpipp02.lo glplib01.lo glplib02.lo \
     82        glplib03.lo glplib04.lo glplib05.lo glplib06.lo glplib07.lo \
     83        glplib08.lo glplib09.lo glplib10.lo glplib11.lo glplib12.lo \
     84        glplpf.lo glplpp01.lo glplpp02.lo glplpx01.lo glplpx02.lo \
     85        glplpx03.lo glplpx04.lo glplpx05.lo glplpx06.lo glplpx07.lo \
     86        glplpx08.lo glplpx09.lo glplpx10.lo glplpx11.lo glplpx12.lo \
     87        glplpx13.lo glplpx14.lo glpluf.lo glplux.lo glpmat.lo \
    8888        glpmpl01.lo glpmpl02.lo glpmpl03.lo glpmpl04.lo glpmpl05.lo \
    89         glppds.lo glpqmd.lo glprng01.lo glprng02.lo glprgr.lo \
    90         glpscf.lo glpscg.lo glpscl.lo glpspm.lo glpspx01.lo \
    91         glpspx02.lo glpsql.lo glpssx01.lo glpssx02.lo
     89        glpmps01.lo glpmps02.lo glppds.lo glpqmd.lo glprgr.lo \
     90        glprng01.lo glprng02.lo glpscf.lo glpscg.lo glpscl.lo \
     91        glpspm.lo glpspx01.lo glpspx02.lo glpsql.lo glpssx01.lo \
     92        glpssx02.lo
    9293libcoinglpk_la_OBJECTS = $(nodist_libcoinglpk_la_OBJECTS)
    9394@COIN_BUILD_GLPK_TRUE@am_libcoinglpk_la_rpath =
     
    276277$(GLPKDIR)/src/glpbfx.c \
    277278$(GLPKDIR)/src/glpcli.c \
     279$(GLPKDIR)/src/glpcpx.c \
    278280$(GLPKDIR)/src/glpdmp.c \
    279281$(GLPKDIR)/src/glpfhv.c \
     
    288290$(GLPKDIR)/src/glpios05.c \
    289291$(GLPKDIR)/src/glpios06.c \
     292$(GLPKDIR)/src/glpios07.c \
     293$(GLPKDIR)/src/glpios08.c \
    290294$(GLPKDIR)/src/glpipm.c \
    291295$(GLPKDIR)/src/glpipp01.c \
     
    320324$(GLPKDIR)/src/glplpx13.c \
    321325$(GLPKDIR)/src/glplpx14.c \
    322 $(GLPKDIR)/src/glplpx15.c \
    323 $(GLPKDIR)/src/glplpx16.c \
    324 $(GLPKDIR)/src/glplpx17.c \
    325326$(GLPKDIR)/src/glpluf.c \
    326327$(GLPKDIR)/src/glplux.c \
     
    331332$(GLPKDIR)/src/glpmpl04.c \
    332333$(GLPKDIR)/src/glpmpl05.c \
     334$(GLPKDIR)/src/glpmps01.c \
     335$(GLPKDIR)/src/glpmps02.c \
    333336$(GLPKDIR)/src/glppds.c \
    334337$(GLPKDIR)/src/glpqmd.c \
     338$(GLPKDIR)/src/glprgr.c \
    335339$(GLPKDIR)/src/glprng01.c \
    336340$(GLPKDIR)/src/glprng02.c \
    337 $(GLPKDIR)/src/glprgr.c \
    338341$(GLPKDIR)/src/glpscf.c \
    339342$(GLPKDIR)/src/glpscg.c \
     
    432435@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpbfx.Plo@am__quote@
    433436@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpcli.Plo@am__quote@
     437@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpcpx.Plo@am__quote@
    434438@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpdmp.Plo@am__quote@
    435439@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpfhv.Plo@am__quote@
     
    444448@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpios05.Plo@am__quote@
    445449@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpios06.Plo@am__quote@
     450@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpios07.Plo@am__quote@
     451@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpios08.Plo@am__quote@
    446452@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpipm.Plo@am__quote@
    447453@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpipp01.Plo@am__quote@
     
    476482@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glplpx13.Plo@am__quote@
    477483@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glplpx14.Plo@am__quote@
    478 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glplpx15.Plo@am__quote@
    479 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glplpx16.Plo@am__quote@
    480 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glplpx17.Plo@am__quote@
    481484@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpluf.Plo@am__quote@
    482485@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glplux.Plo@am__quote@
     
    487490@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpmpl04.Plo@am__quote@
    488491@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpmpl05.Plo@am__quote@
     492@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpmps01.Plo@am__quote@
     493@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpmps02.Plo@am__quote@
    489494@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glppds.Plo@am__quote@
    490495@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpqmd.Plo@am__quote@
     
    656661@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glpcli.lo `test -f '$(GLPKDIR)/src/glpcli.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpcli.c
    657662
     663glpcpx.lo: $(GLPKDIR)/src/glpcpx.c
     664@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glpcpx.lo -MD -MP -MF "$(DEPDIR)/glpcpx.Tpo" -c -o glpcpx.lo `test -f '$(GLPKDIR)/src/glpcpx.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpcpx.c; \
     665@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/glpcpx.Tpo" "$(DEPDIR)/glpcpx.Plo"; else rm -f "$(DEPDIR)/glpcpx.Tpo"; exit 1; fi
     666@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(GLPKDIR)/src/glpcpx.c' object='glpcpx.lo' libtool=yes @AMDEPBACKSLASH@
     667@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     668@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glpcpx.lo `test -f '$(GLPKDIR)/src/glpcpx.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpcpx.c
     669
    658670glpdmp.lo: $(GLPKDIR)/src/glpdmp.c
    659671@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glpdmp.lo -MD -MP -MF "$(DEPDIR)/glpdmp.Tpo" -c -o glpdmp.lo `test -f '$(GLPKDIR)/src/glpdmp.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpdmp.c; \
     
    740752@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glpios06.lo `test -f '$(GLPKDIR)/src/glpios06.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpios06.c
    741753
     754glpios07.lo: $(GLPKDIR)/src/glpios07.c
     755@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glpios07.lo -MD -MP -MF "$(DEPDIR)/glpios07.Tpo" -c -o glpios07.lo `test -f '$(GLPKDIR)/src/glpios07.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpios07.c; \
     756@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/glpios07.Tpo" "$(DEPDIR)/glpios07.Plo"; else rm -f "$(DEPDIR)/glpios07.Tpo"; exit 1; fi
     757@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(GLPKDIR)/src/glpios07.c' object='glpios07.lo' libtool=yes @AMDEPBACKSLASH@
     758@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     759@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glpios07.lo `test -f '$(GLPKDIR)/src/glpios07.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpios07.c
     760
     761glpios08.lo: $(GLPKDIR)/src/glpios08.c
     762@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glpios08.lo -MD -MP -MF "$(DEPDIR)/glpios08.Tpo" -c -o glpios08.lo `test -f '$(GLPKDIR)/src/glpios08.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpios08.c; \
     763@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/glpios08.Tpo" "$(DEPDIR)/glpios08.Plo"; else rm -f "$(DEPDIR)/glpios08.Tpo"; exit 1; fi
     764@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(GLPKDIR)/src/glpios08.c' object='glpios08.lo' libtool=yes @AMDEPBACKSLASH@
     765@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     766@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glpios08.lo `test -f '$(GLPKDIR)/src/glpios08.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpios08.c
     767
    742768glpipm.lo: $(GLPKDIR)/src/glpipm.c
    743769@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glpipm.lo -MD -MP -MF "$(DEPDIR)/glpipm.Tpo" -c -o glpipm.lo `test -f '$(GLPKDIR)/src/glpipm.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpipm.c; \
     
    964990@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glplpx14.lo `test -f '$(GLPKDIR)/src/glplpx14.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glplpx14.c
    965991
    966 glplpx15.lo: $(GLPKDIR)/src/glplpx15.c
    967 @am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glplpx15.lo -MD -MP -MF "$(DEPDIR)/glplpx15.Tpo" -c -o glplpx15.lo `test -f '$(GLPKDIR)/src/glplpx15.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glplpx15.c; \
    968 @am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/glplpx15.Tpo" "$(DEPDIR)/glplpx15.Plo"; else rm -f "$(DEPDIR)/glplpx15.Tpo"; exit 1; fi
    969 @AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(GLPKDIR)/src/glplpx15.c' object='glplpx15.lo' libtool=yes @AMDEPBACKSLASH@
    970 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    971 @am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glplpx15.lo `test -f '$(GLPKDIR)/src/glplpx15.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glplpx15.c
    972 
    973 glplpx16.lo: $(GLPKDIR)/src/glplpx16.c
    974 @am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glplpx16.lo -MD -MP -MF "$(DEPDIR)/glplpx16.Tpo" -c -o glplpx16.lo `test -f '$(GLPKDIR)/src/glplpx16.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glplpx16.c; \
    975 @am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/glplpx16.Tpo" "$(DEPDIR)/glplpx16.Plo"; else rm -f "$(DEPDIR)/glplpx16.Tpo"; exit 1; fi
    976 @AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(GLPKDIR)/src/glplpx16.c' object='glplpx16.lo' libtool=yes @AMDEPBACKSLASH@
    977 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    978 @am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glplpx16.lo `test -f '$(GLPKDIR)/src/glplpx16.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glplpx16.c
    979 
    980 glplpx17.lo: $(GLPKDIR)/src/glplpx17.c
    981 @am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glplpx17.lo -MD -MP -MF "$(DEPDIR)/glplpx17.Tpo" -c -o glplpx17.lo `test -f '$(GLPKDIR)/src/glplpx17.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glplpx17.c; \
    982 @am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/glplpx17.Tpo" "$(DEPDIR)/glplpx17.Plo"; else rm -f "$(DEPDIR)/glplpx17.Tpo"; exit 1; fi
    983 @AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(GLPKDIR)/src/glplpx17.c' object='glplpx17.lo' libtool=yes @AMDEPBACKSLASH@
    984 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    985 @am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glplpx17.lo `test -f '$(GLPKDIR)/src/glplpx17.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glplpx17.c
    986 
    987992glpluf.lo: $(GLPKDIR)/src/glpluf.c
    988993@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glpluf.lo -MD -MP -MF "$(DEPDIR)/glpluf.Tpo" -c -o glpluf.lo `test -f '$(GLPKDIR)/src/glpluf.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpluf.c; \
     
    10411046@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glpmpl05.lo `test -f '$(GLPKDIR)/src/glpmpl05.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpmpl05.c
    10421047
     1048glpmps01.lo: $(GLPKDIR)/src/glpmps01.c
     1049@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glpmps01.lo -MD -MP -MF "$(DEPDIR)/glpmps01.Tpo" -c -o glpmps01.lo `test -f '$(GLPKDIR)/src/glpmps01.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpmps01.c; \
     1050@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/glpmps01.Tpo" "$(DEPDIR)/glpmps01.Plo"; else rm -f "$(DEPDIR)/glpmps01.Tpo"; exit 1; fi
     1051@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(GLPKDIR)/src/glpmps01.c' object='glpmps01.lo' libtool=yes @AMDEPBACKSLASH@
     1052@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1053@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glpmps01.lo `test -f '$(GLPKDIR)/src/glpmps01.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpmps01.c
     1054
     1055glpmps02.lo: $(GLPKDIR)/src/glpmps02.c
     1056@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glpmps02.lo -MD -MP -MF "$(DEPDIR)/glpmps02.Tpo" -c -o glpmps02.lo `test -f '$(GLPKDIR)/src/glpmps02.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpmps02.c; \
     1057@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/glpmps02.Tpo" "$(DEPDIR)/glpmps02.Plo"; else rm -f "$(DEPDIR)/glpmps02.Tpo"; exit 1; fi
     1058@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(GLPKDIR)/src/glpmps02.c' object='glpmps02.lo' libtool=yes @AMDEPBACKSLASH@
     1059@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1060@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glpmps02.lo `test -f '$(GLPKDIR)/src/glpmps02.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpmps02.c
     1061
    10431062glppds.lo: $(GLPKDIR)/src/glppds.c
    10441063@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glppds.lo -MD -MP -MF "$(DEPDIR)/glppds.Tpo" -c -o glppds.lo `test -f '$(GLPKDIR)/src/glppds.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glppds.c; \
     
    10551074@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glpqmd.lo `test -f '$(GLPKDIR)/src/glpqmd.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpqmd.c
    10561075
     1076glprgr.lo: $(GLPKDIR)/src/glprgr.c
     1077@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glprgr.lo -MD -MP -MF "$(DEPDIR)/glprgr.Tpo" -c -o glprgr.lo `test -f '$(GLPKDIR)/src/glprgr.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glprgr.c; \
     1078@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/glprgr.Tpo" "$(DEPDIR)/glprgr.Plo"; else rm -f "$(DEPDIR)/glprgr.Tpo"; exit 1; fi
     1079@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(GLPKDIR)/src/glprgr.c' object='glprgr.lo' libtool=yes @AMDEPBACKSLASH@
     1080@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1081@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glprgr.lo `test -f '$(GLPKDIR)/src/glprgr.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glprgr.c
     1082
    10571083glprng01.lo: $(GLPKDIR)/src/glprng01.c
    10581084@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glprng01.lo -MD -MP -MF "$(DEPDIR)/glprng01.Tpo" -c -o glprng01.lo `test -f '$(GLPKDIR)/src/glprng01.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glprng01.c; \
     
    10681094@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    10691095@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glprng02.lo `test -f '$(GLPKDIR)/src/glprng02.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glprng02.c
    1070 
    1071 glprgr.lo: $(GLPKDIR)/src/glprgr.c
    1072 @am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glprgr.lo -MD -MP -MF "$(DEPDIR)/glprgr.Tpo" -c -o glprgr.lo `test -f '$(GLPKDIR)/src/glprgr.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glprgr.c; \
    1073 @am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/glprgr.Tpo" "$(DEPDIR)/glprgr.Plo"; else rm -f "$(DEPDIR)/glprgr.Tpo"; exit 1; fi
    1074 @AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(GLPKDIR)/src/glprgr.c' object='glprgr.lo' libtool=yes @AMDEPBACKSLASH@
    1075 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1076 @am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glprgr.lo `test -f '$(GLPKDIR)/src/glprgr.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glprgr.c
    10771096
    10781097glpscf.lo: $(GLPKDIR)/src/glpscf.c
  • ThirdParty/Glpk/trunk/configure

    r1210 r1212  
    2008520085  echo "$as_me:$LINENO: result: ${majorver}.${minorver}" >&5
    2008620086echo "${ECHO_T}${majorver}.${minorver}" >&6
    20087   if test $majorver != 4 || test $minorver != 31 ; then
     20087  if test $majorver != 4 || test $minorver != 32 ; then
    2008820088    { { echo "$as_me:$LINENO: error: \"Incorrect GLPK version. This build system is made for GLPK 4.31. Please update by rerunning get.GLPK\"" >&5
    2008920089echo "$as_me: error: \"Incorrect GLPK version. This build system is made for GLPK 4.31. Please update by rerunning get.GLPK\"" >&2;}
  • ThirdParty/Glpk/trunk/configure.ac

    r1210 r1212  
    7979  minorver=`awk '/define GLP_MINOR_VERSION/ {print $3}' ${GLPKINCDIR}/glpk.h`
    8080  AC_MSG_RESULT([${majorver}.${minorver}])
    81   if test $majorver != 4 || test $minorver != 31 ; then
     81  if test $majorver != 4 || test $minorver != 32 ; then
    8282    AC_MSG_ERROR(["Incorrect GLPK version. This build system is made for GLPK 4.31. Please update by rerunning get.GLPK"])
    8383  fi
  • ThirdParty/Glpk/trunk/get.Glpk

    r1176 r1212  
    22
    33set -e
    4 glpk_ver=4.31
     4glpk_ver=4.32
    55
    66wgetcmd=wget
  • ThirdParty/Glpk/trunk/glpk.patch

    r1177 r1212  
    1 diff -Naur glpkdummy/src/glpapi08.c glpk/src/glpapi08.c
    2 --- glpkdummy/src/glpapi08.c    Fri Aug 22 08:25:51 2008
    3 +++ glpk/src/glpapi08.c Fri Aug 22 08:31:53 2008
    4 @@ -348,9 +348,15 @@
    5        switch (ret)
    6        {  case 0:
    7              if (tree->mip->mip_stat == GLP_FEAS)
    8 -            {  if (parm->msg_lev >= GLP_MSG_ALL)
    9 -                  xprintf("INTEGER OPTIMAL SOLUTION FOUND\n");
    10 -               tree->mip->mip_stat = GLP_OPT;
    11 +             { if (ios_relative_gap(tree) > 0) {
    12 +                               if (parm->msg_lev >= GLP_MSG_ALL)
    13 +                                       xprintf("INTEGER FEASIBLE SOLUTION FOUND, GAP SMALLER THAN TOLERANCE\n");
    14 +                               tree->mip->mip_stat = GLP_FEAS;
    15 +               } else {
    16 +                       if (parm->msg_lev >= GLP_MSG_ALL)
    17 +                               xprintf("INTEGER OPTIMAL SOLUTION FOUND\n");
    18 +                       tree->mip->mip_stat = GLP_OPT;
    19 +               }
    20              }
    21              else
    22              {  if (parm->msg_lev >= GLP_MSG_ALL)
    23 diff -Naur glpkdummy/src/glpios03.c glpk/src/glpios03.c
    24 --- glpkdummy/src/glpios03.c    Wed Aug 13 04:00:00 2008
    25 +++ glpk/src/glpios03.c Fri Aug 22 08:32:10 2008
    26 @@ -1364,7 +1364,7 @@
    27           {  if (tree->parm->msg_lev >= GLP_MSG_DBG)
    28                 xprintf("Relative gap tolerance reached; search terminat"
    29                    "ed\n");
    30 -            ret = GLP_ETMLIM;
    31 +            ret = 0;
    32              goto done;
    33           }
    34  #endif
    35 diff -Naur glpk/src/glpios03.c.orig glpk/src/glpios03.c
     1diff -Naur glpk/src/glplpx01.c.orig glpk/src/glplpx01.c
    362--- glpk/src/glplpx01.c.orig    2008-09-05 19:44:36.000000000 +0200
    373+++ glpk/src/glplpx01.c 2008-09-05 19:42:45.000000000 +0200
    38 @@ -376,7 +376,7 @@
     4@@ -377,7 +377,7 @@
    395       ret = glp_simplex(lp, &parm);
    406       switch (ret)
Note: See TracChangeset for help on using the changeset viewer.