tweaked output to console

mim · Jul 8, 2015 · a539fa2 · a539fa2
1 parent 2003207
commit a539fa2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/messl.m b/messl.m
@@ -62,8 +62,8 @@
 [tauPosInit, pTauIInit, ildInit, ildStdInit, maskInit, garbageSrc, ...
  ipdMode, ildMode, xiMode, sigmaMode, dctMode, spMode, nfft, ...
  vis, Nrep, modes, sigmaInit, xiInit, sourcePriors, maskHold, ...
- reliability, ildPriorPrec, sr, mrfHardCompatExp, mrfCompatFile ...
- mrfCompatExpSched fixIPriors mrfLbpIter] = ...
+ reliability, ildPriorPrec, sr, mrfHardCompatExp, mrfCompatFile, ...
+ mrfCompatExpSched, fixIPriors, mrfLbpIter, ~, ~] = ...
     process_options(varargin, 'tauPosInit', [], 'pTauIInit', [], ...
     'ildInit', 0, 'ildStdInit', 10, 'maskInit', [], ...
     'garbageSrc', 0, 'ipdMode', 1, 'ildMode', -1, 'xiMode', -1, ...
@@ -72,7 +72,7 @@
     'sourcePriors', [], 'maskHold', 0, 'reliability', [], ...
     'ildPriorPrec', 0, 'sr', 16000, 'mrfHardCompatExp', 0, ...
     'mrfCompatFile', '', 'mrfCompatExpSched', [0 0 0 0 .02 .02 .02 .02 .05], ...
-    'fixIPriors', 0, 'mrfLbpIter', 8);
+    'fixIPriors', 0, 'mrfLbpIter', 8, 'refMic', [], 'useConsistentTdoa', []);
 
 if ~isempty(modes)
   ipdMode   = modes(1);

diff --git a/messlMultichannel.m b/messlMultichannel.m
@@ -107,6 +107,7 @@
     % Run messl on each pair for several iterations to initialize parameters
     for c = 1:Np
         cp = channelPairs(c,:);
+        fprintf('Channels: %d %d\n', cp(1), cp(2));
         [p_lr_iwt params(c)] = messl(X(:,:,cp), tau, I, varargin{:}, 'Nrep', 4, 'modes', [1 1 0 1 1 0]);
         masks(:,:,:,c) = squeeze(p_lr_iwt(1,:,:,:));
     end
@@ -146,6 +147,8 @@
     tauPosInit = [];
 end
 
+fprintf('Done init, starting multi-channel MESSL...\n')
+
 % Start actual Multi-channel MESSL using those alignments.  Re-initialize
 % parameters.
 for c = 1:Np
@@ -192,6 +195,8 @@
 
 % Start EM
 for rep=1:Nrep
+    fprintf('ll(%02d) = ', rep);
+
     for useCombinedPost = [0 1]
         for c = 1:Np
             cp = channelPairs(c,:);
@@ -256,7 +261,7 @@
                 clear lp*
 
                 % ll should be non-decreasing
-                fprintf('ll(%02d,%02d) = %e\n', rep, c, ll(c,rep));
+                fprintf('%0.3e ', ll(c,rep));
 
                 if (rep >= maskHold)
                     logMaskPrior = 0;
@@ -280,6 +285,7 @@
             end
         end
     end
+    fprintf('\n');
 
     subplots(cellFrom3D(mean(logMultichannelPosteriors,4)), [], [], @(r,c,i) caxis([-4 0]))
     drawnow