added count file to cluster.classic and cluster.split. modified splitting classes...

[mothur.git] / flowdata.cpp

diff --git a/flowdata.cpp b/flowdata.cpp
index d1769bbed46e34c12a1a8ad4a1f69bebaeca071d..1420f84b992a54ed6dfb6d3a28d8452a083691de 100644 (file)
--- a/flowdata.cpp
+++ b/flowdata.cpp
@@ -42,14 +42,11 @@ FlowData::FlowData(int numFlows, float signal, float noise, int maxHomoP, string
 bool FlowData::getNext(ifstream& flowFile){
        
        try {
-               
-               string lengthString;
-               string flowString;
-               
-               flowFile >> seqName >> endFlow;         
-               for(int i=0;i<numFlows;i++)     {       flowFile >> flowData[i];        }
-               
-               updateEndFlow();
+               flowFile >> seqName >> endFlow; 
+               //cout << "in Flowdata " + seqName << endl;
+               for(int i=0;i<numFlows;i++)     {       flowFile >> flowData[i];        }
+               //cout << "in Flowdata read " << seqName + " done" << endl;
+               updateEndFlow(); 
                translateFlow();
                
                m->gobble(flowFile);
@@ -138,7 +135,8 @@ void FlowData::capFlows(int mF){
        try{
                
                maxFlows = mF;
-               if(endFlow > maxFlows){ endFlow = maxFlows;     }               
+               if(endFlow > maxFlows){ endFlow = maxFlows;     }       
+        translateFlow();
                
        }
        catch(exception& e) {