comparison DL/two-step DL/SMALL_two_step_DL.m @ 169:290cca7d3469 danieleb

Added dictionary decorrelation functions and test script for ICASSP paper.

 end
 
 
 % initialize the dictionary %
 
-if (isfield(DL.param,'initdict'))
+if (isfield(DL.param,'initdict')) && ~isempty(DL.param.initdict);
   if (any(size(DL.param.initdict)==1) && all(iswhole(DL.param.initdict(:))))
     dico = sig(:,DL.param.initdict(1:dictsize));
   else
     if (size(DL.param.initdict,1)~=size(sig,1) || size(DL.param.initdict,2)<dictsize)
       error('Invalid initial dictionary');

 solver.profile = 0;
 
 % main loop %
 
 for i = 1:iternum
-    disp([num2str(i) '/' num2str(iternum)]);
+    %disp([num2str(i) '/' num2str(iternum)]);
     Problem.A = dico;
     solver = SMALL_solve(Problem, solver);
     [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'
                 [n m] = size(dico);
-                dico = grassmannian(n,m,[],[],[],dico,true);
+                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;
             otherwise
         end
     
    if ((show_dictionary)&&(mod(i,show_iter)==0))
        dictimg = SMALL_showdict(dico,[8 8],...