v2.3.1

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.

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

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.

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

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)

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

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 ;
 

CSparse/MATLAB/UFget/UFgrep.m

@@ -20,6 +20,8 @@
 %
 % See also regexp, UFget.
 
+% Copyright 2006, Timothy A. Davis
+
 if (nargin < 2)
     index = UFget ;
 end

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.
 

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') ;