Changeset 4353


Ignore:
Timestamp:
Sep 27, 2012, 3:11:11 PM (10 years ago)
Author:
marianne
Message:

Refs #774. Bug fix during clusterID propagation and speed-up.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/plugin/src/org/proteios/plugins/FeatureSequencePropagator.java

    r4347 r4353  
    825825
    826826            if (ignoreLimit[firstFileIndex] || ignoreLimit[secondFileIndex] || ((nbrMatchesPerFile[firstFileIndex]<currentMatch || nbrMatchesPerFile[secondFileIndex]<currentMatch) && nbrMatchesPerFile[firstFileIndex]<MATCHED_FILES_LIMIT+1 && nbrMatchesPerFile[secondFileIndex]<MATCHED_FILES_LIMIT+1)) { 
    827              
     827           
    828828              currentNbrALignments++;
    829829
     
    22342234      log.debug("Size of fClustIDList: " + fClusterIDList.size());
    22352235     
     2236      log.debug("bestMatchClusterIDList ID:s ");
     2237      if(fp.getFirstFile()==13 && fp.getSecondFile()==25){
     2238        for(int i=0;i<bestMatchClusterIDList.size();i++){
     2239          log.debug("Flist ID: " +fList.get(i).getClusterId() +" f Clust ID: " +fClusterIDList.get(i) + " sBM ID: "+ bestMatchList.get(i).getClusterId() +" bm Clust ID: " +bestMatchClusterIDList.get(i));
     2240        }
     2241      }
     2242     
    22362243      Collections.sort(clusterIDFeaturesList, new ClusterIDComparator());
    22372244      // helper array for not counting clusters multiple times
     
    22392246     
    22402247      Long prevBestMatchClusterID = null;
     2248      Feature f = null;
     2249      Long fClusterID = null;
    22412250      int featureNbr = -1;
    22422251     
     
    22472256        Long bestMatchClusterID = bestMatch.getClusterId();
    22482257       
    2249         if(!bestMatchClusterID.equals(prevBestMatchClusterID)){
     2258        if(!bestMatchClusterID.equals(prevBestMatchClusterID) && !bestMatchClusterID.equals(fClusterID)){
    22502259          featureNbr = bestMatchClusterIDList.indexOf(bestMatchClusterID);
     2260          f = fList.get(featureNbr);
     2261          fClusterID = f.getClusterId();
    22512262          prevBestMatchClusterID = bestMatchClusterID;
    22522263        }
    2253        
    2254         Feature f = fList.get(featureNbr);
    2255         Long fClusterID = f.getClusterId();
    22562264
    22572265        if (fClusterID != null
Note: See TracChangeset for help on using the changeset viewer.