v3.6.0

DrTimothyAldenDavis · Oct 19, 2019 · bb32f8e · bb32f8e
1 parent f15ff39
commit bb32f8e
Show file tree

Hide file tree

Showing 137 changed files with 2,255 additions and 671 deletions.
diff --git a/AMD/Demo/amd_demo.out b/AMD/Demo/amd_demo.out
@@ -1,7 +1,7 @@
-AMD version 2.2, date: Nov 30, 2009
+AMD version 2.2, date: Jan 25, 2011
 AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-AMD version 2.2.1, Nov 30, 2009: approximate minimum degree ordering
+AMD version 2.2.2, Jan 25, 2011: approximate minimum degree ordering
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)
@@ -115,7 +115,7 @@ Plot of input matrix pattern:
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from amd_order: 0 (should be 0)
 
-AMD version 2.2.1, Nov 30, 2009, results:
+AMD version 2.2.2, Jan 25, 2011, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

diff --git a/AMD/Demo/amd_demo2.out b/AMD/Demo/amd_demo2.out
@@ -1,7 +1,7 @@
 AMD demo, with a jumbled version of the 24-by-24
 Harwell/Boeing matrix, can_24:
 
-AMD version 2.2.1, Nov 30, 2009: approximate minimum degree ordering
+AMD version 2.2.2, Jan 25, 2011: approximate minimum degree ordering
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)
@@ -144,7 +144,7 @@ Plot of symmetric matrix to be ordered by amd_order:
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from amd_order: 1 (should be 1)
 
-AMD version 2.2.1, Nov 30, 2009, results:
+AMD version 2.2.2, Jan 25, 2011, results:
     status: OK, but jumbled
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        102

diff --git a/AMD/Demo/amd_l_demo.out b/AMD/Demo/amd_l_demo.out
@@ -1,7 +1,7 @@
-AMD version 2.2, date: Nov 30, 2009
+AMD version 2.2, date: Jan 25, 2011
 AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-AMD version 2.2.1, Nov 30, 2009: approximate minimum degree ordering
+AMD version 2.2.2, Jan 25, 2011: approximate minimum degree ordering
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)
@@ -115,7 +115,7 @@ Plot of input matrix pattern:
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from amd_l_order: 0 (should be 0)
 
-AMD version 2.2.1, Nov 30, 2009, results:
+AMD version 2.2.2, Jan 25, 2011, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

diff --git a/AMD/Doc/ChangeLog b/AMD/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Jan 25, 2011: version 2.2.2
+
+    * minor fix to "make install"
+
 Nov 30, 2009: version 2.2.1
 
     * added "make install" and "make uninstall"

diff --git a/AMD/Include/amd.h b/AMD/Include/amd.h
@@ -398,11 +398,11 @@ void amd_l_info     (double Info [ ]) ;
  * Versions 1.1 and earlier of AMD do not include a #define'd version number.
  */
 
-#define AMD_DATE "Nov 30, 2009"
+#define AMD_DATE "Jan 25, 2011"
 #define AMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define AMD_MAIN_VERSION 2
 #define AMD_SUB_VERSION 2
-#define AMD_SUBSUB_VERSION 1
+#define AMD_SUBSUB_VERSION 2
 #define AMD_VERSION AMD_VERSION_CODE(AMD_MAIN_VERSION,AMD_SUB_VERSION)
 
 #ifdef __cplusplus

diff --git a/AMD/Makefile b/AMD/Makefile
@@ -2,7 +2,7 @@
 # AMD Makefile (for GNU Make or original make)
 #------------------------------------------------------------------------------
 
-VERSION = 2.2.1
+VERSION = 2.2.2
 
 default: demos
 
@@ -71,7 +71,7 @@ mex:
 # install AMD
 install:
 	$(CP) Lib/libamd.a $(INSTALL_LIB)/libamd.$(VERSION).a
