bugs fix

Author: avouros

check/validate_groups.m

@@ -15,7 +15,13 @@
             groups = [1,2];
             return;
         end
-    end    
+    end 
+    if length(varargin) == 2
+        if isequal(varargin{1},1) && isequal(varargin{2},2)
+            groups = [1,2];
+            return;
+        end
+    end
 
     % Other data 
     if length(groups) == 1 %Only one animal group

gui.m

@@ -185,27 +185,27 @@ function class_path_CreateFcn(hObject, eventdata, handles)
 %% CODE FOR ALL THE PATH TEXTS %%
 function b_path_data_Callback(hObject, eventdata, handles)
     FN_data = uigetdir(matlabroot,'Select data folder');
-    if FN_data==0
-        return
-    end    
-    set(handles.path_data,'String',FN_data);
+    if isnumeric(FN_data)
+       return
+    end       
+    set(handles.path_data,'String',FN_data);  
 function b_path_output_Callback(hObject, eventdata, handles)
     FN_output = uigetdir(matlabroot,'Select output folder');
-    if FN_output==0
-        return
-    end  
-    set(handles.path_output,'String',FN_output);
+    if isnumeric(FN_output)
+       return
+    end     
+    set(handles.path_output,'String',FN_output);   
 function b_path_labels_Callback(hObject, eventdata, handles)
     [FN_labels,PN_labels] = uigetfile({'*.csv','CSV-file (*.csv)'},'Select CSV file containing segment labels');
-    if FN_labels==0 && PN_labels==0
-        return
-    end    
+    if isnumeric(FN_labels) && isnumeric(PN_labels)
+       return
+    end     
     set(handles.path_labels,'String',strcat(PN_labels,FN_labels));
 function segment_path_Callback(hObject, eventdata, handles)
     [FN_seg,PN_seg] = uigetfile({'*.mat','MAT-file (*.mat)'},'Select MAT file containing segmentation data');
-    if FN_seg==0 && PN_seg==0
-        return
-    end     
+    if isnumeric(FN_seg) && isnumeric(PN_seg)
+       return 
+    end   
     error = check_object_output_dir(1, FN_seg, PN_seg);
     if error == 1
         errordlg('File path for segmentation configurations not found.','Input Error');
@@ -214,12 +214,12 @@ function segment_path_Callback(hObject, eventdata, handles)
         errordlg('Wrong MAT file was selected.','Input Error');
         return
     end    
-    set(handles.seg_path,'String',strcat(PN_seg,FN_seg));
+    set(handles.seg_path,'String',strcat(PN_seg,FN_seg));  
 function b_class_path_Callback(hObject, eventdata, handles)      
     [FN_class,PN_class] = uigetfile({'*.mat','MAT-file (*.mat)'},'Select MAT file containing classification data');
-    if FN_class==0 && PN_class==0
+    if isnumeric(FN_class) && isnumeric(PN_class)
         return
-    end       
+    end   
     error = check_object_output_dir(2, FN_class);
     if error == 1
         errordlg('File path for classification configurations not found.','Input Error');
@@ -229,7 +229,7 @@ function b_class_path_Callback(hObject, eventdata, handles)
         return
     end    
     set(handles.class_path,'String',strcat(PN_class,FN_class))
-
+    
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% CODE FOR BUTTONS %%
 function load_traj_buttom_Callback(hObject, eventdata, handles)

results/RUN_ALL_RESULTS.m

@@ -1,7 +1,8 @@
 function RUN_ALL_RESULTS( segmentation_configs, classification_configs, labels_path, folds, group_1, group_2, varargin )
 
     results_class_weights (segmentation_configs, classification_configs);
-    results_clustering_parameters (segmentation_configs, labels_path);
+    results_clustering_parameters (segmentation_configs, labels_path, 0);
+    results_clustering_parameters (segmentation_configs, labels_path, 1);
     results_confusion_matrix (segmentation_configs, classification_configs, folds);
     results_latency_speed_length (segmentation_configs, group_1, group_2, varargin{:});
     results_strategies_distributions_length (segmentation_configs, classification_configs, group_1, group_2, varargin{:});

results/results_clustering_parameters.m

