diff config/SMALL_two_step_DL_config.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
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config/SMALL_two_step_DL_config.m	Tue Mar 13 17:33:20 2012 +0000
@@ -0,0 +1,30 @@
+
+    %DICTIONARY UPDATE STEP
+    if strcmpi(typeUpdate,'mocod')			%if update is MOCOD create parameters structure
+        mocodParams = struct('zeta',DL.param.zeta,...	%coherence regularization factor
+            'eta',DL.param.eta,...		%atoms norm regularization factor
+            'Dprev',dico);				%previous dictionary
+        % dico = dico_update(dico,sig,solver.solution,typeUpdate,flow,learningRate,mocodParams);
+        if ~isfield(DL.param,'decFcn'), DL.param.decFcn = 'none'; end
+
+        dico = dico_update_mocod(dico,sig,solver.solution,typeUpdate,flow,learningRate,mocodParams);
+           
+    else
+        [dico, solver.solution] = dico_update(dico, sig, solver.solution, ...
+            typeUpdate, flow, learningRate);
+        dico = normcols(dico);
+    end
+    
+    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,[],0.9,0.99,dico);
+        case 'shrinkgram'
+            dico = shrinkgram(dico,mu);
+        case 'iterproj'
+            dico = iterativeprojections(dico,mu,Problem.b1,solver.solution);
+        otherwise
+    end
+    
\ No newline at end of file