# HG changeset patch # User idamnjanovic # Date 1277815748 0 # Node ID f6b49c9d728c8e8b61a484bc9c9c4fb710fc1be1 # Parent 6521a7c2b93c1dfcdd4919c89d10bcbf2f73d0fa diff -r 6521a7c2b93c -r f6b49c9d728c SMALLboxSetup.m --- a/SMALLboxSetup.m Tue Jun 29 11:07:35 2010 +0000 +++ b/SMALLboxSetup.m Tue Jun 29 12:49:08 2010 +0000 @@ -131,7 +131,7 @@ if exist([SPGL1_path, FS, 'spgl1-1.7.zip'],'file'), SPGL1_zip=[SPGL1_path, FS, 'spgl1-1.7.zip']; else - SPGL1_zip='http://www.cs.ubc.ca/labs/scl/spgl1/downloads.php?filename=spgl1-1.7.zip'; + SPGL1_zip='http://www.cs.ubc.ca/~mpf/downloads/spgl1-1.7.zip'; fprintf('\n\n Downloading toolbox, please be patient\n\n'); end unzip(SPGL1_zip,SPGL1_path); @@ -177,6 +177,7 @@ fprintf('\n SparseLab Installation Failed\n'); cd(SMALL_path); end + cd(SMALL_path); else fprintf('\n ******************************************************************'); fprintf('\n\n SparseLab is already installed'); @@ -201,8 +202,8 @@ fprintf('\n Sparsify Installation Successful\n'); catch fprintf('\n Sparsify Installation Failed\n'); - cd(SMALL_path); end + cd(SMALL_path); else fprintf('\n ******************************************************************'); fprintf('\n\n Sparsify is already installed'); @@ -221,13 +222,14 @@ fprintf('\n\n Downloading toolbox, please be patient\n\n'); end unzip(GPSR_zip,GPSR_path); + GPSR_p=genpath(GPSR_path); addpath(GPSR_p); fprintf('\n GPSR Installation Successful\n'); catch fprintf('\n GPSR Installation Failed'); - cd(SMALL_path); end + cd(SMALL_path); else fprintf('\n ******************************************************************'); fprintf('\n\n GPSR is already installed');