Mercurial > hg > smallbox
changeset 223:efe179d9757c
Merge from branch "luisf_dev"
| author | luisf <luis.figueira@eecs.qmul.ac.uk> |
|---|---|
| date | Wed, 11 Apr 2012 16:28:46 +0100 |
| parents | 0d30f9074dd9 (current diff) 29e04ffe742b (diff) |
| children | fd0b5d36f6ad b50e2b6a9c37 15fd4c5be71a |
| files | |
| diffstat | 1 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/config/SMALL_solve_config.m Wed Apr 11 15:56:39 2012 +0100 +++ b/config/SMALL_solve_config.m Wed Apr 11 16:28:46 2012 +0100 @@ -37,6 +37,14 @@ 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. +elseif (strcmpi(solver.toolbox, 'ompbox_fast')) + DtX=A'*b; + 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; if issparse(Problem.A)