v4.0.0

AMD/Demo/Makefile

@@ -4,11 +4,11 @@
 
 default: amd_simple amd_demo amd_demo2 amd_l_demo
 
-include ../../UFconfig/UFconfig.mk
+include ../../SuiteSparse_config/SuiteSparse_config.mk
 
-C = $(CC) $(CF) -I../Include -I../../UFconfig
+C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
 
-INC = ../Include/amd.h ../../UFconfig/UFconfig.h
+INC = ../Include/amd.h ../../SuiteSparse_config/SuiteSparse_config.h
 
 library:
 	( cd ../Lib ; $(MAKE) )

AMD/Demo/amd_demo.c

@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD Copyright (c) by Timothy A. Davis,				     */
 /* Patrick R. Amestoy, and Iain S. Duff.  See ../README.txt for License.     */
-/* email: davis at cise.ufl.edu    CISE Department, Univ. of Florida.        */
-/* web: http://www.cise.ufl.edu/research/sparse/amd                          */
+/* [email protected], http://www.suitesparse.com                 */
 /* ------------------------------------------------------------------------- */
 
 /* A simple C main program that illustrates the use of the ANSI C interface
@@ -58,8 +57,8 @@ int main (void)
     /* here is an example of how to use AMD_VERSION.  This code will work in
      * any version of AMD. */
 #if defined(AMD_VERSION) && (AMD_VERSION >= AMD_VERSION_CODE(1,2))
-    printf ("AMD version %d.%d, date: %s\n", AMD_MAIN_VERSION, AMD_SUB_VERSION,
-	    AMD_DATE) ;
+    printf ("AMD version %d.%d.%d, date: %s\n",
+        AMD_MAIN_VERSION, AMD_SUB_VERSION, AMD_SUBSUB_VERSION, AMD_DATE) ;
 #else
     printf ("AMD version: 1.1 or earlier\n") ;
 #endif

AMD/Demo/amd_demo.out

@@ -1,7 +1,7 @@
-AMD version 2.2, date: Dec 7, 2011
+AMD version 2.3.0, date: Jun 1, 2012
 AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-AMD version 2.2.3, Dec 7, 2011: approximate minimum degree ordering
+AMD version 2.3.0, Jun 1, 2012: 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.3, Dec 7, 2011, results:
+AMD version 2.3.0, Jun 1, 2012, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

AMD/Demo/amd_demo2.c

@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD Copyright (c) by Timothy A. Davis,				     */
 /* Patrick R. Amestoy, and Iain S. Duff.  See ../README.txt for License.     */
-/* email: davis at cise.ufl.edu    CISE Department, Univ. of Florida.        */
-/* web: http://www.cise.ufl.edu/research/sparse/amd                          */
+/* [email protected], http://www.suitesparse.com                 */
 /* ------------------------------------------------------------------------- */
 
 /* A simple C main program that illustrates the use of the ANSI C interface

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.3, Dec 7, 2011: approximate minimum degree ordering
+AMD version 2.3.0, Jun 1, 2012: 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.3, Dec 7, 2011, results:
+AMD version 2.3.0, Jun 1, 2012, results:
     status: OK, but jumbled
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        102

AMD/Demo/amd_f77cross.f

@@ -4,9 +4,8 @@
 
 C ----------------------------------------------------------------------
 C AMD, Copyright (c) by Timothy A. Davis, Patrick R.
-C Amestoy, and Iain S. Duff.  See ../README.txt for
-C License.  email: davis at cise.ufl.edu    CISE Department, Univ. of
-C Florida.  web: http://www.cise.ufl.edu/research/sparse/amd
+C Amestoy, and Iain S. Duff.  See ../README.txt for License.
+C email: [email protected]
 C ----------------------------------------------------------------------
 
 C This program provides an example of how to call the C version of AMD

AMD/Demo/amd_f77demo.f

@@ -4,9 +4,8 @@
 
 C ----------------------------------------------------------------------
 C AMD, Copyright (c) by Timothy A. Davis, Patrick R.
-C Amestoy, and Iain S. Duff.  See ../README.txt for
-C License.  email: davis at cise.ufl.edu    CISE Department, Univ. of
-C Florida.  web: http://www.cise.ufl.edu/research/sparse/amd
+C Amestoy, and Iain S. Duff.  See ../README.txt for License.
+C email: [email protected]
 C ----------------------------------------------------------------------
 
 C A simple Fortran 77 main program that illustrates the use of the

AMD/Demo/amd_f77simple.f

@@ -1,8 +1,7 @@
 C ----------------------------------------------------------------------
 C AMD, Copyright (c) by Timothy A. Davis, Patrick R.
-C Amestoy, and Iain S. Duff.  See ../README.txt for
-C License.  email: davis at cise.ufl.edu    CISE Department, Univ. of
-C Florida.  web: http://www.cise.ufl.edu/research/sparse/amd
+C Amestoy, and Iain S. Duff.  See ../README.txt for License.
+C email: [email protected]
 C ----------------------------------------------------------------------
 
 C This program provides an example of how to call the Fortran version

AMD/Demo/amd_f77wrapper.c

@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD Copyright (c) by Timothy A. Davis,				     */
 /* Patrick R. Amestoy, and Iain S. Duff.  See ../README.txt for License.     */
