comparison SMALLboxSetup.m @ 143:8d866d96f006

changes to the merge

     fprintf('\n ******************************************************************');
     fprintf('\n\n CVX is already installed');
 end
 
 %%
-
+%% KSVD utils setup
+
+if ~(exist('addtocols')==3)
+    cd([SMALL_path,FS,'util',FS,'ksvd utils']);
+    make
+    cd(SMALL_path);
+end
+
+%% fast omp for Gabor dictionary 
+
+if ~(exist('omp2Gabor')==3)
+    cd([SMALL_path,FS,'solvers', FS,'SMALL_ompGabor']);
+    make
+cd(SMALL_path);
+end
+%%
 if ~exist('ksvdver.m','file')
     fprintf('\n ******************************************************************');
     fprintf('\n\n Initialising OMPbox and KSVDBox Setup');
     
     try

         else
             KSVD_zip='http://www.cs.technion.ac.il/%7Eronrubin/Software/ksvdbox13.zip';
             fprintf('\n\n Downloading toolbox, please be patient\n\n');
         end
         unzip(KSVD_zip,[KSVD_path, FS, 'ksvdbox']);
-%         cd([KSVD_path, FS, 'ksvdbox', FS, 'private']);
-%         make;
-%         cd(SMALL_path);
+        cd([KSVD_path, FS, 'ksvdbox', FS, 'private']);
+        make;
+        cd(SMALL_path);
         KSVD_p=genpath(KSVD_path);
         addpath(KSVD_p);
         fprintf('\n KSVDBox and OMPBox Installation Successful\n');
     catch
         fprintf('\n KSVDBox and OMPBox Installation Failed');

 else
     fprintf('\n ******************************************************************');
     fprintf('\n\n matlab_midi (http://www.kenschutte.com/midi/) is already installed');
 end
 
-%% KSVD utils setup
-
-if ~(exist('addtocols')==3)
-    cd([SMALL_path,FS,'util',FS,'ksvd utils']);
-    make
-    cd(SMALL_path);
-end
+
 
 %% RWT setup
 if ~(exist('mdwt')==3)
     cd([SMALL_path, FS, 'util', FS, 'Rice Wavelet Toolbox'])
     fprintf('Compiling the Rice Wavelet Toolbox MEX interfaces...');