Merge lp:~logan/ubuntu/trusty/suitesparse/4.2.1-3ubuntu1 into lp:ubuntu/trusty/suitesparse

[Logan Rosen]

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

12. By Logan Rosen on 2013-12-08

* Merge from Debian unstable. Remaining changes:
  - debian/control: Demote libatlas-doc from Recommends to Suggests, as it
    is not in main.
* Upload to unstable.
* Register user guides for KLU, CAMD, SPQR and LDL in doc-base.
* Really fix BLAS/LAPACK dependencies of libsuitesparse-dev
  - remove obsolete ATLAS specialized libraries (Closes: #645846)
  - add virtual package libblas.so as a BLAS alternative (Closes: #645844)
* Remove Daniel Rus Morales from Uploaders, with his consent. Thanks
  Daniel for your work!
* d/rules: do not regenerate d/control automatically, this is
  forbidden
* d/rules: fix get-orig-source rule
* d/control: use canonical URLs for Vcs-* fields
* Mark debug package as Multi-Arch: same
* Ship libsuitesparseconfig.a in the -dev package.
* Bump Standards-Version to 3.9.5, no changes needed.
* New upstream release (Closes: #706709)
  - debian/library-soname.pl: update soversion numbers
* debian/rules: recreate d/control when d/library-sonames.pl is
  modified
* New upstream release (Closes: #653660, #687282)
  - Renamed UFconfig to SuiteSparse_config
  - Update patches to new release
  - debian/library-soname.pl: update soversion numbers

* debian/control.in:
  - fix Maintainer field (Closes: #674266, #674268, #674270, #674271, #674272,
    #674273, #674274, #674275, #674276, #674277, #674278, #674279, #674280,
    #674281)
  - add myself to Uploaders
  - remove obsolete DM-Upload-Allowed flag
* Remove obsolete README.source
* debian/rules: clean *.oo files
* Bump to debhelper compat level 9
* Update debian/copyright
* Remove symbols files: they are useless since we bump the soversion
  at every new upstream release
* Clean up build flags
  - make sure to inject flags from dpkg-buildflags
  - buildflags.diff: new patch to remove spurious flags in upstream build
    system
  - remove -m64 flag on amd64 CPUs (Closes: #701654)
* Fix version in NEWS.Debian, to make lintian happy
* parallel-build.diff: new patch, fixes parallel build
* Multiarchify the package
* Fix BLAS/LAPACK dependencies of libsuitesparse-dev:
  - remove obsolete ATLAS specialized libraries (Closes: #645846)
  - add libopenblas-dev as a BLAS alternative (Closes: #645844)
* Bump to Standards-Version 3.9.4, no changes needed
* Suitesparse_config_Makefile.diff: new patch, creates a PIC version
  of the (small) config code, for embedding in other shared libs
* KLU_Demo_Makefile.diff: new patch, needed for creating the right
  dependencies between shared libraries
* Create a new shared library package for SPQR (Closes: #589296)
* Update README.Debian

=== added directory '.pc'
=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2013-12-08 03:08:50 +0000
@@ -0,0 +1,1 @@
+debian/patches

=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2013-12-08 03:08:50 +0000
@@ -0,0 +1,1 @@
+series

=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2013-12-08 03:08:50 +0000
@@ -0,0 +1,1 @@
+2

=== modified file 'AMD/Demo/Makefile'
--- AMD/Demo/Makefile	2007-05-29 09:36:29 +0000
+++ AMD/Demo/Makefile	2013-12-08 03:08:50 +0000
@@ -4,11 +4,11 @@
 
 default: amd_simple amd_demo amd_demo2 amd_l_demo
 
-include ../../UFconfig/UFconfig.mk
-
-C = $(CC) $(CFLAGS) -I../Include -I../../UFconfig
-
-INC = ../Include/amd.h ../../UFconfig/UFconfig.h
+include ../../SuiteSparse_config/SuiteSparse_config.mk
+
+C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
+
+INC = ../Include/amd.h ../../SuiteSparse_config/SuiteSparse_config.h
 
 library:
 	( cd ../Lib ; $(MAKE) )
@@ -88,3 +88,4 @@
 	- $(RM) amd_f77demo my_amd_f77demo.out
 	- $(RM) amd_f77simple my_amd_f77simple.out
 	- $(RM) amd_f77cross my_amd_f77cross.out
+	- $(RM) -r *.dSYM

=== modified file 'AMD/Demo/amd_demo.c'
--- AMD/Demo/amd_demo.c	2007-05-29 09:36:29 +0000
+++ AMD/Demo/amd_demo.c	2013-12-08 03:08:50 +0000
@@ -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                          */
+/* [e-mail], http://www.suitesparse.com                 */
 /* ------------------------------------------------------------------------- */
 
 /* A simple C main program that illustrates the use of the ANSI C interface
@@ -58,8 +57,8 @@
     /* 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

=== modified file 'AMD/Demo/amd_demo.out'
--- AMD/Demo/amd_demo.out	2007-05-29 09:36:29 +0000
+++ AMD/Demo/amd_demo.out	2013-12-08 03:08:50 +0000
@@ -1,7 +1,7 @@
-AMD version 2.2, date: May 31, 2007
+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.0, May 31, 2007: 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 @@
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from amd_order: 0 (should be 0)
 
-AMD version 2.2.0, May 31, 2007, results:
+AMD version 2.3.0, Jun 1, 2012, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

=== modified file 'AMD/Demo/amd_demo2.c'
--- AMD/Demo/amd_demo2.c	2007-05-29 09:36:29 +0000
+++ AMD/Demo/amd_demo2.c	2013-12-08 03:08:50 +0000
@@ -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                          */
+/* [e-mail], http://www.suitesparse.com                 */
 /* ------------------------------------------------------------------------- */
 
 /* A simple C main program that illustrates the use of the ANSI C interface

=== modified file 'AMD/Demo/amd_demo2.out'
--- AMD/Demo/amd_demo2.out	2007-05-29 09:36:29 +0000
+++ AMD/Demo/amd_demo2.out	2013-12-08 03:08:50 +0000
@@ -1,7 +1,7 @@
 AMD demo, with a jumbled version of the 24-by-24
 Harwell/Boeing matrix, can_24:
 
-AMD version 2.2.0, May 31, 2007: 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 @@
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from amd_order: 1 (should be 1)
 
-AMD version 2.2.0, May 31, 2007, 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

=== modified file 'AMD/Demo/amd_f77cross.f'
--- AMD/Demo/amd_f77cross.f	2007-05-29 09:36:29 +0000
+++ AMD/Demo/amd_f77cross.f	2013-12-08 03:08:50 +0000
@@ -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: [e-mail]
 C ----------------------------------------------------------------------
 
 C This program provides an example of how to call the C version of AMD

=== modified file 'AMD/Demo/amd_f77demo.f'
--- AMD/Demo/amd_f77demo.f	2007-05-29 09:36:29 +0000
+++ AMD/Demo/amd_f77demo.f	2013-12-08 03:08:50 +0000
@@ -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: [e-mail]
 C ----------------------------------------------------------------------
 
 C A simple Fortran 77 main program that illustrates the use of the

=== modified file 'AMD/Demo/amd_f77simple.f'
--- AMD/Demo/amd_f77simple.f	2007-05-29 09:36:29 +0000
+++ AMD/Demo/amd_f77simple.f	2013-12-08 03:08:50 +0000
@@ -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: [e-mail]
 C ----------------------------------------------------------------------
 
 C This program provides an example of how to call the Fortran version

=== modified file 'AMD/Demo/amd_f77wrapper.c'
--- AMD/Demo/amd_f77wrapper.c	2007-05-29 09:36:29 +0000
+++ AMD/Demo/amd_f77wrapper.c	2013-12-08 03:08:50 +0000
@@ -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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* Fortran interface for the C-callable AMD library (int version only).  This

=== modified file 'AMD/Demo/amd_l_demo.c'
--- AMD/Demo/amd_l_demo.c	2007-05-29 09:36:29 +0000
+++ AMD/Demo/amd_l_demo.c	2013-12-08 03:08:50 +0000
@@ -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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* 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 @@
 	/* 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

=== modified file 'AMD/Demo/amd_l_demo.out'
--- AMD/Demo/amd_l_demo.out	2007-05-29 09:36:29 +0000
+++ AMD/Demo/amd_l_demo.out	2013-12-08 03:08:50 +0000
@@ -1,7 +1,7 @@
-AMD version 2.2, date: May 31, 2007
+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.0, May 31, 2007: 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 @@
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from amd_l_order: 0 (should be 0)
 
-AMD version 2.2.0, May 31, 2007, results:
+AMD version 2.3.0, Jun 1, 2012, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

=== modified file 'AMD/Demo/amd_simple.c'
--- AMD/Demo/amd_simple.c	2007-05-29 09:36:29 +0000
+++ AMD/Demo/amd_simple.c	2013-12-08 03:08:50 +0000
@@ -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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 #include <stdio.h>

=== modified file 'AMD/Doc/AMD_UserGuide.pdf'
Binary files AMD/Doc/AMD_UserGuide.pdf	2007-05-29 09:36:29 +0000 and AMD/Doc/AMD_UserGuide.pdf	2013-12-08 03:08:50 +0000 differ
=== modified file 'AMD/Doc/AMD_UserGuide.tex'
--- AMD/Doc/AMD_UserGuide.tex	2007-05-29 09:36:29 +0000
+++ AMD/Doc/AMD_UserGuide.tex	2013-12-08 03:08:50 +0000
@@ -13,15 +13,13 @@
 \begin{document}
 %------------------------------------------------------------------------------
 
-\title{AMD Version 2.2 User Guide}
+\title{AMD User Guide}
 \author{Patrick R. Amestoy\thanks{ENSEEIHT-IRIT,
 2 rue Camichel 31017 Toulouse, France.
 email: [e-mail].  http://www.enseeiht.fr/$\sim$amestoy.}
 \and Timothy A. Davis\thanks{
-Dept.~of Computer and Information Science and Engineering,
-Univ.~of Florida, Gainesville, FL, USA.
-email: [e-mail].
-http://www.cise.ufl.edu/$\sim$davis.
+email: [e-mail],
+http://www.suitesparse.com.
 This work was supported by the National
 Science Foundation, under grants ASC-9111263, DMS-9223088, and CCR-0203270.
 Portions of the work were done while on sabbatical at Stanford University
@@ -34,7 +32,7 @@
 This work was supported by the EPSRC under grant GR/R46441.
 }}
 
-\date{May 31, 2007}
+\date{VERSION 2.3.1, Jun 20, 2012}
 \maketitle
 
 %------------------------------------------------------------------------------
@@ -47,10 +45,7 @@
 \end{abstract}
 %------------------------------------------------------------------------------
 
-Technical report TR-04-002 (revised), CISE Department, University of Florida,
-Gainesville, FL, 2007.
-
-AMD Version 2.2, Copyright\copyright 2007 by Timothy A.
+AMD Copyright\copyright 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.
 
@@ -84,7 +79,7 @@
     and a notice that the code was modified is included.
 
 {\bf Availability:}
-    http://www.cise.ufl.edu/research/sparse/amd
+    http://www.suitesparse.com
 
 {\bf Acknowledgments:}
 
@@ -174,7 +169,7 @@
 %------------------------------------------------------------------------------
 
 In addition to appearing as a Collected Algorithm of the ACM, \newline
-AMD is available at http://www.cise.ufl.edu/research/sparse.
+AMD is available at http://www.suitesparse.com.
 The Fortran version is available as the routine {\tt MC47} in HSL
 (formerly the Harwell Subroutine Library) \cite{hsl:2002}.
 
@@ -212,7 +207,7 @@
 uses several strategies, including a symmetric pivoting strategy, and
 will give you better results if you want to factorize an unsymmetric matrix
 of this type.  Refer to the UMFPACK User Guide for more details, at
-http://www.cise.ufl.edu/research/sparse/umfpack.
+http://www.suitesparse.com.
 
 The AMD mexFunction is much faster than the built-in MATLAB symmetric minimum
 degree ordering methods, SYMAMD and SYMMMD.  Its ordering quality is
@@ -690,7 +685,8 @@
 The following discussion assumes you have the {\tt make} program, either in
 Unix, or in Windows with Cygwin.
 
-System-dependent configurations are in the {\tt ../UFconfig/UFconfig.mk}
+System-dependent configurations are in the
+{\tt ../SuiteSparse\_config/SuiteSparse\_config.mk}
 file.  You can edit that file to customize the compilation.  The default
 settings will work on most systems.
 Sample configuration files are provided
@@ -713,7 +709,8 @@
 Typing {\tt make clean} will remove all but the final compiled libraries
 and demo programs.  Typing {\tt make purge} or {\tt make distclean}
 removes all files not in the original distribution.
-If you compile AMD and then later change the {\tt ../UFconfig/UFconfig.mk} file
+If you compile AMD and then later change the
+{\tt ../SuiteSparse\_config/SuiteSparse\_config.mk} file
 then you should type {\tt make purge} and then {\tt make} to recompile.
 
 When you compile your program that uses the C-callable AMD library,
@@ -731,11 +728,6 @@
 Alternately, type {\tt make} in the {\tt AMD/MATLAB} directory,
 or just use the built-in {\tt amd} in MATLAB 7.3 or later.
 
-If you have MATLAB 7.2 or earlier, you must first edit UFconfig/UFconfig.h to
-remove the "-largeArrayDims" option from the MEX command, prior to
-{\tt make mex} or {\tt make} in the MATLAB directory
-(or just use {\tt amd\_make.m} inside MATLAB.
-
 If you are including AMD as a subset of a larger library and do not want
 to link the C standard I/O library, or if you simply do not need to use
 them, you can safely remove the {\tt amd\_control.c} and {\tt amd\_info.c}
@@ -776,422 +768,7 @@
 and gives details on their use.
 
 {\footnotesize
-\begin{verbatim}
-
-/* ========================================================================= */
-/* === AMD:  approximate minimum degree ordering =========================== */
-/* ========================================================================= */
-
-/* ------------------------------------------------------------------------- */
-/* AMD Version 2.2, Copyright (c) 2007 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                          */
-/* ------------------------------------------------------------------------- */
-
-/* AMD finds a symmetric ordering P of a matrix A so that the Cholesky
- * factorization of P*A*P' has fewer nonzeros and takes less work than the
- * Cholesky factorization of A.  If A is not symmetric, then it performs its
- * ordering on the matrix A+A'.  Two sets of user-callable routines are
- * provided, one for int integers and the other for UF_long integers.
- *
- * The method is based on the approximate minimum degree algorithm, discussed
- * in Amestoy, Davis, and Duff, "An approximate degree ordering algorithm",
- * SIAM Journal of Matrix Analysis and Applications, vol. 17, no. 4, pp.
- * 886-905, 1996.  This package can perform both the AMD ordering (with
- * aggressive absorption), and the AMDBAR ordering (without aggressive
- * absorption) discussed in the above paper.  This package differs from the
- * Fortran codes discussed in the paper:
- *
- *      (1) it can ignore "dense" rows and columns, leading to faster run times
- *      (2) it computes the ordering of A+A' if A is not symmetric
- *      (3) it is followed by a depth-first post-ordering of the assembly tree
- *          (or supernodal elimination tree)
- *
- * For historical reasons, the Fortran versions, amd.f and amdbar.f, have
- * been left (nearly) unchanged.  They compute the identical ordering as
- * described in the above paper.
- */
-
-#ifndef AMD_H
-#define AMD_H
-
-/* make it easy for C++ programs to include AMD */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* get the definition of size_t: */
-#include <stddef.h>
-
-/* define UF_long */
-#include "UFconfig.h"
-
-int amd_order               /* returns AMD_OK, AMD_OK_BUT_JUMBLED,
-                             * AMD_INVALID, or AMD_OUT_OF_MEMORY */
-(
-    int n,                  /* A is n-by-n.  n must be >= 0. */
-    const int Ap [ ],       /* column pointers for A, of size n+1 */
-    const int Ai [ ],       /* row indices of A, of size nz = Ap [n] */
-    int P [ ],              /* output permutation, of size n */
-    double Control [ ],     /* input Control settings, of size AMD_CONTROL */
-    double Info [ ]         /* output Info statistics, of size AMD_INFO */
-) ;
-
-UF_long amd_l_order         /* see above for description of arguments */
-(
-    UF_long n,
-    const UF_long Ap [ ],
-    const UF_long Ai [ ],
-    UF_long P [ ],
-    double Control [ ],
-    double Info [ ]
-) ;
-
-/* Input arguments (not modified):
- *
- *      n: the matrix A is n-by-n.
- *      Ap: an int/UF_long array of size n+1, containing column pointers of A.
- *      Ai: an int/UF_long array of size nz, containing the row indices of A,
- *          where nz = Ap [n].
- *      Control:  a double array of size AMD_CONTROL, containing control
- *          parameters.  Defaults are used if Control is NULL.
- *
- * Output arguments (not defined on input):
- *
- *      P: an int/UF_long array of size n, containing the output permutation. If
- *          row i is the kth pivot row, then P [k] = i.  In MATLAB notation,
- *          the reordered matrix is A (P,P).
- *      Info: a double array of size AMD_INFO, containing statistical
- *          information.  Ignored if Info is NULL.
- *
- * On input, the matrix A is stored in column-oriented form.  The row indices
- * of nonzero entries in column j are stored in Ai [Ap [j] ... Ap [j+1]-1].
- *
- * If the row indices appear in ascending order in each column, and there
- * are no duplicate entries, then amd_order is slightly more efficient in
- * terms of time and memory usage.  If this condition does not hold, a copy
- * of the matrix is created (where these conditions do hold), and the copy is
- * ordered.  This feature is new to v2.0 (v1.2 and earlier required this
- * condition to hold for the input matrix).
- * 
- * Row indices must be in the range 0 to
- * n-1.  Ap [0] must be zero, and thus nz = Ap [n] is the number of nonzeros
- * in A.  The array Ap is of size n+1, and the array Ai is of size nz = Ap [n].
- * The matrix does not need to be symmetric, and the diagonal does not need to
- * be present (if diagonal entries are present, they are ignored except for
- * the output statistic Info [AMD_NZDIAG]).  The arrays Ai and Ap are not
- * modified.  This form of the Ap and Ai arrays to represent the nonzero
- * pattern of the matrix A is the same as that used internally by MATLAB.
- * If you wish to use a more flexible input structure, please see the
- * umfpack_*_triplet_to_col routines in the UMFPACK package, at
- * http://www.cise.ufl.edu/research/sparse/umfpack.
- *
- * Restrictions:  n >= 0.  Ap [0] = 0.  Ap [j] <= Ap [j+1] for all j in the
- *      range 0 to n-1.  nz = Ap [n] >= 0.  Ai [0..nz-1] must be in the range 0
- *      to n-1.  Finally, Ai, Ap, and P must not be NULL.  If any of these
- *      restrictions are not met, AMD returns AMD_INVALID.
- *
- * AMD returns:
- *
- *      AMD_OK if the matrix is valid and sufficient memory can be allocated to
- *          perform the ordering.
- *
- *      AMD_OUT_OF_MEMORY if not enough memory can be allocated.
- *
- *      AMD_INVALID if the input arguments n, Ap, Ai are invalid, or if P is
- *          NULL.
- *
- *      AMD_OK_BUT_JUMBLED if the matrix had unsorted columns, and/or duplicate
- *          entries, but was otherwise valid.
- *
- * The AMD routine first forms the pattern of the matrix A+A', and then
- * computes a fill-reducing ordering, P.  If P [k] = i, then row/column i of
- * the original is the kth pivotal row.  In MATLAB notation, the permuted
- * matrix is A (P,P), except that 0-based indexing is used instead of the
- * 1-based indexing in MATLAB.
- *
- * The Control array is used to set various parameters for AMD.  If a NULL
- * pointer is passed, default values are used.  The Control array is not
- * modified.
- *
- *      Control [AMD_DENSE]:  controls the threshold for "dense" rows/columns.
- *          A dense row/column in A+A' can cause AMD to spend a lot of time in
- *          ordering the matrix.  If Control [AMD_DENSE] >= 0, rows/columns
- *          with more than Control [AMD_DENSE] * sqrt (n) entries are ignored
- *          during the ordering, and placed last in the output order.  The
- *          default value of Control [AMD_DENSE] is 10.  If negative, no
- *          rows/columns are treated as "dense".  Rows/columns with 16 or
- *          fewer off-diagonal entries are never considered "dense".
- *
- *      Control [AMD_AGGRESSIVE]: controls whether or not to use aggressive
- *          absorption, in which a prior element is absorbed into the current
- *          element if is a subset of the current element, even if it is not
- *          adjacent to the current pivot element (refer to Amestoy, Davis,
- *          & Duff, 1996, for more details).  The default value is nonzero,
- *          which means to perform aggressive absorption.  This nearly always
- *          leads to a better ordering (because the approximate degrees are
- *          more accurate) and a lower execution time.  There are cases where
- *          it can lead to a slightly worse ordering, however.  To turn it off,
- *          set Control [AMD_AGGRESSIVE] to 0.
- *
- *      Control [2..4] are not used in the current version, but may be used in
- *          future versions.
- *
- * The Info array provides statistics about the ordering on output.  If it is
- * not present, the statistics are not returned.  This is not an error
- * condition.
- * 
- *      Info [AMD_STATUS]:  the return value of AMD, either AMD_OK,
- *          AMD_OK_BUT_JUMBLED, AMD_OUT_OF_MEMORY, or AMD_INVALID.
- *
- *      Info [AMD_N]: n, the size of the input matrix
- *
- *      Info [AMD_NZ]: the number of nonzeros in A, nz = Ap [n]
- *
- *      Info [AMD_SYMMETRY]:  the symmetry of the matrix A.  It is the number
- *          of "matched" off-diagonal entries divided by the total number of
- *          off-diagonal entries.  An entry A(i,j) is matched if A(j,i) is also
- *          an entry, for any pair (i,j) for which i != j.  In MATLAB notation,
- *              S = spones (A) ;
- *              B = tril (S, -1) + triu (S, 1) ;
- *              symmetry = nnz (B & B') / nnz (B) ;
- *
- *      Info [AMD_NZDIAG]: the number of entries on the diagonal of A.
- *
- *      Info [AMD_NZ_A_PLUS_AT]:  the number of nonzeros in A+A', excluding the
- *          diagonal.  If A is perfectly symmetric (Info [AMD_SYMMETRY] = 1)
- *          with a fully nonzero diagonal, then Info [AMD_NZ_A_PLUS_AT] = nz-n
- *          (the smallest possible value).  If A is perfectly unsymmetric
- *          (Info [AMD_SYMMETRY] = 0, for an upper triangular matrix, for
- *          example) with no diagonal, then Info [AMD_NZ_A_PLUS_AT] = 2*nz
- *          (the largest possible value).
- *
- *      Info [AMD_NDENSE]: the number of "dense" rows/columns of A+A' that were
- *          removed from A prior to ordering.  These are placed last in the
- *          output order P.
- *
- *      Info [AMD_MEMORY]: the amount of memory used by AMD, in bytes.  In the
- *          current version, this is 1.2 * Info  [AMD_NZ_A_PLUS_AT] + 9*n
- *          times the size of an integer.  This is at most 2.4nz + 9n.  This
- *          excludes the size of the input arguments Ai, Ap, and P, which have
- *          a total size of nz + 2*n + 1 integers.
- *
- *      Info [AMD_NCMPA]: the number of garbage collections performed.
- *
- *      Info [AMD_LNZ]: the number of nonzeros in L (excluding the diagonal).
- *          This is a slight upper bound because mass elimination is combined
- *          with the approximate degree update.  It is a rough upper bound if
- *          there are many "dense" rows/columns.  The rest of the statistics,
- *          below, are also slight or rough upper bounds, for the same reasons.
- *          The post-ordering of the assembly tree might also not exactly
- *          correspond to a true elimination tree postordering.
- *
- *      Info [AMD_NDIV]: the number of divide operations for a subsequent LDL'
- *          or LU factorization of the permuted matrix A (P,P).
- *
- *      Info [AMD_NMULTSUBS_LDL]:  the number of multiply-subtract pairs for a
- *          subsequent LDL' factorization of A (P,P).
- *
- *      Info [AMD_NMULTSUBS_LU]:  the number of multiply-subtract pairs for a
- *          subsequent LU factorization of A (P,P), assuming that no numerical
- *          pivoting is required.
- *
- *      Info [AMD_DMAX]:  the maximum number of nonzeros in any column of L,
- *          including the diagonal.
- *
- *      Info [14..19] are not used in the current version, but may be used in
- *          future versions.
- */    
-
-/* ------------------------------------------------------------------------- */
-/* direct interface to AMD */
-/* ------------------------------------------------------------------------- */
-
-/* amd_2 is the primary AMD ordering routine.  It is not meant to be
- * user-callable because of its restrictive inputs and because it destroys
- * the user's input matrix.  It does not check its inputs for errors, either.
- * However, if you can work with these restrictions it can be faster than
- * amd_order and use less memory (assuming that you can create your own copy
- * of the matrix for AMD to destroy).  Refer to AMD/Source/amd_2.c for a
- * description of each parameter. */
-
-void amd_2
-(
-    int n,
-    int Pe [ ],
-    int Iw [ ],
-    int Len [ ],
-    int iwlen,
-    int pfree,
-    int Nv [ ],
-    int Next [ ], 
-    int Last [ ],
-    int Head [ ],
-    int Elen [ ],
-    int Degree [ ],
-    int W [ ],
-    double Control [ ],
-    double Info [ ]
-) ;
-
-void amd_l2
-(
-    UF_long n,
-    UF_long Pe [ ],
-    UF_long Iw [ ],
-    UF_long Len [ ],
-    UF_long iwlen,
-    UF_long pfree,
-    UF_long Nv [ ],
-    UF_long Next [ ], 
-    UF_long Last [ ],
-    UF_long Head [ ],
-    UF_long Elen [ ],
-    UF_long Degree [ ],
-    UF_long W [ ],
-    double Control [ ],
-    double Info [ ]
-) ;
-
-/* ------------------------------------------------------------------------- */
-/* amd_valid */
-/* ------------------------------------------------------------------------- */
-
-/* Returns AMD_OK or AMD_OK_BUT_JUMBLED if the matrix is valid as input to
- * amd_order; the latter is returned if the matrix has unsorted and/or
- * duplicate row indices in one or more columns.  Returns AMD_INVALID if the
- * matrix cannot be passed to amd_order.  For amd_order, the matrix must also
- * be square.  The first two arguments are the number of rows and the number
- * of columns of the matrix.  For its use in AMD, these must both equal n.
- *
- * NOTE: this routine returned TRUE/FALSE in v1.2 and earlier.
- */
-
-int amd_valid
-(
-    int n_row,              /* # of rows */
-    int n_col,              /* # of columns */
-    const int Ap [ ],       /* column pointers, of size n_col+1 */
-    const int Ai [ ]        /* row indices, of size Ap [n_col] */
-) ;
-
-UF_long amd_l_valid
-(
-    UF_long n_row,
-    UF_long n_col,
-    const UF_long Ap [ ],
-    const UF_long Ai [ ]
-) ;
-
-/* ------------------------------------------------------------------------- */
-/* AMD memory manager and printf routines */
-/* ------------------------------------------------------------------------- */
-
-/* The user can redefine these to change the malloc, free, and printf routines
- * that AMD uses. */
-
-#ifndef EXTERN
-#define EXTERN extern
-#endif
-
-EXTERN void *(*amd_malloc) (size_t) ;               /* pointer to malloc */
-EXTERN void (*amd_free) (void *) ;                  /* pointer to free */
-EXTERN void *(*amd_realloc) (void *, size_t) ;      /* pointer to realloc */
-EXTERN void *(*amd_calloc) (size_t, size_t) ;       /* pointer to calloc */
-EXTERN int (*amd_printf) (const char *, ...) ;      /* pointer to printf */
-
-/* ------------------------------------------------------------------------- */
-/* AMD Control and Info arrays */
-/* ------------------------------------------------------------------------- */
-
-/* amd_defaults:  sets the default control settings */
-void amd_defaults   (double Control [ ]) ;
-void amd_l_defaults (double Control [ ]) ;
-
-/* amd_control: prints the control settings */
-void amd_control    (double Control [ ]) ;
-void amd_l_control  (double Control [ ]) ;
-
-/* amd_info: prints the statistics */
-void amd_info       (double Info [ ]) ;
-void amd_l_info     (double Info [ ]) ;
-
-#define AMD_CONTROL 5       /* size of Control array */
-#define AMD_INFO 20         /* size of Info array */
-
-/* contents of Control */
-#define AMD_DENSE 0         /* "dense" if degree > Control [0] * sqrt (n) */
-#define AMD_AGGRESSIVE 1    /* do aggressive absorption if Control [1] != 0 */
-
-/* default Control settings */
-#define AMD_DEFAULT_DENSE 10.0      /* default "dense" degree 10*sqrt(n) */
-#define AMD_DEFAULT_AGGRESSIVE 1    /* do aggressive absorption by default */
-
-/* contents of Info */
-#define AMD_STATUS 0        /* return value of amd_order and amd_l_order */
-#define AMD_N 1             /* A is n-by-n */
-#define AMD_NZ 2            /* number of nonzeros in A */ 
-#define AMD_SYMMETRY 3      /* symmetry of pattern (1 is sym., 0 is unsym.) */
-#define AMD_NZDIAG 4        /* # of entries on diagonal */
-#define AMD_NZ_A_PLUS_AT 5  /* nz in A+A' */
-#define AMD_NDENSE 6        /* number of "dense" rows/columns in A */
-#define AMD_MEMORY 7        /* amount of memory used by AMD */
-#define AMD_NCMPA 8         /* number of garbage collections in AMD */
-#define AMD_LNZ 9           /* approx. nz in L, excluding the diagonal */
-#define AMD_NDIV 10         /* number of fl. point divides for LU and LDL' */
-#define AMD_NMULTSUBS_LDL 11 /* number of fl. point (*,-) pairs for LDL' */
-#define AMD_NMULTSUBS_LU 12  /* number of fl. point (*,-) pairs for LU */
-#define AMD_DMAX 13          /* max nz. in any column of L, incl. diagonal */
-
-/* ------------------------------------------------------------------------- */
-/* return values of AMD */
-/* ------------------------------------------------------------------------- */
-
-#define AMD_OK 0                /* success */
-#define AMD_OUT_OF_MEMORY -1    /* malloc failed, or problem too large */
-#define AMD_INVALID -2          /* input arguments are not valid */
-#define AMD_OK_BUT_JUMBLED 1    /* input matrix is OK for amd_order, but
-    * columns were not sorted, and/or duplicate entries were present.  AMD had
-    * to do extra work before ordering the matrix.  This is a warning, not an
-    * error.  */
-
-/* ========================================================================== */
-/* === AMD version ========================================================== */
-/* ========================================================================== */
-
-/* AMD Version 1.2 and later include the following definitions.
- * As an example, to test if the version you are using is 1.2 or later:
- *
- * #ifdef AMD_VERSION
- *      if (AMD_VERSION >= AMD_VERSION_CODE (1,2)) ...
- * #endif
- *
- * This also works during compile-time:
- *
- *      #if defined(AMD_VERSION) && (AMD_VERSION >= AMD_VERSION_CODE (1,2))
- *          printf ("This is version 1.2 or later\n") ;
- *      #else
- *          printf ("This is an early version\n") ;
- *      #endif
- *
- * Versions 1.1 and earlier of AMD do not include a #define'd version number.
- */
-
-#define AMD_DATE "May 31, 2007"
-#define AMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
-#define AMD_MAIN_VERSION 2
-#define AMD_SUB_VERSION 2
-#define AMD_SUBSUB_VERSION 0
-#define AMD_VERSION AMD_VERSION_CODE(AMD_MAIN_VERSION,AMD_SUB_VERSION)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-#endif
-\end{verbatim}
+\input{amd_h.tex}
 }
 
 

=== modified file 'AMD/Doc/ChangeLog'
--- AMD/Doc/ChangeLog	2007-05-29 09:36:29 +0000
+++ AMD/Doc/ChangeLog	2013-12-08 03:08:50 +0000
@@ -1,3 +1,27 @@
+Jun 20, 2012: verison 2.3.1
+
+    * minor update for Windows (removed filesep)
+
+Jun 1, 2012: version 2.3.0
+
+    * changed from UFconfig to SuiteSparse_config
+
+May 15, 2011: version 2.2.4
+
+    * minor fix to SIZE_T_MAX definition (finicky compiler workaround)
+
+Dec 7, 2011: version 2.2.3
+
+    * fixed the Makefile to better align with CFLAGS and other standards
+
+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"
+
 May 31, 2007: version 2.2.0
 
     * port to 64-bit MATLAB

=== modified file 'AMD/Doc/License'
--- AMD/Doc/License	2007-05-29 09:36:29 +0000
+++ AMD/Doc/License	2013-12-08 03:08:50 +0000
@@ -34,6 +34,6 @@
 
 Availability:
 
-    http://www.cise.ufl.edu/research/sparse/amd
+    http://www.suitesparse.com
 
 -------------------------------------------------------------------------------

=== modified file 'AMD/Doc/Makefile'
--- AMD/Doc/Makefile	2006-12-22 10:16:15 +0000
+++ AMD/Doc/Makefile	2013-12-08 03:08:50 +0000
@@ -4,7 +4,7 @@
 
 default: dist
 
-include ../../UFconfig/UFconfig.mk
+include ../../SuiteSparse_config/SuiteSparse_config.mk
 
 #------------------------------------------------------------------------------
 # Remove all but the files in the original distribution
@@ -22,12 +22,15 @@
 # Create the User Guide and Quick Start Guide
 #------------------------------------------------------------------------------
 
-AMD_UserGuide.pdf: AMD_UserGuide.tex AMD_UserGuide.bib
+AMD_UserGuide.pdf: AMD_UserGuide.tex AMD_UserGuide.bib ../Include/amd.h
+	echo '\\begin{verbatim}' > amd_h.tex
+	expand -8 ../Include/amd.h >> amd_h.tex
+	echo '\end{verbatim}' >> amd_h.tex
 	pdflatex AMD_UserGuide
 	bibtex AMD_UserGuide
 	pdflatex AMD_UserGuide
 	pdflatex AMD_UserGuide
 
 dist:  AMD_UserGuide.pdf
-	- $(RM) *.aux *.bbl *.blg *.log *.toc
+	- $(RM) *.aux *.bbl *.blg *.log *.toc amd_h.tex
 

=== modified file 'AMD/Include/amd.h'
--- AMD/Include/amd.h	2007-05-29 09:36:29 +0000
+++ AMD/Include/amd.h	2013-12-08 03:08:50 +0000
@@ -5,15 +5,14 @@
 /* ------------------------------------------------------------------------- */
 /* AMD Version 2.2, Copyright (c) 2007 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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* AMD finds a symmetric ordering P of a matrix A so that the Cholesky
  * factorization of P*A*P' has fewer nonzeros and takes less work than the
  * Cholesky factorization of A.  If A is not symmetric, then it performs its
  * ordering on the matrix A+A'.  Two sets of user-callable routines are
- * provided, one for int integers and the other for UF_long integers.
+ * provided, one for int integers and the other for SuiteSparse_long integers.
  *
  * The method is based on the approximate minimum degree algorithm, discussed
  * in Amestoy, Davis, and Duff, "An approximate degree ordering algorithm",
@@ -23,10 +22,10 @@
  * absorption) discussed in the above paper.  This package differs from the
  * Fortran codes discussed in the paper:
  *
- *	(1) it can ignore "dense" rows and columns, leading to faster run times
- *	(2) it computes the ordering of A+A' if A is not symmetric
- *	(3) it is followed by a depth-first post-ordering of the assembly tree
- *	    (or supernodal elimination tree)
+ *       (1) it can ignore "dense" rows and columns, leading to faster run times
+ *       (2) it computes the ordering of A+A' if A is not symmetric
+ *       (3) it is followed by a depth-first post-ordering of the assembly tree
+ *           (or supernodal elimination tree)
  *
  * For historical reasons, the Fortran versions, amd.f and amdbar.f, have
  * been left (nearly) unchanged.  They compute the identical ordering as
@@ -44,46 +43,46 @@
 /* get the definition of size_t: */
 #include <stddef.h>
 
-/* define UF_long */
-#include "UFconfig.h"
+#include "SuiteSparse_config.h"
 
-int amd_order		    /* returns AMD_OK, AMD_OK_BUT_JUMBLED,
-			     * AMD_INVALID, or AMD_OUT_OF_MEMORY */
+int amd_order                  /* returns AMD_OK, AMD_OK_BUT_JUMBLED,
+                                * AMD_INVALID, or AMD_OUT_OF_MEMORY */
 (
-    int n,		    /* A is n-by-n.  n must be >= 0. */
-    const int Ap [ ],	    /* column pointers for A, of size n+1 */
-    const int Ai [ ],	    /* row indices of A, of size nz = Ap [n] */
-    int P [ ],		    /* output permutation, of size n */
-    double Control [ ],	    /* input Control settings, of size AMD_CONTROL */
-    double Info [ ]	    /* output Info statistics, of size AMD_INFO */
+    int n,                     /* A is n-by-n.  n must be >= 0. */
+    const int Ap [ ],          /* column pointers for A, of size n+1 */
+    const int Ai [ ],          /* row indices of A, of size nz = Ap [n] */
+    int P [ ],                 /* output permutation, of size n */
+    double Control [ ],        /* input Control settings, of size AMD_CONTROL */
+    double Info [ ]            /* output Info statistics, of size AMD_INFO */
 ) ;
 
-UF_long amd_l_order	    /* see above for description of arguments */
+SuiteSparse_long amd_l_order    /* see above for description of arguments */
 (
-    UF_long n,
-    const UF_long Ap [ ],
-    const UF_long Ai [ ],
-    UF_long P [ ],
+    SuiteSparse_long n,
+    const SuiteSparse_long Ap [ ],
+    const SuiteSparse_long Ai [ ],
+    SuiteSparse_long P [ ],
     double Control [ ],
     double Info [ ]
 ) ;
 
 /* Input arguments (not modified):
  *
- *	n: the matrix A is n-by-n.
- *	Ap: an int/UF_long array of size n+1, containing column pointers of A.
- *	Ai: an int/UF_long array of size nz, containing the row indices of A,
- *	    where nz = Ap [n].
- *	Control:  a double array of size AMD_CONTROL, containing control
- *	    parameters.  Defaults are used if Control is NULL.
+ *       n: the matrix A is n-by-n.
+ *       Ap: an int/SuiteSparse_long array of size n+1, containing column
+ *              pointers of A.
+ *       Ai: an int/SuiteSparse_long array of size nz, containing the row
+ *              indices of A, where nz = Ap [n].
+ *       Control:  a double array of size AMD_CONTROL, containing control
+ *           parameters.  Defaults are used if Control is NULL.
  *
  * Output arguments (not defined on input):
  *
- *	P: an int/UF_long array of size n, containing the output permutation. If
- *	    row i is the kth pivot row, then P [k] = i.  In MATLAB notation,
- *	    the reordered matrix is A (P,P).
- *	Info: a double array of size AMD_INFO, containing statistical
- *	    information.  Ignored if Info is NULL.
+ *       P: an int/SuiteSparse_long array of size n, containing the output
+ *           permutation. If row i is the kth pivot row, then P [k] = i.  In
+ *           MATLAB notation, the reordered matrix is A (P,P).
+ *       Info: a double array of size AMD_INFO, containing statistical
+ *           information.  Ignored if Info is NULL.
  *
  * On input, the matrix A is stored in column-oriented form.  The row indices
  * of nonzero entries in column j are stored in Ai [Ap [j] ... Ap [j+1]-1].
@@ -105,25 +104,25 @@
  * pattern of the matrix A is the same as that used internally by MATLAB.
  * If you wish to use a more flexible input structure, please see the
  * umfpack_*_triplet_to_col routines in the UMFPACK package, at
- * http://www.cise.ufl.edu/research/sparse/umfpack.
+ * http://www.suitesparse.com.
  *
  * Restrictions:  n >= 0.  Ap [0] = 0.  Ap [j] <= Ap [j+1] for all j in the
- *	range 0 to n-1.  nz = Ap [n] >= 0.  Ai [0..nz-1] must be in the range 0
- *	to n-1.  Finally, Ai, Ap, and P must not be NULL.  If any of these
- *	restrictions are not met, AMD returns AMD_INVALID.
+ *       range 0 to n-1.  nz = Ap [n] >= 0.  Ai [0..nz-1] must be in the range 0
+ *       to n-1.  Finally, Ai, Ap, and P must not be NULL.  If any of these
+ *       restrictions are not met, AMD returns AMD_INVALID.
  *
  * AMD returns:
  *
- *	AMD_OK if the matrix is valid and sufficient memory can be allocated to
- *	    perform the ordering.
- *
- *	AMD_OUT_OF_MEMORY if not enough memory can be allocated.
- *
- *	AMD_INVALID if the input arguments n, Ap, Ai are invalid, or if P is
- *	    NULL.
- *
- *	AMD_OK_BUT_JUMBLED if the matrix had unsorted columns, and/or duplicate
- *	    entries, but was otherwise valid.
+ *       AMD_OK if the matrix is valid and sufficient memory can be allocated to
+ *           perform the ordering.
+ *
+ *       AMD_OUT_OF_MEMORY if not enough memory can be allocated.
+ *
+ *       AMD_INVALID if the input arguments n, Ap, Ai are invalid, or if P is
+ *           NULL.
+ *
+ *       AMD_OK_BUT_JUMBLED if the matrix had unsorted columns, and/or duplicate
+ *           entries, but was otherwise valid.
  *
  * The AMD routine first forms the pattern of the matrix A+A', and then
  * computes a fill-reducing ordering, P.  If P [k] = i, then row/column i of
@@ -135,93 +134,93 @@
  * pointer is passed, default values are used.  The Control array is not
  * modified.
  *
- *	Control [AMD_DENSE]:  controls the threshold for "dense" rows/columns.
- *	    A dense row/column in A+A' can cause AMD to spend a lot of time in
- *	    ordering the matrix.  If Control [AMD_DENSE] >= 0, rows/columns
- *	    with more than Control [AMD_DENSE] * sqrt (n) entries are ignored
- *	    during the ordering, and placed last in the output order.  The
- *	    default value of Control [AMD_DENSE] is 10.  If negative, no
- *	    rows/columns are treated as "dense".  Rows/columns with 16 or
- *	    fewer off-diagonal entries are never considered "dense".
- *
- *	Control [AMD_AGGRESSIVE]: controls whether or not to use aggressive
- *	    absorption, in which a prior element is absorbed into the current
- *	    element if is a subset of the current element, even if it is not
- *	    adjacent to the current pivot element (refer to Amestoy, Davis,
- *	    & Duff, 1996, for more details).  The default value is nonzero,
- *	    which means to perform aggressive absorption.  This nearly always
- *	    leads to a better ordering (because the approximate degrees are
- *	    more accurate) and a lower execution time.  There are cases where
- *	    it can lead to a slightly worse ordering, however.  To turn it off,
- *	    set Control [AMD_AGGRESSIVE] to 0.
- *
- *	Control [2..4] are not used in the current version, but may be used in
- *	    future versions.
+ *       Control [AMD_DENSE]:  controls the threshold for "dense" rows/columns.
+ *           A dense row/column in A+A' can cause AMD to spend a lot of time in
+ *           ordering the matrix.  If Control [AMD_DENSE] >= 0, rows/columns
+ *           with more than Control [AMD_DENSE] * sqrt (n) entries are ignored
+ *           during the ordering, and placed last in the output order.  The
+ *           default value of Control [AMD_DENSE] is 10.  If negative, no
+ *           rows/columns are treated as "dense".  Rows/columns with 16 or
+ *           fewer off-diagonal entries are never considered "dense".
+ *
+ *       Control [AMD_AGGRESSIVE]: controls whether or not to use aggressive
+ *           absorption, in which a prior element is absorbed into the current
+ *           element if is a subset of the current element, even if it is not
+ *           adjacent to the current pivot element (refer to Amestoy, Davis,
+ *           & Duff, 1996, for more details).  The default value is nonzero,
+ *           which means to perform aggressive absorption.  This nearly always
+ *           leads to a better ordering (because the approximate degrees are
+ *           more accurate) and a lower execution time.  There are cases where
+ *           it can lead to a slightly worse ordering, however.  To turn it off,
+ *           set Control [AMD_AGGRESSIVE] to 0.
+ *
+ *       Control [2..4] are not used in the current version, but may be used in
+ *           future versions.
  *
  * The Info array provides statistics about the ordering on output.  If it is
  * not present, the statistics are not returned.  This is not an error
  * condition.
  * 
- *	Info [AMD_STATUS]:  the return value of AMD, either AMD_OK,
- *	    AMD_OK_BUT_JUMBLED, AMD_OUT_OF_MEMORY, or AMD_INVALID.
- *
- *	Info [AMD_N]: n, the size of the input matrix
- *
- *	Info [AMD_NZ]: the number of nonzeros in A, nz = Ap [n]
- *
- *	Info [AMD_SYMMETRY]:  the symmetry of the matrix A.  It is the number
- *	    of "matched" off-diagonal entries divided by the total number of
- *	    off-diagonal entries.  An entry A(i,j) is matched if A(j,i) is also
- *	    an entry, for any pair (i,j) for which i != j.  In MATLAB notation,
- *		S = spones (A) ;
- *		B = tril (S, -1) + triu (S, 1) ;
- *		symmetry = nnz (B & B') / nnz (B) ;
- *
- *	Info [AMD_NZDIAG]: the number of entries on the diagonal of A.
- *
- *	Info [AMD_NZ_A_PLUS_AT]:  the number of nonzeros in A+A', excluding the
- *	    diagonal.  If A is perfectly symmetric (Info [AMD_SYMMETRY] = 1)
- *	    with a fully nonzero diagonal, then Info [AMD_NZ_A_PLUS_AT] = nz-n
- *	    (the smallest possible value).  If A is perfectly unsymmetric
- *	    (Info [AMD_SYMMETRY] = 0, for an upper triangular matrix, for
- *	    example) with no diagonal, then Info [AMD_NZ_A_PLUS_AT] = 2*nz
- *	    (the largest possible value).
- *
- *	Info [AMD_NDENSE]: the number of "dense" rows/columns of A+A' that were
- *	    removed from A prior to ordering.  These are placed last in the
- *	    output order P.
- *
- *	Info [AMD_MEMORY]: the amount of memory used by AMD, in bytes.  In the
- *	    current version, this is 1.2 * Info  [AMD_NZ_A_PLUS_AT] + 9*n
- *	    times the size of an integer.  This is at most 2.4nz + 9n.  This
- *	    excludes the size of the input arguments Ai, Ap, and P, which have
- *	    a total size of nz + 2*n + 1 integers.
- *
- *	Info [AMD_NCMPA]: the number of garbage collections performed.
- *
- *	Info [AMD_LNZ]: the number of nonzeros in L (excluding the diagonal).
- *	    This is a slight upper bound because mass elimination is combined
- *	    with the approximate degree update.  It is a rough upper bound if
- *	    there are many "dense" rows/columns.  The rest of the statistics,
- *	    below, are also slight or rough upper bounds, for the same reasons.
- *	    The post-ordering of the assembly tree might also not exactly
- *	    correspond to a true elimination tree postordering.
- *
- *	Info [AMD_NDIV]: the number of divide operations for a subsequent LDL'
- *	    or LU factorization of the permuted matrix A (P,P).
- *
- *	Info [AMD_NMULTSUBS_LDL]:  the number of multiply-subtract pairs for a
- *	    subsequent LDL' factorization of A (P,P).
- *
- *	Info [AMD_NMULTSUBS_LU]:  the number of multiply-subtract pairs for a
- *	    subsequent LU factorization of A (P,P), assuming that no numerical
- *	    pivoting is required.
- *
- *	Info [AMD_DMAX]:  the maximum number of nonzeros in any column of L,
- *	    including the diagonal.
- *
- *	Info [14..19] are not used in the current version, but may be used in
- *	    future versions.
+ *       Info [AMD_STATUS]:  the return value of AMD, either AMD_OK,
+ *           AMD_OK_BUT_JUMBLED, AMD_OUT_OF_MEMORY, or AMD_INVALID.
+ *
+ *       Info [AMD_N]: n, the size of the input matrix
+ *
+ *       Info [AMD_NZ]: the number of nonzeros in A, nz = Ap [n]
+ *
+ *       Info [AMD_SYMMETRY]:  the symmetry of the matrix A.  It is the number
+ *           of "matched" off-diagonal entries divided by the total number of
+ *           off-diagonal entries.  An entry A(i,j) is matched if A(j,i) is also
+ *           an entry, for any pair (i,j) for which i != j.  In MATLAB notation,
+ *                S = spones (A) ;
+ *                B = tril (S, -1) + triu (S, 1) ;
+ *                symmetry = nnz (B & B') / nnz (B) ;
+ *
+ *       Info [AMD_NZDIAG]: the number of entries on the diagonal of A.
+ *
+ *       Info [AMD_NZ_A_PLUS_AT]:  the number of nonzeros in A+A', excluding the
+ *           diagonal.  If A is perfectly symmetric (Info [AMD_SYMMETRY] = 1)
+ *           with a fully nonzero diagonal, then Info [AMD_NZ_A_PLUS_AT] = nz-n
+ *           (the smallest possible value).  If A is perfectly unsymmetric
+ *           (Info [AMD_SYMMETRY] = 0, for an upper triangular matrix, for
+ *           example) with no diagonal, then Info [AMD_NZ_A_PLUS_AT] = 2*nz
+ *           (the largest possible value).
+ *
+ *       Info [AMD_NDENSE]: the number of "dense" rows/columns of A+A' that were
+ *           removed from A prior to ordering.  These are placed last in the
+ *           output order P.
+ *
+ *       Info [AMD_MEMORY]: the amount of memory used by AMD, in bytes.  In the
+ *           current version, this is 1.2 * Info  [AMD_NZ_A_PLUS_AT] + 9*n
+ *           times the size of an integer.  This is at most 2.4nz + 9n.  This
+ *           excludes the size of the input arguments Ai, Ap, and P, which have
+ *           a total size of nz + 2*n + 1 integers.
+ *
+ *       Info [AMD_NCMPA]: the number of garbage collections performed.
+ *
+ *       Info [AMD_LNZ]: the number of nonzeros in L (excluding the diagonal).
+ *           This is a slight upper bound because mass elimination is combined
+ *           with the approximate degree update.  It is a rough upper bound if
+ *           there are many "dense" rows/columns.  The rest of the statistics,
+ *           below, are also slight or rough upper bounds, for the same reasons.
+ *           The post-ordering of the assembly tree might also not exactly
+ *           correspond to a true elimination tree postordering.
+ *
+ *       Info [AMD_NDIV]: the number of divide operations for a subsequent LDL'
+ *           or LU factorization of the permuted matrix A (P,P).
+ *
+ *       Info [AMD_NMULTSUBS_LDL]:  the number of multiply-subtract pairs for a
+ *           subsequent LDL' factorization of A (P,P).
+ *
+ *       Info [AMD_NMULTSUBS_LU]:  the number of multiply-subtract pairs for a
+ *           subsequent LU factorization of A (P,P), assuming that no numerical
+ *           pivoting is required.
+ *
+ *       Info [AMD_DMAX]:  the maximum number of nonzeros in any column of L,
+ *           including the diagonal.
+ *
+ *       Info [14..19] are not used in the current version, but may be used in
+ *           future versions.
  */    
 
 /* ------------------------------------------------------------------------- */
@@ -257,19 +256,19 @@
 
 void amd_l2
 (
-    UF_long n,
-    UF_long Pe [ ],
-    UF_long Iw [ ],
-    UF_long Len [ ],
-    UF_long iwlen,
-    UF_long pfree,
-    UF_long Nv [ ],
-    UF_long Next [ ], 
-    UF_long Last [ ],
-    UF_long Head [ ],
-    UF_long Elen [ ],
-    UF_long Degree [ ],
-    UF_long W [ ],
+    SuiteSparse_long n,
+    SuiteSparse_long Pe [ ],
+    SuiteSparse_long Iw [ ],
+    SuiteSparse_long Len [ ],
+    SuiteSparse_long iwlen,
+    SuiteSparse_long pfree,
+    SuiteSparse_long Nv [ ],
+    SuiteSparse_long Next [ ], 
+    SuiteSparse_long Last [ ],
+    SuiteSparse_long Head [ ],
+    SuiteSparse_long Elen [ ],
+    SuiteSparse_long Degree [ ],
+    SuiteSparse_long W [ ],
     double Control [ ],
     double Info [ ]
 ) ;
@@ -290,18 +289,18 @@
 
 int amd_valid
 (
-    int n_row,		    /* # of rows */
-    int n_col,		    /* # of columns */
-    const int Ap [ ],	    /* column pointers, of size n_col+1 */
-    const int Ai [ ]	    /* row indices, of size Ap [n_col] */
+    int n_row,                 /* # of rows */
+    int n_col,                 /* # of columns */
+    const int Ap [ ],          /* column pointers, of size n_col+1 */
+    const int Ai [ ]           /* row indices, of size Ap [n_col] */
 ) ;
 
-UF_long amd_l_valid
+SuiteSparse_long amd_l_valid
 (
-    UF_long n_row,
-    UF_long n_col,
-    const UF_long Ap [ ],
-    const UF_long Ai [ ]
+    SuiteSparse_long n_row,
+    SuiteSparse_long n_col,
+    const SuiteSparse_long Ap [ ],
+    const SuiteSparse_long Ai [ ]
 ) ;
 
 /* ------------------------------------------------------------------------- */
@@ -315,11 +314,11 @@
 #define EXTERN extern
 #endif
 
-EXTERN void *(*amd_malloc) (size_t) ;		    /* pointer to malloc */
-EXTERN void (*amd_free) (void *) ;		    /* pointer to free */
-EXTERN void *(*amd_realloc) (void *, size_t) ;	    /* pointer to realloc */
-EXTERN void *(*amd_calloc) (size_t, size_t) ;	    /* pointer to calloc */
-EXTERN int (*amd_printf) (const char *, ...) ;	    /* pointer to printf */
+EXTERN void *(*amd_malloc) (size_t) ;                     /* pointer to malloc */
+EXTERN void (*amd_free) (void *) ;               /* pointer to free */
+EXTERN void *(*amd_realloc) (void *, size_t) ;            /* pointer to realloc */
+EXTERN void *(*amd_calloc) (size_t, size_t) ;             /* pointer to calloc */
+EXTERN int (*amd_printf) (const char *, ...) ;            /* pointer to printf */
 
 /* ------------------------------------------------------------------------- */
 /* AMD Control and Info arrays */
@@ -337,41 +336,41 @@
 void amd_info       (double Info [ ]) ;
 void amd_l_info     (double Info [ ]) ;
 
-#define AMD_CONTROL 5	    /* size of Control array */
-#define AMD_INFO 20	    /* size of Info array */
+#define AMD_CONTROL 5          /* size of Control array */
+#define AMD_INFO 20            /* size of Info array */
 
 /* contents of Control */
-#define AMD_DENSE 0	    /* "dense" if degree > Control [0] * sqrt (n) */
+#define AMD_DENSE 0            /* "dense" if degree > Control [0] * sqrt (n) */
 #define AMD_AGGRESSIVE 1    /* do aggressive absorption if Control [1] != 0 */
 
 /* default Control settings */
-#define AMD_DEFAULT_DENSE 10.0	    /* default "dense" degree 10*sqrt(n) */
+#define AMD_DEFAULT_DENSE 10.0          /* default "dense" degree 10*sqrt(n) */
 #define AMD_DEFAULT_AGGRESSIVE 1    /* do aggressive absorption by default */
 
 /* contents of Info */
-#define AMD_STATUS 0	    /* return value of amd_order and amd_l_order */
-#define AMD_N 1		    /* A is n-by-n */
-#define AMD_NZ 2	    /* number of nonzeros in A */ 
-#define AMD_SYMMETRY 3	    /* symmetry of pattern (1 is sym., 0 is unsym.) */
-#define AMD_NZDIAG 4	    /* # of entries on diagonal */
+#define AMD_STATUS 0           /* return value of amd_order and amd_l_order */
+#define AMD_N 1                /* A is n-by-n */
+#define AMD_NZ 2      /* number of nonzeros in A */ 
+#define AMD_SYMMETRY 3         /* symmetry of pattern (1 is sym., 0 is unsym.) */
+#define AMD_NZDIAG 4           /* # of entries on diagonal */
 #define AMD_NZ_A_PLUS_AT 5  /* nz in A+A' */
-#define AMD_NDENSE 6	    /* number of "dense" rows/columns in A */
-#define AMD_MEMORY 7	    /* amount of memory used by AMD */
-#define AMD_NCMPA 8	    /* number of garbage collections in AMD */
-#define AMD_LNZ 9	    /* approx. nz in L, excluding the diagonal */
-#define AMD_NDIV 10	    /* number of fl. point divides for LU and LDL' */
+#define AMD_NDENSE 6           /* number of "dense" rows/columns in A */
+#define AMD_MEMORY 7           /* amount of memory used by AMD */
+#define AMD_NCMPA 8            /* number of garbage collections in AMD */
+#define AMD_LNZ 9     /* approx. nz in L, excluding the diagonal */
+#define AMD_NDIV 10            /* number of fl. point divides for LU and LDL' */
 #define AMD_NMULTSUBS_LDL 11 /* number of fl. point (*,-) pairs for LDL' */
 #define AMD_NMULTSUBS_LU 12  /* number of fl. point (*,-) pairs for LU */
-#define AMD_DMAX 13	     /* max nz. in any column of L, incl. diagonal */
+#define AMD_DMAX 13             /* max nz. in any column of L, incl. diagonal */
 
 /* ------------------------------------------------------------------------- */
 /* return values of AMD */
 /* ------------------------------------------------------------------------- */
 
-#define AMD_OK 0		/* success */
-#define AMD_OUT_OF_MEMORY -1	/* malloc failed, or problem too large */
-#define AMD_INVALID -2		/* input arguments are not valid */
-#define AMD_OK_BUT_JUMBLED 1	/* input matrix is OK for amd_order, but
+#define AMD_OK 0           /* success */
+#define AMD_OUT_OF_MEMORY -1        /* malloc failed, or problem too large */
+#define AMD_INVALID -2              /* input arguments are not valid */
+#define AMD_OK_BUT_JUMBLED 1        /* input matrix is OK for amd_order, but
     * columns were not sorted, and/or duplicate entries were present.  AMD had
     * to do extra work before ordering the matrix.  This is a warning, not an
     * error.  */
@@ -384,25 +383,25 @@
  * As an example, to test if the version you are using is 1.2 or later:
  *
  * #ifdef AMD_VERSION
- *	if (AMD_VERSION >= AMD_VERSION_CODE (1,2)) ...
+ *       if (AMD_VERSION >= AMD_VERSION_CODE (1,2)) ...
  * #endif
  *
  * This also works during compile-time:
  *
- *	#if defined(AMD_VERSION) && (AMD_VERSION >= AMD_VERSION_CODE (1,2))
- *	    printf ("This is version 1.2 or later\n") ;
- *	#else
- *	    printf ("This is an early version\n") ;
- *	#endif
+ *       #if defined(AMD_VERSION) && (AMD_VERSION >= AMD_VERSION_CODE (1,2))
+ *           printf ("This is version 1.2 or later\n") ;
+ *       #else
+ *           printf ("This is an early version\n") ;
+ *       #endif
  *
  * Versions 1.1 and earlier of AMD do not include a #define'd version number.
  */
 
-#define AMD_DATE "May 31, 2007"
+#define AMD_DATE "Jun 20, 2012"
 #define AMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define AMD_MAIN_VERSION 2
-#define AMD_SUB_VERSION 2
-#define AMD_SUBSUB_VERSION 0
+#define AMD_SUB_VERSION 3
+#define AMD_SUBSUB_VERSION 1
 #define AMD_VERSION AMD_VERSION_CODE(AMD_MAIN_VERSION,AMD_SUB_VERSION)
 
 #ifdef __cplusplus

=== modified file 'AMD/Include/amd_internal.h'
--- AMD/Include/amd_internal.h	2007-05-29 09:36:29 +0000
+++ AMD/Include/amd_internal.h	2013-12-08 03:08:50 +0000
@@ -3,10 +3,9 @@
 /* ========================================================================= */
 
 /* ------------------------------------------------------------------------- */
-/* AMD, Copyright (c) Timothy A. Davis,					     */
+/* AMD, Copyright (c) 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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* This file is for internal use in AMD itself, and does not normally need to
@@ -15,17 +14,17 @@
  *
  * The following compile-time definitions affect how AMD is compiled.
  *
- *	-DNPRINT
- *
- *	    Disable all printing.  stdio.h will not be included.  Printing can
- *	    be re-enabled at run-time by setting the global pointer amd_printf
- *	    to printf (or mexPrintf for a MATLAB mexFunction).
- *
- *	-DNMALLOC
- *
- *	    No memory manager is defined at compile-time.  You MUST define the
- *	    function pointers amd_malloc, amd_free, amd_realloc, and
- *	    amd_calloc at run-time for AMD to work properly.
+ *      -DNPRINT
+ *
+ *          Disable all printing.  stdio.h will not be included.  Printing can
+ *          be re-enabled at run-time by setting the global pointer amd_printf
+ *          to printf (or mexPrintf for a MATLAB mexFunction).
+ *
+ *      -DNMALLOC
+ *
+ *          No memory manager is defined at compile-time.  You MUST define the
+ *          function pointers amd_malloc, amd_free, amd_realloc, and
+ *          amd_calloc at run-time for AMD to work properly.
  */
 
 /* ========================================================================= */
@@ -154,21 +153,25 @@
 
 /* largest value of size_t */
 #ifndef SIZE_T_MAX
+#ifdef SIZE_MAX
+/* C99 only */
+#define SIZE_T_MAX SIZE_MAX
+#else
 #define SIZE_T_MAX ((size_t) (-1))
 #endif
-
-/* ------------------------------------------------------------------------- */
-/* integer type for AMD: int or UF_long */
-/* ------------------------------------------------------------------------- */
-
-/* define UF_long */
-#include "UFconfig.h"
+#endif
+
+/* ------------------------------------------------------------------------- */
+/* integer type for AMD: int or SuiteSparse_long */
+/* ------------------------------------------------------------------------- */
+
+#include "amd.h"
 
 #if defined (DLONG) || defined (ZLONG)
 
-#define Int UF_long
-#define ID  UF_long_id
-#define Int_MAX UF_long_max
+#define Int SuiteSparse_long
+#define ID  SuiteSparse_long_id
+#define Int_MAX SuiteSparse_long_max
 
 #define AMD_order amd_l_order
 #define AMD_defaults amd_l_defaults
@@ -216,12 +219,6 @@
 #define PRINTF(params) { if (amd_printf != NULL) (void) amd_printf params ; }
 
 /* ------------------------------------------------------------------------- */
-/* AMD routine definitions (user-callable) */
-/* ------------------------------------------------------------------------- */
-
-#include "amd.h"
-
-/* ------------------------------------------------------------------------- */
 /* AMD routine definitions (not user-callable) */
 /* ------------------------------------------------------------------------- */
 

=== modified file 'AMD/Lib/GNUmakefile'
--- AMD/Lib/GNUmakefile	2007-05-29 09:36:29 +0000
+++ AMD/Lib/GNUmakefile	2013-12-08 03:08:50 +0000
@@ -2,11 +2,11 @@
 # AMD Makefile for compiling on Unix systems (for GNU make only)
 #-------------------------------------------------------------------------------
 
-default: ../Lib/libamd.a
-
-include ../../UFconfig/UFconfig.mk
-
-C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
+default: libamd.a
+
+include ../../SuiteSparse_config/SuiteSparse_config.mk
+
+C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
 
 #-------------------------------------------------------------------------------
 # source files
@@ -15,9 +15,9 @@
 AMD = amd_aat amd_1 amd_2 amd_dump amd_postorder amd_post_tree amd_defaults \
 	amd_order amd_control amd_info amd_valid amd_preprocess
 
-UFCONFIG = ../../UFconfig/UFconfig.h
+CONFIG = ../../SuiteSparse_config/SuiteSparse_config.h
 
-INC = ../Include/amd.h ../Include/amd_internal.h $(UFCONFIG)
+INC = ../Include/amd.h ../Include/amd_internal.h $(CONFIG)
 
 #-------------------------------------------------------------------------------
 # object files for each version
@@ -43,15 +43,15 @@
 # Create the libamd.a library (C versions only)
 #-------------------------------------------------------------------------------
 
-../Lib/libamd.a: amd_global.o $(AMDI) $(AMDL)
-	$(AR) ../Lib/libamd.a $^
-	- $(RANLIB) ../Lib/libamd.a
+libamd.a: amd_global.o $(AMDI) $(AMDL)
+	$(ARCHIVE) libamd.a $^
+	- $(RANLIB) libamd.a
 
 #-------------------------------------------------------------------------------
 # compile the Fortran versions and the libamdf77.a library
 #-------------------------------------------------------------------------------
 
-fortran: ../Lib/libamdf77.a
+fortran: libamdf77.a
 
 AMDF77 = amd.o amdbar.o
 
@@ -61,9 +61,9 @@
 amdbar.o: ../Source/amdbar.f
 	$(F77) $(F77FLAGS) -c ../Source/amdbar.f -o amdbar.o
 
-../Lib/libamdf77.a: $(AMDF77)
-	$(AR) ../Lib/libamdf77.a $^
-	- $(RANLIB) ../Lib/libamdf77.a
+libamdf77.a: $(AMDF77)
+	$(ARCHIVE) libamdf77.a $^
+	- $(RANLIB) libamdf77.a
 
 #-------------------------------------------------------------------------------
 # Remove all but the files in the original distribution
@@ -75,4 +75,4 @@
 purge: distclean
 
 distclean: clean
-	- $(RM) ../Lib/libamd.a ../Lib/libamdf77.a
+	- $(RM) libamd.a libamdf77.a

=== modified file 'AMD/Lib/Makefile'
--- AMD/Lib/Makefile	2007-05-29 09:36:29 +0000
+++ AMD/Lib/Makefile	2013-12-08 03:08:50 +0000
@@ -8,9 +8,9 @@
 
 default: everything
 
-include ../../UFconfig/UFconfig.mk
+include ../../SuiteSparse_config/SuiteSparse_config.mk
 
-C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
+C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
 
 everything:
 	$(C) -DDINT -c ../Source/amd_aat.c -o amd_i_aat.o
@@ -26,7 +26,7 @@
 	$(C) -DDINT -c ../Source/amd_valid.c -o amd_i_valid.o
 	$(C) -DDINT -c ../Source/amd_preprocess.c -o amd_i_preprocess.o
 	$(C) -DDLONG -c ../Source/amd_aat.c -o amd_l_aat.o
-	$(C) -DDLONG -c ../Source/amd_1.c -o ../Source/amd_l_1.o
+	$(C) -DDLONG -c ../Source/amd_1.c -o amd_l_1.o
 	$(C) -DDLONG -c ../Source/amd_2.c -o amd_l_2.o
 	$(C) -DDLONG -c ../Source/amd_dump.c -o amd_l_dump.o
 	$(C) -DDLONG -c ../Source/amd_postorder.c -o amd_l_postorder.o
@@ -38,7 +38,8 @@
 	$(C) -DDLONG -c ../Source/amd_valid.c -o amd_l_valid.o
 	$(C) -DDLONG -c ../Source/amd_preprocess.c -o amd_l_preprocess.o
 	$(C) -c ../Source/amd_global.c
-	$(AR) ../Lib/libamd.a amd_i_aat.o amd_i_1.o amd_i_2.o amd_i_dump.o \
+	$(ARCHIVE)  ../Lib/libamd.a \
+            amd_i_aat.o amd_i_1.o amd_i_2.o amd_i_dump.o \
 	    amd_i_postorder.o amd_i_post_tree.o amd_i_defaults.o amd_i_order.o \
 	    amd_i_control.o amd_i_info.o amd_i_valid.o amd_l_aat.o amd_l_1.o \
 	    amd_l_2.o amd_l_dump.o amd_l_postorder.o amd_l_post_tree.o \
@@ -53,7 +54,7 @@
 fortran:
 	$(F77) $(F77FLAGS) -c ../Source/amd.f -o amd.o
 	$(F77) $(F77FLAGS) -c ../Source/amdbar.f -o amdbar.o
-	$(AR) ../Lib/libamdf77.a amd.o amdbar.o
+	$(ARCHIVE)  ../Lib/libamdf77.a amd.o amdbar.o
 	- $(RANLIB) ../Lib/libamdf77.a
 
 #-------------------------------------------------------------------------------

=== modified file 'AMD/MATLAB/Contents.m'
--- AMD/MATLAB/Contents.m	2007-05-29 09:36:29 +0000
+++ AMD/MATLAB/Contents.m	2013-12-08 03:08:50 +0000
@@ -13,7 +13,6 @@
 % Example:
 %   p = amd2 (A) ;
 
-% Copyright 1994-2007, Tim Davis, University of Florida,
-% Patrick R. Amestoy, and Iain S. Duff. 
+% Copyright 1994-2007, Tim Davis, Patrick R. Amestoy, and Iain S. Duff. 
 
 help Contents

=== removed file 'AMD/MATLAB/Makefile'
--- AMD/MATLAB/Makefile	2007-05-29 09:36:29 +0000
+++ AMD/MATLAB/Makefile	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-#------------------------------------------------------------------------------
-# Makefile for the AMD MATLAB mexFunction
-#------------------------------------------------------------------------------
-
-default: amd2
-
-include ../../UFconfig/UFconfig.mk
-
-AMD = ../Lib/libamd.a
-
-I = -I../Include -I../../UFconfig
-
-INC = ../Include/amd.h ../Include/amd_internal.h ../../UFconfig/UFconfig.h
-
-SRC = ../Source/amd_1.c ../Source/amd_2.c ../Source/amd_aat.c \
-    ../Source/amd_control.c ../Source/amd_defaults.c ../Source/amd_dump.c \
-    ../Source/amd_global.c ../Source/amd_info.c ../Source/amd_order.c \
-    ../Source/amd_postorder.c ../Source/amd_post_tree.c \
-    ../Source/amd_preprocess.c ../Source/amd_valid.c
-
-amd2: $(SRC) $(INC) amd_mex.c
-	$(MEX) -DDLONG $(I) -output amd2 amd_mex.c $(SRC)
-
-#------------------------------------------------------------------------------
-# Remove all but the files in the original distribution
-#------------------------------------------------------------------------------
-
-clean:
-	- $(RM) $(CLEAN)
-
-purge: distclean
-
-distclean: clean
-	- $(RM) amd2.mex*

=== modified file 'AMD/MATLAB/amd2.m'
--- AMD/MATLAB/amd2.m	2007-05-29 09:36:29 +0000
+++ AMD/MATLAB/amd2.m	2013-12-08 03:08:50 +0000
@@ -63,12 +63,8 @@
 %
 % See also AMD, COLMMD, COLAMD, COLPERM, SYMAMD, SYMMMD, SYMRCM.
 
-% --------------------------------------------------------------------------
-% Copyright 1994-2007, Tim Davis, University of Florida
+% Copyright 1994-2012, Timothy A. Davis, http://www.suitesparse.com,
 % 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
-% --------------------------------------------------------------------------
 %
 %    Acknowledgements: This work was supported by the National Science
 %       Foundation, under grants ASC-9111263, DMS-9223088, and CCR-0203270.

=== modified file 'AMD/MATLAB/amd_demo.m'
--- AMD/MATLAB/amd_demo.m	2007-05-29 09:36:29 +0000
+++ AMD/MATLAB/amd_demo.m	2013-12-08 03:08:50 +0000
@@ -8,8 +8,7 @@
 %
 % See also: amd, amd2, amd_make
 
-% Copyright 1994-2007, Tim Davis, University of Florida,
-% Patrick R. Amestoy, and Iain S. Duff. 
+% Copyright 1994-2007, Tim Davis, Patrick R. Amestoy, and Iain S. Duff. 
 
 % This orders the same matrix as the ANSI C demo, amd_demo.c.  It includes an
 % additional analysis of the matrix via MATLAB's symbfact routine.
@@ -24,9 +23,7 @@
 
 n = size (A,1) ;
 
-figure (1)
 clf
-hold off
 subplot (2,2,1) ;
 spy (A)
 title ('HB/can24 matrix') ;

=== modified file 'AMD/MATLAB/amd_install.m'
--- AMD/MATLAB/amd_install.m	2007-05-29 09:36:29 +0000
+++ AMD/MATLAB/amd_install.m	2013-12-08 03:08:50 +0000
@@ -7,8 +7,7 @@
 %
 % See also amd, amd2.
 
-% Copyright 1994-2007, Tim Davis, University of Florida,
-% Patrick R. Amestoy, and Iain S. Duff. 
+% Copyright 1994-2007, Tim Davis, Patrick R. Amestoy, and Iain S. Duff. 
 
 % This orders the same matrix as the ANSI C demo, amd_demo.c.  It includes an
 

=== modified file 'AMD/MATLAB/amd_make.m'
--- AMD/MATLAB/amd_make.m	2007-05-29 09:36:29 +0000
+++ AMD/MATLAB/amd_make.m	2013-12-08 03:08:50 +0000
@@ -6,8 +6,7 @@
 %
 % See also amd, amd2.
 
-% Copyright 1994-2007, Tim Davis, University of Florida,
-% Patrick R. Amestoy, and Iain S. Duff. 
+% Copyright 1994-2007, Tim Davis, Patrick R. Amestoy, and Iain S. Duff. 
 
 details = 0 ;	    % 1 if details of each command are to be printed
 
@@ -16,13 +15,13 @@
     d = '-largeArrayDims' ;
 end
 
-i = sprintf ('-I..%sInclude -I..%s..%sUFconfig', filesep, filesep, filesep) ;
+i = sprintf ('-I../Include -I../../SuiteSparse_config') ;
 cmd = sprintf ('mex -O %s -DDLONG -output amd2 %s amd_mex.c', d, i) ;
 files = {'amd_order', 'amd_dump', 'amd_postorder', 'amd_post_tree', ...
     'amd_aat', 'amd_2', 'amd_1', 'amd_defaults', 'amd_control', ...
     'amd_info', 'amd_valid', 'amd_global', 'amd_preprocess' } ;
 for i = 1 : length (files)
-    cmd = sprintf ('%s ..%sSource%s%s.c', cmd, filesep, filesep, files {i}) ;
+    cmd = sprintf ('%s ../Source/%s.c', cmd, files {i}) ;
 end
 if (details)
     fprintf ('%s\n', cmd) ;

=== modified file 'AMD/MATLAB/amd_mex.c'
--- AMD/MATLAB/amd_mex.c	2007-05-29 09:36:29 +0000
+++ AMD/MATLAB/amd_mex.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD, Copyright (c) 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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /*
@@ -30,7 +29,7 @@
 #include "amd.h"
 #include "mex.h"
 #include "matrix.h"
-#include "UFconfig.h"
+#define Long SuiteSparse_long
 
 void mexFunction
 (
@@ -40,7 +39,7 @@
     const mxArray *pargin [ ]
 )
 {
-    UF_long i, m, n, *Ap, *Ai, *P, nc, result, spumoni, full ;
+    Long i, m, n, *Ap, *Ai, *P, nc, result, spumoni, full ;
     double *Pout, *InfoOut, Control [AMD_CONTROL], Info [AMD_INFO], *ControlIn ;
     mxArray *A ;
 
@@ -113,7 +112,7 @@
     /* allocate workspace for output permutation */
     /* --------------------------------------------------------------------- */
 
-    P = mxMalloc ((n+1) * sizeof (UF_long)) ;
+    P = mxMalloc ((n+1) * sizeof (Long)) ;
 
     /* --------------------------------------------------------------------- */
     /* if A is full, convert to a sparse matrix */
@@ -129,8 +128,8 @@
 	}
 	mexCallMATLAB (1, &A, 1, (mxArray **) pargin, "sparse") ;
     }
-    Ap = (UF_long *) mxGetJc (A) ;
-    Ai = (UF_long *) mxGetIr (A) ;
+    Ap = (Long *) mxGetJc (A) ;
+    Ai = (Long *) mxGetIr (A) ;
     if (spumoni > 0)
     {
 	mexPrintf ("    input matrix A has %d nonzero entries\n", Ap [n]) ;

=== modified file 'AMD/Makefile'
--- AMD/Makefile	2007-05-29 09:36:29 +0000
+++ AMD/Makefile	2013-12-08 03:08:50 +0000
@@ -2,24 +2,20 @@
 # AMD Makefile (for GNU Make or original make)
 #------------------------------------------------------------------------------
 
-default: demo
-
-include ../UFconfig/UFconfig.mk
-
-# Compile all C code, including the C-callable routines.
-# Do not compile the FORTRAN versions, or MATLAB interface.
-demo:
-	( cd Lib    ; $(MAKE) )
-	( cd Demo   ; $(MAKE) )
-
-# Compile all C code, including the C-callable routine and the mexFunctions.
-# Do not compile the FORTRAN versions.
+VERSION = 2.3.1
+
+default: all
+
+include ../SuiteSparse_config/SuiteSparse_config.mk
+
+demos: all
+
+# Compile all C code.  Do not compile the FORTRAN versions.
 all:
 	( cd Lib    ; $(MAKE) )
 	( cd Demo   ; $(MAKE) )
-	( cd MATLAB ; $(MAKE) )
 
-# compile just the C-callable libraries (not mexFunctions or Demos)
+# compile just the C-callable libraries (not Demos)
 library:
 	( cd Lib    ; $(MAKE) )
 
@@ -37,20 +33,20 @@
 clean:
 	( cd Lib    ; $(MAKE) clean )
 	( cd Demo   ; $(MAKE) clean )
-	( cd MATLAB ; $(MAKE) clean )
+	( cd MATLAB ; $(RM) $(CLEAN) )
 	( cd Doc    ; $(MAKE) clean )
 
 # clean, and then remove compiled programs and library archives
 purge:
 	( cd Lib    ; $(MAKE) purge )
 	( cd Demo   ; $(MAKE) purge )
-	( cd MATLAB ; $(MAKE) purge )
+	( cd MATLAB ; $(RM) $(CLEAN) ; $(RM) *.mex* )
 	( cd Doc    ; $(MAKE) purge )
 
 distclean: purge
 
 # create PDF documents for the original distribution
-doc:
+docs:
 	( cd Doc    ; $(MAKE) )
 
 # get ready for distribution
@@ -62,6 +58,16 @@
 
 lib: library
 
-# compile the MATLAB mexFunction
-mex:
-	( cd MATLAB ; $(MAKE) )
+# install AMD
+install:
+	$(CP) Lib/libamd.a $(INSTALL_LIB)/libamd.$(VERSION).a
+	( cd $(INSTALL_LIB) ; ln -sf libamd.$(VERSION).a libamd.a )
+	$(CP) Include/amd.h $(INSTALL_INCLUDE)
+	chmod 644 $(INSTALL_LIB)/libamd*
+	chmod 644 $(INSTALL_INCLUDE)/amd.h
+
+# uninstall AMD
+uninstall:
+	$(RM) $(INSTALL_LIB)/libamd*.a
+	$(RM) $(INSTALL_INCLUDE)/amd.h
+

=== modified file 'AMD/README.txt'
--- AMD/README.txt	2007-05-29 09:36:29 +0000
+++ AMD/README.txt	2013-12-08 03:08:50 +0000
@@ -1,32 +1,30 @@
-AMD Version 2.2, Copyright (c) 2007 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.
+AMD, Copyright (c) 2009-2012 by Timothy A. Davis (http://www.suitesparse.com),
+Patrick R. Amestoy, and Iain S. Duff.  All Rights Reserved.  AMD is available
+under alternate licences; contact T. Davis for details.
 
 AMD:  a set of routines for permuting sparse matrices prior to
     factorization.  Includes a version in C, a version in Fortran, and a MATLAB
     mexFunction.
 
-Requires UFconfig, in the ../UFconfig directory relative to this directory.
+Requires SuiteSparse_config, in the ../SuiteSparse_config directory relative to
+this directory.
 
 Quick start (Unix, or Windows with Cygwin):
 
     To compile, test, and install AMD, you may wish to first configure the
-    installation by editting the ../UFconfig/UFconfig.mk file.  Next, cd to this
-    directory (AMD) and type "make" (or "make lib" if you do not have MATLAB).
-    To compile and run a demo program for the Fortran version, type
-    "make fortran".  When done, type "make clean" to remove unused *.o files
-    (keeps the compiled libraries and demo programs).  See the User Guide
-    (Doc/AMD_UserGuide.pdf), or ../UFconfig/UFconfig.mk for more details.
+    installation by editting the ../SuiteSparse_config/SuiteSparse_config.mk
+    file.  Next, cd to this directory (AMD) and type "make" (or "make lib" if
+    you do not have MATLAB).  To compile and run a demo program for the Fortran
+    version, type "make fortran".  When done, type "make clean" to remove
+    unused *.o files (keeps the compiled libraries and demo programs).  See the
+    User Guide (Doc/AMD_UserGuide.pdf), or
+    ../SuiteSparse_config/SuiteSparse_config.mk for more details.
 
 Quick start (for MATLAB users);
 
     To compile, test, and install the AMD mexFunction, cd to the
     AMD/MATLAB directory and type amd_make at the MATLAB prompt.
 
-If you have MATLAB 7.2 or earlier and use "make mex", you must first edit
-UFconfig/UFconfig.h to remove the "-largeArrayDims" option from the MEX command
-(or just use amd_make.m inside MATLAB).
-
 -------------------------------------------------------------------------------
 
 AMD License:
@@ -61,7 +59,7 @@
 
 Availability:
 
-    http://www.cise.ufl.edu/research/sparse/amd
+    http://www.suitesparse.com
 
 -------------------------------------------------------------------------------
 
@@ -78,7 +76,7 @@
 
 Authors:
 
-    Timothy A. Davis (davis at cise.ufl.edu), University of Florida.
+    Timothy A. Davis ([e-mail])
     Patrick R. Amestory, ENSEEIHT, Toulouse, France.
     Iain S. Duff, Rutherford Appleton Laboratory, UK.
 
@@ -171,7 +169,7 @@
     amd_demo2.c			C demo program for AMD, jumbled matrix
     amd_demo2.out		output of amd_demo2.c
 
-    amd_l_demo.c		C demo program for AMD (UF_long version)
+    amd_l_demo.c		C demo program for AMD (long integer version)
     amd_l_demo.out		output of amd_l_demo.c
 
     amd_simple.c		simple C demo program for AMD

=== modified file 'AMD/Source/amd_1.c'
--- AMD/Source/amd_1.c	2007-05-29 09:36:29 +0000
+++ AMD/Source/amd_1.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD, Copyright (c) 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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* AMD_1: Construct A+A' for a sparse matrix A and perform the AMD ordering.

=== modified file 'AMD/Source/amd_2.c'
--- AMD/Source/amd_2.c	2007-05-29 09:36:29 +0000
+++ AMD/Source/amd_2.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD, Copyright (c) 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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* AMD_2:  performs the AMD ordering on a symmetric sparse matrix A, followed
@@ -120,9 +119,9 @@
  *	ouput.  Many of these functions are also provided by the Fortran
  *	Harwell Subroutine Library routine MC47A.
  *
- * (6) both int and UF_long versions are provided.  In the descriptions below
- *	and integer is and int or UF_long depending on which version is
- *	being used.
+ * (6) both int and SuiteSparse_long versions are provided.  In the
+ *      descriptions below and integer is and int or SuiteSparse_long depending
+ *      on which version is being used.
 
  **********************************************************************
  ***** CAUTION:  ARGUMENTS ARE NOT CHECKED FOR ERRORS ON INPUT.  ******
@@ -495,8 +494,9 @@
  * nvj:		the number of variables in a supervariable j (= Nv [j])
  * nvpiv:	number of pivots in current element
  * slenme:	number of variables in variable list of pivotal variable
- * wbig:	= INT_MAX - n for the int version, UF_long_max - n for the
- *		    UF_long version.  wflg is not allowed to be >= wbig.
+ * wbig:	= (INT_MAX - n) for the int version, (SuiteSparse_long_max - n)
+ *                  for the SuiteSparse_long version.  wflg is not allowed to
+ *                  be >= wbig.
  * we:		W [e]
  * wflg:	used for flagging the W array.  See description of Iw.
  * wnvi:	wflg - Nv [i]

=== modified file 'AMD/Source/amd_aat.c'
--- AMD/Source/amd_aat.c	2007-05-29 09:36:29 +0000
+++ AMD/Source/amd_aat.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD, Copyright (c) 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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* AMD_aat:  compute the symmetry of the pattern of A, and count the number of

=== modified file 'AMD/Source/amd_control.c'
--- AMD/Source/amd_control.c	2007-05-29 09:36:29 +0000
+++ AMD/Source/amd_control.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD, Copyright (c) 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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* User-callable.  Prints the control parameters for AMD.  See amd.h

=== modified file 'AMD/Source/amd_defaults.c'
--- AMD/Source/amd_defaults.c	2007-05-29 09:36:29 +0000
+++ AMD/Source/amd_defaults.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD, Copyright (c) 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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* User-callable.  Sets default control parameters for AMD.  See amd.h

=== modified file 'AMD/Source/amd_dump.c'
--- AMD/Source/amd_dump.c	2007-05-29 09:36:29 +0000
+++ AMD/Source/amd_dump.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD, Copyright (c) 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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* Debugging routines for AMD.  Not used if NDEBUG is not defined at compile-

=== modified file 'AMD/Source/amd_global.c'
--- AMD/Source/amd_global.c	2007-05-29 09:36:29 +0000
+++ AMD/Source/amd_global.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD, Copyright (c) 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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 #include <stdlib.h>

=== modified file 'AMD/Source/amd_info.c'
--- AMD/Source/amd_info.c	2007-05-29 09:36:29 +0000
+++ AMD/Source/amd_info.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD, Copyright (c) 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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* User-callable.  Prints the output statistics for AMD.  See amd.h

=== modified file 'AMD/Source/amd_order.c'
--- AMD/Source/amd_order.c	2007-05-29 09:36:29 +0000
+++ AMD/Source/amd_order.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD, Copyright (c) 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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* User-callable AMD minimum degree ordering routine.  See amd.h for

=== modified file 'AMD/Source/amd_post_tree.c'
--- AMD/Source/amd_post_tree.c	2007-05-29 09:36:29 +0000
+++ AMD/Source/amd_post_tree.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD, Copyright (c) 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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* Post-ordering of a supernodal elimination tree.  */

=== modified file 'AMD/Source/amd_postorder.c'
--- AMD/Source/amd_postorder.c	2007-05-29 09:36:29 +0000
+++ AMD/Source/amd_postorder.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD, Copyright (c) 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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* Perform a postordering (via depth-first search) of an assembly tree. */

=== modified file 'AMD/Source/amd_preprocess.c'
--- AMD/Source/amd_preprocess.c	2007-05-29 09:36:29 +0000
+++ AMD/Source/amd_preprocess.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD, Copyright (c) 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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* Sorts, removes duplicate entries, and transposes from the nonzero pattern of

=== modified file 'AMD/Source/amd_valid.c'
--- AMD/Source/amd_valid.c	2007-05-29 09:36:29 +0000
+++ AMD/Source/amd_valid.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* AMD, Copyright (c) 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: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* Check if a column-form matrix is valid or not.  The matrix A is

=== modified file 'BTF/Doc/ChangeLog'
--- BTF/Doc/ChangeLog	2010-04-15 10:36:16 +0000
+++ BTF/Doc/ChangeLog	2013-12-08 03:08:50 +0000
@@ -1,3 +1,19 @@
+Jun 1, 2012: version 1.2.0
+
+    * changed from UFconfig to SuiteSparse_config
+
+Dec 7, 2011: version 1.1.3
+
+    * fixed the Makefile to better align with CFLAGS and other standards
+
+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"
+
 Mar 24, 2009: version 1.1.0
 
     * tabs expanded to 8 spaces; version number updated to stay in sync with KLU

=== modified file 'BTF/Include/btf.h'
--- BTF/Include/btf.h	2010-04-15 10:36:16 +0000
+++ BTF/Include/btf.h	2013-12-08 03:08:50 +0000
@@ -7,7 +7,7 @@
  *      upper triangular form.
  * BTF_ORDER: do both of the above (btf_maxtrans then btf_strongcomp).
  *
- * Copyright (c) 2004-2007.  Tim Davis, University of Florida,
+ * By Tim Davis.  Copyright (c) 2004-2007, University of Florida.
  * with support from Sandia National Laboratories.  All Rights Reserved.
  */
 
@@ -93,7 +93,7 @@
 extern "C" {
 #endif
 
-#include "UFconfig.h"
+#include "SuiteSparse_config.h"
 
 int btf_maxtrans    /* returns # of columns matched */
 (
@@ -117,9 +117,10 @@
     int Work [ ]    /* size 5*ncol */
 ) ;
 
-/* long integer version (all "int" parameters become "UF_long") */
-UF_long btf_l_maxtrans (UF_long, UF_long, UF_long *, UF_long *, double,
-    double *, UF_long *, UF_long *) ;
+/* long integer version (all "int" parameters become "SuiteSparse_long") */
+SuiteSparse_long btf_l_maxtrans (SuiteSparse_long, SuiteSparse_long,
+    SuiteSparse_long *, SuiteSparse_long *, double, double *,
+    SuiteSparse_long *, SuiteSparse_long *) ;
 
 
 /* ========================================================================== */
@@ -164,8 +165,9 @@
     int Work [ ]    /* size 4n */
 ) ;
 
-UF_long btf_l_strongcomp (UF_long, UF_long *, UF_long *, UF_long *, UF_long *,
-    UF_long *, UF_long *) ;
+SuiteSparse_long btf_l_strongcomp (SuiteSparse_long, SuiteSparse_long *,
+    SuiteSparse_long *, SuiteSparse_long *, SuiteSparse_long *,
+    SuiteSparse_long *, SuiteSparse_long *) ;
 
 
 /* ========================================================================== */
@@ -211,8 +213,10 @@
     int Work [ ]    /* size 5n */
 ) ;
 
-UF_long btf_l_order (UF_long, UF_long *, UF_long *, double , double *,
-    UF_long *, UF_long *, UF_long *, UF_long *, UF_long *) ;
+SuiteSparse_long btf_l_order (SuiteSparse_long, SuiteSparse_long *,
+    SuiteSparse_long *, double , double *, SuiteSparse_long *,
+    SuiteSparse_long *, SuiteSparse_long *, SuiteSparse_long *,
+    SuiteSparse_long *) ;
 
 
 /* ========================================================================== */
@@ -250,10 +254,10 @@
  *      #endif
  */
 
-#define BTF_DATE "Mar 24, 2009"
+#define BTF_DATE "Jun 1, 2012"
 #define BTF_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define BTF_MAIN_VERSION 1
-#define BTF_SUB_VERSION 1
+#define BTF_SUB_VERSION 2
 #define BTF_SUBSUB_VERSION 0
 #define BTF_VERSION BTF_VERSION_CODE(BTF_MAIN_VERSION,BTF_SUB_VERSION)
 

=== modified file 'BTF/Include/btf_internal.h'
--- BTF/Include/btf_internal.h	2007-05-29 09:36:29 +0000
+++ BTF/Include/btf_internal.h	2013-12-08 03:08:50 +0000
@@ -6,15 +6,15 @@
 #define _BTF_INTERNAL_H
 
 /*
- * Copyright (c) 2004-2007.  Tim Davis, University of Florida,
+ * By Tim Davis.  Copyright (c) 2004-2007, University of Florida.
  * with support from Sandia National Laboratories.  All Rights Reserved.
  */
 
 /* Not to be included in any user program. */
 
 #ifdef DLONG
-#define Int UF_long
-#define Int_id UF_long_id
+#define Int SuiteSparse_long
+#define Int_id SuiteSparse_long_id
 #define BTF(name) btf_l_ ## name
 #else
 #define Int int

=== modified file 'BTF/Lib/Makefile'
--- BTF/Lib/Makefile	2007-05-29 09:36:29 +0000
+++ BTF/Lib/Makefile	2013-12-08 03:08:50 +0000
@@ -2,16 +2,16 @@
 
 ccode: all
 
-include ../../UFconfig/UFconfig.mk
+include ../../SuiteSparse_config/SuiteSparse_config.mk
 
 # for testing only:
 # TEST = -DTESTING
 
-C = $(CC) $(CFLAGS)
+C = $(CC) $(CF)
 
 INC = ../Include/btf.h ../Include/btf_internal.h
 
-I = -I../Include -I../../UFconfig
+I = -I../Include -I../../SuiteSparse_config
 
 all: library
 
@@ -21,8 +21,8 @@
     btf_l_order.o btf_l_maxtrans.o btf_l_strongcomp.o
 
 libbtf.a: $(OBJ)
-	$(AR) libbtf.a $(OBJ)
-	$(RANLIB) libbtf.a
+	$(ARCHIVE)  libbtf.a $(OBJ)
+	- $(RANLIB) libbtf.a
 
 $(OBJ): $(INC)
 

=== modified file 'BTF/MATLAB/Contents.m'
--- BTF/MATLAB/Contents.m	2007-05-29 09:36:29 +0000
+++ BTF/MATLAB/Contents.m	2013-12-08 03:08:50 +0000
@@ -17,4 +17,4 @@
 %   [p,q,r] = btf (A)
 %   [p,r] = strongcomp (A)
 
-% Copyright 2004-2007, Tim Davis, University of Florida
+% Copyright 2004-2007, University of Florida

=== removed file 'BTF/MATLAB/Makefile'
--- BTF/MATLAB/Makefile	2007-05-29 09:36:29 +0000
+++ BTF/MATLAB/Makefile	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-
-include ../../UFconfig/UFconfig.mk
-
-I = -I../Include -I../../UFconfig
-
-MX = $(MEX) $(I) -DDLONG
-
-all: maxtrans.mexglx strongcomp.mexglx btf.mexglx
-
-recursive: strongcomp_recursive.mexglx
-
-maxtrans.mexglx: ../Source/btf_maxtrans.c ../Include/btf.h maxtrans.c \
-		../Include/btf_internal.h
-	$(MX) maxtrans.c ../Source/btf_maxtrans.c
-
-strongcomp.mexglx: ../Source/btf_strongcomp.c ../Include/btf.h \
-		strongcomp.c ../Include/btf_internal.h
-	$(MX) strongcomp.c ../Source/btf_strongcomp.c
-
-strongcomp_recursive.mexglx: ../Source/btf_strongcomp.c ../Include/btf.h \
-		strongcomp.c ../Include/btf_internal.h
-	$(MX) -DRECURSIVE -output strongcomp_recursive \
-		../Source/btf_strongcomp.c strongcomp.c
-
-btf.mexglx: ../Source/btf_strongcomp.c ../Include/btf.h btf.c \
-		../Include/btf_internal.h \
-		../Source/btf_maxtrans.c ../Source/btf_order.c
-	$(MX) btf.c ../Source/btf_maxtrans.c \
-		../Source/btf_strongcomp.c ../Source/btf_order.c
-
-distclean: purge
-
-purge: clean
-	- $(RM) *.o *.mex*
-
-clean:
-	- $(RM) $(CLEAN)

=== modified file 'BTF/MATLAB/Test/btf_test.m'
--- BTF/MATLAB/Test/btf_test.m	2008-02-21 14:46:50 +0000
+++ BTF/MATLAB/Test/btf_test.m	2013-12-08 03:08:50 +0000
@@ -7,7 +7,7 @@
 %   test1, test2, test3, test4, test5, test6.
 
 if (nargin < 1)
-    nmat = 800 ;
+    nmat = 200 ;
 end
 
 test1 (nmat) ;

=== modified file 'BTF/MATLAB/Test/checkbtf.m'
--- BTF/MATLAB/Test/checkbtf.m	2010-04-15 10:36:16 +0000
+++ BTF/MATLAB/Test/checkbtf.m	2013-12-08 03:08:50 +0000
@@ -9,7 +9,7 @@
 %
 % See also drawbtf, maxtrans, strongcomp.
 
-% Copyright 2007, Timothy A. Davis, University of Florida
+% Copyright 2007, Timothy A. Davis, http://www.suitesparse.com
 
 [m n] = size (A) ;
 if (m ~= n)

=== modified file 'BTF/MATLAB/Test/test1.m'
--- BTF/MATLAB/Test/test1.m	2010-04-15 10:36:16 +0000
+++ BTF/MATLAB/Test/test1.m	2013-12-08 03:08:50 +0000
@@ -6,7 +6,7 @@
 % See also btf, maxtrans, strongcomp, dmperm, UFget,
 %   test1, test2, test3, test4, test5.
 
-% Copyright 2007, Timothy A. Davis, University of Florida
+% Copyright 2007, Timothy A. Davis, http://www.suitesparse.com
 
 index = UFget ;
 % f = find (index.sprank < min (index.nrows, index.ncols)) ;
@@ -29,9 +29,9 @@
 T0 = zeros (nmat,1) ;
 T1 = zeros (nmat,1) ;
 Anz = zeros (nmat,1) ;
-figure (1) ;
 MN = zeros (nmat, 2) ;
 Nzdiag = zeros (nmat,1) ;
+clf
 
 % warmup
 p = maxtrans (sparse (1)) ;         %#ok

=== modified file 'BTF/MATLAB/Test/test2.m'
--- BTF/MATLAB/Test/test2.m	2010-04-15 10:36:16 +0000
+++ BTF/MATLAB/Test/test2.m	2013-12-08 03:08:50 +0000
@@ -6,7 +6,7 @@
 % See also btf, maxtrans, strongcomp, dmperm, UFget,
 %   test1, test2, test3, test4, test5.
 
-% Copyright 2007, Timothy A. Davis, University of Florida
+% Copyright 2007, Timothy A. Davis, http://www.suitesparse.com
 
 index = UFget ;
 f = find (index.nrows == index.ncols) ;
@@ -27,10 +27,9 @@
 T0 = zeros (nmat,1) ;
 T1 = zeros (nmat,1) ;
 Anz = zeros (nmat,1) ;
-figure (1) ;
-clf
 MN = zeros (nmat, 2) ;
 Nzdiag = zeros (nmat,1) ;
+clf
 
 % warmup
 p = maxtrans (sparse (1)) ;             %#ok

=== modified file 'BTF/MATLAB/Test/test3.m'
--- BTF/MATLAB/Test/test3.m	2010-04-15 10:36:16 +0000
+++ BTF/MATLAB/Test/test3.m	2013-12-08 03:08:50 +0000
@@ -6,7 +6,7 @@
 % See also btf, maxtrans, strongcomp, dmperm, UFget,
 %   test1, test2, test3, test4, test5.
 
-% Copyright 2007, Timothy A. Davis, Univ. of Florida
+% Copyright 2007, Timothy A. Davis, http://www.suitesparse.com
 
 doplot = 1 ;
 dopause = 0 ;
@@ -18,8 +18,6 @@
 f = f (i) ;
 clear i
 
-figure (1)
-
 % short test set: seg faults, lots of blocks, lots of work, and so on:
 nasty = [
         % --- various test matrices (no seg fault, quick run time)
@@ -279,7 +277,6 @@
         singular = s1 < n ;
 
         if (doplot)
-            % figure (1)
             clf
             subplot (2,4,1)
             spy (A)

=== modified file 'BTF/MATLAB/Test/test4.m'
--- BTF/MATLAB/Test/test4.m	2008-02-21 14:46:50 +0000
+++ BTF/MATLAB/Test/test4.m	2013-12-08 03:08:50 +0000
@@ -6,7 +6,7 @@
 % See also btf, maxtrans, strongcomp, dmperm, UFget,
 %   test1, test2, test3, test4, test5.
 
-% Copyright 2007, Timothy A. Davis, University of Florida
+% Copyright 2007, Timothy A. Davis, http://www.suitesparse.com
 
 index = UFget ;
 f = find (index.nrows == index.ncols) ;

=== modified file 'BTF/MATLAB/Test/test5.m'
--- BTF/MATLAB/Test/test5.m	2008-02-21 14:46:50 +0000
+++ BTF/MATLAB/Test/test5.m	2013-12-08 03:08:50 +0000
@@ -6,7 +6,7 @@
 % See also btf, maxtrans, strongcomp, dmperm, UFget,
 %   test1, test2, test3, test4, test5.
 
-% Copyright 2007, Timothy A. Davis, University of Florida
+% Copyright 2007, Timothy A. Davis, http://www.suitesparse.com
 
 index = UFget ;
 

=== modified file 'BTF/MATLAB/Test/test6.m'
--- BTF/MATLAB/Test/test6.m	2008-02-21 14:46:50 +0000
+++ BTF/MATLAB/Test/test6.m	2013-12-08 03:08:50 +0000
@@ -6,7 +6,7 @@
 % See also btf, maxtrans, strongcomp, dmperm, UFget,
 %   test1, test2, test3, test4, test5.
 
-% Copyright 2007, Timothy A. Davis, University of Florida
+% Copyright 2007, Timothy A. Davis, http://www.suitesparse.com
 
 quick2 = [ ...
  1522 -272  1463  1521   460 1507  -838 1533 -1533 -1456 -1512   734   211 ...

=== modified file 'BTF/MATLAB/btf.c'
--- BTF/MATLAB/btf.c	2010-04-15 10:36:16 +0000
+++ BTF/MATLAB/btf.c	2013-12-08 03:08:50 +0000
@@ -33,7 +33,7 @@
  * work performed, or -1 if the maximum work limit is reached (in which case
  * the maximum matching might not have been found).
  *
- * Copyright (c) 2004-2007.  Tim Davis, University of Florida,
+ * By Tim Davis.  Copyright (c) 2004-2007, University of Florida.
  * with support from Sandia National Laboratories.  All Rights Reserved.
  *
  * See also maxtrans, strongcomp, dmperm
@@ -43,6 +43,7 @@
 
 #include "mex.h"
 #include "btf.h"
+#define Long SuiteSparse_long
 
 void mexFunction
 (
@@ -53,7 +54,7 @@
 )
 {
     double work, maxwork ;
-    UF_long b, n, k, *Ap, *Ai, *P, *R, nblocks, *Work, *Q, nmatch ;
+    Long b, n, k, *Ap, *Ai, *P, *R, nblocks, *Work, *Q, nmatch ;
     double *Px, *Rx, *Qx, *w ;
 
     /* ---------------------------------------------------------------------- */
@@ -71,16 +72,16 @@
     }
 
     /* get sparse matrix A */
-    Ap = (UF_long *) mxGetJc (pargin [0]) ;
-    Ai = (UF_long *) mxGetIr (pargin [0]) ;
+    Ap = (Long *) mxGetJc (pargin [0]) ;
+    Ai = (Long *) mxGetIr (pargin [0]) ;
 
     /* get output arrays */
-    Q = mxMalloc (n * sizeof (UF_long)) ;
-    P = mxMalloc (n * sizeof (UF_long)) ;
-    R = mxMalloc ((n+1) * sizeof (UF_long)) ;
+    Q = mxMalloc (n * sizeof (Long)) ;
+    P = mxMalloc (n * sizeof (Long)) ;
+    R = mxMalloc ((n+1) * sizeof (Long)) ;
 
     /* get workspace */
-    Work = mxMalloc (5*n * sizeof (UF_long)) ;
+    Work = mxMalloc (5*n * sizeof (Long)) ;
 
     maxwork = 0 ;
     if (nargin > 1)

=== modified file 'BTF/MATLAB/btf.m'
--- BTF/MATLAB/btf.m	2010-04-15 10:36:16 +0000
+++ BTF/MATLAB/btf.m	2013-12-08 03:08:50 +0000
@@ -32,7 +32,7 @@
 %
 % See also maxtrans, strongcomp, dmperm, sprank
 
-% Copyright 2004-2007, Tim Davis, University of Florida
+% Copyright 2004-2007, University of Florida
 % with support from Sandia National Laboratories.  All Rights Reserved.
 
 error ('btf mexFunction not found') ;

=== modified file 'BTF/MATLAB/btf_demo.m'
--- BTF/MATLAB/btf_demo.m	2007-05-29 09:36:29 +0000
+++ BTF/MATLAB/btf_demo.m	2013-12-08 03:08:50 +0000
@@ -5,12 +5,11 @@
 %
 % See also btf, dmperm, strongcomp, maxtrans
 
-% Copyright 2004-2007, Tim Davis, University of Florida
+% Copyright 2004-2007, University of Florida
 
 load west0479 ;
 A = west0479 ;
 
-figure (1)
 clf
 
 subplot (2,3,1) ;

=== modified file 'BTF/MATLAB/btf_install.m'
--- BTF/MATLAB/btf_install.m	2007-05-29 09:36:29 +0000
+++ BTF/MATLAB/btf_install.m	2013-12-08 03:08:50 +0000
@@ -7,7 +7,7 @@
 %
 % See also btf, maxtrans, stroncomp, dmperm.
 
-% Copyright 2004-2007, Tim Davis, University of Florida
+% Copyright 2004-2007, University of Florida
 
 btf_make
 addpath (pwd) ;

=== modified file 'BTF/MATLAB/btf_make.m'
--- BTF/MATLAB/btf_make.m	2010-04-15 10:36:16 +0000
+++ BTF/MATLAB/btf_make.m	2013-12-08 03:08:50 +0000
@@ -7,11 +7,11 @@
 %
 % See also btf, maxtrans, stroncomp, dmperm.
 
-% Copyright 2004-2007, Tim Davis, University of Florida
+% Copyright 2004-2007, University of Florida
 
 details = 0 ;       % if 1, print details of each command
 
-mexcmd = 'mex -O -DDLONG -I../Include -I../../UFconfig ' ;
+mexcmd = 'mex -O -DDLONG -I../Include -I../../SuiteSparse_config ' ;
 if (~isempty (strfind (computer, '64')))
     mexcmd = [mexcmd '-largeArrayDims '] ;
 end

=== modified file 'BTF/MATLAB/drawbtf.m'
--- BTF/MATLAB/drawbtf.m	2010-04-15 10:36:16 +0000
+++ BTF/MATLAB/drawbtf.m	2013-12-08 03:08:50 +0000
@@ -9,7 +9,7 @@
 %
 % See also btf, maxtrans, strongcomp, dmperm.
 
-% Copyright 2004-2007, Tim Davis, University of Florida
+% Copyright 2004-2007, University of Florida
 
 nblocks = length (r) - 1 ;
 

=== modified file 'BTF/MATLAB/maxtrans.c'
--- BTF/MATLAB/maxtrans.c	2010-04-15 10:36:16 +0000
+++ BTF/MATLAB/maxtrans.c	2013-12-08 03:08:50 +0000
@@ -19,7 +19,7 @@
  * work performed, or -1 if the maximum work limit is reached (in which case
  * the maximum matching might not have been found).
  *
- * Copyright (c) 2004-2007.  Tim Davis, University of Florida,
+ * By Tim Davis.  Copyright (c) 2004-2007, University of Florida.
  * with support from Sandia National Laboratories.  All Rights Reserved.
  */
 
@@ -27,6 +27,7 @@
 
 #include "mex.h"
 #include "btf.h"
+#define Long SuiteSparse_long
 
 void mexFunction
 (
@@ -37,7 +38,7 @@
 )
 {
     double maxwork, work ;
-    UF_long nrow, ncol, i, *Ap, *Ai, *Match, nmatch, *Work ;
+    Long nrow, ncol, i, *Ap, *Ai, *Match, nmatch, *Work ;
     double *Matchx, *w ;
 
     /* ---------------------------------------------------------------------- */
@@ -56,14 +57,14 @@
     }
 
     /* get sparse matrix A */
-    Ap = (UF_long *) mxGetJc (pargin [0]) ;
-    Ai = (UF_long *) mxGetIr (pargin [0]) ;
+    Ap = (Long *) mxGetJc (pargin [0]) ;
+    Ai = (Long *) mxGetIr (pargin [0]) ;
 
     /* get output array */
-    Match = mxMalloc (nrow * sizeof (UF_long)) ;
+    Match = mxMalloc (nrow * sizeof (Long)) ;
 
     /* get workspace of size 5n (recursive version needs only 2n) */
-    Work = mxMalloc (5*ncol * sizeof (UF_long)) ;
+    Work = mxMalloc (5*ncol * sizeof (Long)) ;
 
     maxwork = 0 ;
     if (nargin > 1)

=== modified file 'BTF/MATLAB/maxtrans.m'
--- BTF/MATLAB/maxtrans.m	2010-04-15 10:36:16 +0000
+++ BTF/MATLAB/maxtrans.m	2013-12-08 03:08:50 +0000
@@ -25,6 +25,6 @@
 %
 % See also: btf, strongcomp, dmperm, sprank
 
-% Copyright 2004-2007, Tim Davis, University of Florida
+% Copyright 2004-2007, University of Florida
 
 error ('maxtrans mexfunction not found') ;

=== modified file 'BTF/MATLAB/strongcomp.c'
--- BTF/MATLAB/strongcomp.c	2010-04-15 10:36:16 +0000
+++ BTF/MATLAB/strongcomp.c	2013-12-08 03:08:50 +0000
@@ -47,7 +47,7 @@
  * diagonal that is above the main diagonal; btf always returns the matching as
  * the main diagonal (which will thus contain zeros).
  *
- * Copyright (c) 2004-2007.  Tim Davis, University of Florida,
+ * By Tim Davis.  Copyright (c) 2004-2007, University of Florida.
  * with support from Sandia National Laboratories.  All Rights Reserved.
  *
  * See also maxtrans, btf, dmperm
@@ -57,6 +57,7 @@
 
 #include "mex.h"
 #include "btf.h"
+#define Long SuiteSparse_long
 
 void mexFunction
 (
@@ -66,7 +67,7 @@
     const mxArray *pargin[]
 )
 {
-    UF_long b, n, i, k, j, *Ap, *Ai, *P, *R, nblocks, *Work, *Q, jj ;
+    Long b, n, i, k, j, *Ap, *Ai, *P, *R, nblocks, *Work, *Q, jj ;
     double *Px, *Rx, *Qx ;
 
     /* ---------------------------------------------------------------------- */
@@ -85,15 +86,15 @@
     }
 
     /* get sparse matrix A */
-    Ap = (UF_long *) mxGetJc (pargin [0]) ;
-    Ai = (UF_long *) mxGetIr (pargin [0]) ;
+    Ap = (Long *) mxGetJc (pargin [0]) ;
+    Ai = (Long *) mxGetIr (pargin [0]) ;
 
     /* get output arrays */
-    P = mxMalloc (n * sizeof (UF_long)) ;
-    R = mxMalloc ((n+1) * sizeof (UF_long)) ;
+    P = mxMalloc (n * sizeof (Long)) ;
+    R = mxMalloc ((n+1) * sizeof (Long)) ;
 
     /* get workspace of size 4n (recursive code only needs 2n) */
-    Work = mxMalloc (4*n * sizeof (UF_long)) ;
+    Work = mxMalloc (4*n * sizeof (Long)) ;
 
     /* get the input column permutation Q */
     if (nargin == 2)
@@ -104,7 +105,7 @@
                 ("strongcomp: qin must be a permutation vector of size n") ;
         }
         Qx = mxGetPr (pargin [1]) ;
-        Q = mxMalloc (n * sizeof (UF_long)) ;
+        Q = mxMalloc (n * sizeof (Long)) ;
         /* connvert Qin to 0-based and check validity */
         for (i = 0 ; i < n ; i++)
         {
@@ -126,7 +127,7 @@
     else
     {
         /* no input column permutation */
-        Q = (UF_long *) NULL ;
+        Q = (Long *) NULL ;
     }
 
     /* ---------------------------------------------------------------------- */

=== modified file 'BTF/MATLAB/strongcomp.m'
--- BTF/MATLAB/strongcomp.m	2010-04-15 10:36:16 +0000
+++ BTF/MATLAB/strongcomp.m	2013-12-08 03:08:50 +0000
@@ -40,6 +40,6 @@
 %
 % See also btf, maxtrans, dmperm
 
-% Copyright 2004-2007, Tim Davis, University of Florida
+% Copyright 2004-2007, University of Florida
 
 error ('strongcomp mexFunction not found') ;

=== modified file 'BTF/Makefile'
--- BTF/Makefile	2007-05-29 09:36:29 +0000
+++ BTF/Makefile	2013-12-08 03:08:50 +0000
@@ -1,18 +1,36 @@
+#------------------------------------------------------------------------------
+# BTF Makefile
+#------------------------------------------------------------------------------
+
+VERSION = 1.2.0
+
 default: library
 
-include ../UFconfig/UFconfig.mk
+include ../SuiteSparse_config/SuiteSparse_config.mk
 
 library:
 	( cd Lib ; $(MAKE) )
 
 clean:
 	( cd Lib ; $(MAKE) clean )
+	( cd MATLAB ; $(RM) $(CLEAN) )
 
 distclean:
 	( cd Lib ; $(MAKE) distclean )
-	( cd MATLAB ; $(MAKE) distclean )
-
-mex:
-	( cd MATLAB ; $(MAKE) )
+	( cd MATLAB ; $(RM) $(CLEAN) ; $(RM) *.mex* )
 
 purge: distclean
+
+# install BTF
+install:
+	$(CP) Lib/libbtf.a $(INSTALL_LIB)/libbtf.$(VERSION).a
+	( cd $(INSTALL_LIB) ; ln -sf libbtf.$(VERSION).a libbtf.a )
+	$(CP) Include/btf.h $(INSTALL_INCLUDE)
+	chmod 644 $(INSTALL_LIB)/libbtf*.a
+	chmod 644 $(INSTALL_INCLUDE)/btf.h
+
+# uninstall BTF
+uninstall:
+	$(RM) $(INSTALL_LIB)/libbtf*.a
+	$(RM) $(INSTALL_INCLUDE)/btf.h
+

=== modified file 'BTF/README.txt'
--- BTF/README.txt	2010-04-15 10:36:16 +0000
+++ BTF/README.txt	2013-12-08 03:08:50 +0000
@@ -1,7 +1,6 @@
-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-2012, University of Florida
 BTF is also available under other licenses; contact the author for details.
-http://www.cise.ufl.edu/research/sparse
+http://www.suitesparse.com
 
 BTF is a software package for permuting a matrix into block upper triangular
 form.  It includes a maximum transversal algorithm, which finds a permutation
@@ -11,8 +10,9 @@
 strongly connected components of a graph.  These two methods together give the
 permutation to block upper triangular form.
 
-Requires UFconfig, in the ../UFconfig directory relative to this directory.
-KLU relies on this package to permute
+Requires SuiteSparse_config, in the ../SuiteSparse_config directory relative to
+this directory.  KLU relies on the BTF package to permute the matrix prior to
+factorization.
 
 To compile the libbtf.a library, type "make".  The compiled library is located
 in BTF/Lib/libbtf.a.  Compile code that uses BTF with -IBTF/Include.

=== modified file 'BTF/Source/btf_maxtrans.c'
--- BTF/Source/btf_maxtrans.c	2010-04-15 10:36:16 +0000
+++ BTF/Source/btf_maxtrans.c	2013-12-08 03:08:50 +0000
@@ -41,7 +41,7 @@
  * are typically structurally non-singular, maxtrans is preferred.  A partial
  * maxtrans can still be very useful when solving a sparse linear system.
  *
- * Copyright (c) 2004-2007.  Tim Davis, University of Florida,
+ * By Tim Davis.  Copyright (c) 2004-2007, University of Florida.
  * with support from Sandia National Laboratories.  All Rights Reserved.
  */ 
 

=== modified file 'BTF/Source/btf_order.c'
--- BTF/Source/btf_order.c	2010-04-15 10:36:16 +0000
+++ BTF/Source/btf_order.c	2013-12-08 03:08:50 +0000
@@ -22,7 +22,7 @@
  *
  * See btf.h for more details.
  *
- * Copyright (c) 2004-2007.  Tim Davis, University of Florida,
+ * By Tim Davis.  Copyright (c) 2004-2007, University of Florida.
  * with support from Sandia National Laboratories.  All Rights Reserved.
  */
 

=== modified file 'BTF/Source/btf_strongcomp.c'
--- BTF/Source/btf_strongcomp.c	2010-04-15 10:36:16 +0000
+++ BTF/Source/btf_strongcomp.c	2013-12-08 03:08:50 +0000
@@ -6,7 +6,7 @@
  * the matrix into upper block triangular form.  See btf.h for more details.
  * Input matrix and Q are not checked on input.
  *
- * Copyright (c) 2004-2007.  Tim Davis, University of Florida,
+ * By Tim Davis.  Copyright (c) 2004-2007, University of Florida.
  * with support from Sandia National Laboratories.  All Rights Reserved.
  */
 

=== modified file 'CAMD/Demo/Makefile'
--- CAMD/Demo/Makefile	2007-05-29 09:36:29 +0000
+++ CAMD/Demo/Makefile	2013-12-08 03:08:50 +0000
@@ -4,13 +4,11 @@
 
 default: camd_simple camd_demo camd_demo2 camd_l_demo
 
-include ../../UFconfig/UFconfig.mk
-
-C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
-
-UFCONFIG = ../../UFconfig/UFconfig.h
-
-INC = ../Include/camd.h $(UFCONFIG)
+include ../../SuiteSparse_config/SuiteSparse_config.mk
+
+C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
+
+INC = ../Include/camd.h ../../SuiteSparse_config/SuiteSparse_config.h
 
 library:
 	( cd ../Lib ; $(MAKE) )
@@ -55,3 +53,4 @@
 	- $(RM) camd_l_demo my_camd_l_demo.out
 	- $(RM) camd_demo2 my_camd_demo2.out
 	- $(RM) camd_simple my_camd_simple.out
+	- $(RM) -r *.dSYM

=== modified file 'CAMD/Demo/camd_demo.c'
--- CAMD/Demo/camd_demo.c	2007-05-29 09:36:29 +0000
+++ CAMD/Demo/camd_demo.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* A simple C main program that illustrates the use of the ANSI C interface

=== modified file 'CAMD/Demo/camd_demo.out'
--- CAMD/Demo/camd_demo.out	2007-05-29 09:36:29 +0000
+++ CAMD/Demo/camd_demo.out	2013-12-08 03:08:50 +0000
@@ -1,7 +1,7 @@
-CAMD version 2.2, date: May 31, 2007
+CAMD version 2.3, date: Jun 1, 2012
 CAMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-camd version 2.2, May 31, 2007:  approximate minimum degree ordering:
+camd version 2.3, 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)

=== modified file 'CAMD/Demo/camd_demo2.c'
--- CAMD/Demo/camd_demo2.c	2007-05-29 09:36:29 +0000
+++ CAMD/Demo/camd_demo2.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* A simple C main program that illustrates the use of the ANSI C interface

=== modified file 'CAMD/Demo/camd_demo2.out'
--- CAMD/Demo/camd_demo2.out	2007-05-29 09:36:29 +0000
+++ CAMD/Demo/camd_demo2.out	2013-12-08 03:08:50 +0000
@@ -1,7 +1,7 @@
 CAMD demo, with a jumbled version of the 24-by-24
 Harwell/Boeing matrix, can_24:
 
-camd version 2.2, May 31, 2007:  approximate minimum degree ordering:
+camd version 2.3, 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)

=== modified file 'CAMD/Demo/camd_l_demo.c'
--- CAMD/Demo/camd_l_demo.c	2007-05-29 09:36:29 +0000
+++ CAMD/Demo/camd_l_demo.c	2013-12-08 03:08:50 +0000
@@ -1,12 +1,11 @@
 /* ========================================================================= */
-/* === CAMD demo main program (UF_long integer version) ==================== */
+/* === CAMD demo main program (long integer version) ======================= */
 /* ========================================================================= */
 
 /* ------------------------------------------------------------------------- */
 /* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* A simple C main program that illustrates the use of the ANSI C interface
@@ -16,16 +15,14 @@
 #include "camd.h"
 #include <stdio.h>
 #include <stdlib.h>
-
-/* define UF_long */
-#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 [ ] = {
@@ -54,10 +51,10 @@
 	/* 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 [CAMD_CONTROL], Info [CAMD_INFO] ;
     char A [24][24] ;
-    UF_long C [ ] = { 0, 0, 4, 0, 1, 0, 2, 2, 1, 1, 3, 4, 5, 5, 3, 4,
+    Long C [ ] = { 0, 0, 4, 0, 1, 0, 2, 2, 1, 1, 3, 4, 5, 5, 3, 4,
 	5, 2, 5, 3, 4, 2, 1, 0 };
 
     printf ("CAMD version %d.%d, date: %s\n", CAMD_MAIN_VERSION,

=== modified file 'CAMD/Demo/camd_l_demo.out'
--- CAMD/Demo/camd_l_demo.out	2007-05-29 09:36:29 +0000
+++ CAMD/Demo/camd_l_demo.out	2013-12-08 03:08:50 +0000
@@ -1,7 +1,7 @@
-CAMD version 2.2, date: May 31, 2007
+CAMD version 2.3, date: Jun 1, 2012
 CAMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-camd version 2.2, May 31, 2007:  approximate minimum degree ordering:
+camd version 2.3, 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)

=== modified file 'CAMD/Demo/camd_simple.c'
--- CAMD/Demo/camd_simple.c	2007-05-29 09:36:29 +0000
+++ CAMD/Demo/camd_simple.c	2013-12-08 03:08:50 +0000
@@ -1,8 +1,7 @@
 /* ------------------------------------------------------------------------- */
 /* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 #include <stdio.h>

=== modified file 'CAMD/Doc/CAMD_UserGuide.pdf'
Binary files CAMD/Doc/CAMD_UserGuide.pdf	2007-05-29 09:36:29 +0000 and CAMD/Doc/CAMD_UserGuide.pdf	2013-12-08 03:08:50 +0000 differ
=== modified file 'CAMD/Doc/CAMD_UserGuide.tex'
--- CAMD/Doc/CAMD_UserGuide.tex	2007-05-29 09:36:29 +0000
+++ CAMD/Doc/CAMD_UserGuide.tex	2013-12-08 03:08:50 +0000
@@ -13,16 +13,14 @@
 \begin{document}
 %------------------------------------------------------------------------------
 
-\title{CAMD Version 2.2 User Guide}
+\title{CAMD User Guide}
 \author{Patrick R. Amestoy\thanks{ENSEEIHT-IRIT,
 2 rue Camichel 31017 Toulouse, France.
 email: [e-mail].  http://www.enseeiht.fr/$\sim$amestoy.}
 \and Yanqing (Morris) Chen
 \and Timothy A. Davis\thanks{
-Dept.~of Computer and Information Science and Engineering,
-Univ.~of Florida, Gainesville, FL, USA.
-email: [e-mail].
-http://www.cise.ufl.edu/$\sim$davis.
+email: [e-mail],
+http://www.suitesparse.com.
 This work was supported by the National
 Science Foundation, under grants ASC-9111263, DMS-9223088, and CCR-0203270.
 Portions of the work were done while on sabbatical at Stanford University
@@ -36,7 +34,7 @@
 This work was supported by the EPSRC under grant GR/R46441.
 }}
 
-\date{May 31, 2007}
+\date{VERSION 2.3.1, Jun 20, 2012}
 \maketitle
 
 %------------------------------------------------------------------------------
@@ -48,7 +46,7 @@
 \end{abstract}
 %------------------------------------------------------------------------------
 
-CAMD Version 2.2, Copyright\copyright 2007 by Timothy A.  Davis,
+CAMD Copyright\copyright 2011 by Timothy A.  Davis,
 Yanqing (Morris) Chen,
 Patrick R. Amestoy, and Iain S. Duff.  All Rights Reserved.
 CAMD is available under alternate licences; contact T. Davis for details.
@@ -83,7 +81,7 @@
     and a notice that the code was modified is included.
 
 {\bf Availability:}
-    http://www.cise.ufl.edu/research/sparse/camd
+    http://www.suitesparse.com.
 
 {\bf Acknowledgments:}
 
@@ -183,7 +181,7 @@
 \section{Availability}
 %------------------------------------------------------------------------------
 
-CAMD is available at http://www.cise.ufl.edu/research/sparse.
+CAMD is available at http://www.suitesparse.com.
 The Fortran version is available as the routine {\tt MC47} in HSL
 (formerly the Harwell Subroutine Library) \cite{hsl:2002}. {\tt MC47} does
 not include ordering constraints.
@@ -217,7 +215,7 @@
 uses several strategies, including a symmetric pivoting strategy, and
 will give you better results if you want to factorize an unsymmetric matrix
 of this type.  Refer to the UMFPACK User Guide for more details, at
-http://www.cise.ufl.edu/research/sparse/umfpack.
+http://www.suitesparse.com.
 
 The CAMD mexFunction is much faster than the built-in MATLAB symmetric minimum
 degree ordering methods, SYMAMD and SYMMMD.  Its ordering quality is
@@ -539,7 +537,8 @@
 The following discussion assumes you have the {\tt make} program, either in
 Unix, or in Windows with Cygwin.
 
-System-dependent configurations are in the {\tt ../UFconfig/UFconfig.mk}
+System-dependent configurations are in the
+{\tt ../SuiteSparse\_config/SuiteSparse\_config.mk}
 file.  You can edit that file to customize the compilation.  The default
 settings will work on most systems.
 Sample configuration files are provided
@@ -556,7 +555,8 @@
 Typing {\tt make clean} will remove all but the final compiled libraries
 and demo programs.  Typing {\tt make purge} or {\tt make distclean}
 removes all files not in the original distribution.
-If you compile CAMD and then later change the {\tt ../UFconfig/UFconfig.mk} file
+If you compile CAMD and then later change the
+{\tt ../SuiteSparse\_config/SuiteSparse\_config.mk} file
 then you should type {\tt make purge} and then {\tt make} to recompile.
 
 When you compile your program that uses the C-callable CAMD library,
@@ -572,11 +572,6 @@
 This works on any system with MATLAB, including Windows.
 Alternately, type {\tt make} in the {\tt CAMD/MATLAB} directory.
 
-If you have MATLAB 7.2 or earlier, you must first edit UFconfig/UFconfig.h to
-remove the "-largeArrayDims" option from the MEX command, prior to
-{\tt make mex} or {\tt make} in the MATLAB directory
-(or just use {\tt camd\_make.m} inside MATLAB.
-
 If you are including CAMD as a subset of a larger library and do not want
 to link the C standard I/O library, or if you simply do not need to use
 them, you can safely remove the {\tt camd\_control.c} and {\tt camd\_info.c}
@@ -616,427 +611,7 @@
 and gives details on their use.
 
 {\footnotesize
-\begin{verbatim}
-/* ========================================================================= */
-/* === CAMD:  approximate minimum degree ordering ========================== */
-/* ========================================================================= */
-
-/* ------------------------------------------------------------------------- */
-/* CAMD Version 2.2, Copyright (c) 2007 by Timothy A. Davis, Yanqing Chen,   */
-/* 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/camd                         */
-/* ------------------------------------------------------------------------- */
-
-/* CAMD finds a symmetric ordering P of a matrix A so that the Cholesky
- * factorization of P*A*P' has fewer nonzeros and takes less work than the
- * Cholesky factorization of A.  If A is not symmetric, then it performs its
- * ordering on the matrix A+A'.  Two sets of user-callable routines are
- * provided, one for int integers and the other for UF_long integers.
- *
- * The method is based on the approximate minimum degree algorithm, discussed
- * in Amestoy, Davis, and Duff, "An approximate degree ordering algorithm",
- * SIAM Journal of Matrix Analysis and Applications, vol. 17, no. 4, pp.
- * 886-905, 1996.
- */
-
-#ifndef CAMD_H
-#define CAMD_H
-
-/* make it easy for C++ programs to include CAMD */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* get the definition of size_t: */
-#include <stddef.h>
-
-/* define UF_long */
-#include "UFconfig.h"
-
-int camd_order              /* returns CAMD_OK, CAMD_OK_BUT_JUMBLED,
-                             * CAMD_INVALID, or CAMD_OUT_OF_MEMORY */
-(
-    int n,                  /* A is n-by-n.  n must be >= 0. */
-    const int Ap [ ],       /* column pointers for A, of size n+1 */
-    const int Ai [ ],       /* row indices of A, of size nz = Ap [n] */
-    int P [ ],              /* output permutation, of size n */
-    double Control [ ],     /* input Control settings, of size CAMD_CONTROL */
-    double Info [ ],        /* output Info statistics, of size CAMD_INFO */
-    const int C [ ]         /* Constraint set of A, of size n; can be NULL */
-) ;
-
-UF_long camd_l_order        /* see above for description of arguments */
-(
-    UF_long n,
-    const UF_long Ap [ ],
-    const UF_long Ai [ ],
-    UF_long P [ ],
-    double Control [ ],
-    double Info [ ],
-    const UF_long C [ ]
-) ;
-
-/* Input arguments (not modified):
- *
- *      n: the matrix A is n-by-n.
- *      Ap: an int/UF_long array of size n+1, containing column pointers of A.
- *      Ai: an int/UF_long array of size nz, containing the row indices of A,
- *          where nz = Ap [n].
- *      Control:  a double array of size CAMD_CONTROL, containing control
- *          parameters.  Defaults are used if Control is NULL.
- *
- * Output arguments (not defined on input):
- *
- *      P: an int/UF_long array of size n, containing the output permutation. If
- *          row i is the kth pivot row, then P [k] = i.  In MATLAB notation,
- *          the reordered matrix is A (P,P).
- *      Info: a double array of size CAMD_INFO, containing statistical
- *          information.  Ignored if Info is NULL.
- *
- * On input, the matrix A is stored in column-oriented form.  The row indices
- * of nonzero entries in column j are stored in Ai [Ap [j] ... Ap [j+1]-1].
- *
- * If the row indices appear in ascending order in each column, and there
- * are no duplicate entries, then camd_order is slightly more efficient in
- * terms of time and memory usage.  If this condition does not hold, a copy
- * of the matrix is created (where these conditions do hold), and the copy is
- * ordered.
- *
- * Row indices must be in the range 0 to
- * n-1.  Ap [0] must be zero, and thus nz = Ap [n] is the number of nonzeros
- * in A.  The array Ap is of size n+1, and the array Ai is of size nz = Ap [n].
- * The matrix does not need to be symmetric, and the diagonal does not need to
- * be present (if diagonal entries are present, they are ignored except for
- * the output statistic Info [CAMD_NZDIAG]).  The arrays Ai and Ap are not
- * modified.  This form of the Ap and Ai arrays to represent the nonzero
- * pattern of the matrix A is the same as that used internally by MATLAB.
- * If you wish to use a more flexible input structure, please see the
- * umfpack_*_triplet_to_col routines in the UMFPACK package, at
- * http://www.cise.ufl.edu/research/sparse/umfpack.
- *
- * Restrictions:  n >= 0.  Ap [0] = 0.  Ap [j] <= Ap [j+1] for all j in the
- *      range 0 to n-1.  nz = Ap [n] >= 0.  Ai [0..nz-1] must be in the range 0
- *      to n-1.  Finally, Ai, Ap, and P must not be NULL.  If any of these
- *      restrictions are not met, CAMD returns CAMD_INVALID.
- *
- * CAMD returns:
- *
- *      CAMD_OK if the matrix is valid and sufficient memory can be allocated to
- *          perform the ordering.
- *
- *      CAMD_OUT_OF_MEMORY if not enough memory can be allocated.
- *
- *      CAMD_INVALID if the input arguments n, Ap, Ai are invalid, or if P is
- *          NULL.
- *
- *      CAMD_OK_BUT_JUMBLED if the matrix had unsorted columns, and/or duplicate
- *          entries, but was otherwise valid.
- *
- * The CAMD routine first forms the pattern of the matrix A+A', and then
- * computes a fill-reducing ordering, P.  If P [k] = i, then row/column i of
- * the original is the kth pivotal row.  In MATLAB notation, the permuted
- * matrix is A (P,P), except that 0-based indexing is used instead of the
- * 1-based indexing in MATLAB.
- *
- * The Control array is used to set various parameters for CAMD.  If a NULL
- * pointer is passed, default values are used.  The Control array is not
- * modified.
- *
- *      Control [CAMD_DENSE]:  controls the threshold for "dense" rows/columns.
- *          A dense row/column in A+A' can cause CAMD to spend a lot of time in
- *          ordering the matrix.  If Control [CAMD_DENSE] >= 0, rows/columns
- *          with more than Control [CAMD_DENSE] * sqrt (n) entries are ignored
- *          during the ordering, and placed last in the output order.  The
- *          default value of Control [CAMD_DENSE] is 10.  If negative, no
- *          rows/columns are treated as "dense".  Rows/columns with 16 or
- *          fewer off-diagonal entries are never considered "dense".
- *
- *      Control [CAMD_AGGRESSIVE]: controls whether or not to use aggressive
- *          absorption, in which a prior element is absorbed into the current
- *          element if is a subset of the current element, even if it is not
- *          adjacent to the current pivot element (refer to Amestoy, Davis,
- *          & Duff, 1996, for more details).  The default value is nonzero,
- *          which means to perform aggressive absorption.  This nearly always
- *          leads to a better ordering (because the approximate degrees are
- *          more accurate) and a lower execution time.  There are cases where
- *          it can lead to a slightly worse ordering, however.  To turn it off,
- *          set Control [CAMD_AGGRESSIVE] to 0.
- *
- *      Control [2..4] are not used in the current version, but may be used in
- *          future versions.
- *
- * The Info array provides statistics about the ordering on output.  If it is
- * not present, the statistics are not returned.  This is not an error
- * condition.
- * 
- *      Info [CAMD_STATUS]:  the return value of CAMD, either CAMD_OK,
- *          CAMD_OK_BUT_JUMBLED, CAMD_OUT_OF_MEMORY, or CAMD_INVALID.
- *
- *      Info [CAMD_N]: n, the size of the input matrix
- *
- *      Info [CAMD_NZ]: the number of nonzeros in A, nz = Ap [n]
- *
- *      Info [CAMD_SYMMETRY]:  the symmetry of the matrix A.  It is the number
- *          of "matched" off-diagonal entries divided by the total number of
- *          off-diagonal entries.  An entry A(i,j) is matched if A(j,i) is also
- *          an entry, for any pair (i,j) for which i != j.  In MATLAB notation,
- *              S = spones (A) ;
- *              B = tril (S, -1) + triu (S, 1) ;
- *              symmetry = nnz (B & B') / nnz (B) ;
- *
- *      Info [CAMD_NZDIAG]: the number of entries on the diagonal of A.
- *
- *      Info [CAMD_NZ_A_PLUS_AT]:  the number of nonzeros in A+A', excluding the
- *          diagonal.  If A is perfectly symmetric (Info [CAMD_SYMMETRY] = 1)
- *          with a fully nonzero diagonal, then Info [CAMD_NZ_A_PLUS_AT] = nz-n
- *          (the smallest possible value).  If A is perfectly unsymmetric
- *          (Info [CAMD_SYMMETRY] = 0, for an upper triangular matrix, for
- *          example) with no diagonal, then Info [CAMD_NZ_A_PLUS_AT] = 2*nz
- *          (the largest possible value).
- *
- *      Info [CAMD_NDENSE]: the number of "dense" rows/columns of A+A' that were
- *          removed from A prior to ordering.  These are placed last in the
- *          output order P.
- *
- *      Info [CAMD_MEMORY]: the amount of memory used by CAMD, in bytes.  In the
- *          current version, this is 1.2 * Info  [CAMD_NZ_A_PLUS_AT] + 9*n
- *          times the size of an integer.  This is at most 2.4nz + 9n.  This
- *          excludes the size of the input arguments Ai, Ap, and P, which have
- *          a total size of nz + 2*n + 1 integers.
- *
- *      Info [CAMD_NCMPA]: the number of garbage collections performed.
- *
- *      Info [CAMD_LNZ]: the number of nonzeros in L (excluding the diagonal).
- *          This is a slight upper bound because mass elimination is combined
- *          with the approximate degree update.  It is a rough upper bound if
- *          there are many "dense" rows/columns.  The rest of the statistics,
- *          below, are also slight or rough upper bounds, for the same reasons.
- *          The post-ordering of the assembly tree might also not exactly
- *          correspond to a true elimination tree postordering.
- *
- *      Info [CAMD_NDIV]: the number of divide operations for a subsequent LDL'
- *          or LU factorization of the permuted matrix A (P,P).
- *
- *      Info [CAMD_NMULTSUBS_LDL]:  the number of multiply-subtract pairs for a
- *          subsequent LDL' factorization of A (P,P).
- *
- *      Info [CAMD_NMULTSUBS_LU]:  the number of multiply-subtract pairs for a
- *          subsequent LU factorization of A (P,P), assuming that no numerical
- *          pivoting is required.
- *
- *      Info [CAMD_DMAX]:  the maximum number of nonzeros in any column of L,
- *          including the diagonal.
- *
- *      Info [14..19] are not used in the current version, but may be used in
- *          future versions.
- */    
-
-/* ------------------------------------------------------------------------- */
-/* direct interface to CAMD */
-/* ------------------------------------------------------------------------- */
-
-/* camd_2 is the primary CAMD ordering routine.  It is not meant to be
- * user-callable because of its restrictive inputs and because it destroys
- * the user's input matrix.  It does not check its inputs for errors, either.
- * However, if you can work with these restrictions it can be faster than
- * camd_order and use less memory (assuming that you can create your own copy
- * of the matrix for CAMD to destroy).  Refer to CAMD/Source/camd_2.c for a
- * description of each parameter. */
-
-void camd_2
-(
-    int n,
-    int Pe [ ],
-    int Iw [ ],
-    int Len [ ],
-    int iwlen,
-    int pfree,
-    int Nv [ ],
-    int Next [ ], 
-    int Last [ ],
-    int Head [ ],
-    int Elen [ ],
-    int Degree [ ],
-    int W [ ],
-    double Control [ ],
-    double Info [ ],
-    const int C [ ],
-    int BucketSet [ ] 
-) ;
-
-void camd_l2
-(
-    UF_long n,
-    UF_long Pe [ ],
-    UF_long Iw [ ],
-    UF_long Len [ ],
-    UF_long iwlen,
-    UF_long pfree,
-    UF_long Nv [ ],
-    UF_long Next [ ], 
-    UF_long Last [ ],
-    UF_long Head [ ],
-    UF_long Elen [ ],
-    UF_long Degree [ ],
-    UF_long W [ ],
-    double Control [ ],
-    double Info [ ],
-    const UF_long C [ ],
-    UF_long BucketSet [ ]
-    
-) ;
-
-/* ------------------------------------------------------------------------- */
-/* camd_valid */
-/* ------------------------------------------------------------------------- */
-
-/* Returns CAMD_OK or CAMD_OK_BUT_JUMBLED if the matrix is valid as input to
- * camd_order; the latter is returned if the matrix has unsorted and/or
- * duplicate row indices in one or more columns.  Returns CAMD_INVALID if the
- * matrix cannot be passed to camd_order.  For camd_order, the matrix must also
- * be square.  The first two arguments are the number of rows and the number
- * of columns of the matrix.  For its use in CAMD, these must both equal n.
- */
-
-int camd_valid
-(
-    int n_row,              /* # of rows */
-    int n_col,              /* # of columns */
-    const int Ap [ ],       /* column pointers, of size n_col+1 */
-    const int Ai [ ]        /* row indices, of size Ap [n_col] */
-) ;
-
-UF_long camd_l_valid
-(
-    UF_long n_row,
-    UF_long n_col,
-    const UF_long Ap [ ],
-    const UF_long Ai [ ]
-) ;
-
-/* ------------------------------------------------------------------------- */
-/* camd_cvalid */
-/* ------------------------------------------------------------------------- */
-
-/* Returns TRUE if the constraint set is valid as input to camd_order,
- * FALSE otherwise. */
-
-int camd_cvalid
-(
-   int n,
-   const int C [ ]
-) ;
-
-UF_long camd_l_cvalid
-(
-   UF_long n,
-   const UF_long C [ ]
-) ;
-
-/* ------------------------------------------------------------------------- */
-/* CAMD memory manager and printf routines */
-/* ------------------------------------------------------------------------- */
-
-/* The user can redefine these to change the malloc, free, and printf routines
- * that CAMD uses. */
-
-#ifndef EXTERN
-#define EXTERN extern
-#endif
-
-EXTERN void *(*camd_malloc) (size_t) ;              /* pointer to malloc */
-EXTERN void (*camd_free) (void *) ;                 /* pointer to free */
-EXTERN void *(*camd_realloc) (void *, size_t) ;     /* pointer to realloc */
-EXTERN void *(*camd_calloc) (size_t, size_t) ;      /* pointer to calloc */
-EXTERN int (*camd_printf) (const char *, ...) ;     /* pointer to printf */
-
-/* ------------------------------------------------------------------------- */
-/* CAMD Control and Info arrays */
-/* ------------------------------------------------------------------------- */
-
-/* camd_defaults:  sets the default control settings */
-void camd_defaults   (double Control [ ]) ;
-void camd_l_defaults (double Control [ ]) ;
-
-/* camd_control: prints the control settings */
-void camd_control    (double Control [ ]) ;
-void camd_l_control  (double Control [ ]) ;
-
-/* camd_info: prints the statistics */
-void camd_info       (double Info [ ]) ;
-void camd_l_info     (double Info [ ]) ;
-
-#define CAMD_CONTROL 5      /* size of Control array */
-#define CAMD_INFO 20        /* size of Info array */
-
-/* contents of Control */
-#define CAMD_DENSE 0        /* "dense" if degree > Control [0] * sqrt (n) */
-#define CAMD_AGGRESSIVE 1    /* do aggressive absorption if Control [1] != 0 */
-
-/* default Control settings */
-#define CAMD_DEFAULT_DENSE 10.0     /* default "dense" degree 10*sqrt(n) */
-#define CAMD_DEFAULT_AGGRESSIVE 1    /* do aggressive absorption by default */
-
-/* contents of Info */
-#define CAMD_STATUS 0       /* return value of camd_order and camd_l_order */
-#define CAMD_N 1                    /* A is n-by-n */
-#define CAMD_NZ 2           /* number of nonzeros in A */ 
-#define CAMD_SYMMETRY 3     /* symmetry of pattern (1 is sym., 0 is unsym.) */
-#define CAMD_NZDIAG 4       /* # of entries on diagonal */
-#define CAMD_NZ_A_PLUS_AT 5  /* nz in A+A' */
-#define CAMD_NDENSE 6       /* number of "dense" rows/columns in A */
-#define CAMD_MEMORY 7       /* amount of memory used by CAMD */
-#define CAMD_NCMPA 8        /* number of garbage collections in CAMD */
-#define CAMD_LNZ 9          /* approx. nz in L, excluding the diagonal */
-#define CAMD_NDIV 10        /* number of fl. point divides for LU and LDL' */
-#define CAMD_NMULTSUBS_LDL 11 /* number of fl. point (*,-) pairs for LDL' */
-#define CAMD_NMULTSUBS_LU 12  /* number of fl. point (*,-) pairs for LU */
-#define CAMD_DMAX 13         /* max nz. in any column of L, incl. diagonal */
-
-/* ------------------------------------------------------------------------- */
-/* return values of CAMD */
-/* ------------------------------------------------------------------------- */
-
-#define CAMD_OK 0               /* success */
-#define CAMD_OUT_OF_MEMORY -1   /* malloc failed, or problem too large */
-#define CAMD_INVALID -2         /* input arguments are not valid */
-#define CAMD_OK_BUT_JUMBLED 1   /* input matrix is OK for camd_order, but
-    * columns were not sorted, and/or duplicate entries were present.  CAMD had
-    * to do extra work before ordering the matrix.  This is a warning, not an
-    * error.  */
-
-/* ========================================================================== */
-/* === CAMD version ========================================================= */
-/* ========================================================================== */
-
-/*
- * As an example, to test if the version you are using is 1.2 or later:
- *
- *      if (CAMD_VERSION >= CAMD_VERSION_CODE (1,2)) ...
- *
- * This also works during compile-time:
- *
- *      #if (CAMD_VERSION >= CAMD_VERSION_CODE (1,2))
- *          printf ("This is version 1.2 or later\n") ;
- *      #else
- *          printf ("This is an early version\n") ;
- *      #endif
- */
-
-#define CAMD_DATE "May 31, 2007"
-#define CAMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
-#define CAMD_MAIN_VERSION 2
-#define CAMD_SUB_VERSION 2
-#define CAMD_SUBSUB_VERSION 0
-#define CAMD_VERSION CAMD_VERSION_CODE(CAMD_MAIN_VERSION,CAMD_SUB_VERSION)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-\end{verbatim}
+\input{camd_h.tex}
 }
 
 %------------------------------------------------------------------------------

=== modified file 'CAMD/Doc/ChangeLog'
--- CAMD/Doc/ChangeLog	2007-05-29 09:36:29 +0000
+++ CAMD/Doc/ChangeLog	2013-12-08 03:08:50 +0000
@@ -1,3 +1,27 @@
+Jun 20, 2012: verison 2.3.1
+
+    * minor update for Windows (removed filesep)
+
+Jun 1, 2012: version 2.3.0
+
+    * changed from UFconfig to SuiteSparse_config
+
+May 15, 2011: version 2.2.4
+
+    * minor fix to SIZE_T_MAX definition (finicky compiler workaround)
+
+Dec 7, 2011: version 2.2.3
+
+    * fixed the Makefile to better align with CFLAGS and other standards
+
+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"
+
 May 31, 2007: version 2.2.0
 
     * port to 64-bit MATLAB

=== modified file 'CAMD/Doc/License'
--- CAMD/Doc/License	2007-05-29 09:36:29 +0000
+++ CAMD/Doc/License	2013-12-08 03:08:50 +0000
@@ -35,6 +35,6 @@
 
 Availability:
 
-    http://www.cise.ufl.edu/research/sparse/camd
+    http://www.suitesparse.com
 
 -------------------------------------------------------------------------------

=== modified file 'CAMD/Doc/Makefile'
--- CAMD/Doc/Makefile	2006-12-22 10:16:15 +0000
+++ CAMD/Doc/Makefile	2013-12-08 03:08:50 +0000
@@ -4,32 +4,36 @@
 
 default: dist
 
-include ../../UFconfig/UFconfig.mk
+include ../../SuiteSparse_config/SuiteSparse_config.mk
 
 #------------------------------------------------------------------------------
 # Remove all but the files in the original distribution
 #------------------------------------------------------------------------------
 
 clean:
-	- $(RM) $(CLEAN)
+	- $(RM) -r $(CLEAN)
 	- $(RM) camd_temp
 
 purge: distclean
 
 distclean: clean
 	- $(RM) *.aux *.bbl *.blg *.log *.toc
+	- $(RM) -r *.dSYM
 
 #------------------------------------------------------------------------------
 # Create the User Guide and Quick Start Guide
 #------------------------------------------------------------------------------
 
-CAMD_UserGuide.pdf: CAMD_UserGuide.tex CAMD_UserGuide.bib
+CAMD_UserGuide.pdf: CAMD_UserGuide.tex CAMD_UserGuide.bib ../Include/camd.h
+	echo '\\begin{verbatim}' > camd_h.tex
+	expand -8 ../Include/camd.h >> camd_h.tex
+	echo '\end{verbatim}' >> camd_h.tex
 	pdflatex CAMD_UserGuide
 	bibtex CAMD_UserGuide
 	pdflatex CAMD_UserGuide
 	pdflatex CAMD_UserGuide
 
 dist:  CAMD_UserGuide.pdf
-	- $(RM) *.aux *.bbl *.blg *.log *.toc
+	- $(RM) *.aux *.bbl *.blg *.log *.toc camd_h.tex
 	- $(RM) camd_temp
 

=== modified file 'CAMD/Include/camd.h'
--- CAMD/Include/camd.h	2007-05-29 09:36:29 +0000
+++ CAMD/Include/camd.h	2013-12-08 03:08:50 +0000
@@ -5,15 +5,14 @@
 /* ------------------------------------------------------------------------- */
 /* CAMD Version 2.2, Copyright (c) 2007 by Timothy A. Davis, Yanqing Chen,   */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* CAMD finds a symmetric ordering P of a matrix A so that the Cholesky
  * factorization of P*A*P' has fewer nonzeros and takes less work than the
  * Cholesky factorization of A.  If A is not symmetric, then it performs its
  * ordering on the matrix A+A'.  Two sets of user-callable routines are
- * provided, one for int integers and the other for UF_long integers.
+ * provided, one for int integers and the other for SuiteSparse_long integers.
  *
  * The method is based on the approximate minimum degree algorithm, discussed
  * in Amestoy, Davis, and Duff, "An approximate degree ordering algorithm",
@@ -32,48 +31,48 @@
 /* get the definition of size_t: */
 #include <stddef.h>
 
-/* define UF_long */
-#include "UFconfig.h"
+#include "SuiteSparse_config.h"
 
-int camd_order		    /* returns CAMD_OK, CAMD_OK_BUT_JUMBLED,
-			     * CAMD_INVALID, or CAMD_OUT_OF_MEMORY */
+int camd_order              /* returns CAMD_OK, CAMD_OK_BUT_JUMBLED,
+                             * CAMD_INVALID, or CAMD_OUT_OF_MEMORY */
 (
-    int n,		    /* A is n-by-n.  n must be >= 0. */
-    const int Ap [ ],	    /* column pointers for A, of size n+1 */
-    const int Ai [ ],	    /* row indices of A, of size nz = Ap [n] */
-    int P [ ],		    /* output permutation, of size n */
-    double Control [ ],	    /* input Control settings, of size CAMD_CONTROL */
-    double Info [ ],	    /* output Info statistics, of size CAMD_INFO */
-    const int C [ ]	    /* Constraint set of A, of size n; can be NULL */
+    int n,                  /* A is n-by-n.  n must be >= 0. */
+    const int Ap [ ],       /* column pointers for A, of size n+1 */
+    const int Ai [ ],       /* row indices of A, of size nz = Ap [n] */
+    int P [ ],              /* output permutation, of size n */
+    double Control [ ],     /* input Control settings, of size CAMD_CONTROL */
+    double Info [ ],        /* output Info statistics, of size CAMD_INFO */
+    const int C [ ]         /* Constraint set of A, of size n; can be NULL */
 ) ;
 
-UF_long camd_l_order	    /* see above for description of arguments */
+SuiteSparse_long camd_l_order   /* see above for description of arguments */
 (
-    UF_long n,
-    const UF_long Ap [ ],
-    const UF_long Ai [ ],
-    UF_long P [ ],
+    SuiteSparse_long n,
+    const SuiteSparse_long Ap [ ],
+    const SuiteSparse_long Ai [ ],
+    SuiteSparse_long P [ ],
     double Control [ ],
     double Info [ ],
-    const UF_long C [ ]
+    const SuiteSparse_long C [ ]
 ) ;
 
 /* Input arguments (not modified):
  *
- *	n: the matrix A is n-by-n.
- *	Ap: an int/UF_long array of size n+1, containing column pointers of A.
- *	Ai: an int/UF_long array of size nz, containing the row indices of A,
- *	    where nz = Ap [n].
- *	Control:  a double array of size CAMD_CONTROL, containing control
- *	    parameters.  Defaults are used if Control is NULL.
+ *      n: the matrix A is n-by-n.
+ *      Ap: an int/SuiteSparse_long array of size n+1, containing column
+ *          pointers of A.
+ *      Ai: an int/SuiteSparse_long array of size nz, containing the row
+ *          indices of A, where nz = Ap [n].
+ *      Control:  a double array of size CAMD_CONTROL, containing control
+ *          parameters.  Defaults are used if Control is NULL.
  *
  * Output arguments (not defined on input):
  *
- *	P: an int/UF_long array of size n, containing the output permutation. If
- *	    row i is the kth pivot row, then P [k] = i.  In MATLAB notation,
- *	    the reordered matrix is A (P,P).
- *	Info: a double array of size CAMD_INFO, containing statistical
- *	    information.  Ignored if Info is NULL.
+ *      P: an int/SuiteSparse_long array of size n, containing the output
+ *          permutation. If row i is the kth pivot row, then P [k] = i.  In
+ *          MATLAB notation, the reordered matrix is A (P,P).
+ *      Info: a double array of size CAMD_INFO, containing statistical
+ *          information.  Ignored if Info is NULL.
  *
  * On input, the matrix A is stored in column-oriented form.  The row indices
  * of nonzero entries in column j are stored in Ai [Ap [j] ... Ap [j+1]-1].
@@ -94,25 +93,25 @@
  * pattern of the matrix A is the same as that used internally by MATLAB.
  * If you wish to use a more flexible input structure, please see the
  * umfpack_*_triplet_to_col routines in the UMFPACK package, at
- * http://www.cise.ufl.edu/research/sparse/umfpack.
+ * http://www.suitesparse.com.
  *
  * Restrictions:  n >= 0.  Ap [0] = 0.  Ap [j] <= Ap [j+1] for all j in the
- *	range 0 to n-1.  nz = Ap [n] >= 0.  Ai [0..nz-1] must be in the range 0
- *	to n-1.  Finally, Ai, Ap, and P must not be NULL.  If any of these
- *	restrictions are not met, CAMD returns CAMD_INVALID.
+ *      range 0 to n-1.  nz = Ap [n] >= 0.  Ai [0..nz-1] must be in the range 0
+ *      to n-1.  Finally, Ai, Ap, and P must not be NULL.  If any of these
+ *      restrictions are not met, CAMD returns CAMD_INVALID.
  *
  * CAMD returns:
  *
- *	CAMD_OK if the matrix is valid and sufficient memory can be allocated to
- *	    perform the ordering.
- *
- *	CAMD_OUT_OF_MEMORY if not enough memory can be allocated.
- *
- *	CAMD_INVALID if the input arguments n, Ap, Ai are invalid, or if P is
- *	    NULL.
- *
- *	CAMD_OK_BUT_JUMBLED if the matrix had unsorted columns, and/or duplicate
- *	    entries, but was otherwise valid.
+ *      CAMD_OK if the matrix is valid and sufficient memory can be allocated to
+ *          perform the ordering.
+ *
+ *      CAMD_OUT_OF_MEMORY if not enough memory can be allocated.
+ *
+ *      CAMD_INVALID if the input arguments n, Ap, Ai are invalid, or if P is
+ *          NULL.
+ *
+ *      CAMD_OK_BUT_JUMBLED if the matrix had unsorted columns, and/or duplicate
+ *          entries, but was otherwise valid.
  *
  * The CAMD routine first forms the pattern of the matrix A+A', and then
  * computes a fill-reducing ordering, P.  If P [k] = i, then row/column i of
@@ -124,93 +123,93 @@
  * pointer is passed, default values are used.  The Control array is not
  * modified.
  *
- *	Control [CAMD_DENSE]:  controls the threshold for "dense" rows/columns.
- *	    A dense row/column in A+A' can cause CAMD to spend a lot of time in
- *	    ordering the matrix.  If Control [CAMD_DENSE] >= 0, rows/columns
- *	    with more than Control [CAMD_DENSE] * sqrt (n) entries are ignored
- *	    during the ordering, and placed last in the output order.  The
- *	    default value of Control [CAMD_DENSE] is 10.  If negative, no
- *	    rows/columns are treated as "dense".  Rows/columns with 16 or
- *	    fewer off-diagonal entries are never considered "dense".
- *
- *	Control [CAMD_AGGRESSIVE]: controls whether or not to use aggressive
- *	    absorption, in which a prior element is absorbed into the current
- *	    element if is a subset of the current element, even if it is not
- *	    adjacent to the current pivot element (refer to Amestoy, Davis,
- *	    & Duff, 1996, for more details).  The default value is nonzero,
- *	    which means to perform aggressive absorption.  This nearly always
- *	    leads to a better ordering (because the approximate degrees are
- *	    more accurate) and a lower execution time.  There are cases where
- *	    it can lead to a slightly worse ordering, however.  To turn it off,
- *	    set Control [CAMD_AGGRESSIVE] to 0.
- *
- *	Control [2..4] are not used in the current version, but may be used in
- *	    future versions.
+ *      Control [CAMD_DENSE]:  controls the threshold for "dense" rows/columns.
+ *          A dense row/column in A+A' can cause CAMD to spend a lot of time in
+ *          ordering the matrix.  If Control [CAMD_DENSE] >= 0, rows/columns
+ *          with more than Control [CAMD_DENSE] * sqrt (n) entries are ignored
+ *          during the ordering, and placed last in the output order.  The
+ *          default value of Control [CAMD_DENSE] is 10.  If negative, no
+ *          rows/columns are treated as "dense".  Rows/columns with 16 or
+ *          fewer off-diagonal entries are never considered "dense".
+ *
+ *      Control [CAMD_AGGRESSIVE]: controls whether or not to use aggressive
+ *          absorption, in which a prior element is absorbed into the current
+ *          element if is a subset of the current element, even if it is not
+ *          adjacent to the current pivot element (refer to Amestoy, Davis,
+ *          & Duff, 1996, for more details).  The default value is nonzero,
+ *          which means to perform aggressive absorption.  This nearly always
+ *          leads to a better ordering (because the approximate degrees are
+ *          more accurate) and a lower execution time.  There are cases where
+ *          it can lead to a slightly worse ordering, however.  To turn it off,
+ *          set Control [CAMD_AGGRESSIVE] to 0.
+ *
+ *      Control [2..4] are not used in the current version, but may be used in
+ *          future versions.
  *
  * The Info array provides statistics about the ordering on output.  If it is
  * not present, the statistics are not returned.  This is not an error
  * condition.
  * 
- *	Info [CAMD_STATUS]:  the return value of CAMD, either CAMD_OK,
- *	    CAMD_OK_BUT_JUMBLED, CAMD_OUT_OF_MEMORY, or CAMD_INVALID.
- *
- *	Info [CAMD_N]: n, the size of the input matrix
- *
- *	Info [CAMD_NZ]: the number of nonzeros in A, nz = Ap [n]
- *
- *	Info [CAMD_SYMMETRY]:  the symmetry of the matrix A.  It is the number
- *	    of "matched" off-diagonal entries divided by the total number of
- *	    off-diagonal entries.  An entry A(i,j) is matched if A(j,i) is also
- *	    an entry, for any pair (i,j) for which i != j.  In MATLAB notation,
- *		S = spones (A) ;
- *		B = tril (S, -1) + triu (S, 1) ;
- *		symmetry = nnz (B & B') / nnz (B) ;
- *
- *	Info [CAMD_NZDIAG]: the number of entries on the diagonal of A.
- *
- *	Info [CAMD_NZ_A_PLUS_AT]:  the number of nonzeros in A+A', excluding the
- *	    diagonal.  If A is perfectly symmetric (Info [CAMD_SYMMETRY] = 1)
- *	    with a fully nonzero diagonal, then Info [CAMD_NZ_A_PLUS_AT] = nz-n
- *	    (the smallest possible value).  If A is perfectly unsymmetric
- *	    (Info [CAMD_SYMMETRY] = 0, for an upper triangular matrix, for
- *	    example) with no diagonal, then Info [CAMD_NZ_A_PLUS_AT] = 2*nz
- *	    (the largest possible value).
- *
- *	Info [CAMD_NDENSE]: the number of "dense" rows/columns of A+A' that were
- *	    removed from A prior to ordering.  These are placed last in the
- *	    output order P.
- *
- *	Info [CAMD_MEMORY]: the amount of memory used by CAMD, in bytes.  In the
- *	    current version, this is 1.2 * Info  [CAMD_NZ_A_PLUS_AT] + 9*n
- *	    times the size of an integer.  This is at most 2.4nz + 9n.  This
- *	    excludes the size of the input arguments Ai, Ap, and P, which have
- *	    a total size of nz + 2*n + 1 integers.
- *
- *	Info [CAMD_NCMPA]: the number of garbage collections performed.
- *
- *	Info [CAMD_LNZ]: the number of nonzeros in L (excluding the diagonal).
- *	    This is a slight upper bound because mass elimination is combined
- *	    with the approximate degree update.  It is a rough upper bound if
- *	    there are many "dense" rows/columns.  The rest of the statistics,
- *	    below, are also slight or rough upper bounds, for the same reasons.
- *	    The post-ordering of the assembly tree might also not exactly
- *	    correspond to a true elimination tree postordering.
- *
- *	Info [CAMD_NDIV]: the number of divide operations for a subsequent LDL'
- *	    or LU factorization of the permuted matrix A (P,P).
- *
- *	Info [CAMD_NMULTSUBS_LDL]:  the number of multiply-subtract pairs for a
- *	    subsequent LDL' factorization of A (P,P).
- *
- *	Info [CAMD_NMULTSUBS_LU]:  the number of multiply-subtract pairs for a
- *	    subsequent LU factorization of A (P,P), assuming that no numerical
- *	    pivoting is required.
- *
- *	Info [CAMD_DMAX]:  the maximum number of nonzeros in any column of L,
- *	    including the diagonal.
- *
- *	Info [14..19] are not used in the current version, but may be used in
- *	    future versions.
+ *      Info [CAMD_STATUS]:  the return value of CAMD, either CAMD_OK,
+ *          CAMD_OK_BUT_JUMBLED, CAMD_OUT_OF_MEMORY, or CAMD_INVALID.
+ *
+ *      Info [CAMD_N]: n, the size of the input matrix
+ *
+ *      Info [CAMD_NZ]: the number of nonzeros in A, nz = Ap [n]
+ *
+ *      Info [CAMD_SYMMETRY]:  the symmetry of the matrix A.  It is the number
+ *          of "matched" off-diagonal entries divided by the total number of
+ *          off-diagonal entries.  An entry A(i,j) is matched if A(j,i) is also
+ *          an entry, for any pair (i,j) for which i != j.  In MATLAB notation,
+ *              S = spones (A) ;
+ *              B = tril (S, -1) + triu (S, 1) ;
+ *              symmetry = nnz (B & B') / nnz (B) ;
+ *
+ *      Info [CAMD_NZDIAG]: the number of entries on the diagonal of A.
+ *
+ *      Info [CAMD_NZ_A_PLUS_AT]:  the number of nonzeros in A+A', excluding the
+ *          diagonal.  If A is perfectly symmetric (Info [CAMD_SYMMETRY] = 1)
+ *          with a fully nonzero diagonal, then Info [CAMD_NZ_A_PLUS_AT] = nz-n
+ *          (the smallest possible value).  If A is perfectly unsymmetric
+ *          (Info [CAMD_SYMMETRY] = 0, for an upper triangular matrix, for
+ *          example) with no diagonal, then Info [CAMD_NZ_A_PLUS_AT] = 2*nz
+ *          (the largest possible value).
+ *
+ *      Info [CAMD_NDENSE]: the number of "dense" rows/columns of A+A' that were
+ *          removed from A prior to ordering.  These are placed last in the
+ *          output order P.
+ *
+ *      Info [CAMD_MEMORY]: the amount of memory used by CAMD, in bytes.  In the
+ *          current version, this is 1.2 * Info  [CAMD_NZ_A_PLUS_AT] + 9*n
+ *          times the size of an integer.  This is at most 2.4nz + 9n.  This
+ *          excludes the size of the input arguments Ai, Ap, and P, which have
+ *          a total size of nz + 2*n + 1 integers.
+ *
+ *      Info [CAMD_NCMPA]: the number of garbage collections performed.
+ *
+ *      Info [CAMD_LNZ]: the number of nonzeros in L (excluding the diagonal).
+ *          This is a slight upper bound because mass elimination is combined
+ *          with the approximate degree update.  It is a rough upper bound if
+ *          there are many "dense" rows/columns.  The rest of the statistics,
+ *          below, are also slight or rough upper bounds, for the same reasons.
+ *          The post-ordering of the assembly tree might also not exactly
+ *          correspond to a true elimination tree postordering.
+ *
+ *      Info [CAMD_NDIV]: the number of divide operations for a subsequent LDL'
+ *          or LU factorization of the permuted matrix A (P,P).
+ *
+ *      Info [CAMD_NMULTSUBS_LDL]:  the number of multiply-subtract pairs for a
+ *          subsequent LDL' factorization of A (P,P).
+ *
+ *      Info [CAMD_NMULTSUBS_LU]:  the number of multiply-subtract pairs for a
+ *          subsequent LU factorization of A (P,P), assuming that no numerical
+ *          pivoting is required.
+ *
+ *      Info [CAMD_DMAX]:  the maximum number of nonzeros in any column of L,
+ *          including the diagonal.
+ *
+ *      Info [14..19] are not used in the current version, but may be used in
+ *          future versions.
  */    
 
 /* ------------------------------------------------------------------------- */
@@ -248,23 +247,23 @@
 
 void camd_l2
 (
-    UF_long n,
-    UF_long Pe [ ],
-    UF_long Iw [ ],
-    UF_long Len [ ],
-    UF_long iwlen,
-    UF_long pfree,
-    UF_long Nv [ ],
-    UF_long Next [ ], 
-    UF_long Last [ ],
-    UF_long Head [ ],
-    UF_long Elen [ ],
-    UF_long Degree [ ],
-    UF_long W [ ],
+    SuiteSparse_long n,
+    SuiteSparse_long Pe [ ],
+    SuiteSparse_long Iw [ ],
+    SuiteSparse_long Len [ ],
+    SuiteSparse_long iwlen,
+    SuiteSparse_long pfree,
+    SuiteSparse_long Nv [ ],
+    SuiteSparse_long Next [ ], 
+    SuiteSparse_long Last [ ],
+    SuiteSparse_long Head [ ],
+    SuiteSparse_long Elen [ ],
+    SuiteSparse_long Degree [ ],
+    SuiteSparse_long W [ ],
     double Control [ ],
     double Info [ ],
-    const UF_long C [ ],
-    UF_long BucketSet [ ]
+    const SuiteSparse_long C [ ],
+    SuiteSparse_long BucketSet [ ]
     
 ) ;
 
@@ -282,18 +281,18 @@
 
 int camd_valid
 (
-    int n_row,		    /* # of rows */
-    int n_col,		    /* # of columns */
-    const int Ap [ ],	    /* column pointers, of size n_col+1 */
-    const int Ai [ ]	    /* row indices, of size Ap [n_col] */
+    int n_row,              /* # of rows */
+    int n_col,              /* # of columns */
+    const int Ap [ ],       /* column pointers, of size n_col+1 */
+    const int Ai [ ]        /* row indices, of size Ap [n_col] */
 ) ;
 
-UF_long camd_l_valid
+SuiteSparse_long camd_l_valid
 (
-    UF_long n_row,
-    UF_long n_col,
-    const UF_long Ap [ ],
-    const UF_long Ai [ ]
+    SuiteSparse_long n_row,
+    SuiteSparse_long n_col,
+    const SuiteSparse_long Ap [ ],
+    const SuiteSparse_long Ai [ ]
 ) ;
 
 /* ------------------------------------------------------------------------- */
@@ -309,10 +308,10 @@
    const int C [ ]
 ) ;
 
-UF_long camd_l_cvalid
+SuiteSparse_long camd_l_cvalid
 (
-   UF_long n,
-   const UF_long C [ ]
+   SuiteSparse_long n,
+   const SuiteSparse_long C [ ]
 ) ;
 
 /* ------------------------------------------------------------------------- */
@@ -326,11 +325,11 @@
 #define EXTERN extern
 #endif
 
-EXTERN void *(*camd_malloc) (size_t) ;		    /* pointer to malloc */
-EXTERN void (*camd_free) (void *) ;		    /* pointer to free */
-EXTERN void *(*camd_realloc) (void *, size_t) ;	    /* pointer to realloc */
-EXTERN void *(*camd_calloc) (size_t, size_t) ;	    /* pointer to calloc */
-EXTERN int (*camd_printf) (const char *, ...) ;	    /* pointer to printf */
+EXTERN void *(*camd_malloc) (size_t) ;              /* pointer to malloc */
+EXTERN void (*camd_free) (void *) ;                 /* pointer to free */
+EXTERN void *(*camd_realloc) (void *, size_t) ;     /* pointer to realloc */
+EXTERN void *(*camd_calloc) (size_t, size_t) ;      /* pointer to calloc */
+EXTERN int (*camd_printf) (const char *, ...) ;     /* pointer to printf */
 
 /* ------------------------------------------------------------------------- */
 /* CAMD Control and Info arrays */
@@ -348,41 +347,41 @@
 void camd_info       (double Info [ ]) ;
 void camd_l_info     (double Info [ ]) ;
 
-#define CAMD_CONTROL 5	    /* size of Control array */
-#define CAMD_INFO 20	    /* size of Info array */
+#define CAMD_CONTROL 5      /* size of Control array */
+#define CAMD_INFO 20        /* size of Info array */
 
 /* contents of Control */
-#define CAMD_DENSE 0	    /* "dense" if degree > Control [0] * sqrt (n) */
+#define CAMD_DENSE 0        /* "dense" if degree > Control [0] * sqrt (n) */
 #define CAMD_AGGRESSIVE 1    /* do aggressive absorption if Control [1] != 0 */
 
 /* default Control settings */
-#define CAMD_DEFAULT_DENSE 10.0	    /* default "dense" degree 10*sqrt(n) */
+#define CAMD_DEFAULT_DENSE 10.0     /* default "dense" degree 10*sqrt(n) */
 #define CAMD_DEFAULT_AGGRESSIVE 1    /* do aggressive absorption by default */
 
 /* contents of Info */
-#define CAMD_STATUS 0	    /* return value of camd_order and camd_l_order */
-#define CAMD_N 1		    /* A is n-by-n */
-#define CAMD_NZ 2	    /* number of nonzeros in A */ 
-#define CAMD_SYMMETRY 3	    /* symmetry of pattern (1 is sym., 0 is unsym.) */
-#define CAMD_NZDIAG 4	    /* # of entries on diagonal */
+#define CAMD_STATUS 0       /* return value of camd_order and camd_l_order */
+#define CAMD_N 1                    /* A is n-by-n */
+#define CAMD_NZ 2           /* number of nonzeros in A */ 
+#define CAMD_SYMMETRY 3     /* symmetry of pattern (1 is sym., 0 is unsym.) */
+#define CAMD_NZDIAG 4       /* # of entries on diagonal */
 #define CAMD_NZ_A_PLUS_AT 5  /* nz in A+A' */
-#define CAMD_NDENSE 6	    /* number of "dense" rows/columns in A */
-#define CAMD_MEMORY 7	    /* amount of memory used by CAMD */
-#define CAMD_NCMPA 8	    /* number of garbage collections in CAMD */
-#define CAMD_LNZ 9	    /* approx. nz in L, excluding the diagonal */
-#define CAMD_NDIV 10	    /* number of fl. point divides for LU and LDL' */
+#define CAMD_NDENSE 6       /* number of "dense" rows/columns in A */
+#define CAMD_MEMORY 7       /* amount of memory used by CAMD */
+#define CAMD_NCMPA 8        /* number of garbage collections in CAMD */
+#define CAMD_LNZ 9          /* approx. nz in L, excluding the diagonal */
+#define CAMD_NDIV 10        /* number of fl. point divides for LU and LDL' */
 #define CAMD_NMULTSUBS_LDL 11 /* number of fl. point (*,-) pairs for LDL' */
 #define CAMD_NMULTSUBS_LU 12  /* number of fl. point (*,-) pairs for LU */
-#define CAMD_DMAX 13	     /* max nz. in any column of L, incl. diagonal */
+#define CAMD_DMAX 13         /* max nz. in any column of L, incl. diagonal */
 
 /* ------------------------------------------------------------------------- */
 /* return values of CAMD */
 /* ------------------------------------------------------------------------- */
 
-#define CAMD_OK 0		/* success */
-#define CAMD_OUT_OF_MEMORY -1	/* malloc failed, or problem too large */
-#define CAMD_INVALID -2		/* input arguments are not valid */
-#define CAMD_OK_BUT_JUMBLED 1	/* input matrix is OK for camd_order, but
+#define CAMD_OK 0               /* success */
+#define CAMD_OUT_OF_MEMORY -1   /* malloc failed, or problem too large */
+#define CAMD_INVALID -2         /* input arguments are not valid */
+#define CAMD_OK_BUT_JUMBLED 1   /* input matrix is OK for camd_order, but
     * columns were not sorted, and/or duplicate entries were present.  CAMD had
     * to do extra work before ordering the matrix.  This is a warning, not an
     * error.  */
@@ -394,22 +393,22 @@
 /*
  * As an example, to test if the version you are using is 1.2 or later:
  *
- *	if (CAMD_VERSION >= CAMD_VERSION_CODE (1,2)) ...
+ *      if (CAMD_VERSION >= CAMD_VERSION_CODE (1,2)) ...
  *
  * This also works during compile-time:
  *
- *	#if (CAMD_VERSION >= CAMD_VERSION_CODE (1,2))
- *	    printf ("This is version 1.2 or later\n") ;
- *	#else
- *	    printf ("This is an early version\n") ;
- *	#endif
+ *      #if (CAMD_VERSION >= CAMD_VERSION_CODE (1,2))
+ *          printf ("This is version 1.2 or later\n") ;
+ *      #else
+ *          printf ("This is an early version\n") ;
+ *      #endif
  */
 
-#define CAMD_DATE "May 31, 2007"
+#define CAMD_DATE "Jun 20, 2012"
 #define CAMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define CAMD_MAIN_VERSION 2
-#define CAMD_SUB_VERSION 2
-#define CAMD_SUBSUB_VERSION 0
+#define CAMD_SUB_VERSION 3
+#define CAMD_SUBSUB_VERSION 1
 #define CAMD_VERSION CAMD_VERSION_CODE(CAMD_MAIN_VERSION,CAMD_SUB_VERSION)
 
 #ifdef __cplusplus

=== modified file 'CAMD/Include/camd_internal.h'
--- CAMD/Include/camd_internal.h	2007-05-29 09:36:29 +0000
+++ CAMD/Include/camd_internal.h	2013-12-08 03:08:50 +0000
@@ -3,10 +3,9 @@
 /* ========================================================================= */
 
 /* ------------------------------------------------------------------------- */
-/* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
+/* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,                       */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* This file is for internal use in CAMD itself, and does not normally need to
@@ -15,17 +14,17 @@
  *
  * The following compile-time definitions affect how CAMD is compiled.
  *
- *	-DNPRINT
- *
- *	    Disable all printing.  stdio.h will not be included.  Printing can
- *	    be re-enabled at run-time by setting the global pointer camd_printf
- *	    to printf (or mexPrintf for a MATLAB mexFunction).
- *
- *	-DNMALLOC
- *
- *	    No memory manager is defined at compile-time.  You MUST define the
- *	    function pointers camd_malloc, camd_free, camd_realloc, and
- *	    camd_calloc at run-time for CAMD to work properly.
+ *      -DNPRINT
+ *
+ *          Disable all printing.  stdio.h will not be included.  Printing can
+ *          be re-enabled at run-time by setting the global pointer camd_printf
+ *          to printf (or mexPrintf for a MATLAB mexFunction).
+ *
+ *      -DNMALLOC
+ *
+ *          No memory manager is defined at compile-time.  You MUST define the
+ *          function pointers camd_malloc, camd_free, camd_realloc, and
+ *          camd_calloc at run-time for CAMD to work properly.
  */
 
 /* ========================================================================= */
@@ -155,21 +154,25 @@
 
 /* largest value of size_t */
 #ifndef SIZE_T_MAX
+#ifdef SIZE_MAX
+/* C99 only */
+#define SIZE_T_MAX SIZE_MAX
+#else
 #define SIZE_T_MAX ((size_t) (-1))
 #endif
-
-/* ------------------------------------------------------------------------- */
-/* integer type for CAMD: int or UF_long */
-/* ------------------------------------------------------------------------- */
-
-/* define UF_long */
-#include "UFconfig.h"
+#endif
+
+/* ------------------------------------------------------------------------- */
+/* integer type for CAMD: int or SuiteSparse_long */
+/* ------------------------------------------------------------------------- */
+
+#include "camd.h"
 
 #if defined (DLONG) || defined (ZLONG)
 
-#define Int UF_long
-#define ID  UF_long_id
-#define Int_MAX UF_long_max
+#define Int SuiteSparse_long
+#define ID  SuiteSparse_long_id
+#define Int_MAX SuiteSparse_long_max
 
 #define CAMD_order camd_l_order
 #define CAMD_defaults camd_l_defaults
@@ -219,12 +222,6 @@
 #define PRINTF(params) { if (camd_printf != NULL) (void) camd_printf params ; }
 
 /* ------------------------------------------------------------------------- */
-/* CAMD routine definitions (user-callable) */
-/* ------------------------------------------------------------------------- */
-
-#include "camd.h"
-
-/* ------------------------------------------------------------------------- */
 /* CAMD routine definitions (not user-callable) */
 /* ------------------------------------------------------------------------- */
 

=== modified file 'CAMD/Lib/GNUmakefile'
--- CAMD/Lib/GNUmakefile	2007-05-29 09:36:29 +0000
+++ CAMD/Lib/GNUmakefile	2013-12-08 03:08:50 +0000
@@ -4,9 +4,9 @@
 
 default: libcamd.a
 
-include ../../UFconfig/UFconfig.mk
+include ../../SuiteSparse_config/SuiteSparse_config.mk
 
-C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
+C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
 
 #-------------------------------------------------------------------------------
 # source files
@@ -15,9 +15,8 @@
 CAMD = camd_aat camd_1 camd_2 camd_dump camd_postorder camd_defaults \
 	camd_order camd_control camd_info camd_valid camd_preprocess
 
-UFCONFIG = ../../UFconfig/UFconfig.h
-
-INC = ../Include/camd.h ../Include/camd_internal.h $(UFCONFIG)
+INC = ../Include/camd.h ../Include/camd_internal.h \
+      ../../SuiteSparse_config/SuiteSparse_config.h
 
 #-------------------------------------------------------------------------------
 # object files for each version
@@ -44,7 +43,7 @@
 #-------------------------------------------------------------------------------
 
 libcamd.a: camd_global.o $(CAMDI) $(CAMDL)
-	$(AR) libcamd.a $^
+	$(ARCHIVE)  libcamd.a $^
 	- $(RANLIB) libcamd.a
 
 #-------------------------------------------------------------------------------

=== modified file 'CAMD/Lib/Makefile'
--- CAMD/Lib/Makefile	2007-05-29 09:36:29 +0000
+++ CAMD/Lib/Makefile	2013-12-08 03:08:50 +0000
@@ -8,9 +8,9 @@
 
 default: everything
 
-include ../../UFconfig/UFconfig.mk
+include ../../SuiteSparse_config/SuiteSparse_config.mk
 
-C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
+C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
 
 everything:
 	$(C) -DDINT -c ../Source/camd_aat.c -o camd_i_aat.o
@@ -36,7 +36,8 @@
 	$(C) -DDLONG -c ../Source/camd_valid.c -o camd_l_valid.o
 	$(C) -DDLONG -c ../Source/camd_preprocess.c -o camd_l_preprocess.o
 	$(C) -c ../Source/camd_global.c
-	$(AR) libcamd.a camd_i_aat.o camd_i_1.o camd_i_2.o camd_i_dump.o \
+	$(ARCHIVE)  libcamd.a \
+            camd_i_aat.o camd_i_1.o camd_i_2.o camd_i_dump.o \
 	    camd_i_postorder.o camd_i_defaults.o camd_i_order.o \
 	    camd_i_control.o camd_i_info.o camd_i_valid.o camd_l_aat.o \
 	    camd_l_1.o camd_l_2.o camd_l_dump.o camd_l_postorder.o \

=== modified file 'CAMD/MATLAB/Contents.m'
--- CAMD/MATLAB/Contents.m	2007-05-29 09:36:29 +0000
+++ CAMD/MATLAB/Contents.m	2013-12-08 03:08:50 +0000
@@ -9,7 +9,6 @@
 %
 % See also:  camd, amd, colamd, symamd, colmmd, symmmd, umfpack
 
-% Copyright 1994-2007, Tim Davis, University of Florida,
-% Patrick R. Amestoy, Iain S. Duff, and Yanqing Chen.
+% Copyright 1994-2007, Tim Davis, Patrick R. Amestoy, Iain S. Duff, and Y. Chen.
 
 help Contents

=== removed file 'CAMD/MATLAB/Makefile'
--- CAMD/MATLAB/Makefile	2007-05-29 09:36:29 +0000
+++ CAMD/MATLAB/Makefile	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-#------------------------------------------------------------------------------
-# Makefile for the CAMD MATLAB mexFunction
-#------------------------------------------------------------------------------
-
-default: camd
-
-include ../../UFconfig/UFconfig.mk
-
-CAMD = ../Lib/libcamd.a
-
-I = -I../Include -I../../UFconfig
-
-INC = ../Include/camd.h ../Include/camd_internal.h ../../UFconfig/UFconfig.h
-
-SRC = ../Source/camd_1.c ../Source/camd_2.c ../Source/camd_aat.c \
-    ../Source/camd_control.c ../Source/camd_defaults.c ../Source/camd_dump.c \
-    ../Source/camd_global.c ../Source/camd_info.c ../Source/camd_order.c \
-    ../Source/camd_postorder.c \
-    ../Source/camd_preprocess.c ../Source/camd_valid.c
-
-camd: $(SRC) $(INC) camd_mex.c
-	$(MEX) -DDLONG $(I) -output camd camd_mex.c $(SRC)
-
-#------------------------------------------------------------------------------
-# Remove all but the files in the original distribution
-#------------------------------------------------------------------------------
-
-clean:
-	- $(RM) $(CLEAN)
-
-purge: distclean
-
-distclean: clean
-	- $(RM) camd.mex*

=== modified file 'CAMD/MATLAB/camd.m'
--- CAMD/MATLAB/camd.m	2007-05-29 09:36:29 +0000
+++ CAMD/MATLAB/camd.m	2013-12-08 03:08:50 +0000
@@ -68,8 +68,7 @@
 %    See also AMD, COLMMD, COLAMD, COLPERM, SYMAMD, SYMMMD, SYMRCM.
 
 
-% Copyright 1994-2007, Tim Davis, University of Florida,
-% Patrick R. Amestoy, Iain S. Duff, and Yanqing Chen.
+% Copyright 1994-2007, Tim Davis, Patrick R. Amestoy, Iain S. Duff, and Y. Chen.
 %
 %    Acknowledgements: This work was supported by the National Science
 %       Foundation, under grants ASC-9111263, DMS-9223088, and CCR-0203270,

=== modified file 'CAMD/MATLAB/camd_demo.m'
--- CAMD/MATLAB/camd_demo.m	2007-05-29 09:36:29 +0000
+++ CAMD/MATLAB/camd_demo.m	2013-12-08 03:08:50 +0000
@@ -8,8 +8,7 @@
 %
 % See also: camd, camd_make
 
-% Copyright 1994-2007, Tim Davis, University of Florida,
-% Patrick R. Amestoy, Iain S. Duff, and Yanqing Chen.
+% Copyright 1994-2007, Tim Davis, Patrick R. Amestoy, Iain S. Duff, and Y. Chen.
 
 % This orders the same matrix as the ANSI C demo, camd_demo.c.  It includes an
 % additional analysis of the matrix via MATLAB's symbfact routine.
@@ -27,7 +26,6 @@
 rand ('state', 0) ;
 C = irand (6, n) ;
 
-figure (1)
 clf
 hold off
 subplot (2,2,1) ;

=== modified file 'CAMD/MATLAB/camd_make.m'
--- CAMD/MATLAB/camd_make.m	2007-05-29 09:36:29 +0000
+++ CAMD/MATLAB/camd_make.m	2013-12-08 03:08:50 +0000
@@ -6,8 +6,7 @@
 %
 % See also camd.
 
-% Copyright 1994-2007, Tim Davis, University of Florida,
-% Patrick R. Amestoy, Iain S. Duff, and Yanqing Chen.
+% Copyright 1994-2007, Tim Davis, Patrick R. Amestoy, Iain S. Duff, and Y. Chen.
 
 details = 0 ;	    % 1 if details of each command are to be printed
 
@@ -16,13 +15,13 @@
     d = '-largeArrayDims' ;
 end
 
-i = sprintf ('-I..%sInclude -I..%s..%sUFconfig', filesep, filesep, filesep) ;
+i = sprintf ('-I../Include -I../../SuiteSparse_config') ;
 cmd = sprintf ('mex -O %s -DDLONG -output camd %s camd_mex.c', d, i) ;
 files = {'camd_order', 'camd_dump', 'camd_postorder', ...
     'camd_aat', 'camd_2', 'camd_1', 'camd_defaults', 'camd_control', ...
     'camd_info', 'camd_valid', 'camd_global', 'camd_preprocess' } ;
 for i = 1 : length (files)
-    cmd = sprintf ('%s ..%sSource%s%s.c', cmd, filesep, filesep, files {i}) ;
+    cmd = sprintf ('%s ../Source/%s.c', cmd, files {i}) ;
 end
 if (details)
     fprintf ('%s\n', cmd) ;

=== modified file 'CAMD/MATLAB/camd_mex.c'
--- CAMD/MATLAB/camd_mex.c	2007-05-29 09:36:29 +0000
+++ CAMD/MATLAB/camd_mex.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /*
@@ -30,7 +29,7 @@
 #include "camd.h"
 #include "mex.h"
 #include "matrix.h"
-#include "UFconfig.h"
+#define Long SuiteSparse_long
 
 void mexFunction
 (
@@ -40,7 +39,7 @@
     const mxArray *pargin [ ]
 )
 {
-    UF_long i, m, n, *Ap, *Ai, *P, nc, result, spumoni, full, *C, Clen ;
+    Long i, m, n, *Ap, *Ai, *P, nc, result, spumoni, full, *C, Clen ;
     double *Pout, *InfoOut, Control [CAMD_CONTROL], Info [CAMD_INFO],
 	*ControlIn, *Cin ;
     mxArray *A ;
@@ -103,11 +102,11 @@
 	Clen = mxGetNumberOfElements (pargin [2]) ;
 	if (Clen != 0)
 	{
-	    C = (UF_long *) mxCalloc (Clen, sizeof (UF_long)) ;
+	    C = (Long *) mxCalloc (Clen, sizeof (Long)) ;
 	    for (i = 0 ; i < Clen ; i++)
 	    {
 		/* convert c from 1-based to 0-based */
-		C [i] = (UF_long) Cin [i] - 1 ;
+		C [i] = (Long) Cin [i] - 1 ;
 	    }
 	}
     }
@@ -133,7 +132,7 @@
     /* allocate workspace for output permutation */
     /* --------------------------------------------------------------------- */
 
-    P = mxMalloc ((n+1) * sizeof (UF_long)) ;
+    P = mxMalloc ((n+1) * sizeof (Long)) ;
 
     /* --------------------------------------------------------------------- */
     /* if A is full, convert to a sparse matrix */
@@ -149,8 +148,8 @@
 	}
 	mexCallMATLAB (1, &A, 1, (mxArray **) pargin, "sparse") ;
     }
