fixed problem with class.fy.seqs where group totals did not add up. added constructo...

diff --git a/classifyseqscommand.cpp b/classifyseqscommand.cpp
index 85883282ed841c4f22bba3dda6e39e83fe5287c7..7ae2ee5041af97ff462909095aa2af0ec24e5b0d 100644 (file)
--- a/classifyseqscommand.cpp
+++ b/classifyseqscommand.cpp
@@ -526,6 +526,11 @@ int ClassifySeqsCommand::execute(){
        #endif  
 #endif
 
+               m->mothurOutEndLine();
+               m->mothurOut("It took " + toString(time(NULL) - start) + " secs to classify " + toString(numFastaSeqs) + " sequences."); m->mothurOutEndLine(); m->mothurOutEndLine();
+               start = time(NULL);
+
+
                #ifdef USE_MPI  
                        if (pid == 0) {  //this part does not need to be paralellized
                        
@@ -556,10 +561,6 @@ int ClassifySeqsCommand::execute(){
                        }
                #endif
 
-                       m->mothurOutEndLine();
-                       m->mothurOut("It took " + toString(time(NULL) - start) + " secs to classify " + toString(numFastaSeqs) + " sequences."); m->mothurOutEndLine(); m->mothurOutEndLine();
-                       start = time(NULL);
-                       
                        string group = "";
                        if (groupfile != "") {  group = groupfileNames[s]; }
                        

diff --git a/sequence.cpp b/sequence.cpp
index 136e8934419c45182ae2116d2aead2b7374eea3d..71dd3a925fab8eb7771803c6db557dfb9d10200b 100644 (file)
--- a/sequence.cpp
+++ b/sequence.cpp
@@ -10,14 +10,11 @@
 #include "sequence.hpp"
 
 /***********************************************************************/
-
 Sequence::Sequence(){
        m = MothurOut::getInstance();
        initialize();
 }
-
 /***********************************************************************/
-
 Sequence::Sequence(string newName, string sequence) {
        try {
                m = MothurOut::getInstance();
@@ -33,6 +30,22 @@ Sequence::Sequence(string newName, string sequence) {
                exit(1);
        }                       
 }
+/***********************************************************************/
+Sequence::Sequence(string newName, string sequence, string justUnAligned) {
+       try {
+               m = MothurOut::getInstance();
+               initialize();   
+               name = newName;
+               
+               //setUnaligned removes any gap characters for us
+               setUnaligned(sequence);
+       }
+       catch(exception& e) {
+               m->errorOut(e, "Sequence", "Sequence");
+               exit(1);
+       }                       
+}
+
 //********************************************************************************************************************
 //this function will jump over commented out sequences, but if the last sequence in a file is commented out it makes a blank seq
 Sequence::Sequence(istringstream& fastaString){
@@ -70,6 +83,44 @@ Sequence::Sequence(istringstream& fastaString){
                exit(1);
        }                                                               
 }
+//********************************************************************************************************************
+//this function will jump over commented out sequences, but if the last sequence in a file is commented out it makes a blank seq
+Sequence::Sequence(istringstream& fastaString, string JustUnaligned){
+       try {
+               m = MothurOut::getInstance();
+       
+               initialize();
+               fastaString >> name;
+               name = name.substr(1);
+               string sequence;
+       
+               //read comments
+               while ((name[0] == '#') && fastaString) { 
+                       while (!fastaString.eof())      {       char c = fastaString.get(); if (c == 10 || c == 13){    break;  }       } // get rest of line if there's any crap there
+                       sequence = getCommentString(fastaString);
+                       
+                       if (fastaString) {  
+                               fastaString >> name;  
+                               name = name.substr(1);  
+                       }else { 
+                               name = "";
+                               break;
+                       }
+               }
+               
+               while (!fastaString.eof())      {       char c = fastaString.get();  if (c == 10 || c == 13){   break;  }       } // get rest of line if there's any crap there
+               
+               sequence = getSequenceString(fastaString);              
+               
+               //setUnaligned removes any gap characters for us                                                
+               setUnaligned(sequence);         
+       }
+       catch(exception& e) {
+               m->errorOut(e, "Sequence", "Sequence");
+               exit(1);
+       }                                                               
+}
+
 
 //********************************************************************************************************************
 //this function will jump over commented out sequences, but if the last sequence in a file is commented out it makes a blank seq
@@ -109,6 +160,44 @@ Sequence::Sequence(ifstream& fastaFile){
                exit(1);
        }                                                       
 }
+//********************************************************************************************************************
+//this function will jump over commented out sequences, but if the last sequence in a file is commented out it makes a blank seq
+Sequence::Sequence(ifstream& fastaFile, string JustUnaligned){
+       try {
+               m = MothurOut::getInstance();
+               initialize();
+               fastaFile >> name;
+               name = name.substr(1);
+               string sequence;
+               
+               //read comments
+               while ((name[0] == '#') && fastaFile) { 
+                       while (!fastaFile.eof())        {       char c = fastaFile.get(); if (c == 10 || c == 13){      break;  }       } // get rest of line if there's any crap there
+                       sequence = getCommentString(fastaFile);
+                       
+                       if (fastaFile) {  
+                               fastaFile >> name;  
+                               name = name.substr(1);  
+                       }else { 
+                               name = "";
+                               break;
+                       }
+               }
+               
+               //read real sequence
+               while (!fastaFile.eof())        {       char c = fastaFile.get(); if (c == 10 || c == 13){      break;  }       } // get rest of line if there's any crap there
+               
+               sequence = getSequenceString(fastaFile);                
+               
+               //setUnaligned removes any gap characters for us                                                
+               setUnaligned(sequence); 
+       }
+       catch(exception& e) {
+               m->errorOut(e, "Sequence", "Sequence");
+               exit(1);
+       }                                                       
+}
+
 //********************************************************************************************************************
 string Sequence::getSequenceString(ifstream& fastaFile) {
        try {
@@ -314,7 +403,8 @@ string Sequence::getName(){
 //********************************************************************************************************************
 
 string Sequence::getAligned(){
-       return aligned;
+       if(isAligned == 0)      { return unaligned; }
+       else                            {  return aligned;  }
 }
 
 //********************************************************************************************************************
@@ -443,31 +533,4 @@ void Sequence::reverseComplement(){
        aligned = temp;
        
 }
-#ifdef USE_MPI 
-//********************************************************************************************************************
-int Sequence::MPISend(int receiver) {
-       try {
-               
-       
-               return 0;
-
-       }
-       catch(exception& e) {
-               m->errorOut(e, "Sequence", "MPISend");
-               exit(1);
-       }
-}
-/**************************************************************************************************/
-int Sequence::MPIRecv(int sender) {
-       try {
-               
-               return 0;
-
-       }
-       catch(exception& e) {
-               m->errorOut(e, "Sequence", "MPIRecv");
-               exit(1);
-       }
-}
-#endif
 /**************************************************************************************************/

diff --git a/sequence.hpp b/sequence.hpp
index 21b4c3874c9ccb1f5ab9eab31fe78fbd7f0a40c6..95c3e51839029393798dc2f57848d5e325c6c2df 100644 (file)
--- a/sequence.hpp
+++ b/sequence.hpp
@@ -26,6 +26,11 @@ public:
        Sequence(ifstream&);
        Sequence(istringstream&);
        
+       //these constructors just set the unaligned string to save space
+       Sequence(string, string, string);  
+       Sequence(ifstream&, string);
+       Sequence(istringstream&, string);
+       
        void setName(string);
        void setUnaligned(string);
        void setPairwise(string);
@@ -47,9 +52,6 @@ public:
        bool getIsAligned();
        void printSequence(ostream&);
        
-       int MPISend(int); //not working at the moment...
-       int MPIRecv(int); //not working at the moment...
-       
 private:
        MothurOut* m;
        void initialize();