@@ -1,4 +1,4 @@
-function [varargout] = results_clustering_parameters(segmentation_configs,labels_path,varargin)
+function [varargout] = results_clustering_parameters(segmentation_configs,labels_path,graph,varargin)
 % Generates three figures indicating the impact of the number of clusters 
 % on the clustering performance for a set of N computed segments:
 % 1. Percentage of classification errors.
@@ -7,6 +7,15 @@
 % 3. Percentage of the full swimming paths that are covered by at least 
 %    one segment of a known class.
 % The calculated data from the clustering proceedures are also saved.
+
+% PARAMETERS:
+% Segmentation object
+% Path of the labels CSV file
+% 0/1: don't generate/generate graphs
+
+% Optional: min number of clusters
+%           max number of clusters
+%           increment
 
     % Iterations
     min_num = 1;
@@ -26,7 +35,16 @@
 
     % Tag trajectories/segments if data are available
     [~, LABELLING_MAP, ~, CLASSIFICATION_TAGS] = setup_tags(segments,labels_path);
-
+    
+    % generate unique id
+    segs = num2str(size(features,1));
+    a = [];
+    for i = 1:10
+        temp = num2str(size(find([LABELLING_MAP{:}]==i-2),2));
+        a = [a, temp];
+    end 
+    a = [segs,a];
+    
     % run multiple clusterings with different target number of clusters
     ptest = 0;
     res1 = [];
@@ -68,7 +86,7 @@
 
         % i) two-phase clustering (default)        
         % see if we already have the data
-        fn = fullfile(strcat(segmentation_configs.OUTPUT_DIR,'/'), sprintf('clustering_n%d.mat', n));
+        fn = fullfile(strcat(segmentation_configs.OUTPUT_DIR,'/'), 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);
             load(fn);
@@ -86,7 +104,7 @@
         % ii) clustering using all the constraints
         % see if we already have the data
         classif.two_stage = 1;        
-        fn = fullfile(strcat(segmentation_configs.OUTPUT_DIR,'/'), sprintf('clustering_all_constr_%d.mat', n));
+        fn = fullfile(strcat(segmentation_configs.OUTPUT_DIR,'/'), 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);
             load(fn);
@@ -99,9 +117,6 @@
         covering = [covering, res.coverage(feature_length)];      
     end
 
-    % export data
-    save(fullfile(strcat(segmentation_configs.OUTPUT_DIR,'/'), 'clustering_parameters.mat'), 'res1', 'res2', 'res3');
-    
     % remap the classes as to not invalidate mixed clusters
     % because we want to compare the clustering errors
     res1bare = [];
@@ -113,7 +128,7 @@
         res2bare = [res2bare, res2(i).remap_clusters('DiscardMixed', 0)];
     end
 
-    if length(varargin) > 3 
+    if graph 
         % Generate the graphs
         results_clustering_parameters_graphs(segmentation_configs.OUTPUT_DIR,nc,res1bare,res2bare,res1,res2,res3,covering);
 

utility/number_of_clusters.m

@@ -214,7 +214,7 @@ function run_callback(varargin)
         max_num  = str2num(get(h.text_max,'string'));
         step = str2num(get(h.text_step,'string'));
         % run clustering
-        [nc,res1bare,res2bare,res1,res2,res3,covering]  = results_clustering_parameters(segmentation_configs,labels_path,min_num,max_num,inc_dec);
+        [nc,res1bare,res2bare,res1,res2,res3,covering]  = results_clustering_parameters(segmentation_configs,labels_path,0,min_num,max_num,inc_dec);
         [nc,per_errors1,per_undefined1,coverage] = algorithm_statistics(1,nc,res1bare,res2bare,res1,res2,res3,covering);                         
         % UPDATE THE TABLE
         data_old = get(t,'Data');
@@ -257,7 +257,7 @@ function graphs_callback(varargin)
         max_num  = str2num(get(h.text_max,'string'));  
         step = str2num(get(h.text_step,'string'));
         try
-            results_clustering_parameters(segmentation_configs,labels_path,min_num,max_num,inc_dec,1);
+            results_clustering_parameters(segmentation_configs,labels_path,1,min_num,max_num,inc_dec,1);
             return
         catch
             errordlg('Graphs cannot be generated.','Error');