Mercurial > hg > smallbox

diff config/SMALL_solve_config.m @ 246:cef4500b936f ver_2.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Wed, 31 Oct 2012 12:10:13 +0000
parents 5c8bcdadb380
children
line wrap: on
line diff
--- a/config/SMALL_solve_config.m	Wed Oct 31 11:53:07 2012 +0000
+++ b/config/SMALL_solve_config.m	Wed Oct 31 12:10:13 2012 +0000
@@ -74,6 +74,14 @@
     end
     
     [y, cost] = wrapper_mm_solver(b, A, solver.param);
+
+elseif (strcmpi(solver.toolbox, 'UNLocBox'))
+    if ~isa(Problem.A,'float')
+        % MMbox does not accept implicit dictionary definition
+        A = opToMatrix(Problem.A, 1);
+    end
+    
+    y = unloc_solver(b, A, solver.param,solver.name);
     
     %%
     %   Please do not make any changes to the 'SMALL_solve_config.m' file