-	( cd $(INSTALL_LIB) ; ln -s libamd.$(VERSION).a libamd.a )
+	( cd $(INSTALL_LIB) ; ln -sf libamd.$(VERSION).a libamd.a )
 	$(CP) Include/amd.h $(INSTALL_INCLUDE)
 
 # uninstall AMD

diff --git a/AMD/README.txt b/AMD/README.txt
@@ -1,4 +1,4 @@
-AMD Version 2.2.1, Copyright (c) 2009 by Timothy A.
+AMD, Copyright (c) 2009-2011 by Timothy A.
 Davis, Patrick R. Amestoy, and Iain S. Duff.  All Rights Reserved.
 AMD is available under alternate licences; contact T. Davis for details.
 

diff --git a/BTF/Doc/ChangeLog b/BTF/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Jan 25, 2011: version 1.1.2
+
+    * minor fix to "make install"
+
 Nov 30, 2009: version 1.1.1
 
     * added "make install" and "make uninstall"

diff --git a/BTF/Include/btf.h b/BTF/Include/btf.h
@@ -250,11 +250,11 @@ UF_long btf_l_order (UF_long, UF_long *, UF_long *, double , double *,
  *      #endif
  */
 
-#define BTF_DATE "Nov 30, 2009"
+#define BTF_DATE "Jan 25, 2011"
 #define BTF_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define BTF_MAIN_VERSION 1
 #define BTF_SUB_VERSION 1
-#define BTF_SUBSUB_VERSION 1
+#define BTF_SUBSUB_VERSION 2
 #define BTF_VERSION BTF_VERSION_CODE(BTF_MAIN_VERSION,BTF_SUB_VERSION)
 
 #ifdef __cplusplus

diff --git a/BTF/Makefile b/BTF/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.1.1
+VERSION = 1.1.2
 
 default: library
 
@@ -22,7 +22,7 @@ purge: distclean
 # install BTF
 install:
 	$(CP) Lib/libbtf.a $(INSTALL_LIB)/libbtf.$(VERSION).a
-	( cd $(INSTALL_LIB) ; ln -s libbtf.$(VERSION).a libbtf.a )
+	( cd $(INSTALL_LIB) ; ln -sf libbtf.$(VERSION).a libbtf.a )
 	$(CP) Include/btf.h $(INSTALL_INCLUDE)
 
 # uninstall BTF

diff --git a/BTF/README.txt b/BTF/README.txt
@@ -1,5 +1,4 @@
-BTF Version 1.0, May 31, 2007, by Timothy A. Davis
-Copyright (C) 2004-2007, University of Florida
+BTF, by Timothy A. Davis, Copyright (C) 2004-2011, University of Florida
 BTF is also available under other licenses; contact the author for details.
 http://www.cise.ufl.edu/research/sparse
 

diff --git a/CAMD/Demo/camd_demo.out b/CAMD/Demo/camd_demo.out
@@ -1,7 +1,7 @@
-CAMD version 2.2, date: Nov 30, 2009
+CAMD version 2.2, date: Jan 25, 2011
 CAMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-camd version 2.2, Nov 30, 2009:  approximate minimum degree ordering:
+camd version 2.2, Jan 25, 2011:  approximate minimum degree ordering:
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)

diff --git a/CAMD/Demo/camd_demo2.out b/CAMD/Demo/camd_demo2.out
@@ -1,7 +1,7 @@
 CAMD demo, with a jumbled version of the 24-by-24
 Harwell/Boeing matrix, can_24:
 
-camd version 2.2, Nov 30, 2009:  approximate minimum degree ordering:
+camd version 2.2, Jan 25, 2011:  approximate minimum degree ordering:
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)

diff --git a/CAMD/Demo/camd_l_demo.out b/CAMD/Demo/camd_l_demo.out
@@ -1,7 +1,7 @@
-CAMD version 2.2, date: Nov 30, 2009
+CAMD version 2.2, date: Jan 25, 2011
 CAMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-camd version 2.2, Nov 30, 2009:  approximate minimum degree ordering:
