Mercurial > hg > smallbox

changeset 221:c1efdd5d6250 luisf_dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added ompbox_fast as sparse approximation solver, which calls the functions in ompbox using the fastest implementation
author Daniele Barchiesi <daniele.barchiesi@eecs.qmul.ac.uk>
date Wed, 11 Apr 2012 16:13:08 +0100
parents 4337e28183f1
children 29e04ffe742b
files config/SMALL_solve_config.m
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/config/SMALL_solve_config.m	Fri Mar 23 20:48:25 2012 +0000
+++ b/config/SMALL_solve_config.m	Wed Apr 11 16:13:08 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)