Changeset 897


Ignore:
Timestamp:
Jan 4, 2008 5:24:45 AM (12 years ago)
Author:
stefan
Message:

update to GLPK 4.25

Location:
ThirdParty/Glpk/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/Glpk/trunk/Makefile.am

    r788 r897  
    4242$(GLPKDIR)/src/glpios04.c \
    4343$(GLPKDIR)/src/glpios05.c \
     44$(GLPKDIR)/src/glpios06.c \
    4445$(GLPKDIR)/src/glpipm.c \
    4546$(GLPKDIR)/src/glpipp01.c \
    … …  
    9091$(GLPKDIR)/src/glpscf.c \
    9192$(GLPKDIR)/src/glpscg.c \
    92 $(GLPKDIR)/src/glpscs.c \
    9393$(GLPKDIR)/src/glpspx01.c \
    9494$(GLPKDIR)/src/glpspx02.c \

  • ThirdParty/Glpk/trunk/Makefile.in

    r872 r897  
    7878        glpbfd.lo glpbfx.lo glpdmp.lo glpfhv.lo glpgmp.lo glphbm.lo \
    7979        glpios01.lo glpios02.lo glpios03.lo glpios04.lo glpios05.lo \
    80         glpipm.lo glpipp01.lo glpipp02.lo glplib01.lo glplib02.lo \
    81         glplib03.lo glplib04.lo glplib05.lo glplib06.lo glplib07.lo \
    82         glplib08.lo glplib09.lo glplpf.lo glplpp01.lo glplpp02.lo \
    83         glplpx01.lo glplpx02.lo glplpx03.lo glplpx04.lo glplpx05.lo \
    84         glplpx06.lo glplpx07.lo glplpx08.lo glplpx09.lo glplpx10.lo \
    85         glplpx11.lo glplpx12.lo glplpx13.lo glplpx14.lo glplpx15.lo \
    86         glplpx16.lo glplpx17.lo glplpx18.lo glplpx19.lo glplpx20.lo \
    87         glpluf.lo glplux.lo glpmat.lo glpmpl01.lo glpmpl02.lo \
    88         glpmpl03.lo glpmpl04.lo glppds.lo glpqmd.lo glprng01.lo \
    89         glprng02.lo glpscf.lo glpscg.lo glpscs.lo glpspx01.lo \
     80        glpios06.lo glpipm.lo glpipp01.lo glpipp02.lo glplib01.lo \
     81        glplib02.lo glplib03.lo glplib04.lo glplib05.lo glplib06.lo \
     82        glplib07.lo glplib08.lo glplib09.lo glplpf.lo glplpp01.lo \
     83        glplpp02.lo glplpx01.lo glplpx02.lo glplpx03.lo glplpx04.lo \
     84        glplpx05.lo glplpx06.lo glplpx07.lo glplpx08.lo glplpx09.lo \
     85        glplpx10.lo glplpx11.lo glplpx12.lo glplpx13.lo glplpx14.lo \
     86        glplpx15.lo glplpx16.lo glplpx17.lo glplpx18.lo glplpx19.lo \
     87        glplpx20.lo glpluf.lo glplux.lo glpmat.lo glpmpl01.lo \
     88        glpmpl02.lo glpmpl03.lo glpmpl04.lo glppds.lo glpqmd.lo \
     89        glprng01.lo glprng02.lo glpscf.lo glpscg.lo glpspx01.lo \
    9090        glpspx02.lo glpssx01.lo glpssx02.lo
    9191libcoinglpk_la_OBJECTS = $(nodist_libcoinglpk_la_OBJECTS)
    … …  
    280280$(GLPKDIR)/src/glpios04.c \
    281281$(GLPKDIR)/src/glpios05.c \
     282$(GLPKDIR)/src/glpios06.c \
    282283$(GLPKDIR)/src/glpipm.c \
    283284$(GLPKDIR)/src/glpipp01.c \
    … …  
    328329$(GLPKDIR)/src/glpscf.c \
    329330$(GLPKDIR)/src/glpscg.c \
    330 $(GLPKDIR)/src/glpscs.c \
    331331$(GLPKDIR)/src/glpspx01.c \
    332332$(GLPKDIR)/src/glpspx02.c \
    … …  
    442442@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpios04.Plo@am__quote@
    443443@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpios05.Plo@am__quote@
     444@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpios06.Plo@am__quote@
    444445@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpipm.Plo@am__quote@
    445446@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpipp01.Plo@am__quote@
    … …  
    490491@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpscf.Plo@am__quote@
    491492@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpscg.Plo@am__quote@
    492 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpscs.Plo@am__quote@
    493493@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpspx01.Plo@am__quote@
    494494@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glpspx02.Plo@am__quote@
    … …  
    685685@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glpios05.lo `test -f '$(GLPKDIR)/src/glpios05.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpios05.c
    686686
     687glpios06.lo: $(GLPKDIR)/src/glpios06.c
     688@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glpios06.lo -MD -MP -MF "$(DEPDIR)/glpios06.Tpo" -c -o glpios06.lo `test -f '$(GLPKDIR)/src/glpios06.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpios06.c; \
     689@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/glpios06.Tpo" "$(DEPDIR)/glpios06.Plo"; else rm -f "$(DEPDIR)/glpios06.Tpo"; exit 1; fi
     690@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(GLPKDIR)/src/glpios06.c' object='glpios06.lo' libtool=yes @AMDEPBACKSLASH@
     691@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     692@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
     693
    687694glpipm.lo: $(GLPKDIR)/src/glpipm.c
    688695@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; \
    … …  
    10201027@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    10211028@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glpscg.lo `test -f '$(GLPKDIR)/src/glpscg.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpscg.c
    1022 
    1023 glpscs.lo: $(GLPKDIR)/src/glpscs.c
    1024 @am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glpscs.lo -MD -MP -MF "$(DEPDIR)/glpscs.Tpo" -c -o glpscs.lo `test -f '$(GLPKDIR)/src/glpscs.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpscs.c; \
    1025 @am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/glpscs.Tpo" "$(DEPDIR)/glpscs.Plo"; else rm -f "$(DEPDIR)/glpscs.Tpo"; exit 1; fi
    1026 @AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(GLPKDIR)/src/glpscs.c' object='glpscs.lo' libtool=yes @AMDEPBACKSLASH@
    1027 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1028 @am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glpscs.lo `test -f '$(GLPKDIR)/src/glpscs.c' || echo '$(srcdir)/'`$(GLPKDIR)/src/glpscs.c
    10291029
    10301030glpspx01.lo: $(GLPKDIR)/src/glpspx01.c

  • ThirdParty/Glpk/trunk/get.Glpk

    r788 r897  
    22
    33set -e
    4 glpk_ver=4.24
     4glpk_ver=4.25
    55
    66wgetcmd=wget

  • ThirdParty/Glpk/trunk/glpk.patch

    r814 r897  
    1 diff -Naur glpk-4.24/include/glpk.h glpk/include/glpk.h
    2 --- glpk-4.24/include/glpk.h    2007-11-21 10:00:00.000000000 +0100
    3 +++ glpk/include/glpk.h 2007-11-26 10:14:41.000000000 +0100
    4 @@ -30,7 +30,7 @@
    5  
    6  /* library version numbers: */
    7  #define GLP_MAJOR_VERSION  4
    8 -#define GLP_MINOR_VERSION  23
    9 +#define GLP_MINOR_VERSION  24
    10  
    11  #ifndef _GLP_PROB
    12  #define _GLP_PROB
    13 diff -Naur glpk-4.24/src/glpapi08.c glpk/src/glpapi08.c
    14 --- glpk-4.24/src/glpapi08.c    2007-11-21 10:00:00.000000000 +0100
    15 +++ glpk/src/glpapi08.c 2007-11-26 10:14:41.000000000 +0100
    16 @@ -345,9 +345,15 @@
     1diff -Naur glpk-4.25/src/glpapi08.c glpk/src/glpapi08.c
     2--- glpk-4.25/src/glpapi08.c    2007-12-19 10:00:00.000000000 +0100
     3+++ glpk/src/glpapi08.c 2008-01-04 11:13:21.000000000 +0100
     4@@ -348,9 +348,15 @@
    175       switch (ret)
    186       {  case 0:
    … …  
    3321             else
    3422             {  if (parm->msg_lev >= GLP_MSG_ALL)
    35 diff -Naur glpk-4.24/src/glpios03.c glpk/src/glpios03.c
    36 --- glpk-4.24/src/glpios03.c    2007-11-21 10:00:00.000000000 +0100
    37 +++ glpk/src/glpios03.c 2007-11-26 10:14:41.000000000 +0100
    38 @@ -1341,7 +1341,7 @@
     23diff -Naur glpk-4.25/src/glpios03.c glpk/src/glpios03.c
     24--- glpk-4.25/src/glpios03.c    2007-12-19 10:00:00.000000000 +0100
     25+++ glpk/src/glpios03.c 2008-01-04 11:13:21.000000000 +0100
     26@@ -1345,7 +1345,7 @@
    3927          {  if (tree->parm->msg_lev >= GLP_MSG_DBG)
    4028                xprintf("Relative gap tolerance reached; search terminat"
    … …  
    4533          }
    4634 #endif
    47 diff -Naur glpk-4.24/src/glpios05.c glpk/src/glpios05.c
    48 --- glpk-4.24/src/glpios05.c    2007-11-21 10:00:00.000000000 +0100
    49 +++ glpk/src/glpios05.c 2007-12-06 15:00:33.000000000 +0100
    50 @@ -1084,7 +1084,16 @@
    51              else
    52              {  /* x'[k] = x[k] - lb[k] * x[kk] */
    53                 jj = mir->cut_vec->pos[kk];
    54 +#if 0
    55                 xassert(jj != 0);
    56 +#else
    57 +               if (jj == 0)
    58 +               {  ios_set_vj(mir->cut_vec, kk, 1.0);
    59 +                  jj = mir->cut_vec->pos[kk];
    60 +                  xassert(jj != 0);
    61 +                  mir->cut_vec->val[jj] = 0.0;
    62 +               }
    63 +#endif
    64                 mir->cut_vec->val[jj] -= mir->cut_vec->val[j] *
    65                    mir->lb[k];
    66              }
Note: See TracChangeset for help on using the changeset viewer.