Added some files that seemed to have been deleted (found old copies o…

…n the web svn

repository); these were used by tagContextDemo5.



git-svn-id: https://pmtk3.googlecode.com/svn/trunk@2845 b6abd7f4-f95b-11de-aa3c-59de0406b4f5

projects/sceneContext/tagContextDemo5.m

@@ -11,6 +11,7 @@
 if ismac
   figFolder = '/Users/kpmurphy/Dropbox/figures/sceneContext';
 end
+doPrint = false;
 
 %% Models/ methods
 
@@ -50,35 +51,35 @@
 methods(m).logprobFn = @(model, labels) discreteLogprob(model, labels);
 
 
-
+%{
 %[logZ, nodeBel] = treegmInferNodes(treeModel, localFeatures, softev);
 m = m + 1;
 methods(m).modelname = 'tree';
 methods(m).obstype = 'gauss';
 methods(m).fitFn = @(labels, features) treegmFit(labels);
 methods(m).infFn = @(model, features, softev) argout(2, @treegmInferNodes, model, [], softev);
 methods(m).logprobFn = @(model, labels) treegmLogprob(model, labels);
+%}
 
 
-%{
 %[pZ, pX] = noisyMixModelInferNodes(mixModel{ki}, localFeatures, softev);
 m = m + 1;
-methods(m).modelname = 'mix20';
+methods(m).modelname = 'mix10';
 methods(m).obstype = 'gauss';
 methods(m).fitFn = @(labels, features) noisyMixModelFit(labels, [], 10);
 methods(m).infFn = @(model, features, softev) argout(2, @noisyMixModelInferNodes, model, [], softev);
-methods(m).logprobFn = @(model, labels) mixModelLogprob(model.mixmodel, labels);
-%}
+methods(m).logprobFn = @(model, labels) mixDiscreteLogprob(model.mixmodel, labels);
 
 
+%{
 %[pZ, pX] = noisyMixModelInferNodes(mixModel{ki}, localFeatures, softev);
 m = m + 1;
-methods(m).modelname = 'mix40';
+methods(m).modelname = 'mix10';
 methods(m).obstype = 'gauss';
-methods(m).fitFn = @(labels, features) noisyMixModelFit(labels, [], 40);
+methods(m).fitFn = @(labels, features) noisyMixModelFit(labels, [], 10);
 methods(m).infFn = @(model, features, softev) argout(2, @noisyMixModelInferNodes, model, [], softev);
 methods(m).logprobFn = @(model, labels) mixModelLogprob(model.mixmodel, labels);
-
+%}
 
 
 
@@ -265,7 +266,7 @@
 set(gca, 'xticklabel',  methodNames(ndx))
 title(sprintf('AUC averaged over classes'))
 fname = fullfile(figFolder, sprintf('boxplot-auc.png'));
-print(gcf, '-dpng', fname);
+if doPrint, print(gcf, '-dpng', fname); end
 
 % Mean EER
 figure;
@@ -279,8 +280,7 @@
 set(gca, 'xticklabel', methodNames(ndx))
 title(sprintf('EER averaged over classes'))
 fname = fullfile(figFolder, sprintf('boxplot-eer.png'));
-print(gcf, '-dpng', fname);
-
+if doPrint, print(gcf, '-dpng', fname); end 
 
 
 %% Plot some ROC curves for some classes on a single fold
@@ -302,7 +302,7 @@
   legend(h, legendstr, 'location', 'southeast')
   title(objectnames{c})
   fname = fullfile(figFolder, sprintf('roc-%s.png', objectnames{c}));
-  print(gcf, '-dpng', fname);
+  if doPrint, print(gcf, '-dpng', fname); end
 end
 
 
@@ -318,13 +318,13 @@
   ylabel(sprintf('improvement in AUC over baseline'))
   title(methodNames{m})
   fname = fullfile(figFolder, sprintf('roc-delta-%s.png', methodNames{m}));
-  print(gcf, '-dpng', fname);
+  if doPrint, print(gcf, '-dpng', fname); end
 end
 
 
 %% Visualize predictions plotted on top of some images
 
-
+%{
 % presence_model(n,c,m), test.presence(n,c), cutoff_models(c,m)
 
 frames = [1,100,500,1000,2000];
@@ -361,7 +361,7 @@
 frames = 1
 
 visPredictions(test.presence,  presence_model, objectnames, methodNames, test.filenames, cutoff_fpr, DB, frames);
-
+%}