comparison phase2/treeLinkFeatures.m @ 17:c674bf769d82

fix infinite loop bug in tree feature identification

 linkList = aglomCluster(data);
 linkList = depthCheck(linkList);
 listSize = size(data,1);
 
 % linkList(:,4) = 0;
-featureList = cell(listSize-1,1);
+featureList = cell(listSize-1,2);
 currentRow = [2*listSize-1];
 
 %%
 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} = rfFeatureSelection(data(classList>0,:), classList(classList>0));
-            currentRow = [currentRow(2:end); linkList(row,1); linkList(row,2)];
+            featureList{row,1} = rfFeatureSelection(data(classList>0,:), classList(classList>0));
+            featureList{row,2} = linkList(row,4);
         end
-    else
-        currentRow = currentRow(2:end);
+        currentRow = [currentRow; linkList(row,1); linkList(row,2)];
     end
+    currentRow = currentRow(2:end);
 end
 
 end