comparison config/SMALL_solve_config.m @ 228:198d4d9cee74 luisf_dev

Now can use a local configuration file, which is a copy of the default config files, and thus not being commited to the repository.

 %% Configuration file used in SMALL_solve
 %
-%   Use this file to change the solvers in SMALLBox
-%   Please refer to the documentation before editing this file
+%   Please DO NOT use this file to change the solvers used in SMALLBox
+%   If you want to change the solvers create a copy 
+%     of this file named 'SMALL_learn_config_local.m'
+%
+%   Please refer to the documentation for further information
 
 %   Centre for Digital Music, Queen Mary, University of London.
 %   This file copyright 2009 Ivan Damnjanovic.
 %
 %   This program is free software; you can redistribute it and/or

 %   published by the Free Software Foundation; either version 2 of the
 %   License, or (at your option) any later version.  See the file
 %   COPYING included with this distribution for more information.
 %
 %%
+
 
 if strcmpi(solver.toolbox,'sparselab')
     y = eval([solver.name,'(SparseLab_A, b, n,',solver.param,');']);
 elseif strcmpi(solver.toolbox,'sparsify')
     if isa(Problem.A,'float')

 elseif (strcmpi(solver.toolbox, 'ompbox'))
     G=A'*A;
     epsilon=solver.param.epsilon;
     maxatoms=solver.param.maxatoms;
     y = eval([solver.name,'(A, b, G,epsilon,''maxatoms'',maxatoms,''checkdict'',''off'');']);
-% danieleb: added call to omp functions with fast implementation.
+    % danieleb: added call to omp functions with fast implementation.
 elseif (strcmpi(solver.toolbox, 'ompbox_fast'))
     DtX=A'*b;
-	XtX = sum(b.*b);
-	G=A'*A;
+    XtX = sum(b.*b);
+    G=A'*A;
     epsilon=solver.param.epsilon;
     maxatoms=solver.param.maxatoms;
     y = eval([solver.name,'(DtX, XtX, G,epsilon,''maxatoms'',maxatoms,''checkdict'',''off'');']);
 elseif (strcmpi(solver.toolbox, 'ompsbox'))
     basedict = Problem.basedict;

         A = opToMatrix(Problem.A, 1);
     end
     
     [y, cost] = wrapper_mm_solver(b, A, solver.param);
     
+    %%
+    %   Please do not make any changes to the 'SMALL_solve_config.m' file
+    %   All the changes should be done to your local configuration file
+    %    named 'SMALL_solve_config_local.m'
+    %
     %   To introduce new sparse representation algorithm put the files in
     %   your Matlab path. Next, unique name <TolboxID> for your toolbox and
     %   prefferd API <Preffered_API> needs to be defined.
     %
     % elseif strcmpi(solver.toolbox,'<ToolboxID>')