Mercurial > hg > sfx-subgrouping
changeset 12:d0bd98e7b6c9
fixing error where crash at end of file, for treeLinkFeatures
| author | DaveM |
|---|---|
| date | Fri, 10 Feb 2017 14:32:07 +0000 |
| parents | 29304e7bfead |
| children | b398be42561d |
| files | phase2/traverseDownOneStep.m phase2/treeLinkFeatures.m |
| diffstat | 2 files changed, 18 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/phase2/traverseDownOneStep.m Fri Feb 10 12:18:20 2017 +0000 +++ b/phase2/traverseDownOneStep.m Fri Feb 10 14:32:07 2017 +0000 @@ -10,19 +10,23 @@ if(row > listSize) row = row-listSize; end -leaf1 = linkList(row,1); -leaf2 = linkList(row,2); -if(leaf1 > listSize) - leaf = traverseDownOneStep(linkList,leaf,leaf1); +if (row == listSize) + leaf = row; else - leaf = cat(1,leaf,leaf1); + leaf1 = linkList(row,1); + leaf2 = linkList(row,2); + + if(leaf1 > listSize) + leaf = traverseDownOneStep(linkList,leaf,leaf1); + else + leaf = cat(1,leaf,leaf1); + end + + if(leaf2 > listSize) + leaf = traverseDownOneStep(linkList,leaf,leaf2); + else + leaf = cat(1,leaf,leaf2); + end end - -if(leaf2 > listSize) - leaf = traverseDownOneStep(linkList,leaf,leaf2); -else - leaf = cat(1,leaf,leaf2); -end - end \ No newline at end of file
--- a/phase2/treeLinkFeatures.m Fri Feb 10 12:18:20 2017 +0000 +++ b/phase2/treeLinkFeatures.m Fri Feb 10 14:32:07 2017 +0000 @@ -13,9 +13,9 @@ featureList = cell(listSize-1,1); currentRow = [2*listSize-1]; - +%% while (length(currentRow) > 0) - if(currentRow(1) >= listSize) + if(currentRow(1) > listSize) row = currentRow(1) - listSize classList = traceLinkageToBinary(linkList, row); featureList{row} = rfFeatureSelection(data(classList>0,:), classList(classList>0));