-/* email: davis at cise.ufl.edu    CISE Department, Univ. of Florida.        */
-/* web: http://www.cise.ufl.edu/research/sparse/amd                          */
+/* email: [email protected]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* Fortran interface for the C-callable AMD library (int version only).  This

AMD/Demo/amd_l_demo.c

@@ -1,12 +1,11 @@
 /* ========================================================================= */
-/* === AMD demo main program (UF_long integer version) ===================== */
+/* === AMD demo main program (long integer version) ======================== */
 /* ========================================================================= */
 
 /* ------------------------------------------------------------------------- */
 /* AMD Copyright (c) by Timothy A. Davis,				     */
 /* Patrick R. Amestoy, and Iain S. Duff.  See ../README.txt for License.     */
-/* email: davis at cise.ufl.edu    CISE Department, Univ. of Florida.        */
-/* web: http://www.cise.ufl.edu/research/sparse/amd                          */
+/* email: [email protected]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* A simple C main program that illustrates the use of the ANSI C interface
@@ -16,14 +15,14 @@
 #include "amd.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "UFconfig.h"
+#define Long SuiteSparse_long
 
 int main (void)
 {
     /* The symmetric can_24 Harwell/Boeing matrix, including upper and lower
      * triangular parts, and the diagonal entries.  Note that this matrix is
      * 0-based, with row and column indices in the range 0 to n-1. */
-    UF_long n = 24, nz,
+    Long n = 24, nz,
     Ap [ ] = { 0, 9, 15, 21, 27, 33, 39, 48, 57, 61, 70, 76, 82, 88, 94, 100,
 	106, 110, 119, 128, 137, 143, 152, 156, 160 },
     Ai [ ] = {
@@ -52,15 +51,15 @@ int main (void)
 	/* column 22: */    2, 20, 21, 22,
 	/* column 23: */    6, 11, 12, 23 } ;
 
-    UF_long P [24], Pinv [24], i, j, k, jnew, p, inew, result ;
+    Long P [24], Pinv [24], i, j, k, jnew, p, inew, result ;
     double Control [AMD_CONTROL], Info [AMD_INFO] ;
     char A [24][24] ;
 
     /* here is an example of how to use AMD_VERSION.  This code will work in
      * any version of AMD. */
 #if defined(AMD_VERSION) && (AMD_VERSION >= AMD_VERSION_CODE(1,2))
-    printf ("AMD version %d.%d, date: %s\n", AMD_MAIN_VERSION, AMD_SUB_VERSION,
-	    AMD_DATE) ;
+    printf ("AMD version %d.%d.%d, date: %s\n",
+        AMD_MAIN_VERSION, AMD_SUB_VERSION, AMD_SUBSUB_VERSION, AMD_DATE) ;
 #else
     printf ("AMD version: 1.1 or earlier\n") ;
 #endif

AMD/Demo/amd_l_demo.out

@@ -1,7 +1,7 @@
-AMD version 2.2, date: Dec 7, 2011
+AMD version 2.3.0, date: Jun 1, 2012
 AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-AMD version 2.2.3, Dec 7, 2011: approximate minimum degree ordering
+AMD version 2.3.0, Jun 1, 2012: 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.3, Dec 7, 2011, results:
+AMD version 2.3.0, Jun 1, 2012, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

AMD/Demo/amd_simple.c

@@ -1,8 +1,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD Copyright (c) by Timothy A. Davis,				     */
 /* Patrick R. Amestoy, and Iain S. Duff.  See ../README.txt for License.     */
-/* email: davis at cise.ufl.edu    CISE Department, Univ. of Florida.        */
-/* web: http://www.cise.ufl.edu/research/sparse/amd                          */
+/* email: [email protected]                                      */
 /* ------------------------------------------------------------------------- */
 
 #include <stdio.h>