-    Ap = (UF_long *) mxGetJc (A) ;
-    Ai = (UF_long *) mxGetIr (A) ;
+    Ap = (Long *) mxGetJc (A) ;
+    Ai = (Long *) mxGetIr (A) ;
     if (spumoni > 0)
     {
 	mexPrintf ("    input matrix A has %d nonzero entries\n", Ap [n]) ;

=== modified file 'CAMD/Makefile'
--- CAMD/Makefile	2007-05-29 09:36:29 +0000
+++ CAMD/Makefile	2013-12-08 03:08:50 +0000
@@ -1,25 +1,21 @@
 #------------------------------------------------------------------------------
-# CAMD Makefile (for GNU Make or original make)
+# CAMD Makefile
 #------------------------------------------------------------------------------
 
-default: demo
-
-include ../UFconfig/UFconfig.mk
-
-# Compile all C code, including the C-callable routine and the mexFunctions.
-# Do not compile the FORTRAN versions, or MATLAB interface.
-demo:
-	( cd Lib    ; $(MAKE) )
-	( cd Demo   ; $(MAKE) )
-
-# Compile all C code, including the C-callable routine and the mexFunctions.
-# Do not compile the FORTRAN versions.
+VERSION = 2.3.1
+
+default: demos
+
+include ../SuiteSparse_config/SuiteSparse_config.mk
+
+demos: all
+
+# Compile all C code.  Do not compile the FORTRAN versions.
 all:
 	( cd Lib    ; $(MAKE) )
 	( cd Demo   ; $(MAKE) )
-	( cd MATLAB ; $(MAKE) )
 
-# compile just the C-callable libraries (not mexFunctions or Demos)
+# compile just the C-callable libraries (not Demos)
 library:
 	( cd Lib    ; $(MAKE) )
 
@@ -27,20 +23,20 @@
 clean:
 	( cd Lib    ; $(MAKE) clean )
 	( cd Demo   ; $(MAKE) clean )
-	( cd MATLAB ; $(MAKE) clean )
+	( cd MATLAB ; $(RM) $(CLEAN) )
 	( cd Doc    ; $(MAKE) clean )
 
 # clean, and then remove compiled programs and library archives
 purge:
 	( cd Lib    ; $(MAKE) purge )
 	( cd Demo   ; $(MAKE) purge )
-	( cd MATLAB ; $(MAKE) purge )
+	( cd MATLAB ; $(RM) $(CLEAN) ; $(RM) *.mex* )
 	( cd Doc    ; $(MAKE) purge )
 
 distclean: purge
 
 # create PDF documents for the original distribution
-doc:
+docs:
 	( cd Doc    ; $(MAKE) )
 
 # get ready for distribution
@@ -52,6 +48,16 @@
 
 lib: library
 
-# compile the MATLAB mexFunction
-mex:
-	( cd MATLAB ; $(MAKE) )
+# install CAMD
+install:
+	$(CP) Lib/libcamd.a $(INSTALL_LIB)/libcamd.$(VERSION).a
+	( cd $(INSTALL_LIB) ; ln -sf libcamd.$(VERSION).a libcamd.a )
+	$(CP) Include/camd.h $(INSTALL_INCLUDE)
+	chmod 644 $(INSTALL_LIB)/libcamd*.a
+	chmod 644 $(INSTALL_INCLUDE)/camd.h
+
+# uninstall CAMD
+uninstall:
+	$(RM) $(INSTALL_LIB)/libcamd*.a
+	$(RM) $(INSTALL_INCLUDE)/camd.h
+

=== modified file 'CAMD/README.txt'
--- CAMD/README.txt	2007-05-29 09:36:29 +0000
+++ CAMD/README.txt	2013-12-08 03:08:50 +0000
@@ -1,31 +1,30 @@
-CAMD Version 2.2, Copyright (c) 2007 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.
+CAMD, Copyright (c) 2007-2012, University of Florida.
+Written by Timothy A. Davis (http://www.suitesparse.com), Yanqing Chen, Patrick
+R. Amestoy, and Iain S. Duff.  All Rights Reserved.  CAMD is available under
+alternate licences; contact T. Davis for details.
 
 CAMD:  a set of routines for permuting sparse matrices prior to
     factorization.  Includes a version in C, a version in Fortran, and a MATLAB
     mexFunction.
 
-Requires UFconfig, in the ../UFconfig directory relative to this directory.
+Requires SuiteSparse_config, in the ../SuiteSparse_config directory relative to
+this directory.
 
 Quick start (Unix, or Windows with Cygwin):
 
     To compile, test, and install CAMD, you may wish to first configure the
-    installation by editting the ../UFconfig/UFconfig.mk file.  Next, cd to
-    this directory (CAMD) and type "make" (or "make lib" if you do not have
-    MATLAB).  When done, type "make clean" to remove unused *.o files
-    (keeps the compiled libraries and demo programs).  See the User Guide
-    (Doc/CAMD_UserGuide.pdf), or ../UFconfig/UFconfig.mk for more details.
+    installation by editting the ../SuiteSparse_config/SuiteSparse_config.mk
+    file.  Next, cd to this directory (CAMD) and type "make" (or "make lib" if
+    you do not have MATLAB).  When done, type "make clean" to remove unused *.o
+    files (keeps the compiled libraries and demo programs).  See the User Guide
+    (Doc/CAMD_UserGuide.pdf), or ../SuiteSparse_config/SuiteSparse_config.mk
+    for more details.
 
 Quick start (for MATLAB users);
 
     To compile, test, and install the CAMD mexFunction, cd to the
     CAMD/MATLAB directory and type camd_make at the MATLAB prompt.
 
-If you have MATLAB 7.2 or earlier and use "make mex", you must first edit
-UFconfig/UFconfig.h to remove the "-largeArrayDims" option from the MEX command
-(or just use camd_make.m inside MATLAB).
-
 -------------------------------------------------------------------------------
 
 CAMD License:
@@ -60,7 +59,7 @@
 
 Availability:
 
-    http://www.cise.ufl.edu/research/sparse/camd
+    http://www.suitesparse.com
 
 -------------------------------------------------------------------------------
 
@@ -77,7 +76,7 @@
 
 Authors:
 
-    Timothy A. Davis (davis at cise.ufl.edu), University of Florida.
+    Timothy A. Davis ([e-mail])
     Patrick R. Amestory, ENSEEIHT, Toulouse, France.
     Iain S. Duff, Rutherford Appleton Laboratory, UK.
 

=== modified file 'CAMD/Source/camd_1.c'
--- CAMD/Source/camd_1.c	2007-05-29 09:36:29 +0000
+++ CAMD/Source/camd_1.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* CAMD_1: Construct A+A' for a sparse matrix A and perform the CAMD ordering.

=== modified file 'CAMD/Source/camd_2.c'
--- CAMD/Source/camd_2.c	2007-05-29 09:36:29 +0000
+++ CAMD/Source/camd_2.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* CAMD_2:  performs the CAMD ordering on a symmetric sparse matrix A, followed

=== modified file 'CAMD/Source/camd_aat.c'
--- CAMD/Source/camd_aat.c	2007-05-29 09:36:29 +0000
+++ CAMD/Source/camd_aat.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* CAMD_aat:  compute the symmetry of the pattern of A, and count the number of

=== modified file 'CAMD/Source/camd_control.c'
--- CAMD/Source/camd_control.c	2007-05-29 09:36:29 +0000
+++ CAMD/Source/camd_control.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* User-callable.  Prints the control parameters for CAMD.  See camd.h

=== modified file 'CAMD/Source/camd_defaults.c'
--- CAMD/Source/camd_defaults.c	2007-05-29 09:36:29 +0000
+++ CAMD/Source/camd_defaults.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* User-callable.  Sets default control parameters for CAMD.  See camd.h

=== modified file 'CAMD/Source/camd_dump.c'
--- CAMD/Source/camd_dump.c	2007-05-29 09:36:29 +0000
+++ CAMD/Source/camd_dump.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* Debugging routines for CAMD.  Not used if NDEBUG is not defined at compile-

=== modified file 'CAMD/Source/camd_global.c'
--- CAMD/Source/camd_global.c	2007-05-29 09:36:29 +0000
+++ CAMD/Source/camd_global.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 #include <stdlib.h>

=== modified file 'CAMD/Source/camd_info.c'
--- CAMD/Source/camd_info.c	2007-05-29 09:36:29 +0000
+++ CAMD/Source/camd_info.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* User-callable.  Prints the output statistics for CAMD.  See camd.h

=== modified file 'CAMD/Source/camd_order.c'
--- CAMD/Source/camd_order.c	2007-05-29 09:36:29 +0000
+++ CAMD/Source/camd_order.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* User-callable CAMD minimum degree ordering routine.  See camd.h for

=== modified file 'CAMD/Source/camd_postorder.c'
--- CAMD/Source/camd_postorder.c	2007-05-29 09:36:29 +0000
+++ CAMD/Source/camd_postorder.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* Perform a postordering (via depth-first search) of an assembly tree. */

=== modified file 'CAMD/Source/camd_preprocess.c'
--- CAMD/Source/camd_preprocess.c	2007-05-29 09:36:29 +0000
+++ CAMD/Source/camd_preprocess.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* Sorts, removes duplicate entries, and transposes from the nonzero pattern of

=== modified file 'CAMD/Source/camd_valid.c'
--- CAMD/Source/camd_valid.c	2007-05-29 09:36:29 +0000
+++ CAMD/Source/camd_valid.c	2013-12-08 03:08:50 +0000
@@ -5,8 +5,7 @@
 /* ------------------------------------------------------------------------- */
 /* CAMD, Copyright (c) Timothy A. Davis, Yanqing Chen,			     */
 /* 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/camd                         */
+/* email: [e-mail]                                      */
 /* ------------------------------------------------------------------------- */
 
 /* Check if a column-form matrix is valid or not.  The matrix A is

=== modified file 'CCOLAMD/Demo/Makefile'
--- CCOLAMD/Demo/Makefile	2007-05-29 09:36:29 +0000
+++ CCOLAMD/Demo/Makefile	2013-12-08 03:08:50 +0000
@@ -4,11 +4,11 @@
 
 default: ccolamd_example ccolamd_l_example
 
-include ../../UFconfig/UFconfig.mk
-
-I = -I../Include -I../../UFconfig
-
-C = $(CC) $(CFLAGS) $(I)
+include ../../SuiteSparse_config/SuiteSparse_config.mk
+
+I = -I../Include -I../../SuiteSparse_config
+
+C = $(CC) $(CF) $(I)
 
 library:
 	( cd ../Lib ; $(MAKE) )
@@ -27,7 +27,7 @@
 ccolamd_l_example: ccolamd_l_example.c library
 	$(C) -o ccolamd_l_example ccolamd_l_example.c ../Lib/libccolamd.a -lm
 	- ./ccolamd_l_example > my_ccolamd_l_example.out
-	- diff ccolamd_example.out my_ccolamd_example.out
+	- diff ccolamd_l_example.out my_ccolamd_l_example.out
 
 #------------------------------------------------------------------------------
 # Remove all but the files in the original distribution
@@ -41,3 +41,4 @@
 distclean: clean
 	- $(RM) ccolamd_example ccolamd_l_example
 	- $(RM) my_ccolamd_example.out my_ccolamd_l_example.out
+	- $(RM) -r *.dSYM

=== modified file 'CCOLAMD/Demo/ccolamd_example.c'
--- CCOLAMD/Demo/ccolamd_example.c	2007-05-29 09:36:29 +0000
+++ CCOLAMD/Demo/ccolamd_example.c	2013-12-08 03:08:50 +0000
@@ -6,7 +6,6 @@
  * CCOLAMD Copyright (C), Univ. of Florida.  Authors: Timothy A. Davis,
  * Sivasankaran Rajamanickam, and Stefan Larimore
  * See License.txt for the Version 2.1 of the GNU Lesser General Public License
- * http://www.cise.ufl.edu/research/sparse
  * -------------------------------------------------------------------------- */
 
 /*

=== modified file 'CCOLAMD/Demo/ccolamd_example.out'
--- CCOLAMD/Demo/ccolamd_example.out	2008-02-21 14:46:50 +0000
+++ CCOLAMD/Demo/ccolamd_example.out	2013-12-08 03:08:50 +0000
@@ -15,7 +15,7 @@
     row 1
     row 3
 
-ccolamd version 2.7, Nov 1, 2007: OK.  
+ccolamd version 2.8, Jun 1, 2012: 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 @@
     row 4
 Column 4, with 0 entries:
 
-csymamd version 2.7, Nov 1, 2007: OK.  
+csymamd version 2.8, Jun 1, 2012: 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

=== modified file 'CCOLAMD/Demo/ccolamd_l_example.c'
--- CCOLAMD/Demo/ccolamd_l_example.c	2007-05-29 09:36:29 +0000
+++ CCOLAMD/Demo/ccolamd_l_example.c	2013-12-08 03:08:50 +0000
@@ -1,12 +1,11 @@
 /* ========================================================================== */
-/* === ccolamd and csymamd example (UF_long integer version) ================ */
+/* === ccolamd and csymamd example (long integer version) =================== */
 /* ========================================================================== */
 
 /* ----------------------------------------------------------------------------
  * CCOLAMD Copyright (C), Univ. of Florida.  Authors: Timothy A. Davis,
  * Sivasankaran Rajamanickam, and Stefan Larimore
  * See License.txt for the Version 2.1 of the GNU Lesser General Public License
- * http://www.cise.ufl.edu/research/sparse
  * -------------------------------------------------------------------------- */
 
 /*
@@ -46,9 +45,6 @@
 #define B_NNZ 4
 #define B_N 5
 
-/* define UF_long */
-#include "UFconfig.h"
-
 int main (void)
 {
 
@@ -56,14 +52,14 @@
     /* input matrix A definition */
     /* ====================================================================== */
 
-    UF_long A [ALEN] = {
+    SuiteSparse_long A [ALEN] = {
 
     	0, 1, 4,		/* row indices of nonzeros in column 0 */
 	2, 4,			/* row indices of nonzeros in column 1 */
 	0, 1, 2, 3,		/* row indices of nonzeros in column 2 */
 	1, 3} ;			/* row indices of nonzeros in column 3 */
 
-    UF_long p [ ] = {
+    SuiteSparse_long p [ ] = {
 
     	0,			/* column 0 is in A [0..2] */
 	3,			/* column 1 is in A [3..4] */ 
@@ -75,7 +71,7 @@
     /* input matrix B definition */
     /* ====================================================================== */
 
-    UF_long B [ ] = {		/* Note: only strictly lower triangular part */
+    SuiteSparse_long B [ ] = {  /* Note: only strictly lower triangular part */
     				/* is included, since symamd ignores the */
 				/* diagonal and upper triangular part of B. */
 
@@ -85,7 +81,7 @@
     	4			/* row indices of nonzeros in column 3 */
     	} ;			/* row indices of nonzeros in column 4 (none) */
 
-    UF_long q [ ] = {
+    SuiteSparse_long q [ ] = {
 
     	0,			/* column 0 is in B [0] */
 	1,			/* column 1 is in B [1..2] */ 
@@ -98,10 +94,9 @@
     /* other variable definitions */
     /* ====================================================================== */
 
-    UF_long perm [B_N+1] ;	    /* note the size is N+1 */
-    UF_long stats [CCOLAMD_STATS] ; /* for ccolamd and csymamd output stats */
-
-    UF_long row, col, pp, length, ok ;
+    SuiteSparse_long perm [B_N+1] ;	    /* note the size is N+1 */
+    SuiteSparse_long stats [CCOLAMD_STATS] ;  /* ccolamd/csymamd output stats */
+    SuiteSparse_long row, col, pp, length, ok ;
 
     /* ====================================================================== */
     /* dump the input matrix A */

=== modified file 'CCOLAMD/Demo/ccolamd_l_example.out'
--- CCOLAMD/Demo/ccolamd_l_example.out	2008-02-21 14:46:50 +0000
+++ CCOLAMD/Demo/ccolamd_l_example.out	2013-12-08 03:08:50 +0000
@@ -15,7 +15,7 @@
     row 1
     row 3
 
-ccolamd version 2.7, Nov 1, 2007: OK.  
+ccolamd version 2.8, Jun 1, 2012: 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 @@
     row 4
 Column 4, with 0 entries:
 
-csymamd version 2.7, Nov 1, 2007: OK.  
+csymamd version 2.8, Jun 1, 2012: OK.