Mercurial > hg > smallbox

comparison config/SMALL_solve_config.m @ 223:efe179d9757c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "luisf_dev"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Wed, 11 Apr 2012 16:28:46 +0100
parents c1efdd5d6250
children 198d4d9cee74
comparison
equal deleted inserted replaced
220:0d30f9074dd9 223:efe179d9757c
35 elseif (strcmpi(solver.toolbox, 'ompbox')) 35 elseif (strcmpi(solver.toolbox, 'ompbox'))
36 G=A'*A; 36 G=A'*A;
37 epsilon=solver.param.epsilon; 37 epsilon=solver.param.epsilon;
38 maxatoms=solver.param.maxatoms; 38 maxatoms=solver.param.maxatoms;
39 y = eval([solver.name,'(A, b, G,epsilon,''maxatoms'',maxatoms,''checkdict'',''off'');']); 39 y = eval([solver.name,'(A, b, G,epsilon,''maxatoms'',maxatoms,''checkdict'',''off'');']);
40 % danieleb: added call to omp functions with fast implementation.
41 elseif (strcmpi(solver.toolbox, 'ompbox_fast'))
42 DtX=A'*b;
43 XtX = sum(b.*b);
44 G=A'*A;
45 epsilon=solver.param.epsilon;
46 maxatoms=solver.param.maxatoms;
47 y = eval([solver.name,'(DtX, XtX, G,epsilon,''maxatoms'',maxatoms,''checkdict'',''off'');']);
40 elseif (strcmpi(solver.toolbox, 'ompsbox')) 48 elseif (strcmpi(solver.toolbox, 'ompsbox'))
41 basedict = Problem.basedict; 49 basedict = Problem.basedict;
42 if issparse(Problem.A) 50 if issparse(Problem.A)
43 A = Problem.A; 51 A = Problem.A;
44 else 52 else