Mercurial > hg > smallbox
diff config/SMALL_solve_config.m @ 232:15fd4c5be71a
merge
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Thu, 19 Apr 2012 15:55:14 +0100 |
parents | 198d4d9cee74 |
children | 5c8bcdadb380 |
line wrap: on
line diff
--- a/config/SMALL_solve_config.m Wed Apr 11 16:28:46 2012 +0100 +++ b/config/SMALL_solve_config.m Thu Apr 19 15:55:14 2012 +0100 @@ -1,7 +1,10 @@ %% 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. @@ -14,6 +17,7 @@ % %% + if strcmpi(solver.toolbox,'sparselab') y = eval([solver.name,'(SparseLab_A, b, n,',solver.param,');']); elseif strcmpi(solver.toolbox,'sparsify') @@ -37,11 +41,11 @@ 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'');']); @@ -71,6 +75,11 @@ [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.