Mercurial > hg > smallbox
diff 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).
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Tue, 13 Mar 2012 17:33:20 +0000 |
parents | af307f247ac7 |
children | d50f5bdbe14c |
line wrap: on
line diff
--- a/DL/two-step DL/SMALL_two_step_DL.m Thu Feb 09 17:26:45 2012 +0000 +++ b/DL/two-step DL/SMALL_two_step_DL.m Tue Mar 13 17:33:20 2012 +0000 @@ -30,7 +30,8 @@ % 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 @@ -110,11 +111,15 @@ 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],...