From: <jpi...@us...> - 2012-03-26 09:28:36
|
Revision: 10064 http://octave.svn.sourceforge.net/octave/?rev=10064&view=rev Author: jpicarbajal Date: 2012-03-26 09:28:30 +0000 (Mon, 26 Mar 2012) Log Message: ----------- linear-algebra: continue adapting nmf_bpas Modified Paths: -------------- trunk/octave-forge/main/linear-algebra/devel/nmf_bpas.m Modified: trunk/octave-forge/main/linear-algebra/devel/nmf_bpas.m =================================================================== --- trunk/octave-forge/main/linear-algebra/devel/nmf_bpas.m 2012-03-25 23:59:38 UTC (rev 10063) +++ trunk/octave-forge/main/linear-algebra/devel/nmf_bpas.m 2012-03-26 09:28:30 UTC (rev 10064) @@ -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' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |