Minor changes

chlubba · Aug 18, 2016 · c5ec326 · c5ec326
1 parent fba3026
commit c5ec326
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 484 deletions.
diff --git a/SS_Clustering_main.m b/SS_Clustering_main.m
@@ -5,7 +5,7 @@
 SS_SetupRunOptions;
 
 % Load your data matrix then normalise and filter it
-SS_NormaliseAndFilter;
+%SS_NormaliseAndFilter;
 
 % Enter values of K you want to calculate 
 % NB: The largest value of K will automatically be used for the linkage clustering etc
@@ -24,7 +24,7 @@
 SS_CorrOpsWithClusters;
 
 % Output final clusters to a text file
-SS_OutputBestOpsTxtFile;
+SS_IdentifyBestOps;
 
 % Cluster the time series in the reduced operation space to visualise
 % effectiveness of selected operations 

diff --git a/SS_CorrOpsWithClusters.m b/SS_CorrOpsWithClusters.m
@@ -7,9 +7,10 @@
 
 kmedoidsClusters = km(kIdx);
 
-allClusters = cluster_Groupi{1};
+allClusters = cluster_Groupi;
 
 fprintf('Calculating correlations of operations to their linkage clustered centres\n');
+
 for i = 1:length(allClusters)
     % Within linkage clusters take the mean of members to find cluster centre
     cluster = cell2mat(allClusters(i));
@@ -33,7 +34,7 @@
     linkageClusters(i).memDists = memDists;
 end
 
-save(strcat('linkage_clusters_with_member_corrs.mat'),'linkageClusters',...
+save('linkage_clusters_with_member_corrs.mat','linkageClusters',...
     'kmedoidsClusters');
 end
 
diff --git a/SS_IdentifyBestOps → SS_IdentifyBestOps.m b/SS_IdentifyBestOps → SS_IdentifyBestOps.m
@@ -26,11 +26,12 @@
 
     kmCentreOps = Operations(kmedoidsClusters.CCi(kmedCentres));
     kmCentreNames = {kmCentreOps.Name};
+    kmCentreKeys = {kmCentreOps.Keywords};
 
     % Print all centres associated with cluster
     fprintf(fID,'CLUSTER %i: ',i);
     for j = 1:length(kmCentreNames)
-        fprintf(fID,'%s , ',kmCentreNames{j}); 
+        fprintf(fID,'%s (%s), ',kmCentreNames{j},kmCentreKeys{j}); 
     end
     fprintf(fID,'\n');
 

diff --git a/SS_LinkageClusterOps.m b/SS_LinkageClusterOps.m
@@ -5,7 +5,6 @@
 load('clusters_kmedoids.mat');
 load('resid_variance.mat');
 
-
 kmed = km(kIdx);
 
 % Find best operations
@@ -17,8 +16,8 @@
 % Cluster linkages using a cutoff value for minimum inter-cluster distance
 [distMat_cl,cluster_Groupi,ord]  = BF_ClusterDown(distVec,...
     'clusterThreshold',corr_dist_threshold,'whatDistance','general',...
-    'linkageMeth','complete');
-colormap(BF_getcmap('redyellowgreen',10));
+    'linkageMeth','average');
+colormap(BF_getcmap('redyellowblue',10));
 
 fprintf(['Linkage clustering reduced %i operations to %i groups using '...
     'a distance threshold of %.2f \n'],...

diff --git a/SS_SetupRunOptions.m b/SS_SetupRunOptions.m
@@ -2,10 +2,10 @@ function SS_SetupRunInfo( ks , kToUse , op_km_repeats , ts_km_repeats , ...
     inMatFileName , outTxtFileName , corr_dist_threshold , av_ts_cluster_size)
 
 if ~exist('ks','var')
-    ks = [5042];
+    ks = [30];
 end
 if ~exist('kToUse','var') 
-    kToUse = 5042;
+    kToUse = 30;
 end
 if ~exist('op_km_repeats','var')
     op_km_repeats = 10;