Mercurial > hg > sfx-subgrouping

changeset 22:e3a1a7d38a3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bug in treeLinkFeature - was not performign feature selection correctly
author DaveM
date Tue, 07 Mar 2017 19:03:46 +0000
parents 06adc55c0fd7
children 30db29d5cf5c
files phase2/runme.m phase2/treeLinkFeatures.m
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/phase2/runme.m	Wed Feb 22 13:32:29 2017 +0000
+++ b/phase2/runme.m	Tue Mar 07 19:03:46 2017 +0000
@@ -5,8 +5,8 @@
 % save('testResults.mat','linkList','featureList');
 
 %%
-load('~/sfx-subgrouping/phase2/adobeDataNorm.mat')
-[linkList, featureList]= treeLinkFeatures(AdobeNormalised,5);
+load('adobeDataNorm.mat')
+[linkList, featureList]= treeLinkFeatures(AdobeNormalised,1);
 save('adobeResults.mat','linkList','featureList');
 % exit
 
--- a/phase2/treeLinkFeatures.m	Wed Feb 22 13:32:29 2017 +0000
+++ b/phase2/treeLinkFeatures.m	Tue Mar 07 19:03:46 2017 +0000
@@ -21,11 +21,11 @@
 %%
 while (~isempty(currentRow))
     if(currentRow(1) > listSize)
-        row = currentRow(1) - listSize
+        row = currentRow(1) - listSize;
 %         rD = linkList(row,4);
         if(linkList(row,4) < depthThresh)
             classList = traceLinkageToBinary(linkList, row);
-            featureList{row,1} = rfFeatureSelection(data(classList>0,:), classList(classList>0));
+            featureList{row,1} = rfFeatureSelection(data(classList>0,:), data(classList>0));
             featureList{row,2} = linkList(row,4);
         end
         currentRow = [currentRow; linkList(row,1); linkList(row,2)];