Mercurial > hg > smallbox
diff DL/two-step DL/SMALL_two_step_DL.m @ 170:68fb71aa5339 danieleb
Added dictionary decorrelation functions and test script for Letters paper.
| author | Daniele Barchiesi <daniele.barchiesi@eecs.qmul.ac.uk> |
|---|---|
| date | Thu, 06 Oct 2011 14:33:41 +0100 |
| parents | 290cca7d3469 |
| children | d0645d5fca7d |
line wrap: on
line diff
--- a/DL/two-step DL/SMALL_two_step_DL.m Thu Sep 29 09:46:52 2011 +0100 +++ b/DL/two-step DL/SMALL_two_step_DL.m Thu Oct 06 14:33:41 2011 +0100 @@ -114,18 +114,16 @@ [dico, solver.solution] = dico_update(dico, sig, solver.solution, ... typeUpdate, flow, learningRate); dico = normcols(dico); - switch DL.param.decFcn - case 'mailhe' - dico = dico_decorr_symetric(dico, mu, solver.solution); - case 'tropp' + switch lower(DL.param.decFcn) + case 'ink-svd' + dico = dico_decorr_symetric(dico,mu,solver.solution); + case 'grassmannian' [n m] = size(dico); - dico = grassmannian(n,m,[],[],[],dico); - case 'barchiesi' - [n m] = size(dico); - params.nIter = 100; - dico = iterativeprojections(n,m,[],[],[],dico); - [~, ~, W] = rotatematrix(Problem.b,dico*solver.solution,'conjgradlie',params); - dico = W*dico; + dico = grassmannian(n,m,[],0.9,0.99,dico); + case 'shrinkgram' + dico = shrinkgram(dico,mu); + case 'iterproj' + dico = iterativeprojections(dico,mu,Problem.b1,solver.solution); otherwise end