diff SMALLboxSetup.m @ 78:f69ae88b8be5

added Rice Wavelet Toolbox with my modification, so it can be compiled on newer systems.

--- a/SMALLboxSetup.m	Wed Mar 23 17:08:55 2011 +0000
+++ b/SMALLboxSetup.m	Fri Mar 25 15:27:33 2011 +0000
@@ -103,18 +103,9 @@
             'will not work.\n\n']);
     end
     
-    cd([Sparco_path, FS, 'sparco-1.2', FS, 'tools' ,FS, 'rwt'])
-    fprintf('Compiling the Rice Wavelet Toolbox MEX interfaces...');
-    try
-        if exist('mdwt'  ,'file')~=3, mex mdwt.c   mdwt_r.c;   end
-        if exist('midwt' ,'file')~=3, mex midwt.c  midwt_r.c;  end
-        if exist('mrdwt' ,'file')~=3, mex mrdwt.c  mrdwt_r.c;  end
-        if exist('mirdwt','file')~=3, mex mirdwt.c mirdwt_r.c; end
-        fprintf('SPARCO Installation Successful!\n');
-    catch
-        warning('Could not compile Rice Wavelet Toolbox MEX interfaces.');
-    end
+    
     cd(SMALL_path);
+    fprintf('SPARCO Installation Successful!\n');
 else
     fprintf('\n ******************************************************************');
     fprintf('\n\n SPARCO and Rice Wavelet Toolbox are already installed');
@@ -354,28 +345,39 @@
     fprintf('\n\n matlab_midi (http://www.kenschutte.com/midi/) is already installed');
 end 
 
-cd([pwd,FS,'util',FS,'ksvd utils']);
+cd([SMALL_path,FS,'util',FS,'ksvd utils']);
 make
 cd(SMALL_path);
 %%
-
+cd([SMALL_path, FS, 'util', FS, 'Rice Wavelet Toolbox'])
+    fprintf('Compiling the Rice Wavelet Toolbox MEX interfaces...');
+    try
+        if exist('mdwt'  ,'file')~=3, mex mdwt.c;   end
+        if exist('midwt' ,'file')~=3, mex midwt.c;  end
+        if exist('mrdwt' ,'file')~=3, mex mrdwt.c;  end
+        if exist('mirdwt','file')~=3, mex mirdwt.c; end
+        fprintf('Rice Wavelet Toolbox Installation Successful!\n\n');
+    catch
+        warning('Could not compile Rice Wavelet Toolbox MEX interfaces.\n');
+    end
+cd(SMALL_path);
 
 fprintf('\n ******************************************************************');
 fprintf('\n\n Initialising SMALLbox Examples Setup');
 
-    % Need to do a bit of temporary housekeeping first.
-    cd(SMALL_path);
-  try
-    cd(['Problems',FS,'private']);
-    if exist('addtocols'  ,'file')~=3,
-    fprintf('\n Compiling MEX interfaces for SMALL examples \n');
-    make;
-    end
-    fprintf('\n SMALLbox Problems Installation Successful! \n');
-  catch
-    fprintf('\n SMALLbox Problems Installation Failed \n');
-  end
-    cd(SMALL_path);
+%     % Need to do a bit of temporary housekeeping first.
+%     cd(SMALL_path);
+%   try
+%     cd(['Problems',FS,'private']);
+%     if exist('addtocols'  ,'file')~=3,
+%     fprintf('\n Compiling MEX interfaces for SMALL examples \n');
+%     make;
+%     end
+%     fprintf('\n SMALLbox Problems Installation Successful! \n');
+%   catch
+%     fprintf('\n SMALLbox Problems Installation Failed \n');
+%   end
+%     cd(SMALL_path);