fixes

Author: avouros

clustering/cross_validation/results_clustering_parameters.m

@@ -16,7 +16,17 @@
 % Optional: min number of clusters
 %           max number of clusters
 %           increment
-  
+
+    WAITBAR = 1;
+    DISPLAY = 1;
+    for i = 1:length(varargin)
+        if isequal(varargin{i},'WAITBAR')
+            WAITBAR = varargin{i+1};         
+        elseif isequal(varargin{i},'DISPLAY')
+            DISPLAY = varargin{i+1};     
+        end
+    end
+    
     % Iterations
     min_num = 1;
     max_num = 10;
@@ -61,7 +71,9 @@
     test_set = [];      
     covering = [];  
 
-    h = waitbar(0,'Loading...','Name','Clustering');
+    if WAITBAR
+        h = waitbar(0,'Loading...','Name','Clustering');
+    end
 
     for i = min_num:step:max_num
         % original code
@@ -98,10 +110,14 @@
         % see if we already have the data
         fn = fullfile(output_path, sprintf('clustering_%d_%s.mat', n,a));
         if exist(fn ,'file')
-            fprintf('\nData for %d number of clusters (two-phase clustering) found. Loading data...\n', n);
+            if DISPLAY
+                fprintf('\nData for %d number of clusters (two-phase clustering) found. Loading data...\n', n);
+            end
             load(fn);
-        else            
-            fprintf('\nData for %d number of clusters (two-phase clustering) not found. Computing...\n', n);
+        else        
+            if DISPLAY
+                fprintf('\nData for %d number of clusters (two-phase clustering) not found. Computing...\n', n);
+            end
             [res, res1st] = classif.cluster_cross_validation(n, 'Folds', 10, 'TestSet', test_set);
             save(fn, 'res', 'res1st');
         end 
@@ -116,16 +132,22 @@
         classif.two_stage = 1;        
         fn = fullfile(output_path, sprintf('clustering_all_%d_%s.mat', n,a));
         if exist(fn ,'file')
-            fprintf('\nData for %d number of clusters (clustering using all the constraints) found. Loading data...\n', n);
+            if DISPLAY
+                fprintf('\nData for %d number of clusters (clustering using all the constraints) found. Loading data...\n', n);
+            end
             load(fn);
-        else            
-            fprintf('\nData for %d number of clusters (clustering using all the constraints) not found. Computing...\n', n);
+        else   
+            if DISPLAY
+                fprintf('\nData for %d number of clusters (clustering using all the constraints) not found. Computing...\n', n);
+            end
             res = classif.cluster(n);
             save(fn, 'res');
         end        
         res3 = [res3, res];
         covering = [covering, res.coverage(feature_length)]; 
-        waitbar(i/max_num);
+        if WAITBAR
+            waitbar(i/max_num);
+        end
     end
 
     % remap the classes as to not invalidate mixed clusters
@@ -152,5 +174,7 @@
         varargout{6} = res3;
         varargout{7} = covering;
     end   
-    delete(h);    
+    if WAITBAR
+        delete(h);    
+    end
 end

demo.m

@@ -177,7 +177,7 @@ function demo(set,user_path,varargin)
                     data = data(:,[1,2,5]);
                     cvErr = find(data(:,3) < 25);
                     num_clusters = data(cvErr,1);    
-                    error = execute_classification(project_path,sfiles(j).name,lfiles(i).name,num_clusters,varargin);
+                    error = execute_classification(project_path,sfiles(j).name,lfiles(i).name,num_clusters,varargin{:});
                 end
             end        
         end
@@ -326,7 +326,7 @@ function demo(set,user_path,varargin)
             if ~exist(output_path,'dir')
                 mkdir(output_path);
             end
-            [nc,res1bare,res2bare,res1,res2,res3,covering] = results_clustering_parameters(segmentation_configs,fullfile(project_path,'labels',lab_name(i).name),0,output_path,10,100,10);
+            [nc,res1bare,res2bare,res1,res2,res3,covering] = results_clustering_parameters(segmentation_configs,fullfile(project_path,'labels',lab_name(i).name),0,output_path,10,100,10,'WAITBAR', WAITBAR, 'DISPLAY', DISPLAY);
             output_path = char(fullfile(project_path,'results',strcat(p,'_cross_validation')));
             if exist(output_path,'dir');
                 rmdir(output_path,'s');