comparison DL/two-step DL/SMALL_two_step_DL.m @ 190:759313488e7b luisf_dev

Added two config files for the 2 step dic and learn scripts; removed 'extra' folder; created init script (initial version).

 end
 
 
 % initialize the dictionary %
 
-if (isfield(DL.param,'initdict'))
+% todo: check second if statement
+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');

 % main loop %
 
 for i = 1:iternum
     Problem.A = dico;
     solver = SMALL_solve(Problem, solver);
-    [dico, solver.solution] = dico_update(dico, sig, solver.solution, ...
-        typeUpdate, flow, learningRate);
-    if (decorrelate)
-        dico = dico_decorr(dico, mu, solver.solution);
-    end
+    
+    % configuration file
+    run([SMALL_path '/config/SMALL_two_step_DL_config.m'])
+   
+%     [dico, solver.solution] = dico_update(dico, sig, solver.solution, ...
+%         typeUpdate, flow, learningRate);
+%     if (decorrelate)
+%         dico = dico_decorr(dico, mu, solver.solution);
+%     end
     
    if ((show_dictionary)&&(mod(i,show_iter)==0))
        dictimg = SMALL_showdict(dico,[8 8],...
             round(sqrt(size(dico,2))),round(sqrt(size(dico,2))),'lines','highcontrast');  
        figure(2); imagesc(dictimg);colormap(gray);axis off; axis image;