+camd version 2.2, Jan 25, 2011:  approximate minimum degree ordering:
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)

diff --git a/CAMD/Doc/ChangeLog b/CAMD/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Jan 25, 2011: version 2.2.2
+
+    * minor fix to "make install"
+
 Nov 30, 2009: version 2.2.1
 
     * added "make install" and "make uninstall"

diff --git a/CAMD/Include/camd.h b/CAMD/Include/camd.h
@@ -405,11 +405,11 @@ void camd_l_info     (double Info [ ]) ;
  *	#endif
  */
 
-#define CAMD_DATE "Nov 30, 2009"
+#define CAMD_DATE "Jan 25, 2011"
 #define CAMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define CAMD_MAIN_VERSION 2
 #define CAMD_SUB_VERSION 2
-#define CAMD_SUBSUB_VERSION 1
+#define CAMD_SUBSUB_VERSION 2
 #define CAMD_VERSION CAMD_VERSION_CODE(CAMD_MAIN_VERSION,CAMD_SUB_VERSION)
 
 #ifdef __cplusplus

diff --git a/CAMD/Makefile b/CAMD/Makefile
@@ -2,7 +2,7 @@
 # CAMD Makefile (for GNU Make or original make)
 #------------------------------------------------------------------------------
 
-VERSION = 2.2.1
+VERSION = 2.2.2
 
 default: demos
 
@@ -61,7 +61,7 @@ mex:
 # install CAMD
 install:
 	$(CP) Lib/libcamd.a $(INSTALL_LIB)/libcamd.$(VERSION).a
-	( cd $(INSTALL_LIB) ; ln -s libcamd.$(VERSION).a libcamd.a )
+	( cd $(INSTALL_LIB) ; ln -sf libcamd.$(VERSION).a libcamd.a )
 	$(CP) Include/camd.h $(INSTALL_INCLUDE)
 
 # uninstall CAMD

diff --git a/CAMD/README.txt b/CAMD/README.txt
@@ -1,4 +1,4 @@
-CAMD Version 2.2, Copyright (c) 2007 by Timothy A.  Davis, Yanqing Chen,
+CAMD, Copyright (c) 2007-2011 by Timothy A.  Davis, Yanqing Chen,
 Patrick R. Amestoy, and Iain S. Duff.  All Rights Reserved.
 CAMD is available under alternate licences; contact T. Davis for details.
 

diff --git a/CCOLAMD/Demo/ccolamd_example.out b/CCOLAMD/Demo/ccolamd_example.out
@@ -15,7 +15,7 @@ Column 3, with 2 entries:
     row 1
     row 3
 
-ccolamd version 2.7, Nov 30, 2009: OK.  
+ccolamd version 2.7, Jan 25, 2011: OK.  
 ccolamd: number of dense or empty rows ignored:    0
 ccolamd: number of dense or empty columns ignored: 0
 ccolamd: number of garbage collections performed:  0
@@ -38,7 +38,7 @@ Column 3, with 1 entries:
     row 4
 Column 4, with 0 entries:
 
-csymamd version 2.7, Nov 30, 2009: OK.  
+csymamd version 2.7, Jan 25, 2011: OK.  
 csymamd: number of dense or empty rows ignored:    0
 csymamd: number of dense or empty columns ignored: 0
 csymamd: number of garbage collections performed:  0

diff --git a/CCOLAMD/Demo/ccolamd_l_example.out b/CCOLAMD/Demo/ccolamd_l_example.out
@@ -15,7 +15,7 @@ Column 3, with 2 entries:
     row 1
     row 3
 
-ccolamd version 2.7, Nov 30, 2009: OK.  
+ccolamd version 2.7, Jan 25, 2011: OK.  
 ccolamd: number of dense or empty rows ignored:    0
 ccolamd: number of dense or empty columns ignored: 0
 ccolamd: number of garbage collections performed:  0
@@ -38,7 +38,7 @@ Column 3, with 1 entries:
     row 4
 Column 4, with 0 entries:
 
