Mercurial > forge

changeset 9878:4d562bed8995 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
linear-algebra: continue adapting nmf_bpas
author jpicarbajal
date Mon, 26 Mar 2012 09:28:30 +0000
parents 0a825a74b5b6
children c81e7476fda3
files main/linear-algebra/devel/nmf_bpas.m
diffstat 1 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/main/linear-algebra/devel/nmf_bpas.m	Sun Mar 25 23:59:38 2012 +0000
+++ b/main/linear-algebra/devel/nmf_bpas.m	Mon Mar 26 09:28:30 2012 +0000
@@ -139,18 +139,19 @@
   clear parser val_type
 
 ### PARSING TYPE
+# TODO add callbacks here to use during main loop. See [1]
   % for regularized/sparse case
   salphaI = sqrt (par.alpha) * eye (k);
   zerokm = zeros (k,m);
 
   if strcmpi (par.type, 'regularized')
-      sbetaI = sqrt (par.beta) * eye (k);
-      zerokn = zeros (k,n);
+    sbetaI = sqrt (par.beta) * eye (k);
+    zerokn = zeros (k,n);
 
   elseif strcmpi (par.type, 'sparse')
-      sbetaE = sqrt (par.beta) * ones (1,k);
-      betaI  = par.beta * ones (k,k);
-      zero1n = zeros (1,n);
+    sbetaE = sqrt (par.beta) * ones (1,k);
+    betaI  = par.beta * ones (k,k);
+    zero1n = zeros (1,n);
 
   end
 ###
@@ -193,7 +194,7 @@
     SCconv = 0;
     SC_COUNT = 3;
 
-#TODO: Replace with callbacks avoid switching each time
+#TODO: [1] Replace with callbacks avoid switching each time
     for iter=1:par.max_iter
         switch par.type
             case 'plain'