# HG changeset patch # User luisf # Date 1334158126 -3600 # Node ID efe179d9757c8a03b96d3600a33b1d8cfe30a69a # Parent 0d30f9074dd966a4ecbaebc40c3e2042bb66de25# Parent 29e04ffe742bea8b7d33a813c17a0b234a431253 Merge from branch "luisf_dev" diff -r 0d30f9074dd9 -r efe179d9757c config/SMALL_solve_config.m --- 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)