forced rarefaction.single to output ending line for all groups. added subsample...

[mothur.git] / flowdata.cpp

diff --git a/flowdata.cpp b/flowdata.cpp
index eb6f9bfec3a88b05bf2dcd03a751b01b320430d0..1420f84b992a54ed6dfb6d3a28d8452a083691de 100644 (file)
--- a/flowdata.cpp
+++ b/flowdata.cpp
@@ -19,14 +19,14 @@ FlowData::~FlowData(){      /*      do nothing      */      }
 
 //**********************************************************************************************************************
 
-FlowData::FlowData(int numFlows, float signal, float noise, int maxHomoP) : 
-                       numFlows(numFlows), signalIntensity(signal), noiseIntensity(noise), maxHomoP(maxHomoP){
+FlowData::FlowData(int numFlows, float signal, float noise, int maxHomoP, string baseFlow) : 
+                       numFlows(numFlows), signalIntensity(signal), noiseIntensity(noise), maxHomoP(maxHomoP), baseFlow(baseFlow){
 
        try {
                m = MothurOut::getInstance();
 
                flowData.assign(numFlows, 0);
-               baseFlow = "TACG";
+//             baseFlow = "TACG";
                seqName = "";
                locationString = "";
        }
@@ -42,14 +42,11 @@ FlowData::FlowData(int numFlows, float signal, float noise, int maxHomoP) :
 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) {
@@ -212,3 +210,16 @@ void FlowData::printFlows(ofstream& outFlowFile, string scrapCode){
 }
 
 //**********************************************************************************************************************
+
+string FlowData::getName(){
+       
+       try{
+               return seqName;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "FlowData", "getName");
+               exit(1);
+       }
+}
+
+//**********************************************************************************************************************