diff util/SMALL_solve.m @ 155:b14209313ba4 ivand_dev

Integration of Majorization Minimisation Dictionary Learning

--- a/util/SMALL_solve.m	Fri Aug 12 11:17:47 2011 +0100
+++ b/util/SMALL_solve.m	Mon Aug 22 11:46:35 2011 +0100
@@ -86,7 +86,15 @@
         A = opToMatrix(Problem.A, 1);
     end
     [y, numiter, time, y_path] = wrapper_ALPS_toolbox(b, A, solver.param);
+elseif (strcmpi(solver.toolbox, 'MMbox'))
+    if ~isa(Problem.A,'float')
+        % ALPS does not accept implicit dictionary definition
+        A = opToMatrix(Problem.A, 1);
+    end
     
+    [y, cost] = wrapper_mm_solver(b, A, solver.param);
+    
+     
     
     %   To introduce new sparse representation algorithm put the files in
     %   your Matlab path. Next, unique name <TolboxID> for your toolbox and