-csymamd version 2.7, Nov 30, 2009: OK.  
+csymamd version 2.7, Jan 25, 2011: OK.  
 csymamd: number of dense or empty rows ignored:    0
 csymamd: number of dense or empty columns ignored: 0
 csymamd: number of garbage collections performed:  0

diff --git a/CCOLAMD/Doc/ChangeLog b/CCOLAMD/Doc/ChangeLog
@@ -1,3 +1,8 @@
+Jan 25, 2011: version 2.7.3
+
+    * minor fix to "make install"
+    * fixed stats [CCOLAMD_EMPTY_ROW] output
+
 Nov 30, 2009: version 2.7.2
 
     * added "make install" and "make uninstall"

diff --git a/CCOLAMD/Include/ccolamd.h b/CCOLAMD/Include/ccolamd.h
@@ -43,11 +43,11 @@ extern "C" {
  *	#endif
  */
 
-#define CCOLAMD_DATE "Nov 30, 2009"
+#define CCOLAMD_DATE "Jan 25, 2011"
 #define CCOLAMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define CCOLAMD_MAIN_VERSION 2
 #define CCOLAMD_SUB_VERSION 7
-#define CCOLAMD_SUBSUB_VERSION 2
+#define CCOLAMD_SUBSUB_VERSION 3
 #define CCOLAMD_VERSION \
 	CCOLAMD_VERSION_CODE(CCOLAMD_MAIN_VERSION,CCOLAMD_SUB_VERSION)
 

diff --git a/CCOLAMD/Makefile b/CCOLAMD/Makefile
@@ -2,7 +2,7 @@
 # CCOLAMD Makefile
 #------------------------------------------------------------------------------
 
-VERSION = 2.7.2
+VERSION = 2.7.3
 
 default: demos
 
@@ -53,7 +53,7 @@ mex:
 # install CCOLAMD
 install:
 	$(CP) Lib/libccolamd.a $(INSTALL_LIB)/libccolamd.$(VERSION).a
-	( cd $(INSTALL_LIB) ; ln -s libccolamd.$(VERSION).a libccolamd.a )
+	( cd $(INSTALL_LIB) ; ln -sf libccolamd.$(VERSION).a libccolamd.a )
 	$(CP) Include/ccolamd.h $(INSTALL_INCLUDE)
 
 # uninstall CCOLAMD

diff --git a/CCOLAMD/README.txt b/CCOLAMD/README.txt
@@ -1,5 +1,5 @@
-CCOLAMD version 2.7: constrained column approximate minimum degree ordering
-Copyright (C) 2005-2007, Univ. of Florida.  Authors: Timothy A. Davis,
+CCOLAMD: constrained column approximate minimum degree ordering
+Copyright (C) 2005-2011, Univ. of Florida.  Authors: Timothy A. Davis,
 Sivasankaran Rajamanickam, and Stefan Larimore.  Closely based on COLAMD by
 Davis, Stefan Larimore, in collaboration with Esmond Ng, and John Gilbert.
 http://www.cise.ufl.edu/research/sparse

diff --git a/CCOLAMD/Source/ccolamd.c b/CCOLAMD/Source/ccolamd.c
@@ -1980,7 +1980,7 @@ PUBLIC Int CCOLAMD_2	    /* returns TRUE if successful, FALSE otherwise */
     /* === Return statistics in stats ======================================= */
 
     stats [CCOLAMD_DENSE_ROW] = ndense_row ;
-    stats [CCOLAMD_DENSE_COL] = nempty_row ;
+    stats [CCOLAMD_EMPTY_ROW] = nempty_row ;        /* fixed in 2.7.3 */
     stats [CCOLAMD_NEWLY_EMPTY_ROW] = nnewlyempty_row ;
     stats [CCOLAMD_DENSE_COL] = ndense_col ;
     stats [CCOLAMD_EMPTY_COL] = nempty_col ;