diff --git a/CHOLMOD/Tcov/tmp b/CHOLMOD/Tcov/tmp deleted file mode 120000 index 3ff809e589..0000000000 --- a/CHOLMOD/Tcov/tmp +++ /dev/null @@ -1 +0,0 @@ -/export/blank0/davis/tmp \ No newline at end of file diff --git a/CHOLMOD/Tcov/tmp/.gitkeep b/CHOLMOD/Tcov/tmp/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CSparse/ChangeLog b/CSparse/ChangeLog index 72e474ad53..c8b266b4fc 100644 --- a/CSparse/ChangeLog +++ b/CSparse/ChangeLog @@ -1,3 +1,8 @@ +Dec 6, 2006, v2.0.6 + + * Update to UFget. Now relies on the MATLAB urlwrite function instead of + my own Java code. + Nov 2006, v2.0.5 * Added UFgrep to UFget toolbox. diff --git a/CSparse/Demo/cs_demo.out b/CSparse/Demo/cs_demo.out index fb3e03ed27..5abe7cb79c 100644 --- a/CSparse/Demo/cs_demo.out +++ b/CSparse/Demo/cs_demo.out @@ -1,6 +1,6 @@ ./cs_demo1 < ../Matrix/t1 T: -CSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 triplet: 4-by-4, nzmax: 16 nnz: 10 2 2 : 3 1 0 : 3.1 @@ -13,7 +13,7 @@ triplet: 4-by-4, nzmax: 16 nnz: 10 0 0 : 4.5 2 1 : 1.7 A: -CSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 11.1 col 0 : locations 0 to 2 1 : 3.1 @@ -30,7 +30,7 @@ CSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 3 : 1 1 : 0.9 AT: -CSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 7.7 col 0 : locations 0 to 1 0 : 4.5 @@ -47,7 +47,7 @@ CSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 1 : 0.4 3 : 1 D: -CSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 16 nnz: 16, 1-norm: 139.58 col 0 : locations 0 to 3 1 : 13.95 @@ -103,17 +103,17 @@ Chol amd(A+A') time: 0.00 resid: 2.01e-19 zero entries dropped: 71 tiny entries dropped: 10 blocks: 38 singletons: 37 structural rank: 183 -QR natural time: 0.01 resid: 1.09e-27 -QR amd(A'*A) time: 0.00 resid: 5.34e-28 -LU natural time: 0.01 resid: 3.08e-28 +QR natural time: 0.00 resid: 1.09e-27 +QR amd(A'*A) time: 0.01 resid: 5.34e-28 +LU natural time: 0.00 resid: 3.08e-28 LU amd(A+A') time: 0.00 resid: 1.42e-27 LU amd(S'*S) time: 0.00 resid: 7.11e-28 -LU amd(A'*A) time: 0.00 resid: 7.11e-28 +LU amd(A'*A) time: 0.01 resid: 7.11e-28 ./cs_demo2 < ../Matrix/mbeacxc --- Matrix: 492-by-490, nnz: 49920 (sym: 0: nnz 0), norm: 9.29e-01 blocks: 10 singletons: 8 structural rank: 448 -QR natural time: 0.26 resid: nan +QR natural time: 0.25 resid: nan QR amd(A'*A) time: 0.30 resid: nan ./cs_demo2 < ../Matrix/west0067 @@ -135,11 +135,11 @@ QR amd(A'*A) time: 0.00 resid: 1.89e-16 --- Matrix: 4884-by-4884, nnz: 147631 (sym: -1: nnz 290378), norm: 7.01e+09 blocks: 75 singletons: 74 structural rank: 4884 -QR amd(A'*A) time: 2.35 resid: 2.02e-22 -LU amd(A+A') time: 1.41 resid: 1.06e-22 -LU amd(S'*S) time: 1.38 resid: 1.21e-22 -LU amd(A'*A) time: 1.45 resid: 1.70e-22 -Chol amd(A+A') time: 0.66 resid: 9.28e-23 +QR amd(A'*A) time: 2.42 resid: 2.02e-22 +LU amd(A+A') time: 1.44 resid: 1.06e-22 +LU amd(S'*S) time: 1.39 resid: 1.21e-22 +LU amd(A'*A) time: 1.48 resid: 1.70e-22 +Chol amd(A+A') time: 0.65 resid: 9.28e-23 ./cs_demo3 < ../Matrix/bcsstk01 --- Matrix: 48-by-48, nnz: 224 (sym: -1: nnz 400), norm: 3.57e+09 @@ -161,10 +161,10 @@ downdate: time: 0.00 (incl solve) resid: 3.30e-17 chol then update/downdate amd(A+A') symbolic chol time 0.04 numeric chol time 0.60 -solve chol time 0.01 +solve chol time 0.02 original: resid: 9.28e-23 update: time: 0.00 -update: time: 0.02 (incl solve) resid: 8.62e-24 -rechol: time: 0.61 (incl solve) resid: 8.72e-24 +update: time: 0.01 (incl solve) resid: 8.62e-24 +rechol: time: 0.62 (incl solve) resid: 8.72e-24 downdate: time: 0.00 -downdate: time: 0.01 (incl solve) resid: 3.60e-22 +downdate: time: 0.02 (incl solve) resid: 3.60e-22 diff --git a/CSparse/MATLAB/README.txt b/CSparse/MATLAB/README.txt index 1cff894dd9..615343924a 100644 --- a/CSparse/MATLAB/README.txt +++ b/CSparse/MATLAB/README.txt @@ -12,13 +12,7 @@ CSparse, and add the directories: CSparse/MATLAB/UFget to your MATLAB path (see the "pathtool" command to add these to your path -permanently, for future MATLAB sessions). It will also add the path - - CSparse/MATLAB/UFget - -to your java class path (see the "javaaddpath" command). Edit your -classpath.txt file (type the command "which claspath.txt") to add this -directory to your Java class path permanently. +permanently, for future MATLAB sessions). To run the MATLAB demo programs, run cs_demo in the Demo directory. To run the MATLAB test programs, run testall in the Test directory. diff --git a/CSparse/MATLAB/UFget/Contents.m b/CSparse/MATLAB/UFget/Contents.m index c94d550352..8226da79e3 100644 --- a/CSparse/MATLAB/UFget/Contents.m +++ b/CSparse/MATLAB/UFget/Contents.m @@ -8,9 +8,7 @@ % % UFget_defaults - returns default parameter settings for UFget. % UFget_example - a demo for UFget. -% UFget_install - installs UFget for the current MATLAB session. % UFget_lookup - gets the group, name, and id of a matrix. -% UFget_java.geturl - downloads a URL as a file (a Java method). % % Example: % help UFget diff --git a/CSparse/MATLAB/UFget/README.txt b/CSparse/MATLAB/UFget/README.txt index 62b1207712..e591ac6bfd 100644 --- a/CSparse/MATLAB/UFget/README.txt +++ b/CSparse/MATLAB/UFget/README.txt @@ -1,7 +1,7 @@ UFget: a MATLAB interface to the UF sparse matrix collection. MATLAB 7.0 or later is required. -Date: Nov 30, 2006. +Date: Dec 6, 2006. Copyright 2005-2006, Tim Davis, University of Florida. Authors: Tim Davis and Erich Mirable. Availability: http://www.cise.ufl.edu/research/sparse/mat/UFget @@ -14,9 +14,6 @@ for a single archive file with all the files listed below. UFget/UFget_defaults.m default parameter settings for UFget UFget/UFget_example.m demo for UFget - UFget/UFget_install.m installs UFget for use in MATLAB - UFget/UFget_java.class compiled version of UFget_java.java - UFget/UFget_java.java downloads a URL UFget/UFget_lookup.m get the group, name, and id of a matrix UFget/UFget.m primary user interface @@ -25,18 +22,14 @@ for a single archive file with all the files listed below. UFget/mat default download directory (can be changed) UFget/mat/UF_Index.mat index to the UF sparse matrix collection -You may also need the Java Development Kit (Java 2 Platform, at -http://java.sun.com/j2se/index.html ) to compile UFget_java.java. - -To install the package, type this command in MATLAB: - - UFget_install +To install the package, just add the path containing the UFget directory +to your MATLAB path. Type "pathtool" in MATLAB for more details. For a simple example of use, type this command in MATLAB: UFget_example -Once the files are downloaded and installed, the MATLAB statement +The MATLAB statement Problem = UFget ('HB/arc130') @@ -71,9 +64,3 @@ To open the web page for one matrix, use either of these formats: For more information on how the index entries were created, see http://www.cise.ufl.edu/research/sparse/SuiteSparse. - -The UFget/UFget_java.class was compiled using: - - java version "1.5.0" - Java(TM) 2 Runtime Environment, Standard Edition (build 1.5.0-b64) - Java HotSpot(TM) Client VM (build 1.5.0-b64, mixed mode) diff --git a/CSparse/MATLAB/UFget/UFget.m b/CSparse/MATLAB/UFget/UFget.m index 6ecbe222e3..d7f7f0a4fc 100644 --- a/CSparse/MATLAB/UFget/UFget.m +++ b/CSparse/MATLAB/UFget/UFget.m @@ -5,11 +5,10 @@ % specified as either a number (1 to the # of matrices in the collection) or % as a string (the name of the matrix). With no input parameters, index=UFget % returns an index of matrices in the collection. A local copy of the matrix -% is saved (be aware that as of Nov 2005 the entire collection is almost 5GB +% is saved (be aware that as of Nov 2006 the entire collection is over 8GB % in size). If no input or output arguments are provided, the index is % printed. With a 2nd parameter (Problem = UFget (matrix, index)), the index % file is not loaded. This is faster if you are loading lots of matrices. -% For details on the Problem struct, type the command "type UFget" % % Examples: % index = UFget ; @@ -18,9 +17,9 @@ % Problem = UFget (6, index) % Problem = UFget ('HB/arc130', index) % -% See also UFget_install, UFget_example, UFget_defaults, UFget_java.java. +% See also UFgrep, UFweb, UFget_example, UFget_defaults, urlwrite. -% Copyright 2005, Tim Davis, University of Florida. +% Copyright 2006, Tim Davis, University of Florida. %------------------------------------------------------------------------------- % get the parameter settings @@ -48,8 +47,9 @@ if (refresh) % a new UF_Index.mat file to get access to new matrices (if any) - fprintf ('downdloading %s\n', indexurl) ; - UFget_java.geturl (indexurl, indexfile) ; + fprintf ('downloading %s\n', indexurl) ; + fprintf ('to %s\n', indexfile) ; + urlwrite (indexurl, indexfile) ; load (indexfile) ; UF_Index.DownloadTimeStamp = now ; save (indexfile, 'UF_Index') ; @@ -135,7 +135,8 @@ load (matfile) else fprintf ('downloading %s\n', maturl) ; - UFget_java.geturl (maturl, matfile) ; + fprintf ('to %s\n', matfile) ; + urlwrite (maturl, matfile) ; load (matfile) save (matfile, 'Problem') ; end diff --git a/CSparse/MATLAB/UFget/UFget_example.m b/CSparse/MATLAB/UFget/UFget_example.m index 6b98e1680c..0e6b7ec33f 100644 --- a/CSparse/MATLAB/UFget/UFget_example.m +++ b/CSparse/MATLAB/UFget/UFget_example.m @@ -6,11 +6,9 @@ % Example: % type UFget_example ; % to see an example of how to use UFget % -% See also UFget, UFweb. +% See also UFget, UFweb, UFgrep. -% Copyright 2005, Tim Davis, University of Florida. - -% Nov 3, 2005. +% Copyright 2006, Tim Davis, University of Florida. type UFget_example ; diff --git a/CSparse/MATLAB/UFget/UFget_install.m b/CSparse/MATLAB/UFget/UFget_install.m deleted file mode 100644 index 302789b4df..0000000000 --- a/CSparse/MATLAB/UFget/UFget_install.m +++ /dev/null @@ -1,31 +0,0 @@ -function UFget_install -%UFget_install installs UFget for the current MATLAB session. -% Run this M-file (UFget_install) for instructions on how to install it -% permanently, for future MATLAB sessions. -% -% Example: -% UFget_install -% -% See also UFget, PATHTOOL, JAVAADDPATH, ADDPATH. -% Also see DOC STARTUP. - -% Copyright 2005, Tim Davis, University of Florida. - -s = which (mfilename) ; -i = find (s == filesep) ; -s = s (1:i(end)) ; - -fprintf ('Temporarily adding %s to your MATLAB path and JAVA path.\n', s) ; -fprintf ('Do this permanently via pathtool. Next, edit the file:\n') ; -fprintf ('%s file.\n', which ('classpath.txt')) ; -fprintf ('and add the line:\n') ; -fprintf ('%s\n', s) ; -fprintf ('to the end of that file (which defines your JAVA class path).\n') ; - -addpath (s) ; -javaaddpath (s) ; - -fprintf ('\nAlternatively, add these two lines to your startup.m file:\n\n') ; -fprintf ('addpath (''%s'') ;\n', s) ; -fprintf ('javaaddpath (''%s'') ;\n', s) ; -fprintf ('\nSee also pathtool, javaaddpath, addpath, and "doc startup".\n\n') ; diff --git a/CSparse/MATLAB/UFget/UFget_java.class b/CSparse/MATLAB/UFget/UFget_java.class deleted file mode 100644 index 7215d99990..0000000000 Binary files a/CSparse/MATLAB/UFget/UFget_java.class and /dev/null differ diff --git a/CSparse/MATLAB/UFget/UFget_java.java b/CSparse/MATLAB/UFget/UFget_java.java deleted file mode 100644 index abac55b62e..0000000000 --- a/CSparse/MATLAB/UFget/UFget_java.java +++ /dev/null @@ -1,68 +0,0 @@ -// function UFget_java.geturl (url, localfile) -// UFget_java.java: download a URL and save as a file. -// -// Example usage in MATLAB: -// -// UFget_java.geturl ... -// ('http://www.cise.ufl.edu/research/sparse/mat/HB/ibm32.mat', ... -// 'ibm32.mat') ; -// -// Example usage at the system command line: -// -// java UFget_java \ -// 'http://www.cise.ufl.edu/research/sparse/mat/HB/ibm32.mat' \ -// 'ibm32.mat' -// -// To compile: -// -// javac -// -// Compiled with java version 1.5.0, on a SUSE Linux Pentium system. -// -// Copyright 2006, Timothy A. Davis - -import java.io.* ; -import java.net.* ; - -public class UFget_java -{ - public static void main (String [ ] args) - - { - geturl (args [0], args [1]) ; - } - - public static void geturl (String u, String f) - { - InputStream i = null ; - OutputStream o = null ; - try - { - URL url = new URL (u) ; - URLConnection conn = url.openConnection ( ) ; - i = conn.getInputStream ( ) ; - o = new FileOutputStream (f); - byte [ ] s = new byte [4096] ; - int b ; - while ((b = i.read (s)) != -1) - { - o.write (s, 0, b) ; - } - } - catch (Exception e) - { - System.out.println (e) ; - } - finally - { - try - { - if (i != null) i.close ( ) ; - if (o != null) o.close ( ) ; - } - catch (IOException ioe) - { - } - } - } -} diff --git a/CSparse/MATLAB/UFget/UFgrep.m b/CSparse/MATLAB/UFget/UFgrep.m index 93a1f097f4..8b306889f5 100644 --- a/CSparse/MATLAB/UFget/UFgrep.m +++ b/CSparse/MATLAB/UFget/UFgrep.m @@ -20,6 +20,8 @@ % % See also regexp, UFget. +% Copyright 2006, Timothy A. Davis + if (nargin < 2) index = UFget ; end diff --git a/CSparse/MATLAB/UFget/UFweb.m b/CSparse/MATLAB/UFget/UFweb.m index 1acb95c240..192e2697ce 100644 --- a/CSparse/MATLAB/UFget/UFweb.m +++ b/CSparse/MATLAB/UFget/UFweb.m @@ -31,7 +31,7 @@ % the MATLAB web command. To use the system web browser instead of the MATLAB % browser, for example, use UFweb ('HB/arc130', '-browser'). % -% See also web, UFget, UFget_defaults, spy, cspy, cs_dmspy. +% See also web, UFget, UFget_defaults. % Copyright 2006, Tim Davis, University of Florida. diff --git a/CSparse/MATLAB/cs_install.m b/CSparse/MATLAB/cs_install.m index 4f20351923..e841345739 100644 --- a/CSparse/MATLAB/cs_install.m +++ b/CSparse/MATLAB/cs_install.m @@ -10,15 +10,7 @@ function cs_install (do_pause) % CSparse/MATLAB/UFget % % are added to your MATLAB path (see the "pathtool" command to add these to -% your path permanently, for future MATLAB sessions). The path -% -% CSparse/MATLAB/UFget -% -% is also added to your java class path (see the "javaaddpath" command). -% Edit your classpath.txt file (type the command "which classpath.txt") to -% add this directory to your Java class path permanently. UFget is not -% required by CSparse (except the extended demos and tests); UFget requires -% MATLAB 7.0 or later. +% your path permanently, for future MATLAB sessions). % % Next, the MATLAB CSparse demo program, CSparse/MATLAB/cs_demo is executed. % To run the demo with pauses so you can see the results, use cs_install(1). @@ -51,18 +43,6 @@ function cs_install (do_pause) addpath ([pwd filesep 'Demo']) ; addpath ([pwd filesep 'UFget']) ; -ufget_path = [pwd filesep 'UFget'] ; -try - javaaddpath (ufget_path) ; -catch - fprintf ('It appears that you are using an older version of MATLAB.\n') ; - fprintf ('To use UFget, edit your classpath.txt file and add the line:\n'); - fprintf ('%s\n', ufget_path) ; - fprintf ('Note that UFget requires MATLAB 7.0 or later.\n') ; - fprintf ('The location of classpath.txt is given below:\n') ; - which classpath.txt -end - cd ('CSparse') ; cs_make cd ('../Demo') ; diff --git a/CSparse/README.txt b/CSparse/README.txt index 8b5c5119e9..cc6165f883 100644 --- a/CSparse/README.txt +++ b/CSparse/README.txt @@ -1,5 +1,5 @@ CSparse: a Concise Sparse Matrix package. -Version 2.0.3, Copyright (c) 2006, Timothy A. Davis, Sept 28, 2006. +Version 2.0.6, Copyright (c) 2006, Timothy A. Davis, Dec 7, 2006. Refer to "Direct Methods for Sparse Linear Systems," Timothy A. Davis, SIAM, Philadelphia, 2006. No detailed user guide is included in this diff --git a/CSparse/Source/cs.h b/CSparse/Source/cs.h index b5e389f766..f0883acda7 100644 --- a/CSparse/Source/cs.h +++ b/CSparse/Source/cs.h @@ -7,10 +7,10 @@ #ifdef MATLAB_MEX_FILE #include "mex.h" #endif -#define CS_VER 2 /* CSparse Version 2.0.5 */ +#define CS_VER 2 /* CSparse Version 2.0.6 */ #define CS_SUBVER 0 -#define CS_SUBSUB 5 -#define CS_DATE "Nov 27, 2006" /* CSparse release date */ +#define CS_SUBSUB 6 +#define CS_DATE "Dec 7, 2006" /* CSparse release date */ #define CS_COPYRIGHT "Copyright (c) Timothy A. Davis, 2006" /* --- primary CSparse routines and data structures ------------------------- */ diff --git a/CXSparse/ChangeLog b/CXSparse/ChangeLog index d4d9077073..c8b266b4fc 100644 --- a/CXSparse/ChangeLog +++ b/CXSparse/ChangeLog @@ -1,5 +1,12 @@ +Dec 6, 2006, v2.0.6 + + * Update to UFget. Now relies on the MATLAB urlwrite function instead of + my own Java code. + Nov 2006, v2.0.5 + * Added UFgrep to UFget toolbox. + * No changes to C Source code, except for version number and date. * Added two test matrices: ibm32a and ibm32b. ibm32ais the Harwell/ diff --git a/CXSparse/Demo/cs_demo.out b/CXSparse/Demo/cs_demo.out index d178276c73..f526a03a6e 100644 --- a/CXSparse/Demo/cs_demo.out +++ b/CXSparse/Demo/cs_demo.out @@ -4,7 +4,7 @@ make[1]: Entering directory `/amd/netapp3/vol/research0a/research18/sparse/Suite --- cs_idemo T: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 triplet: 4-by-4, nzmax: 16 nnz: 10 2 2 : (3, 3.14159) 1 0 : (3.1, 42) @@ -18,7 +18,7 @@ triplet: 4-by-4, nzmax: 16 nnz: 10 2 1 : (1.7, 1) Treal: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 triplet: 4-by-4, nzmax: 16 nnz: 10 2 2 : 3 1 0 : 3.1 @@ -32,7 +32,7 @@ triplet: 4-by-4, nzmax: 16 nnz: 10 2 1 : 1.7 Timag: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 triplet: 4-by-4, nzmax: 16 nnz: 10 2 2 : 3.14159 1 0 : 42 @@ -46,7 +46,7 @@ triplet: 4-by-4, nzmax: 16 nnz: 10 2 1 : 1 A: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 106.075 col 0 : locations 0 to 2 1 : (3.1, 42) @@ -64,7 +64,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 1 : (0.9, 99) C1 = real(A): -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 11.1 col 0 : locations 0 to 2 1 : 3.1 @@ -82,7 +82,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 1 : 0.9 C2 = imag(A): -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 106 col 0 : locations 0 to 2 1 : 42 @@ -100,7 +100,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 1 : 99 A1: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 11.1 col 0 : locations 0 to 2 1 : (3.1, 0) @@ -118,7 +118,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 1 : (0.9, 0) A2: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 106 col 0 : locations 0 to 2 1 : (0, 42) @@ -136,7 +136,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 1 : (0, 99) B = conj(A): -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 106.075 col 0 : locations 0 to 2 1 : (3.1, -42) @@ -157,7 +157,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 --- cs_ldemo T: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 triplet: 4-by-4, nzmax: 16 nnz: 10 2 2 : (3, 3.14159) 1 0 : (3.1, 42) @@ -171,7 +171,7 @@ triplet: 4-by-4, nzmax: 16 nnz: 10 2 1 : (1.7, 1) Treal: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 triplet: 4-by-4, nzmax: 16 nnz: 10 2 2 : 3 1 0 : 3.1 @@ -185,7 +185,7 @@ triplet: 4-by-4, nzmax: 16 nnz: 10 2 1 : 1.7 Timag: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 triplet: 4-by-4, nzmax: 16 nnz: 10 2 2 : 3.14159 1 0 : 42 @@ -199,7 +199,7 @@ triplet: 4-by-4, nzmax: 16 nnz: 10 2 1 : 1 A: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 106.075 col 0 : locations 0 to 2 1 : (3.1, 42) @@ -217,7 +217,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 1 : (0.9, 99) C1 = real(A): -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 11.1 col 0 : locations 0 to 2 1 : 3.1 @@ -235,7 +235,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 1 : 0.9 C2 = imag(A): -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 106 col 0 : locations 0 to 2 1 : 42 @@ -253,7 +253,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 1 : 99 A1: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 11.1 col 0 : locations 0 to 2 1 : (3.1, 0) @@ -271,7 +271,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 1 : (0.9, 0) A2: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 106 col 0 : locations 0 to 2 1 : (0, 42) @@ -289,7 +289,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 1 : (0, 99) B = conj(A): -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 106.075 col 0 : locations 0 to 2 1 : (3.1, -42) @@ -307,7 +307,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 1 : (0.9, -99) ./cs_demo1 < ../Matrix/t1 T: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 triplet: 4-by-4, nzmax: 16 nnz: 10 2 2 : 3 1 0 : 3.1 @@ -320,7 +320,7 @@ triplet: 4-by-4, nzmax: 16 nnz: 10 0 0 : 4.5 2 1 : 1.7 A: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 11.1 col 0 : locations 0 to 2 1 : 3.1 @@ -337,7 +337,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 3 : 1 1 : 0.9 AT: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 7.7 col 0 : locations 0 to 1 0 : 4.5 @@ -354,7 +354,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 1 : 0.4 3 : 1 D: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 16 nnz: 16, 1-norm: 139.58 col 0 : locations 0 to 3 1 : 13.95 @@ -424,7 +424,7 @@ QR amd(A'*A) time: 0.00 resid: 1.61e-02 --- Matrix: 492-by-490, nnz: 49920 (sym: 0: nnz 0), norm: 9.29e-01 blocks: 10 singletons: 8 structural rank: 448 -QR natural time: 0.25 resid: nan +QR natural time: 0.26 resid: nan QR amd(A'*A) time: 0.31 resid: nan ./cs_demo2 < ../Matrix/bcsstk01 @@ -457,27 +457,27 @@ downdate: time: 0.00 (incl solve) resid: 3.30e-17 --- Matrix: 4884-by-4884, nnz: 147631 (sym: -1: nnz 290378), norm: 7.01e+09 blocks: 75 singletons: 74 structural rank: 4884 QR amd(A'*A) time: 2.44 resid: 1.28e-22 -LU amd(A+A') time: 1.42 resid: 1.06e-22 -LU amd(S'*S) time: 1.38 resid: 1.21e-22 -LU amd(A'*A) time: 1.46 resid: 1.70e-22 +LU amd(A+A') time: 1.46 resid: 1.06e-22 +LU amd(S'*S) time: 1.41 resid: 1.21e-22 +LU amd(A'*A) time: 1.48 resid: 1.70e-22 Chol amd(A+A') time: 0.65 resid: 9.28e-23 ./cs_demo3 < ../Matrix/bcsstk16 --- Matrix: 4884-by-4884, nnz: 147631 (sym: -1: nnz 290378), norm: 7.01e+09 chol then update/downdate amd(A+A') -symbolic chol time 0.02 -numeric chol time 0.61 +symbolic chol time 0.03 +numeric chol time 0.62 solve chol time 0.01 original: resid: 9.28e-23 update: time: 0.00 -update: time: 0.02 (incl solve) resid: 8.62e-24 -rechol: time: 0.60 (incl solve) resid: 8.72e-24 +update: time: 0.01 (incl solve) resid: 8.62e-24 +rechol: time: 0.63 (incl solve) resid: 8.72e-24 downdate: time: 0.00 downdate: time: 0.01 (incl solve) resid: 3.60e-22 ./cs_di_demo1 < ../Matrix/t1 T: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 triplet: 4-by-4, nzmax: 16 nnz: 10 2 2 : 3 1 0 : 3.1 @@ -490,7 +490,7 @@ triplet: 4-by-4, nzmax: 16 nnz: 10 0 0 : 4.5 2 1 : 1.7 A: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 11.1 col 0 : locations 0 to 2 1 : 3.1 @@ -507,7 +507,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 3 : 1 1 : 0.9 AT: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 7.7 col 0 : locations 0 to 1 0 : 4.5 @@ -524,7 +524,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 1 : 0.4 3 : 1 D: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 16 nnz: 16, 1-norm: 139.58 col 0 : locations 0 to 3 1 : 13.95 @@ -562,10 +562,10 @@ LU amd(A'*A) time: 0.00 resid: 4.94e-18 zero entries dropped: 71 tiny entries dropped: 10 blocks: 38 singletons: 37 structural rank: 183 -QR natural time: 0.01 resid: 3.15e-28 -QR amd(A'*A) time: 0.00 resid: 2.60e-28 -LU natural time: 0.01 resid: 3.08e-28 -LU amd(A+A') time: 0.00 resid: 1.42e-27 +QR natural time: 0.00 resid: 3.15e-28 +QR amd(A'*A) time: 0.01 resid: 2.60e-28 +LU natural time: 0.00 resid: 3.08e-28 +LU amd(A+A') time: 0.01 resid: 1.42e-27 LU amd(S'*S) time: 0.00 resid: 7.11e-28 LU amd(A'*A) time: 0.00 resid: 7.11e-28 ./cs_di_demo2 < ../Matrix/west0067 @@ -594,7 +594,7 @@ QR amd(A'*A) time: 0.00 resid: 1.61e-02 --- Matrix: 492-by-490, nnz: 49920 (sym: 0: nnz 0), norm: 9.29e-01 blocks: 10 singletons: 8 structural rank: 448 -QR natural time: 0.26 resid: nan +QR natural time: 0.24 resid: nan QR amd(A'*A) time: 0.31 resid: nan ./cs_di_demo2 < ../Matrix/bcsstk01 @@ -626,11 +626,11 @@ downdate: time: 0.00 (incl solve) resid: 3.30e-17 --- Matrix: 4884-by-4884, nnz: 147631 (sym: -1: nnz 290378), norm: 7.01e+09 blocks: 75 singletons: 74 structural rank: 4884 -QR amd(A'*A) time: 2.44 resid: 1.28e-22 -LU amd(A+A') time: 1.44 resid: 1.06e-22 -LU amd(S'*S) time: 1.54 resid: 1.21e-22 -LU amd(A'*A) time: 1.49 resid: 1.70e-22 -Chol amd(A+A') time: 0.66 resid: 9.28e-23 +QR amd(A'*A) time: 2.41 resid: 1.28e-22 +LU amd(A+A') time: 1.49 resid: 1.06e-22 +LU amd(S'*S) time: 1.40 resid: 1.21e-22 +LU amd(A'*A) time: 1.48 resid: 1.70e-22 +Chol amd(A+A') time: 0.69 resid: 9.28e-23 ./cs_di_demo3 < ../Matrix/bcsstk16 --- Matrix: 4884-by-4884, nnz: 147631 (sym: -1: nnz 290378), norm: 7.01e+09 @@ -641,13 +641,13 @@ numeric chol time 0.61 solve chol time 0.01 original: resid: 9.28e-23 update: time: 0.00 -update: time: 0.02 (incl solve) resid: 8.62e-24 +update: time: 0.01 (incl solve) resid: 8.62e-24 rechol: time: 0.62 (incl solve) resid: 8.72e-24 -downdate: time: 0.01 -downdate: time: 0.02 (incl solve) resid: 3.60e-22 +downdate: time: 0.00 +downdate: time: 0.01 (incl solve) resid: 3.60e-22 ./cs_dl_demo1 < ../Matrix/t1 T: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 triplet: 4-by-4, nzmax: 16 nnz: 10 2 2 : 3 1 0 : 3.1 @@ -660,7 +660,7 @@ triplet: 4-by-4, nzmax: 16 nnz: 10 0 0 : 4.5 2 1 : 1.7 A: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 11.1 col 0 : locations 0 to 2 1 : 3.1 @@ -677,7 +677,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 3 : 1 1 : 0.9 AT: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 7.7 col 0 : locations 0 to 1 0 : 4.5 @@ -694,7 +694,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 1 : 0.4 3 : 1 D: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 16 nnz: 16, 1-norm: 139.58 col 0 : locations 0 to 3 1 : 13.95 @@ -732,7 +732,7 @@ LU amd(A'*A) time: 0.00 resid: 4.94e-18 zero entries dropped: 71 tiny entries dropped: 10 blocks: 38 singletons: 37 structural rank: 183 -QR natural time: 0.01 resid: 3.15e-28 +QR natural time: 0.00 resid: 3.15e-28 QR amd(A'*A) time: 0.01 resid: 2.60e-28 LU natural time: 0.00 resid: 3.08e-28 LU amd(A+A') time: 0.00 resid: 1.42e-27 @@ -764,8 +764,8 @@ QR amd(A'*A) time: 0.00 resid: 1.61e-02 --- Matrix: 492-by-490, nnz: 49920 (sym: 0: nnz 0), norm: 9.29e-01 blocks: 10 singletons: 8 structural rank: 448 -QR natural time: 0.25 resid: nan -QR amd(A'*A) time: 0.31 resid: nan +QR natural time: 0.26 resid: nan +QR amd(A'*A) time: 0.33 resid: nan ./cs_dl_demo2 < ../Matrix/bcsstk01 --- Matrix: 48-by-48, nnz: 224 (sym: -1: nnz 400), norm: 3.57e+09 @@ -796,28 +796,28 @@ downdate: time: 0.00 (incl solve) resid: 3.30e-17 --- Matrix: 4884-by-4884, nnz: 147631 (sym: -1: nnz 290378), norm: 7.01e+09 blocks: 75 singletons: 74 structural rank: 4884 -QR amd(A'*A) time: 2.45 resid: 1.28e-22 -LU amd(A+A') time: 1.33 resid: 1.06e-22 -LU amd(S'*S) time: 1.32 resid: 1.21e-22 -LU amd(A'*A) time: 1.40 resid: 1.70e-22 -Chol amd(A+A') time: 0.68 resid: 9.28e-23 +QR amd(A'*A) time: 2.42 resid: 1.28e-22 +LU amd(A+A') time: 1.39 resid: 1.06e-22 +LU amd(S'*S) time: 1.37 resid: 1.21e-22 +LU amd(A'*A) time: 1.41 resid: 1.70e-22 +Chol amd(A+A') time: 0.65 resid: 9.28e-23 ./cs_dl_demo3 < ../Matrix/bcsstk16 --- Matrix: 4884-by-4884, nnz: 147631 (sym: -1: nnz 290378), norm: 7.01e+09 chol then update/downdate amd(A+A') symbolic chol time 0.03 -numeric chol time 0.62 -solve chol time 0.02 +numeric chol time 0.61 +solve chol time 0.01 original: resid: 9.28e-23 update: time: 0.00 -update: time: 0.01 (incl solve) resid: 8.62e-24 -rechol: time: 0.64 (incl solve) resid: 8.72e-24 +update: time: 0.02 (incl solve) resid: 8.62e-24 +rechol: time: 0.63 (incl solve) resid: 8.72e-24 downdate: time: 0.00 downdate: time: 0.01 (incl solve) resid: 3.60e-22 ./cs_ci_demo1 < ../Matrix/t2 T: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 triplet: 4-by-4, nzmax: 16 nnz: 10 2 2 : (3, 3.14159) 1 0 : (3.1, 42) @@ -830,7 +830,7 @@ triplet: 4-by-4, nzmax: 16 nnz: 10 0 0 : (4.5, 6) 2 1 : (1.7, 1) A: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 106.075 col 0 : locations 0 to 2 1 : (3.1, 42) @@ -847,7 +847,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 3 : (1, 7) 1 : (0.9, 99) AT: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 144.296 col 0 : locations 0 to 1 0 : (4.5, -6) @@ -864,7 +864,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 1 : (0.4, -2.71828) 3 : (1, -7) D: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 16 nnz: 16, 1-norm: 25308.3 col 0 : locations 0 to 3 1 : (265.95, 170.4) @@ -929,16 +929,16 @@ LU amd(A'*A) time: 0.00 resid: 4.32e-17 --- Matrix: 492-by-490, nnz: 49920 (sym: 0: nnz 0), norm: 9.29e-01 blocks: 10 singletons: 8 structural rank: 448 QR natural time: 0.62 resid: nan -QR amd(A'*A) time: 0.70 resid: nan +QR amd(A'*A) time: 0.68 resid: nan ./cs_ci_demo2 < ../Matrix/young1c --- Matrix: 841-by-841, nnz: 4089 (sym: 0: nnz 0), norm: 7.30e+02 blocks: 1 singletons: 0 structural rank: 841 -QR natural time: 0.03 resid: 9.10e-17 -QR amd(A'*A) time: 0.01 resid: 8.11e-17 +QR natural time: 0.02 resid: 9.10e-17 +QR amd(A'*A) time: 0.02 resid: 8.11e-17 LU natural time: 0.01 resid: 1.27e-16 LU amd(A+A') time: 0.02 resid: 3.45e-16 -LU amd(S'*S) time: 0.01 resid: 2.31e-16 +LU amd(S'*S) time: 0.02 resid: 2.31e-16 LU amd(A'*A) time: 0.01 resid: 2.31e-16 ./cs_ci_demo2 < ../Matrix/qc324 @@ -947,8 +947,8 @@ blocks: 1 singletons: 0 structural rank: 324 QR natural time: 0.04 resid: 3.27e-17 QR amd(A'*A) time: 0.06 resid: 3.70e-17 LU natural time: 0.03 resid: 4.19e-17 -LU amd(A+A') time: 0.03 resid: 3.73e-17 -LU amd(S'*S) time: 0.04 resid: 4.19e-17 +LU amd(A+A') time: 0.04 resid: 3.73e-17 +LU amd(S'*S) time: 0.03 resid: 4.19e-17 LU amd(A'*A) time: 0.04 resid: 4.19e-17 ./cs_ci_demo2 < ../Matrix/neumann @@ -956,7 +956,7 @@ LU amd(A'*A) time: 0.04 resid: 4.19e-17 blocks: 1 singletons: 0 structural rank: 1600 QR amd(A'*A) time: 0.03 resid: 4.89e-16 LU amd(A+A') time: 0.02 resid: 4.32e-16 -LU amd(S'*S) time: 0.03 resid: 4.63e-16 +LU amd(S'*S) time: 0.02 resid: 4.63e-16 LU amd(A'*A) time: 0.02 resid: 4.63e-16 ./cs_ci_demo2 < ../Matrix/mhd1280b @@ -965,26 +965,26 @@ tiny entries dropped: 66 blocks: 20 singletons: 14 structural rank: 1280 QR amd(A'*A) time: 0.01 resid: 1.98e-25 LU amd(A+A') time: 0.00 resid: 2.07e-25 -LU amd(S'*S) time: 0.02 resid: 1.53e-25 -LU amd(A'*A) time: 0.00 resid: 1.53e-25 +LU amd(S'*S) time: 0.01 resid: 1.53e-25 +LU amd(A'*A) time: 0.02 resid: 1.53e-25 Chol amd(A+A') time: 0.01 resid: 3.63e-16 ./cs_ci_demo3 < ../Matrix/mhd1280b --- Matrix: 1280-by-1280, nnz: 12029 (sym: -1: nnz 22778), norm: 8.00e+01 chol then update/downdate amd(A+A') -symbolic chol time 0.00 +symbolic chol time 0.01 numeric chol time 0.00 solve chol time 0.00 original: resid: 3.64e-16 update: time: 0.00 update: time: 0.00 (incl solve) resid: 3.64e-16 -rechol: time: 0.00 (incl solve) resid: 3.64e-16 +rechol: time: 0.01 (incl solve) resid: 3.64e-16 downdate: time: 0.00 downdate: time: 0.00 (incl solve) resid: 1.89e-15 ./cs_cl_demo1 < ../Matrix/t2 T: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 triplet: 4-by-4, nzmax: 16 nnz: 10 2 2 : (3, 3.14159) 1 0 : (3.1, 42) @@ -997,7 +997,7 @@ triplet: 4-by-4, nzmax: 16 nnz: 10 0 0 : (4.5, 6) 2 1 : (1.7, 1) A: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 106.075 col 0 : locations 0 to 2 1 : (3.1, 42) @@ -1014,7 +1014,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 3 : (1, 7) 1 : (0.9, 99) AT: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 10 nnz: 10, 1-norm: 144.296 col 0 : locations 0 to 1 0 : (4.5, -6) @@ -1031,7 +1031,7 @@ CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 1 : (0.4, -2.71828) 3 : (1, -7) D: -CXSparse Version 2.0.5, Nov 27, 2006. Copyright (c) Timothy A. Davis, 2006 +CXSparse Version 2.0.6, Dec 7, 2006. Copyright (c) Timothy A. Davis, 2006 4-by-4, nzmax: 16 nnz: 16, 1-norm: 25308.3 col 0 : locations 0 to 3 1 : (265.95, 170.4) @@ -1095,34 +1095,34 @@ LU amd(A'*A) time: 0.00 resid: 4.32e-17 --- Matrix: 492-by-490, nnz: 49920 (sym: 0: nnz 0), norm: 9.29e-01 blocks: 10 singletons: 8 structural rank: 448 -QR natural time: 0.64 resid: nan +QR natural time: 0.63 resid: nan QR amd(A'*A) time: 0.67 resid: nan ./cs_cl_demo2 < ../Matrix/young1c --- Matrix: 841-by-841, nnz: 4089 (sym: 0: nnz 0), norm: 7.30e+02 blocks: 1 singletons: 0 structural rank: 841 -QR natural time: 0.02 resid: 9.10e-17 -QR amd(A'*A) time: 0.02 resid: 8.11e-17 -LU natural time: 0.01 resid: 1.27e-16 -LU amd(A+A') time: 0.01 resid: 3.45e-16 -LU amd(S'*S) time: 0.02 resid: 2.31e-16 +QR natural time: 0.03 resid: 9.10e-17 +QR amd(A'*A) time: 0.01 resid: 8.11e-17 +LU natural time: 0.02 resid: 1.27e-16 +LU amd(A+A') time: 0.02 resid: 3.45e-16 +LU amd(S'*S) time: 0.01 resid: 2.31e-16 LU amd(A'*A) time: 0.01 resid: 2.31e-16 ./cs_cl_demo2 < ../Matrix/qc324 --- Matrix: 324-by-324, nnz: 26730 (sym: 0: nnz 0), norm: 1.71e+00 blocks: 1 singletons: 0 structural rank: 324 QR natural time: 0.04 resid: 3.27e-17 -QR amd(A'*A) time: 0.07 resid: 3.70e-17 -LU natural time: 0.02 resid: 4.19e-17 -LU amd(A+A') time: 0.04 resid: 3.73e-17 -LU amd(S'*S) time: 0.03 resid: 4.19e-17 -LU amd(A'*A) time: 0.04 resid: 4.19e-17 +QR amd(A'*A) time: 0.06 resid: 3.70e-17 +LU natural time: 0.03 resid: 4.19e-17 +LU amd(A+A') time: 0.03 resid: 3.73e-17 +LU amd(S'*S) time: 0.04 resid: 4.19e-17 +LU amd(A'*A) time: 0.03 resid: 4.19e-17 ./cs_cl_demo2 < ../Matrix/neumann --- Matrix: 1600-by-1600, nnz: 7840 (sym: 0: nnz 0), norm: 1.41e+01 blocks: 1 singletons: 0 structural rank: 1600 QR amd(A'*A) time: 0.03 resid: 4.89e-16 -LU amd(A+A') time: 0.01 resid: 4.32e-16 +LU amd(A+A') time: 0.02 resid: 4.32e-16 LU amd(S'*S) time: 0.02 resid: 4.63e-16 LU amd(A'*A) time: 0.03 resid: 4.63e-16 ./cs_cl_demo2 < ../Matrix/mhd1280b @@ -1131,10 +1131,10 @@ LU amd(A'*A) time: 0.03 resid: 4.63e-16 tiny entries dropped: 66 blocks: 20 singletons: 14 structural rank: 1280 QR amd(A'*A) time: 0.01 resid: 1.98e-25 -LU amd(A+A') time: 0.00 resid: 2.07e-25 -LU amd(S'*S) time: 0.02 resid: 1.53e-25 -LU amd(A'*A) time: 0.01 resid: 1.53e-25 -Chol amd(A+A') time: 0.00 resid: 3.63e-16 +LU amd(A+A') time: 0.01 resid: 2.07e-25 +LU amd(S'*S) time: 0.01 resid: 1.53e-25 +LU amd(A'*A) time: 0.00 resid: 1.53e-25 +Chol amd(A+A') time: 0.01 resid: 3.63e-16 ./cs_cl_demo3 < ../Matrix/mhd1280b --- Matrix: 1280-by-1280, nnz: 12029 (sym: -1: nnz 22778), norm: 8.00e+01 diff --git a/CXSparse/Source/cs.h b/CXSparse/Source/cs.h index 55ff012a59..f51a9d06e6 100644 --- a/CXSparse/Source/cs.h +++ b/CXSparse/Source/cs.h @@ -14,10 +14,10 @@ extern "C" { #include #endif -#define CS_VER 2 /* CXSparse Version 2.0.5 */ +#define CS_VER 2 /* CXSparse Version 2.0.6 */ #define CS_SUBVER 0 -#define CS_SUBSUB 5 -#define CS_DATE "Nov 27, 2006" /* CXSparse release date */ +#define CS_SUBSUB 6 +#define CS_DATE "Dec 7, 2006" /* CXSparse release date */ #define CS_COPYRIGHT "Copyright (c) Timothy A. Davis, 2006" #define CXSPARSE diff --git a/CXSparse_newfiles.tar.gz b/CXSparse_newfiles.tar.gz index 154efcdc11..2c56c07c66 100644 Binary files a/CXSparse_newfiles.tar.gz and b/CXSparse_newfiles.tar.gz differ diff --git a/CXSparse_newfiles/Source/cs.h b/CXSparse_newfiles/Source/cs.h index 55ff012a59..f51a9d06e6 100644 --- a/CXSparse_newfiles/Source/cs.h +++ b/CXSparse_newfiles/Source/cs.h @@ -14,10 +14,10 @@ extern "C" { #include #endif -#define CS_VER 2 /* CXSparse Version 2.0.5 */ +#define CS_VER 2 /* CXSparse Version 2.0.6 */ #define CS_SUBVER 0 -#define CS_SUBSUB 5 -#define CS_DATE "Nov 27, 2006" /* CXSparse release date */ +#define CS_SUBSUB 6 +#define CS_DATE "Dec 7, 2006" /* CXSparse release date */ #define CS_COPYRIGHT "Copyright (c) Timothy A. Davis, 2006" #define CXSPARSE diff --git a/Contents.m b/Contents.m index 8602265da6..d44236a4a1 100644 --- a/Contents.m +++ b/Contents.m @@ -40,7 +40,7 @@ % ldl_normest - compute error in LDL' factorization. % lu_normest - compute error in LU factorization. % mread - read a sparse matrix in Matrix Market format -% mwrite - read a sparse matrix in Matrix Market format +% mwrite - write a sparse matrix in Matrix Market format % spsym - determine the symmetry of a sparse matrix % %------------------------------------------ diff --git a/LDL/ldlmain2.m b/LDL/ldlmain2.m index b599b78721..ca559c7d09 100644 --- a/LDL/ldlmain2.m +++ b/LDL/ldlmain2.m @@ -17,7 +17,11 @@ if (~ispc) input ('Hit enter to compile and run ldlmain (with AMD): ') ; try - mex -output ldlamd -I../AMD/Include -L../AMD/Lib -DUSE_AMD ldlmain.c -lamd ldl.c + s = pwd ; + cd ('../AMD') ; + !make + cd (s) ; + mex -output ldlamd -I../AMD/Include -I../UFconfig -L../AMD/Lib -DUSE_AMD ldlmain.c -lamd ldl.c ldlamd catch fprintf ('ldlamd mexFunction failed to compile\n') ; diff --git a/SuiteSparse_install.m b/SuiteSparse_install.m index 43a21fb755..e17010a1fc 100644 --- a/SuiteSparse_install.m +++ b/SuiteSparse_install.m @@ -3,14 +3,11 @@ % MATLAB. SuiteSparse is a Suite of Sparse matrix packages. % % Your current working directory must be SuiteSparse in order to use this -% function. Directories are added temporarily your path and javaclasspath. -% You should add them permanently, using the PATHTOOL. Add the Java directory -% for UFget to your classpath.txt, or add a JAVAADDPATH command to your -% STARTUP M-file. +% function. Directories are added temporarily your path. +% You should add them permanently, using the PATHTOOL. % % See also AMD, COLAMD, CAMD, CCOLAMD, CHOLMOD, UMFPACK, CSPARSE, UFget, -% RBio, UFcollection, SuiteSparse, PATHTOOL, PATH, JAVACLASSPATH, -% JAVAADDPATH, STARTUP. +% RBio, UFcollection, SuiteSparse, PATHTOOL, PATH, STARTUP. % % Copyright 2006, Timothy A. Davis. % http://www.cise.ufl.edu/research/sparse @@ -92,12 +89,4 @@ fprintf ('SuiteSparse is now installed. Run pathtool and save your path\n') ; fprintf ('for future sessions.\n') ; -fprintf ('Add the directory\n') ; -fprintf ('%s/CSparse/MATLAB/UFget\n', SuiteSparse) ; -fprintf ('to your classpath.txt file:\n') ; -which classpath.txt -fprintf ('or add the command:\n') ; -fprintf ('javaaddpath (''%s/CSparse/MATLAB/UFget'') ;\n', SuiteSparse) ; -fprintf ('to your startup.m file. Type "doc startup" for more details.\n'); - diff --git a/UFconfig/UFconfig.h b/UFconfig/UFconfig.h index f2d37ccaaa..ac8cc02c0f 100644 --- a/UFconfig/UFconfig.h +++ b/UFconfig/UFconfig.h @@ -76,14 +76,14 @@ extern "C" { * version of SuiteSparse, with another package from another version of * SuiteSparse, may or may not work. * - * SuiteSparse Version 2.3 contains the following packages: + * SuiteSparse Version 2.3.1 contains the following packages: * * AMD version 2.0.3 * CAMD version 2.1.2 * COLAMD version 2.5.1 * CCOLAMD version 2.5.1 * CHOLMOD version 1.3.0 - * CSparse version 2.0.5 + * CSparse version 2.0.6 * CXSparse version 2.0.5 * KLU version 0.10 * BTF version 0.9 @@ -99,11 +99,11 @@ extern "C" { * METIS 4.0.1 required by CHOLMOD (optional) */ -#define SUITESPARSE_DATE "Dec 2, 2006" +#define SUITESPARSE_DATE "Dec 7, 2006" #define SUITESPARSE_VER_CODE(main,sub) ((main) * 1000 + (sub)) #define SUITESPARSE_MAIN_VERSION 2 #define SUITESPARSE_SUB_VERSION 3 -#define SUITESPARSE_SUBSUB_VERSION 0 +#define SUITESPARSE_SUBSUB_VERSION 1 #define SUITESPARSE_VERSION \ SUITESPARSE_VER_CODE(SUITESPARSE_MAIN_VERSION,SUITESPARSE_SUB_VERSION)